fat_core 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb57601c694dcca084b7e0cedf6122267fae07d
-  data.tar.gz: 935cca77deba0bc578dd5ea6d0548b97bfb835e9
+  metadata.gz: 66c342d6384a15e67820f179df257c234d77810d
+  data.tar.gz: 23a1da18e31c2f77adbd4455206dfe1b54326bb9
 SHA512:
-  metadata.gz: 1efe0764bc17f809d64bad67adf09ded6a21e2db79371f3821a48658c284699597d8c48b61d1437981e1d019023d73ffb16a5d7082323fc6b64988944722dd8c
-  data.tar.gz: 6376076ec020b330a5b35a58d26d73c4030f4d7643be3dbb0c6076e12e34588c4c1fa7be2e22ee7a1d9d146487048a8eb6cfa817990f684a971931c0e22c6053
+  metadata.gz: d91ffaf07b1f4353dead0e81b03da11cd311a1a95fc3a0ed92f488336c85b4cbbfd92ee40d4db05ab165f93a7e0b6c6655373bd5963ecc00fbce90a6bac34fb5
+  data.tar.gz: 2f8d2eff64ae74ad5d51f2d2cdc3493a514f21464b4efd5d33881566f8003df7fb48e121b78055f7c995e2696fe565a193fa6cf4dcd40336a53e718b20eaace8

data/fat_core.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "fat_core"
   spec.version       = FatCore::VERSION
   spec.authors       = ["Daniel E. Doherty"]
-  spec.email         = ["ded-law@ddoherty.net"]
+  spec.email         = ["ded@ddoherty.net"]
   spec.summary       = %q{fat_core provides some useful core extensions}
   spec.description   = %q{Write a longer description. Optional.}
   spec.homepage      = ""

data/lib/fat_core/date.rb

@@ -104,6 +104,22 @@ class Date
       quarter = $1.to_i
       date = Date.new(this_year, quarter * 3, 15)
       spec_type == :from ? date.beginning_of_quarter : date.end_of_quarter
+    when /^(\d\d\d\d)-(\d)[Hh]$/, /^(\d\d\d\d)-[Hh](\d)$/
+      # Year-Half
+      year = $1.to_i
+      half = $2.to_i
+      unless [1, 2].include?(half)
+        raise ArgumentError, "bad date format: #{spec}"
+      end
+      month = half * 6
+      spec_type == :from ? Date.new(year, month, 15).beginning_of_half :
+        Date.new(year, month, 1).end_of_half
+    when /^([12])[hH]$/, /^[hH]([12])$/
+      # Half only
+      this_year = today.year
+      half = $1.to_i
+      date = Date.new(this_year, half * 6, 15)
+      spec_type == :from ? date.beginning_of_half : date.end_of_half
     when /^(\d\d\d\d)-(\d\d?)*$/
       # Year-Month only
       spec_type == :from ? Date.new($1.to_i, $2.to_i, 1) :
@@ -149,6 +165,11 @@ class Date
     when /^last_?quarter/
       spec_type == :from ? (today - 3.months).beginning_of_quarter :
         (today - 3.months).end_of_quarter
+    when /^(this_?)?half/
+      spec_type == :from ? today.beginning_of_half : today.end_of_half
+    when /^last_?half/
+      spec_type == :from ? (today - 6.months).beginning_of_half :
+        (today - 6.months).end_of_half
     when /^(this_?)?year/
       spec_type == :from ? today.beginning_of_year : today.end_of_year
     when /^last_?year/
@@ -216,6 +237,16 @@ class Date
     !weekend?
   end
 
+  # Self's calendar half: 1 or 2
+  def half
+    case month
+    when (1..6)
+      1
+    when (7..12)
+      2
+    end
+  end
+
   # Self's calendar quarter: 1, 2, 3, or 4
   def quarter
     case month
@@ -230,6 +261,28 @@ class Date
     end
   end
 
+  # The date that is the first day of the half-year in which self falls.
+  def beginning_of_half
+    if month > 9
+      (beginning_of_quarter - 15).beginning_of_quarter
+    elsif month > 6
+      beginning_of_quarter
+    else
+      beginning_of_year
+    end
+  end
+
+  # The date that is the last day of the half-year in which self falls.
+  def end_of_half
+    if month < 4
+      (end_of_quarter + 15).end_of_quarter
+    elsif month < 7
+      end_of_quarter
+    else
+      end_of_year
+    end
+  end
+
   # The date that is the first day of the bimonth in which self
   # falls. A 'bimonth' is a two-month calendar period beginning on the
   # first day of the odd-numbered months.  E.g., 2014-01-01 to
@@ -304,6 +357,14 @@ class Date
     end_of_year == self
   end
 
+  def beginning_of_half?
+    beginning_of_half == self
+  end
+
+  def end_of_half?
+    end_of_half == self
+  end
+
   def beginning_of_quarter?
     beginning_of_quarter == self
   end
@@ -363,6 +424,8 @@ class Date
     case chunk
     when :year
       next_year
+    when :half
+      next_month(6)
     when :quarter
       next_month(3)
     when :bimonth
@@ -386,6 +449,8 @@ class Date
     case sym
     when :year
       beginning_of_year
+    when :half
+      beginning_of_half
     when :quarter
       beginning_of_quarter
     when :bimonth
@@ -409,6 +474,8 @@ class Date
     case sym
     when :year
       end_of_year
+    when :half
+      end_of_half
     when :quarter
       end_of_quarter
     when :bimonth

data/lib/fat_core/version.rb

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

data/spec/lib/date_spec.rb

@@ -237,6 +237,22 @@ describe Date do
         }.to raise_error
       end
 
+      it "should parse year-half specs such as YYYY-NH or YYYY-HN" 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-3H') }.to raise_error
+      end
+
+      it "should parse half-only specs such as NQ or QN" do
+        expect(Date.parse_spec('2H', :from)).to eq Date.parse('2012-07-01')
+        expect(Date.parse_spec('H2', :to)).to eq Date.parse('2012-12-31')
+        expect(Date.parse_spec('1H', :from)).to eq Date.parse('2012-01-01')
+        expect(Date.parse_spec('H1', :to)).to eq Date.parse('2012-06-30')
+        expect { Date.parse_spec('8H') }.to raise_error
+      end
+
       it "should parse year-quarter specs such as YYYY-NQ or YYYY-QN" 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')
@@ -333,6 +349,14 @@ describe Date do
         expect(Date.parse_spec('last_quarter', :to)).to eq Date.parse('2012-06-30')
       end
 
+      # Today is set to '2012-07-18'
+      it "should parse relative halves: this_half, last_half" do
+        expect(Date.parse_spec('this_half')).to eq Date.parse('2012-07-01')
+        expect(Date.parse_spec('this_half', :to)).to eq Date.parse('2012-12-31')
+        expect(Date.parse_spec('last_half')).to eq Date.parse('2012-01-01')
+        expect(Date.parse_spec('last_half', :to)).to eq Date.parse('2012-06-30')
+      end
+
       it "should parse relative years: this_year, last_year" do
         expect(Date.parse_spec('this_year')).to eq Date.parse('2012-01-01')
         expect(Date.parse_spec('this_year', :to)).to eq Date.parse('2012-12-31')
@@ -426,6 +450,16 @@ describe Date do
         expect(Date.parse('2013-12-30')).to_not be_end_of_year
       end
 
+      it "should know about halves" do
+        expect(Date.parse('2013-01-01')).to be_beginning_of_half
+        expect(Date.parse('2013-12-31')).to be_end_of_half
+        expect(Date.parse('2013-07-01')).to be_beginning_of_half
+        expect(Date.parse('2013-06-30')).to be_end_of_half
+        expect(Date.parse('2013-05-01')).to_not be_beginning_of_half
+        expect(Date.parse('2013-05-01').half).to eq(1)
+        expect(Date.parse('2013-07-31').half).to eq(2)
+      end
+
       it "should know about quarters" do
         expect(Date.parse('2013-01-01')).to be_beginning_of_quarter
         expect(Date.parse('2013-12-31')).to be_end_of_quarter
@@ -486,6 +520,7 @@ describe Date do
 
       it "should know the beginning of chunks" do
         expect(Date.parse('2013-11-04').beginning_of_chunk(:year)).to eq Date.parse('2013-01-01')
+        expect(Date.parse('2013-11-04').beginning_of_chunk(:half)).to eq Date.parse('2013-07-01')
         expect(Date.parse('2013-11-04').beginning_of_chunk(:quarter)).to eq Date.parse('2013-10-01')
         expect(Date.parse('2013-12-04').beginning_of_chunk(:bimonth)).to eq Date.parse('2013-11-01')
         expect(Date.parse('2013-11-04').beginning_of_chunk(:month)).to eq Date.parse('2013-11-01')
@@ -501,6 +536,7 @@ describe Date do
       it "should be able to add a chuck sym to itself" do
         # Date.today is '2012-07-18'
         expect(Date.today.add_chunk(:year)).to eq(Date.parse('2013-07-18'))
+        expect(Date.today.add_chunk(:half)).to eq(Date.parse('2013-01-18'))
         expect(Date.today.add_chunk(:quarter)).to eq(Date.parse('2012-10-18'))
         expect(Date.today.add_chunk(:bimonth)).to eq(Date.parse('2012-09-18'))
         expect(Date.today.add_chunk(:month)).to eq(Date.parse('2012-08-18'))
@@ -516,6 +552,7 @@ describe Date do
 
       it "should know the end of chunks" do
         expect(Date.parse('2013-07-04').end_of_chunk(:year)).to eq Date.parse('2013-12-31')
+        expect(Date.parse('2013-05-04').end_of_chunk(:half)).to eq Date.parse('2013-06-30')
         expect(Date.parse('2013-07-04').end_of_chunk(:quarter)).to eq Date.parse('2013-09-30')
         expect(Date.parse('2013-12-04').end_of_chunk(:bimonth)).to eq Date.parse('2013-12-31')
         expect(Date.parse('2013-07-04').end_of_chunk(:month)).to eq Date.parse('2013-07-31')
@@ -530,6 +567,7 @@ describe Date do
 
       it "should know how to expand to chunk periods" do
         expect(Date.parse('2013-07-04').expand_to_period(:year)).to eq Period.new('2013-01-01', '2013-12-31')
+        expect(Date.parse('2013-07-04').expand_to_period(:half)).to eq Period.new('2013-07-01', '2013-12-31')
         expect(Date.parse('2013-07-04').expand_to_period(:quarter)).to eq Period.new('2013-07-01', '2013-09-30')
         expect(Date.parse('2013-07-04').expand_to_period(:bimonth)).to eq Period.new('2013-07-01', '2013-08-31')
         expect(Date.parse('2013-07-04').expand_to_period(:month)).to eq Period.new('2013-07-01', '2013-07-31')

data/spec/lib/period_spec.rb

@@ -41,7 +41,7 @@ describe Period do
     end
   end
 
-  describe "class methods" do
+  describe 'class methods' do
     it 'should be able to parse a period spec' do
       pd = Period.parse
       expect(pd.first).to eq(Date.parse('2012-01-01'))
@@ -51,6 +51,38 @@ describe Period do
       expect(pd.first).to eq(Date.parse('2012-07-01'))
       expect(pd.last).to eq(Date.parse('2012-12-31'))
 
+      pd = Period.parse('from 2Q')
+      expect(pd.first).to eq(Date.parse('2012-04-01'))
+      expect(pd.last).to eq(Date.parse('2012-06-30'))
+
+      pd = Period.parse('to 3Q')
+      expect(pd.first).to eq(Date.parse('2012-07-01'))
+      expect(pd.last).to eq(Date.parse('2012-09-30'))
+
+      pd = Period.parse('to 2012-2Q')
+      expect(pd.first).to eq(Date.parse('2012-04-01'))
+      expect(pd.last).to eq(Date.parse('2012-06-30'))
+
+      pd = Period.parse('from 2012-1Q')
+      expect(pd.first).to eq(Date.parse('2012-01-01'))
+      expect(pd.last).to eq(Date.parse('2012-03-31'))
+
+      pd = Period.parse('from 2H')
+      expect(pd.first).to eq(Date.parse('2012-07-01'))
+      expect(pd.last).to eq(Date.parse('2012-12-31'))
+
+      pd = Period.parse('to 1H')
+      expect(pd.first).to eq(Date.parse('2012-01-01'))
+      expect(pd.last).to eq(Date.parse('2012-06-30'))
+
+      pd = Period.parse('to 2012-2H')
+      expect(pd.first).to eq(Date.parse('2012-07-01'))
+      expect(pd.last).to eq(Date.parse('2012-12-31'))
+
+      pd = Period.parse('from 2012-1H')
+      expect(pd.first).to eq(Date.parse('2012-01-01'))
+      expect(pd.last).to eq(Date.parse('2012-06-30'))
+
       pd = Period.parse('to 2012')
       expect(pd.first).to eq(Date.parse('2012-01-01'))
       expect(pd.last).to eq(Date.parse('2012-12-31'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -166,7 +166,7 @@ dependencies:
         version: '0'
 description: Write a longer description. Optional.
 email:
-- ded-law@ddoherty.net
+- ded@ddoherty.net
 executables:
 - easters
 extensions: []