From de7b0ec90d8384ed2355b61ce21c059f43ccf206 Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Fri, 28 Jul 2017 14:10:59 +0300 Subject: [PATCH] day and month confusion fixed --- app/models/page.rb | 4 ++-- spec/models/page_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/page.rb b/app/models/page.rb index 748d70b..9a45bed 100644 --- a/app/models/page.rb +++ b/app/models/page.rb @@ -8,8 +8,8 @@ class Page raise "must be partial, statr with _ not:#{base}" unless base[0] == "_" @words = base.split("-") @year = parse_int(@words.shift[1 .. -1] , 2100) - @month = parse_int(@words.shift , 12) @day = parse_int(@words.shift , 32) + @month = parse_int(@words.shift , 12) raise "Invalid path #{path}" unless @words end def slug @@ -22,7 +22,7 @@ class Page "#{date}-#{@words.join("-")}" end def date - "#{year}-#{month}-#{day}" + "#{year}-#{day}-#{month}" end def parse_int( value , max) ret = value.to_i diff --git a/spec/models/page_spec.rb b/spec/models/page_spec.rb index ff24770..9acf7e8 100644 --- a/spec/models/page_spec.rb +++ b/spec/models/page_spec.rb @@ -27,8 +27,8 @@ RSpec.describe Page, type: :model do end it "returns dates" do expect(@page.year).to eq 1993 - expect(@page.month).to eq 2 - expect(@page.day).to eq 4 + expect(@page.month).to eq 4 + expect(@page.day).to eq 2 end it "returns date" do expect(@page.date).to eq "1993-2-4"