cronex 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmM2NjgwNmY4ZTEyMmIzYmIyYjg4YmZjYTZlN2IwZTc4ZGZiMzkwZg==
+    YmQ2ZjA4NDk0NTQ1NGJiZWVjOTIxZWFkMWE1N2Y2NGI5YmEwNzBkZA==
   data.tar.gz: !binary |-
-    ZTg1NDIxYjM0MmFiZGUzZmRlODVjMDc3ZTljNzcwNzY4ZTViNDk5Ng==
+    ZTI0YjcxMmU3MzlkMDUzNmVhN2EyNGEzZjRlMjk4OWM5ODdhYWM0Nw==
 SHA512:
   metadata.gz: !binary |-
-    MjMzYzUzNDEzMjcwNWE2NjcyNzBmYWVhY2RkZDM1NDY5MjhlNWFhMjA3MjYx
-    ZTc3Mzk5YmMzM2VhNTAyZjAyYmM0ZmJjZDIyZjkwMTkxM2Q4YmM2MTA4NTc2
-    MTdjOTk3NjM0MjMwNjVhZjA5OGIzZWJjODMzYmM3NTZlZGM4MjE=
+    ZmY5ODY1ZGIwODkyZDcyNTNlYmZiODY4ZTk3ZmQxOWE3ZDcyMWE5YzRlMWNm
+    MzllNjIxYmEyZTcwOWI0MWRjMjJmZThhZTIxOTQ2N2RiYzY5YzVmM2UzMjky
+    YTc2ZWU5ZTk5N2RkZjIzMTNkMzU3MDAzMzJkOTBjZWM0ODVkOTI=
   data.tar.gz: !binary |-
-    MDc4MTgwMmQwYjZhYWFiNjFiNWE2MzJiMDkzMjAyZGMzZGZiMTMwODY3ODBk
-    MjhhMmYyNDYxZGJkMTgzZmNiMGZiZmM4N2Q1MzIyMWE0Y2ZjMTgxZDQwNTAw
-    MzA3Mjg0ZGE2MTA5M2I4YzdiMjhiZjdkY2Q5ZTBhY2MzYTY2OTY=
+    Y2IxZDRlOGRhOGE3NDkyOTYwODI1ZGY4N2QwNWRkMDM4ODJkZmI0OGU0ODUw
+    NTMxNWM1MDI4YWQ1OGM0M2RlZGRmZTI1ZWI1NjJjZWNhNDA5N2IxNjk2ODFj
+    OTU4ZTZiMmM3ZGY2ZWQ5OTEyOGYwN2E3ODgwYjg1NWY3NGY5OTM=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### [0.4.0] - 2016-11-28
+* Fix handling leading zeros in numbers
+
 ### [0.3.0] - 2016-03-02
 * Add pt_BR translation
 

data/cronex.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.license       = 'Apache 2'
+  spec.license       = 'Apache-2.0'
 
   spec.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }

data/lib/cronex/description/day_of_week.rb

@@ -9,7 +9,7 @@ module Cronex
       end
 
       if Cronex::Utils.number?(exp)
-        dow_num = Integer(exp)
+        dow_num = Cronex::Utils.integer(exp)
         zero_based_dow = options[:zero_based_dow]
         invalid_dow = !zero_based_dow && dow_num <= 1
         if invalid_dow || (zero_based_dow && dow_num == 0)

data/lib/cronex/description/month.rb

@@ -1,7 +1,7 @@
 module Cronex
   class MonthDescription < Description
     def single_item_description(expression)
-      resources.get(DateTime.new(Time.now.year, Integer(expression), 1).strftime('%B').downcase)
+      resources.get(DateTime.new(Time.now.year, Cronex::Utils.integer(expression), 1).strftime('%B').downcase)
     end
 
     def interval_description_format(expression)

data/lib/cronex/description/year.rb

@@ -1,7 +1,7 @@
 module Cronex
   class YearDescription < Description
     def single_item_description(expression)
-      DateTime.new(Integer(expression)).strftime('%Y')
+      DateTime.new(Cronex::Utils.integer(expression)).strftime('%Y')
     end
 
     def interval_description_format(expression)

data/lib/cronex/exp_descriptor.rb

@@ -113,7 +113,7 @@ module Cronex
       else
         match = exp.match(/(\d{1,2}W)|(W\d{1,2})/)
         if match
-          day_num = Integer(match[0].gsub('W', ''))
+          day_num = Cronex::Utils.integer(match[0].gsub('W', ''))
           day_str = day_num == 1 ? resources.get('first_weekday') : format(resources.get('weekday_nearest_day'), day_num)
           description = format(', ' + resources.get('on_the_of_the_month'), day_str)
         else

data/lib/cronex/parser.rb

@@ -20,7 +20,7 @@ module Cronex
     def parse(exp = expression)
       parsed_parts = Array.new(7, '')
 
-      fail ExpressionError, 'Error: Expression null or emtpy' unless Cronex::Utils.present?(exp)
+      fail ExpressionError, 'Error: Expression null or empty' unless Cronex::Utils.present?(exp)
       parts = sanitize(exp).split(' ')
       len = parts.size
 

data/lib/cronex/utils.rb

@@ -11,7 +11,13 @@ module Cronex
     end
 
     def number?(str)
-      Integer(str) rescue nil
+      integer(str) rescue nil
+    end
+
+    def integer(str)
+      # strip leading zeros in numbers to prevent '08', '09'
+      # from being treated as invalid octals
+      Integer(str.sub(/^0*(\d+)/, '\1'))
     end
 
     def day_of_week_name(number)
@@ -20,21 +26,21 @@ module Cronex
 
     def format_minutes(minute_expression)
       if minute_expression.include?(',')
-        minute_expression.split(',').map { |m| format('%02d', m) }.join(',')
+        minute_expression.split(',').map { |m| format('%02d', integer(m)) }.join(',')
       else
-        format('%02d', minute_expression)
+        format('%02d', integer(minute_expression))
       end
     end
 
     def format_time(hour_expression, minute_expression, second_expression = '')
-      hour = Integer(hour_expression)
+      hour = integer(hour_expression)
       period = hour >= 12 ? 'PM' : 'AM'
       hour -= 12 if hour > 12
-      minute = Integer(minute_expression)
+      minute = integer(minute_expression)
       minute = format('%02d', minute)
       second = ''
-      if Cronex::Utils.present?(second_expression)
-        second = Integer(second_expression)
+      if present?(second_expression)
+        second = integer(second_expression)
         second = ':' + format('%02d', second)
       end
       format('%s:%s%s %s', hour, minute, second, period)

data/lib/cronex/version.rb

@@ -1,3 +1,3 @@
 module Cronex
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/spec/exp_descriptor_en_spec.rb

@@ -55,8 +55,22 @@ module Cronex
       end
     end
 
-    it 'daily at time' do
-      expect(desc('30 11 * * *')).to eq('At 11:30 AM')
+    context 'daily:' do
+      it 'daily at /\d\d/:/\d\d/' do
+        expect(desc('30 11 * * *')).to eq('At 11:30 AM')
+      end
+
+      it 'daily at /\d/:/\d/' do
+        expect(desc('9 8 * * *')).to eq('At 8:09 AM')
+      end
+
+      it 'daily at /0[89]/:/0[89]/' do
+        expect(desc('09 08 * * *')).to eq('At 8:09 AM')
+      end
+
+      it 'daily at /0[1-7]/ /0[1-7/' do
+        expect(desc('02 01 * * *')).to eq('At 1:02 AM')
+      end
     end
 
     context 'time of day certain days of week:' do

data/spec/exp_descriptor_pt_BR_spec.rb

@@ -56,8 +56,22 @@ module Cronex
       end
     end
 
-    it 'daily at time' do
-      expect(desc_pt_br('30 11 * * *')).to eq('Às 11:30 AM')
+    context 'daily:' do
+      it 'daily at /\d\d/:/\d\d/' do
+        expect(desc_pt_br('30 11 * * *')).to eq('Às 11:30 AM')
+      end
+
+      it 'daily at /\d/:/\d/' do
+        expect(desc_pt_br('9 8 * * *')).to eq('Às 8:09 AM')
+      end
+
+      it 'daily at /0[89]/:/0[89]/' do
+        expect(desc_pt_br('09 08 * * *')).to eq('Às 8:09 AM')
+      end
+
+      it 'daily at /0[1-7]/ /0[1-7/' do
+        expect(desc_pt_br('02 01 * * *')).to eq('Às 1:02 AM')
+      end
     end
 
     context 'time of day certain days of week:' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cronex
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Adrian Kazaku
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicode
@@ -106,7 +106,7 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/alpinweis/cronex
 licenses:
-- Apache 2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []