repeatable 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b8c2addf36ece2740c6279e7a62055b85840788
-  data.tar.gz: eb550957ad299c4fc07fbbb2f9cc0dea135bbde1
+  metadata.gz: 85f2e7cec322abe280bc2d383c2eb3286685e9ce
+  data.tar.gz: b9495fe2fc4044b096d98734ef8521aaff27439e
 SHA512:
-  metadata.gz: 020b4553225e0c44e455021dd4b825c52aa5074e3a3204546714f24c643e6eb9bdd69af0103ac82486c840d236595096fca92f2ef5212d85df9492f80e4a0d60
-  data.tar.gz: 9d11e275bb37cea484f635bef9b5b7eb3dc2ca1ea0309132773f98b66d16bfc18572de7c9c5b59db6946391d758eae0e2b0322c6c21714c61edac544f06cbc28
+  metadata.gz: eb4e21f11667e4ef609ee9af000a24a83010119cd53fe00c8068272db8fa250b623eeedc77f137dde683edb71d626401bae6cbf0813fba8f43d44e3a0ba93cce
+  data.tar.gz: f6b85f9183fc1e052d5aaefcc6b57f7e52334cbc6685f91e5c930d3be33631af2229b9baa7e717e645d83f83f9b17eedeb9e75a70b42220b58dec677657590cf

data/README.md

@@ -30,7 +30,7 @@ You can create a schedule in one of two ways.
 
 #### Composed objects
 
-You can compose each of the expression objects manually.
+Instantiate and compose each of the `Repeatable::Expression` objects manually.
 
 ```ruby
 second_monday = Repeatabe::Expression::WeekdayInMonth.new(weekday: 1, count: 2)
@@ -43,17 +43,17 @@ schedule = Repeatable::Schedule.new(intersection)
 
 #### Hash
 
-Or you can describe the same structure with a `Hash`, and the gem will compose the objects for you.
+Or describe the same structure with a `Hash`, and the gem will handle instantiating and composing the objects.
 
 ```ruby
-args = {
-  intersection: [                                     # All included conditions must be met
-    weekday_in_month: { weekday: 1, count: 2 }        # The second Monday of every month
-    range_in_year: { start_month: 10, end_month: 12 } # October through December
+arg = {
+  intersection: [
+    { weekday_in_month: { weekday: 1, count: 2 } },
+    { range_in_year: { start_month: 10, end_month: 12 } }
   ]
 }
 
-schedule = Repeatable::Schedule.new(args)
+schedule = Repeatable::Schedule.new(arg)
 ```
 
 - - -
@@ -88,7 +88,7 @@ Repeatable::Expression::WeekdayInMonth.new(weekday: 1, count: 3)
 { day_in_month: { day: 13 } }
 Repeatable::Expression::DayInMonth.new(day: 13)
 
-# Any day in October
+# All days in October
 { range_in_year: { start_month: 10 } }
 Repeatable::Expression::RangeInYear.new(start_month: 10)
 
@@ -103,7 +103,7 @@ Repeatable::Expression::RangeInYear.new(start_month: 10, end_month: 12, start_da
 
 ### Getting information from a Schedule
 
-Ask your schedule one of three questions:
+Ask a schedule one of three questions.
 
 ```ruby
 schedule.next_occurrence

data/lib/repeatable/parse_error.rb

@@ -0,0 +1,4 @@
+module Repeatable
+  class ParseError < StandardError
+  end
+end

data/lib/repeatable/parser.rb

@@ -0,0 +1,44 @@
+module Repeatable
+  class Parser
+    def initialize(hash)
+      @hash = hash
+    end
+
+    def self.call(hash)
+      new(hash).call
+    end
+
+    def call
+      build_expression(hash)
+    end
+
+    private
+
+    attr_reader :hash
+
+    def build_expression(hash)
+      if hash.length != 1
+        fail(ParseError, "Invalid expression: '#{hash}' must have single key and value")
+      else
+        expression_for(*hash.first)
+      end
+    end
+
+    def expression_for(key, value)
+      klass = "repeatable/expression/#{key}".classify.safe_constantize
+      case klass
+      when nil
+        fail(ParseError, "Unknown mapping: Can't map key '#{key.inspect}' to an expression class")
+      when Repeatable::Expression::Set
+        args = value.map { |hash| build_expression(hash) }
+        klass.new(*args)
+      else
+        klass.new(symbolize_keys(value))
+      end
+    end
+
+    def symbolize_keys(hash)
+      hash.each_with_object({}) { |(k, v), a| a[k.to_sym] = v }
+    end
+  end
+end

data/lib/repeatable/schedule.rb

@@ -2,14 +2,14 @@ require 'active_support/core_ext/string/inflections'
 
 module Repeatable
   class Schedule
-    def initialize(args)
-      case args
-      when Hash
-        @expression = build_expression(args)
+    def initialize(arg)
+      case arg
       when Repeatable::Expression::Base
-        @expression = args
+        @expression = arg
+      when Hash
+        @expression = Parser.call(arg)
       else
-        fail ArgumentError, "Can't build a Repeatable::Schedule from #{args.class}"
+        fail(ArgumentError, "Can't build a Repeatable::Schedule from #{arg.class}")
       end
     end
 
@@ -39,26 +39,5 @@ module Repeatable
     private
 
     attr_reader :expression
-
-    def build_expression(hash)
-      if hash.length != 1
-        fail "Invalid expression: '#{hash}' should have single key and value"
-      else
-        expression_for(*hash.first)
-      end
-    end
-
-    def expression_for(key, value)
-      klass = "repeatable/expression/#{key}".classify.safe_constantize
-      case klass
-      when nil
-        fail "Unknown mapping: Can't map key '#{key.inspect}' to an expression class"
-      when Repeatable::Expression::Set
-        args = value.map { |hash| build_expression(hash) }
-        klass.new(*args)
-      else
-        klass.new(value)
-      end
-    end
   end
 end

data/lib/repeatable/version.rb

@@ -1,3 +1,3 @@
 module Repeatable
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/repeatable.rb

@@ -8,6 +8,8 @@ include Repeatable::Conversions
 module Repeatable
 end
 
+require 'repeatable/parse_error'
+
 require 'repeatable/expression'
 require 'repeatable/expression/base'
 
@@ -21,3 +23,4 @@ require 'repeatable/expression/union'
 require 'repeatable/expression/intersection'
 
 require 'repeatable/schedule'
+require 'repeatable/parser'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: repeatable
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Mo Lawson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,6 +94,8 @@ files:
 - lib/repeatable/expression/union.rb
 - lib/repeatable/expression/weekday.rb
 - lib/repeatable/expression/weekday_in_month.rb
+- lib/repeatable/parse_error.rb
+- lib/repeatable/parser.rb
 - lib/repeatable/schedule.rb
 - lib/repeatable/version.rb
 - repeatable.gemspec