cronspeak 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c3b387750c2f7e0acf7b24e5a9e16b08ca19339
-  data.tar.gz: 091a8744419f7f40192697dbebf9ec4ea5d8701c
+  metadata.gz: b48ca04c5db37a5257d2ea8cc6f1ba312a87a4f6
+  data.tar.gz: 87b13a3016a874fb2fde426160aab10b1f1c7e33
 SHA512:
-  metadata.gz: 18b08e0d2dfc10424f58c64206080600d9a409ca6782e358440efacb9dbd6fbf552cf94960808e24d199a8cf2724651a01cf191b289f6ffbbf180da321035252
-  data.tar.gz: 8379cadd755eafb75c5c8f2e6fac883936ae17a28fc55c54136257b1bf06ab927c17cc1711c5276079145c557051f9bb38fb7af4b34e07e765199c7086582610
+  metadata.gz: f6d79fb18d64a2a53c8128cc8cf904b808548d0be2c196c0a97a3b9d85214b37132008c748221c6f3483eae2924c3735d6a318808b440e9cfab78c6a1dedbf12
+  data.tar.gz: b8388d7c30bd5d5d1578efcebbc7c24a530ef0b80d44ae09e521bb76ed1c619f99303d9bd8e69d7e13653bf7735ff3b8360ee50708ce2aaf1f020b2ba233f6c4

data/lib/cronspeak.rb

@@ -40,14 +40,15 @@ class CronSpeak
 
   def mins(m='*')
 
-    r = if m == '*' then
-      'every minute of '
-    elsif m[/^\*\//]
+    return 'every minute of ' if m == '*'
+      
+    r = case m
+    when /^\*\//
       m = m[/^\*\/(\d+)/,1]      
       "every %s minute of " % [m.to_i.ordinal]
-    elsif m =~ /,/
+    when /,/
       "%s minutes of " % m.split(/,/).map {|x| x.to_i.ordinal }.join(' and ')
-    elsif m =~ /\-/
+    when /\-/
       "the %s minutes of " % m.split('-',2)\
                                  .map {|x| x.to_i.ordinal }.join(' through ')
     else
@@ -59,43 +60,43 @@ class CronSpeak
 
   def hrs(h='*')
 
-    r = if h == '*' then
-      'every hour' 
-    elsif h[/^\*\//]
+    return 'every hour' if h == '*'
+
+    @count += 2    
+
+    return case h  
+    when /^\*\//
       h = h[/^\*\/(\d+)/,1]      
       " of every %s hour" % [h.to_i.ordinal]
-    elsif h =~ /,/
-      "%s" % h.split(/,/)\
+    when /,/
+      h.split(/,/)\
         .map {|x| Time.parse(x+':00').strftime("%l%P").lstrip }.join(' and ')
-    elsif h =~ /,/
+    when /,/
       "%s of " % h.split(/,/).map {|x| x.to_i.ordinal }.join(' and ')
-    elsif h =~ /\-/
-      "%s" % h.split('-',2).map do |x| 
-        Time.parse(x+':00').strftime("%l%P").lstrip 
-      end.join(' through ')
+    when /\-/
+      h.split('-',2).map {|x| Time.parse(x+':00').strftime("%l%P").lstrip }\
+                                                            .join(' through ')
     else
-      "%s" % [Time.parse(h+':00').strftime("%l%P").lstrip]
+      [Time.parse(h+':00').strftime("%l%P").lstrip]
     end
     
-    @count += 2
-
-    return r
   end
 
   def days(d='*') 
 
-    r = if @count >= 8 then
-      " %s in " % @dow
-    elsif d == '*' then
+    return " %s in " % @dow if @count >= 8
+      
+    return case d
+    when /^\*$/ then
       ' every day'
-    elsif d[/^\*\//]
+    when/^\*\//
       d = d[/^\*\/(\d+)/,1]      
       @count += 4
       " of every %s day" % [d.to_i.ordinal] 
-    elsif d =~ /,/
+    when /,/
       @count += 8
       "the %s of " % d.split(/,/).map {|x| x.to_i.ordinal }.join(' and ')
-    elsif d =~ /\-/
+    when /\-/
       @count += 8
       " the %s " % d.split('-',2).map {|x| x.to_i.ordinal }.join(' through ')
     else
@@ -103,12 +104,12 @@ class CronSpeak
       " the %s" % [d.to_i.ordinal]
     end
 
-    return r
   end
 
   def months(mon='*') 
 
-    r = if mon == '*' then
+    r = case mon
+    when /^\*$/
 
       if @count < 4 then
         '' 
@@ -117,14 +118,14 @@ class CronSpeak
         s + 'every month'
       end
 
-    elsif mon[/^\*\//]
+    when /^\*\//
       mon = mon[/^\*\/(\d+)/,1]      
       @count += 16
       " of every %s month" % [mon.to_i.ordinal] 
-    elsif mon =~ /,/
+    when /,/
       " of %s" % mon.split(/,/)\
                         .map {|x| Date::MONTHNAMES[x.to_i] }.join(' and ')  
-    elsif mon =~ /\-/
+    when /\-/
       " of %s" % mon.split('-',2).map {|x| Date::MONTHNAMES[x.to_i] }.join(' through ')
     else
       s = @count < 8 ? 'of ' : ''
@@ -136,10 +137,23 @@ class CronSpeak
     return r
   end
 
-  def dow(raw_dow='*') 
-    return '' if raw_dow == '*'
-    @count += 8
-    @dow = Date::DAYNAMES[raw_dow.to_i] + 's'
+  def dow(raw_dow='*')
+ 
+    @dow = case raw_dow
+    when /^\*$/
+      ''
+    when /,/
+      @count += 8
+      raw_dow.split(/,/).map {|x| Date::DAYNAMES[x.to_i] + 's' }.join(' and ')
+    when /\-/
+      @count += 8
+      raw_dow.split('-',2).map {|x| Date::DAYNAMES[x.to_i] + 's' }\
+                                                            .join(' through ')
+    else
+      @count += 8
+      Date::DAYNAMES[raw_dow.to_i] + 's'
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cronspeak
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - James Robertson