fat_core 1.2.8 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b584803e27f06145ac112e534d19283bb680c525
-  data.tar.gz: 03f00dfaca603a3487db9b5f702aa188510151cb
+  metadata.gz: 49d7213a1c1d8f0372f9a5f0e057dec4a194e541
+  data.tar.gz: 6f8ee1ddc0bfb0e8b66247453e2f4c11fc51d0d1
 SHA512:
-  metadata.gz: 71655e984f1019ce9a7c3ae3fc6f180b317061a892dc37315070aca2c5ffc0765ba35fc4e227924bebf9145fc13b3ebe6a70dfc080a364b6d3327b1071a253b0
-  data.tar.gz: 7b7a975597653fa34761a7e075bb8f1f5bdd17d3018c29538bced08b47332972f208d4017d1a990a87e53f674606a61d558194a281e484e0e0838ca3ee5b2cc9
+  metadata.gz: 074407a3a3e4b7885d841b8fe351c18fd03d001620058e9364129fe82f995d3e25554c4b3c2bb364851e006faa95778929bc7342d7799ed8d8c10956421fb64f
+  data.tar.gz: 4d0d70cfc49d8f1152db707a8eb43672d5fcf1586f088e41646a3f33f2d49c2634c15d5944246624a80bc325e277559a960e5e9840077804d4296f2ba1b00d61

data/.gitignore

@@ -19,3 +19,4 @@ tmp
 /GRTAGS
 /GTAGS
 /.rubocop_todo.yml
+/gtags.files

data/lib/fat_core/date.rb

@@ -65,8 +65,8 @@ class Date
     end
 
     today = Date.current
-    case spec
-    when /^(\d\d\d\d)-(\d\d?)-(\d\d?)*$/
+    case spec.clean
+    when /\A(\d\d\d\d)[-\/](\d\d?)[-\/](\d\d?)\z/
       # A specified date
       Date.new($1.to_i, $2.to_i, $3.to_i)
     when /\AW(\d\d?)\z/, /\A(\d\d?)W\z/
@@ -79,7 +79,7 @@ class Date
       else
         Date.commercial(today.year, week_num).end_of_week
       end
-    when /\A(\d\d\d\d)-W(\d\d?)\z/, /\A(\d\d\d\d)-(\d\d?)W\z/
+    when /\A(\d\d\d\d)[-\/]W(\d\d?)\z/, /\A(\d\d\d\d)[-\/](\d\d?)W\z/
       year = $1.to_i
       week_num = $2.to_i
       if week_num < 1 || week_num > 53
@@ -90,7 +90,7 @@ class Date
       else
         Date.commercial(year, week_num).end_of_week
       end
-    when /^(\d\d\d\d)-(\d)[Qq]$/, /^(\d\d\d\d)-[Qq](\d)$/
+    when /^(\d\d\d\d)[-\/](\d)[Qq]$/, /^(\d\d\d\d)[-\/][Qq](\d)$/
       # Year-Quarter
       year = $1.to_i
       quarter = $2.to_i
@@ -113,7 +113,7 @@ class Date
       else
         date.end_of_quarter
       end
-    when /^(\d\d\d\d)-(\d)[Hh]$/, /^(\d\d\d\d)-[Hh](\d)$/
+    when /^(\d\d\d\d)[-\/](\d)[Hh]$/, /^(\d\d\d\d)[-\/][Hh](\d)$/
       # Year-Half
       year = $1.to_i
       half = $2.to_i
@@ -136,13 +136,20 @@ class Date
       else
         date.end_of_half
       end
-    when /^(\d\d\d\d)-(\d\d?)*$/
+    when /^(\d\d\d\d)[-\/](\d\d?)*$/
       # Year-Month only
       if spec_type == :from
         Date.new($1.to_i, $2.to_i, 1)
       else
         Date.new($1.to_i, $2.to_i, 1).end_of_month
       end
+    when /^(\d\d?)[-\/](\d\d?)*$/
+      # Month-Day only
+      if spec_type == :from
+        Date.new(today.year, $1.to_i, $2.to_i)
+      else
+        Date.new(today.year, $1.to_i, $2.to_i).end_of_month
+      end
     when /\A(\d\d?)\z/
       # Month only
       if spec_type == :from

data/lib/fat_core/version.rb

@@ -1,7 +1,7 @@
 module FatCore
   MAJOR = 1
-  MINOR = 2
-  PATCH = 8
+  MINOR = 3
+  PATCH = 0
 
   VERSION = [MAJOR, MINOR, PATCH].compact.join('.')
 end

data/spec/lib/date_spec.rb

@@ -211,7 +211,7 @@ describe Date do
 
       it 'should parse plain iso dates correctly' do
         expect(Date.parse_spec('2011-07-15')).to eq Date.parse('2011-07-15')
-        expect(Date.parse_spec('2011-08-05')).to eq Date.parse('2011-08-05')
+        expect(Date.parse_spec('2011/08/05')).to eq Date.parse('2011-08-05')
       end
 
       it "should parse week numbers such as 'W23' or '23W' correctly" do
@@ -231,7 +231,7 @@ describe Date do
         expect(Date.parse_spec('2003-W23')).to eq Date.parse('2003-06-02')
         expect(Date.parse_spec('2003-W23', :to)).to eq Date.parse('2003-06-08')
         expect(Date.parse_spec('2003-23W')).to eq Date.parse('2003-06-02')
-        expect(Date.parse_spec('2003-23W', :to)).to eq Date.parse('2003-06-08')
+        expect(Date.parse_spec('2003/23W', :to)).to eq Date.parse('2003-06-08')
         expect {
           Date.parse_spec('2003-W83', :to)
         }.to raise_error(ArgumentError)
@@ -241,7 +241,7 @@ describe Date do
         expect(Date.parse_spec('2011-2H', :from)).to eq Date.parse('2011-07-01')
         expect(Date.parse_spec('2011-2H', :to)).to eq Date.parse('2011-12-31')
         expect(Date.parse_spec('2011-H1', :from)).to eq Date.parse('2011-01-01')
-        expect(Date.parse_spec('2011-H1', :to)).to eq Date.parse('2011-06-30')
+        expect(Date.parse_spec('2011/H1', :to)).to eq Date.parse('2011-06-30')
         expect { Date.parse_spec('2011-3H') }.to raise_error(ArgumentError)
       end
 
@@ -257,7 +257,7 @@ describe Date do
         expect(Date.parse_spec('2011-4Q', :from)).to eq Date.parse('2011-10-01')
         expect(Date.parse_spec('2011-4Q', :to)).to eq Date.parse('2011-12-31')
         expect(Date.parse_spec('2011-Q4', :from)).to eq Date.parse('2011-10-01')
-        expect(Date.parse_spec('2011-Q4', :to)).to eq Date.parse('2011-12-31')
+        expect(Date.parse_spec('2011/Q4', :to)).to eq Date.parse('2011-12-31')
         expect { Date.parse_spec('2011-5Q') }.to raise_error(ArgumentError)
       end
 
@@ -271,7 +271,7 @@ describe Date do
 
       it 'should parse year-month specs such as YYYY-MM' do
         expect(Date.parse_spec('2010-5', :from)).to eq Date.parse('2010-05-01')
-        expect(Date.parse_spec('2010-5', :to)).to eq Date.parse('2010-05-31')
+        expect(Date.parse_spec('2010/5', :to)).to eq Date.parse('2010-05-31')
         expect { Date.parse_spec('2010-13') }.to raise_error(ArgumentError)
       end
 
@@ -282,6 +282,21 @@ describe Date do
         expect { Date.parse_spec('011') }.to raise_error(ArgumentError)
       end
 
+      it 'should parse month-day specs such as MM-DD' do
+        expect(Date.parse_spec('10-12', :from)).to eq Date.parse('2012-10-12')
+        expect(Date.parse_spec('10-2', :from)).to eq Date.parse('2012-10-02')
+        expect(Date.parse_spec('5-12', :from)).to eq Date.parse('2012-05-12')
+        expect(Date.parse_spec('5-2', :from)).to eq Date.parse('2012-05-02')
+        expect(Date.parse_spec('10/12', :from)).to eq Date.parse('2012-10-12')
+        expect(Date.parse_spec('10/2', :from)).to eq Date.parse('2012-10-02')
+        expect(Date.parse_spec('5/12', :from)).to eq Date.parse('2012-05-12')
+        expect(Date.parse_spec('5/2', :from)).to eq Date.parse('2012-05-02')
+        expect { Date.parse_spec('99-3') }.to raise_error(ArgumentError)
+        expect { Date.parse_spec('3-33') }.to raise_error(ArgumentError)
+        expect { Date.parse_spec('99/3') }.to raise_error(ArgumentError)
+        expect { Date.parse_spec('3/33') }.to raise_error(ArgumentError)
+      end
+
       it 'should parse year-only specs such as YYYY' do
         expect(Date.parse_spec('2010', :from)).to eq Date.parse('2010-01-01')
         expect(Date.parse_spec('2010', :to)).to eq Date.parse('2010-12-31')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.3.0
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2017-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov