ice_cube_cron 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8587cad1d7f913b7bb81a58e4e3eac37db6d1dc
-  data.tar.gz: 02fc4ecba72f46539c6d2ef155b8b9f64e6d0e88
+  metadata.gz: a337f8cf564877d079a3b1a3a53b4e8d5cbc8d42
+  data.tar.gz: 5888cfd5aff2af878068c572535cef08491b6c56
 SHA512:
-  metadata.gz: 9d0e3698b6657bb35da47fba62350d2ad33db1ace17ec6ba617f9b6eab58a7f7cb28f4f6d83e3f46bf1086600fba1711b5b9f02fc40b49a83cc7abab551aa24e
-  data.tar.gz: 34c79837a63121f7b7f892305cf749c13323e9d515b5328d1daff80ac9d982a9f94a2d21b907c8fb2354e739e0d5718cadb029491e91e763b6c3abf9af57cdf6
+  metadata.gz: 0dfe6377d1577e6c94adc43c10971f68f9e07612affb3e8ec50cdfcb6d1965b0f1c921fd1c1e0836c285d7cc156ac9fe68a1da8ff0d00e700bb7e82b39f7d4ff
+  data.tar.gz: 41d6141e77d63c32cc1d9e7857ca1d265795a148b35333dee933bf864ad6389157423faf6a02fa214511d09b78febd6adc90956617ae25eb798138cb72d4beba

data/.rubocop.yml

@@ -7,6 +7,9 @@ Style/HashSyntax:
 Style/AccessModifierIndentation:
   EnforcedStyle: outdent
 
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
 Style/Documentation:
   Enabled: true
 

data/README.md

@@ -57,7 +57,7 @@ schedule.occurrences_between(::Date.new(2015, 3, 5), ::Date.new(2015, 6, 5))
 |1st of every month||||1||
 |1st and 15th of every month||||1,15||
 |every monday|||||1|
-|1st monday of every month|||||1#1|
+|1st tuesday of every month|||||2#1|
 |ever other friday|2||||5|
 |every 6 months on the 5th|6|||5||
 |last friday of every month|||||5L|

data/ice_cube_cron.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 10'
   s.add_development_dependency 'pry', '~> 0'
   s.add_development_dependency 'rspec', '~> 3.3'
-  s.add_development_dependency 'rubocop', '~> 0.34'
+  s.add_development_dependency 'rubocop', '~> 0'
   s.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
 end

data/lib/ice_cube_cron/expression_parser.rb

@@ -14,7 +14,7 @@ module IceCubeCron # :nodoc:
       :hour => nil,
       :minute => nil,
       :until => nil
-    }
+    }.freeze
 
     EXPRESSION_PART_KEYS = [
       :minute,
@@ -23,7 +23,7 @@ module IceCubeCron # :nodoc:
       :month,
       :day_of_week,
       :year
-    ]
+    ].freeze
 
     ##
     # Create a parsed expression
@@ -83,7 +83,9 @@ module IceCubeCron # :nodoc:
       ExpressionParser.sanitize_integer_array_param(val)
     end
 
-    parser_attribute_accessor :until
+    parser_attribute_accessor :until do |val|
+      ::IceCubeCron::Util.sanitize_date_param(val)
+    end
 
     ##
     # Sanitize given value to a valid day parameter
@@ -178,7 +180,7 @@ module IceCubeCron # :nodoc:
       expression_parts.select! do |_key, value|
         !value.nil?
       end
-      expression_parts.merge!(:interval => interval) unless interval.nil?
+      expression_parts[:interval] = interval unless interval.nil?
 
       expression_parts
     end

data/lib/ice_cube_cron/parser_attribute.rb

@@ -10,7 +10,7 @@ module IceCubeCron # :nodoc: all
 
     module ClassMethods # :nodoc:
       def parser_attribute_accessor(attr_name, &cleanser)
-        getter = "#{attr_name}".to_sym
+        getter = attr_name.to_s.to_sym
         setter = "#{attr_name}=".to_sym
 
         define_method(getter) do
@@ -18,7 +18,7 @@ module IceCubeCron # :nodoc: all
         end
 
         define_method(setter) do |val|
-          val = cleanser.call(val) if cleanser
+          val = yield val if cleanser
           expression_hash[getter] = val
         end
 

data/lib/ice_cube_cron/util.rb

@@ -4,6 +4,7 @@ module IceCubeCron # :nodoc: all
   #
   module Util
     def self.sanitize_date_param(date)
+      date = Date.parse(date) if date.is_a?(::String)
       date = date.to_time(:utc) if date.is_a?(::Date) && !date.is_a?(::DateTime)
       date = date.to_time.utc if date.is_a?(::DateTime)
       date = Time.at(date).utc if date.is_a?(::Integer)

data/lib/ice_cube_cron/version.rb

@@ -1,3 +1,3 @@
 module IceCubeCron # :nodoc: all
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'.freeze
 end

data/spec/lib/ice_cube_cron/expression_parser_spec.rb

@@ -317,6 +317,28 @@ describe ::IceCubeCron::ExpressionParser do
         expect(expression.day_of_week).to eq([{ 1 => [-1] }])
       end
     end
+
+    describe 'until' do
+      it '[]' do
+        expect(expression.until).to eq(nil)
+      end
+
+      it '[]=' do
+        expression.until = 1_453_334_400
+        expect(expression.until).to eq(::Time.at(1_453_334_400).utc)
+      end
+
+      it 'sanitizes' do
+        expression.until = 1_453_334_400
+        expect(expression.until).to eq(::Time.at(1_453_334_400).utc)
+
+        expression.until = nil
+        expect(expression.until).to eq(nil)
+
+        expression.until = ::Date.new(2016, 1, 21)
+        expect(expression.until).to eq(::Time.at(1_453_334_400).utc)
+      end
+    end
   end
 
   describe 'invalid parameters' do

data/spec/lib/ice_cube_cron/util_spec.rb

@@ -13,5 +13,9 @@ describe ::IceCubeCron::Util do
     it 'should handle datetime' do
       expect(described_class.sanitize_date_param(DateTime.new(2015, 5, 1, 0, 0, 0))).to eq(DateTime.new(2015, 5, 1, 0, 0, 0))
     end
+
+    it 'should handle string' do
+      expect(described_class.sanitize_date_param('2015-5-1')).to eq(DateTime.new(2015, 5, 1, 0, 0, 0))
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube_cron
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Matt Nichols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement