periods 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eea9d19b7049b6d03a568e701364c49ffb48a1be
-  data.tar.gz: 98bf92f0394a366292346a1261dbb3e9242ed6e9
+  metadata.gz: b340e86339eee67b5f7915f6df4d6e809aba2107
+  data.tar.gz: 0d613dce4f4898974d2953797e8cd9cd0b6b72b1
 SHA512:
-  metadata.gz: a7d3596288e9733b834c2f7fae59d2ec94b041eaa918ffc7c052dc8d34e38c402f331d17d51ce3e9ed4c2fe047e5098e1d7929cf92ddc818e72885ca0c876f35
-  data.tar.gz: a43ae004a0e85f71fc640ab1b594713fbbd89b3300a62b8c4283c24be287708f7d4a61492814e107dcc36055c5c83076448811dbfdbc525d1aea0974770ea8f2
+  metadata.gz: f299f089e6a1c016005d0120b8784cb317bd7ed73061dd76906fb35eb1b4a2c81da882928608b974f1c54bbda33e9f9993a6c7f362754a4a77575b82e26d92d8
+  data.tar.gz: adc4461e7f2d1e8b2cf112a0bb8baddf9e3732ded407f6ed66d933f9493cbfc2f936d9da25336eb449cfebe817d319c17fe676c25b7d80d6aa3589354707c3e2

data/lib/periods/modules/halfyearly_period.rb

@@ -35,16 +35,6 @@ module Periods
           (self.next.start_date - start_date).to_i
         end
 
-        def include?(period)
-          if period.is_a?(String) || period.is_a?(Date)
-            super
-          elsif period.is_a?(Period)
-            start_date <= period.start_date && period.end_date <= end_date
-          else
-            false
-          end
-        end
-
       end
     end
   end

data/lib/periods/modules/period.rb

@@ -43,9 +43,17 @@ module Periods
           end_date.yday - start_date.yday + 1
         end
 
-        def include?(date)
-          date = Date.parse(date.to_s)
-          start_date <= date && date <= end_date
+        def include?(period)
+          if period.is_a?(Date)
+            start_date <= period && period <= end_date
+          elsif period.is_a?(String)
+            date = Date.parse(period.to_s)
+            start_date <= date && date <= end_date
+          elsif period.is_a?(Period)
+            start_date <= period.start_date && period.end_date <= end_date
+          else
+            false
+          end
         end
 
         def to_s

data/lib/periods/modules/quarterly_period.rb

@@ -38,16 +38,6 @@ module Periods
           self.class.for(start_date.prev_month(3))
         end
 
-        def include?(period)
-          if period.is_a?(String) || period.is_a?(Date)
-            super
-          elsif period.is_a?(Period)
-            start_date <= period.start_date && period.end_date <= end_date
-          else
-            false
-          end
-        end
-
       end
     end
   end

data/lib/periods/modules/year.rb

@@ -47,16 +47,6 @@ module Periods
           (self.next.start_date - start_date).to_i
         end
 
-        def include?(period)
-          if period.is_a?(String) || period.is_a?(Date)
-            super
-          elsif period.is_a?(Period)
-            start_date <= period.start_date && period.end_date <= end_date
-          else
-            false
-          end
-        end
-
         def year
           start_date.year
         end

data/lib/periods/modules/yearly_period.rb

@@ -41,16 +41,6 @@ module Periods
           (self.next.start_date - start_date).to_i
         end
 
-        def include?(period)
-          if period.is_a?(String) || period.is_a?(Date)
-            super
-          elsif period.is_a?(Period)
-            start_date <= period.start_date && period.end_date <= end_date
-          else
-            false
-          end
-        end
-
       end
     end
   end

data/lib/periods/version.rb

@@ -1,3 +1,3 @@
 module Periods
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/halfyear_spec.rb

@@ -11,8 +11,8 @@ describe Halfyear do
     it "returns month of given date included" do
       month = described_class.for('25.06.2015')
 
-      expect(month.start_date).to eq date('01.06.2015')
-      expect(month.end_date).to eq date('30.11.2015')
+      expect(month.start_date).to eq Date('01.06.2015')
+      expect(month.end_date).to eq Date('30.11.2015')
     end
   end
 

data/spec/lib/halfyearly_period_spec.rb

@@ -11,8 +11,8 @@ describe HalfyearlyPeriod do
     it "returns halfyear of given date included" do
       period = described_class.for('25.06.2015')
 
-      expect(period.start_date).to eq date('25.06.2015')
-      expect(period.end_date).to eq date('24.12.2015')
+      expect(period.start_date).to eq Date('25.06.2015')
+      expect(period.end_date).to eq Date('24.12.2015')
     end
   end
 

data/spec/lib/month_spec.rb

@@ -11,8 +11,8 @@ describe Month do
     it "returns month of given date included" do
       month = described_class.for('25.06.2015')
 
-      expect(month.start_date).to eq date('01.06.2015')
-      expect(month.end_date).to eq date('30.06.2015')
+      expect(month.start_date).to eq Date('01.06.2015')
+      expect(month.end_date).to eq Date('30.06.2015')
     end
   end
 

data/spec/lib/monthly_period_spec.rb

@@ -11,8 +11,8 @@ describe MonthlyPeriod do
     it "returns month of given date included" do
       month = described_class.for('25.06.2015')
 
-      expect(month.start_date).to eq date('25.06.2015')
-      expect(month.end_date).to eq date('24.07.2015')
+      expect(month.start_date).to eq Date('25.06.2015')
+      expect(month.end_date).to eq Date('24.07.2015')
     end
   end
 

data/spec/lib/own_class_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+require 'periods/modules'
+
+class MyMonth
+  include Periods::Modules::Month
+end
+
+describe "defining own classes including period module" do
+
+  describe ".for" do
+    it "set start and end date" do
+      month = MyMonth.for('25.06.2015')
+
+      expect(month.start_date).to eq Date('01.06.2015')
+      expect(month.end_date).to eq Date('30.06.2015')
+    end
+  end
+
+end

data/spec/lib/period_spec.rb

@@ -57,18 +57,49 @@ describe Period do
 
   describe "#include?" do
     context "date included" do
+      it "returns true" do
+        expect(new_period("01.02.2015", "28.02.2015").include?(Date("01.02.2015"))).to be_truthy
+        expect(new_period("01.02.2015", "28.02.2015").include?(Date("28.02.2015"))).to be_truthy
+      end
+    end
+
+    context "date not included" do
+      it "returns false" do
+        expect(new_period("01.02.2015", "28.02.2015").include?(Date("31.01.2015"))).to be_falsey
+        expect(new_period("01.02.2015", "28.02.2015").include?(Date("01.03.2015"))).to be_falsey
+      end
+    end
+
+    context "date string included" do
       it "returns true" do
         expect(new_period("01.02.2015", "28.02.2015").include?("01.02.2015")).to be_truthy
         expect(new_period("01.02.2015", "28.02.2015").include?("28.02.2015")).to be_truthy
       end
     end
 
-    context "date not included" do
+    context "date string not included" do
       it "returns false" do
         expect(new_period("01.02.2015", "28.02.2015").include?("31.01.2015")).to be_falsey
         expect(new_period("01.02.2015", "28.02.2015").include?("01.03.2015")).to be_falsey
       end
     end
+
+    context "period included" do
+      it "returns true" do
+        period = new_period("10.04.2015", "20.05.2015")
+        expect(period.include?(new_period("10.04.2015", "20.05.2015"))).to be_truthy
+        expect(period.include?(new_period("11.04.2015", "20.05.2015"))).to be_truthy
+        expect(period.include?(new_period("10.04.2015", "19.05.2015"))).to be_truthy
+      end
+    end
+
+    context "period not included" do
+      it "returns false" do
+        period = new_period("10.04.2015", "20.05.2015")
+        expect(period.include?(new_period("09.04.2015", "20.05.2015"))).to be_falsey
+        expect(period.include?(new_period("10.04.2015", "21.05.2015"))).to be_falsey
+      end
+    end
   end
 end
 

data/spec/lib/periods/date_calculator_spec.rb

@@ -6,17 +6,17 @@ module Periods
 
     describe "#beginning_of_month" do
       it "returns given date with first day of month" do
-        expect(described_class.new('01.06.2015').beginning_of_month).to eq date('01.06.2015')
-        expect(described_class.new('02.06.2015').beginning_of_month).to eq date('01.06.2015')
-        expect(described_class.new('30.06.2015').beginning_of_month).to eq date('01.06.2015')
+        expect(described_class.new('01.06.2015').beginning_of_month).to eq Date('01.06.2015')
+        expect(described_class.new('02.06.2015').beginning_of_month).to eq Date('01.06.2015')
+        expect(described_class.new('30.06.2015').beginning_of_month).to eq Date('01.06.2015')
       end
     end
 
     describe "#end_of_month" do
       it "returns given date with last day of month" do
-        expect(described_class.new('01.06.2015').end_of_month).to eq date('30.06.2015')
-        expect(described_class.new('02.06.2015').end_of_month).to eq date('30.06.2015')
-        expect(described_class.new('30.06.2015').end_of_month).to eq date('30.06.2015')
+        expect(described_class.new('01.06.2015').end_of_month).to eq Date('30.06.2015')
+        expect(described_class.new('02.06.2015').end_of_month).to eq Date('30.06.2015')
+        expect(described_class.new('30.06.2015').end_of_month).to eq Date('30.06.2015')
       end
     end
   end

data/spec/lib/quarter_spec.rb

@@ -11,8 +11,8 @@ describe Quarter do
     it "returns quarter of given date included" do
       period = described_class.for('25.06.2015')
 
-      expect(period.start_date).to eq date('01.06.2015')
-      expect(period.end_date).to eq date('31.08.2015')
+      expect(period.start_date).to eq Date('01.06.2015')
+      expect(period.end_date).to eq Date('31.08.2015')
     end
   end
 

data/spec/lib/quarterly_period_spec.rb

@@ -11,8 +11,8 @@ describe QuarterlyPeriod do
     it "returns quarter of given date included" do
       period = described_class.for('25.06.2015')
 
-      expect(period.start_date).to eq date('25.06.2015')
-      expect(period.end_date).to eq date('24.09.2015')
+      expect(period.start_date).to eq Date('25.06.2015')
+      expect(period.end_date).to eq Date('24.09.2015')
     end
   end
 

data/spec/lib/year_spec.rb

@@ -11,8 +11,8 @@ describe Year do
     it "returns month of given date included" do
       month = described_class.for('25.06.2015')
 
-      expect(month.start_date).to eq date('01.06.2015')
-      expect(month.end_date).to eq date('31.05.2016')
+      expect(month.start_date).to eq Date('01.06.2015')
+      expect(month.end_date).to eq Date('31.05.2016')
     end
   end
 

data/spec/lib/yearly_period_spec.rb

@@ -11,8 +11,8 @@ describe YearlyPeriod do
     it "returns year of given date included" do
       period = described_class.for('25.06.2015')
 
-      expect(period.start_date).to eq date('25.06.2015')
-      expect(period.end_date).to eq date('24.06.2016')
+      expect(period.start_date).to eq Date('25.06.2015')
+      expect(period.end_date).to eq Date('24.06.2016')
     end
   end
 

data/spec/spec_helper.rb

@@ -74,6 +74,6 @@ RSpec.configure do |config|
 =end
 end
 
-def date(date)
+def Date(date)
   Date.parse(date.to_s)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: periods
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Thomas Baustert
@@ -97,6 +97,7 @@ files:
 - spec/lib/january_spec.rb
 - spec/lib/month_spec.rb
 - spec/lib/monthly_period_spec.rb
+- spec/lib/own_class_spec.rb
 - spec/lib/period_spec.rb
 - spec/lib/periods/date_calculator_spec.rb
 - spec/lib/quarter_spec.rb
@@ -135,6 +136,7 @@ test_files:
 - spec/lib/january_spec.rb
 - spec/lib/month_spec.rb
 - spec/lib/monthly_period_spec.rb
+- spec/lib/own_class_spec.rb
 - spec/lib/period_spec.rb
 - spec/lib/periods/date_calculator_spec.rb
 - spec/lib/quarter_spec.rb