hiccup 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65667b19946a8c1a0f340632b1573a086cbf6703
-  data.tar.gz: 13711342f02bbfe9aafdd40d7dd176869acf21d9
+  metadata.gz: 387f7c01d2222a097f3f217469826a82bb33ea56
+  data.tar.gz: cc3c8e31744ad0dd1e28a2a53213de5d1aed50f0
 SHA512:
-  metadata.gz: 0499a77cc41eb22337b6ffea764a6658cc9566b61dac2e1789294ee08494bb749d9214c5d5730a0a363078cd6fefabfd62f79cadd4d4f6b7d533e3f387fdad71
-  data.tar.gz: 3bfde7a8eba8c66e6c7b30ff1fe2b86ae1501cc6a910364de860c22cd8be87cdf80417c0237c17661a0063df08a46c76fa06ea09b92736b7a8603f5566a3d9a2
+  metadata.gz: 40718f786db47800243fac9eaa637fafefa4fd4a6573bd20121272b3bd3d3dc4bd40833a79701fe21f6f5b59be9cc01ec5ad9e24d814d22996b0129ab18cd125
+  data.tar.gz: c4bf292ca44128f2d59b686b699adce465c78cd491641111271e1f99ca96530d7f818406742eb3956d83b3786b7974a12be6ba044a0ee4b38961600b0bd733b8

data/hiccup.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "builder"
 
   s.add_development_dependency "ri_cal"
-  s.add_development_dependency "bundler", "~> 1.10"
+  s.add_development_dependency "bundler"
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "minitest-reporters"
   s.add_development_dependency "minitest-reporters-turn_reporter"

data/lib/hiccup/core_ext/{fixnum.rb → integer.rb}

@@ -1,4 +1,4 @@
-class Fixnum
+class Integer
 
   # todo: complete
   def human_ordinalize(map={})

data/lib/hiccup/enumerable/monthly_enumerator.rb

@@ -7,7 +7,7 @@ module Hiccup
       def self.for(schedule)
         if schedule.monthly_pattern.empty?
           NeverEnumerator
-        elsif schedule.monthly_pattern.all? { |occurrence| Fixnum === occurrence }
+        elsif schedule.monthly_pattern.all? { |occurrence| Integer === occurrence }
           MonthlyDateEnumerator
         else
           self

data/lib/hiccup/humanizable.rb

@@ -1,5 +1,5 @@
 require "hiccup/convenience"
-require "hiccup/core_ext/fixnum"
+require "hiccup/core_ext/integer"
 
 
 module Hiccup

data/lib/hiccup/validatable.rb

@@ -68,10 +68,10 @@ module Hiccup
     def valid_occurrence?(occurrence)
       if occurrence.is_a?(Array)
         i, wd = occurrence
-        Date::DAYNAMES.member?(wd) && i.is_a?(Fixnum) && ((i == -1) || (1..6).include?(i))
+        Date::DAYNAMES.member?(wd) && i.is_a?(Integer) && ((i == -1) || (1..6).include?(i))
       else
         i = occurrence
-        i.is_a?(Fixnum) && ([-1] + (1..31).to_a).include?(i)
+        i.is_a?(Integer) && ([-1] + (1..31).to_a).include?(i)
       end
     end
 
@@ -86,7 +86,7 @@ module Hiccup
     #     ordinal, kind = occurrence
     #
     #     errors.add(:kind, "is not a valid monthly occurrence kind") unless Date::DAYNAMES.member?(kind)
-    #     if ordinal.is_a?(Fixnum)
+    #     if ordinal.is_a?(Integer)
     #       errors.add(:ordinal, "is not a valid integer") unless (ordinal==-1) or (1..6).include?(ordinal)
     #     else
     #       errors.add(:ordinal, "is not an integer")
@@ -94,7 +94,7 @@ module Hiccup
     #   else
     #     ordinal = occurrence
     #
-    #     if ordinal.is_a?(Fixnum)
+    #     if ordinal.is_a?(Integer)
     #       errors.add(:ordinal, "is not an integer between 1 and 31") unless (1..31).include?(ordinal)
     #     else
     #       errors.add(:ordinal, "is not an integer")

data/lib/hiccup/version.rb

@@ -1,3 +1,3 @@
 module Hiccup
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/test/enumerable_test.rb

@@ -260,8 +260,8 @@ class EnumerableTest < ActiveSupport::TestCase
       :start_date => Date.new(2011, 1, 3),
       :ends => true,
       :end_date => Date.new(2011, 1, 31)})
-    assert_equal nil, schedule.first_occurrence_before(Date.new(2011,1,3))
-    assert_equal nil, schedule.first_occurrence_on_or_before(Date.new(2011,1,2))
+    assert_nil schedule.first_occurrence_before(Date.new(2011,1,3))
+    assert_nil schedule.first_occurrence_on_or_before(Date.new(2011,1,2))
     assert_equal [], schedule.n_occurrences_before(10, Date.new(2011,1,3))
     assert_equal [], schedule.n_occurrences_on_or_before(10, Date.new(2011,1,2))
   end
@@ -281,8 +281,8 @@ class EnumerableTest < ActiveSupport::TestCase
       :start_date => Date.new(2011, 1, 3),
       :ends => true,
       :end_date => Date.new(2011, 1, 31)})
-    assert_equal nil, schedule.first_occurrence_after(Date.new(2011,1,31))
-    assert_equal nil, schedule.first_occurrence_on_or_after(Date.new(2011,2, 1))
+    assert_nil schedule.first_occurrence_after(Date.new(2011,1,31))
+    assert_nil schedule.first_occurrence_on_or_after(Date.new(2011,2, 1))
     assert_equal [], schedule.occurrences_between(Date.new(2013, 9, 23), Date.new(2013, 9, 30))
   end
 

data/test/monthly_enumerator_test.rb

@@ -160,7 +160,7 @@ class MonthlyEnumeratorTest < ActiveSupport::TestCase
     should "always return nil" do
       date = Date.new(2015, 2, 1)
       enumerator = @schedule.enumerator.new(@schedule, date)
-      assert_equal nil, enumerator.next
+      assert_nil enumerator.next
     end
   end
 

data/test/weekly_enumerator_test.rb

@@ -119,12 +119,12 @@ class WeeklyEnumeratorTest < ActiveSupport::TestCase
 
     should "return nil for prev rather than raising an exception" do
       enumerator = @schedule.enumerator.new(@schedule, Date.today)
-      assert_equal nil, enumerator.prev
+      assert_nil enumerator.prev
     end
 
     should "return nil for next rather than raising an exception" do
       enumerator = @schedule.enumerator.new(@schedule, Date.today)
-      assert_equal nil, enumerator.next
+      assert_nil enumerator.next
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiccup
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -70,16 +70,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -185,8 +185,8 @@ files:
 - lib/hiccup/core_ext/date.rb
 - lib/hiccup/core_ext/duration.rb
 - lib/hiccup/core_ext/enumerable.rb
-- lib/hiccup/core_ext/fixnum.rb
 - lib/hiccup/core_ext/hash.rb
+- lib/hiccup/core_ext/integer.rb
 - lib/hiccup/enumerable.rb
 - lib/hiccup/enumerable/annually_enumerator.rb
 - lib/hiccup/enumerable/monthly_date_enumerator.rb