ice_cube_model 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1128479e22af71166bf026bf19398f9f26de440f
-  data.tar.gz: dbb48be74fe828c79b005855278c7699e83f534f
+  metadata.gz: b96485ea1cc05ea45c25c4a59d311a583697ca09
+  data.tar.gz: 4874513770391540298d29be1dfe90c24dd526fc
 SHA512:
-  metadata.gz: ceec5f3cba596bf356dd19ce106dbd1910e24d53f1a78cb400b28160d7c680d3df28c1fae2eb32621054a282d51b97620dae13d3479832c5c2654a521ac06237
-  data.tar.gz: 865e4a6b94862468c5075803c120d928ef990cb8569fb676ecf2dbef7a0ecac836ad95c9f33da8ba5709e2cacb57a2d08d3c85089d75325f0467953ecbf01528
+  metadata.gz: 5d1cc3024fff992cc68a3e93f421621de8b0db0224c65e38a36a2e708565472df3745d9f082ab05b2083f9783d33dfbb6d1375ea5e1ba3cacbe1f3585fddf1ca
+  data.tar.gz: 4f916dc2e3dc2d28984cc5c7e8849a32c58462ca3f2f73f962996c3257562ca6afcdcf41ebac2252a7f35dbede46670a4071b3349cc9f3a265e7b2662dc3882a

data/.gitignore

@@ -35,3 +35,5 @@ Gemfile.lock
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
 Guardfile
+vendor/cache
+vendor/cache

data/README.md

@@ -1,4 +1,7 @@
+[![Gem Version](https://badge.fury.io/rb/ice_cube_model.svg)](https://badge.fury.io/rb/ice_cube_model)
+
 # ice_cube_model
+
 Extend any "cron-expression" object with [ice_cube](https://github.com/seejohnrun/ice_cube) (calendar repeating event) capabilities.
 
 Add ice_cube methods to a class (e.g. active_record, active_model) that has cron expression fields.
@@ -49,7 +52,6 @@ appointment.occurrences_between(::Date.new(2015, 3, 5), ::Date.new(2015, 6, 5))
 If needed, you can remap the attributes expected by ice_cube to other attributes or methods on the class.
 
 ```ruby
-
 # map to another attribute
 class Appointment
     attr_accessor 
@@ -115,11 +117,9 @@ end
 - This gem is a work-in-progress.
 - `occurrences_between` is the only method currently supported.
 - Does not yet support all recurrence options. More coming.
-- Does not support inheritance. with_repeat_params called on child classes will mess with parent class' mappings.
+- Supports inheritance but will not pick up dynamic changes in parent class parameter mappings.
 
 ## todo
-- Add support for repeat_end_date
-- Add support for inheritance
-- Add support for time
+- Add support for time options
 - Allow mapping of a single cron expression (string) field, rather than individual fields.
 

data/ice_cube_model.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   ##
   # Dependencies
   #
-  s.add_dependency 'ice_cube_cron', '>= 0.0.2'
+  s.add_dependency 'ice_cube_cron', '>= 0.0.3'
 
   ##
   # Development Dependencies

data/lib/ice_cube_model/base.rb

@@ -12,10 +12,18 @@ module IceCubeModel
     end
     alias_method :occurrences_between, :events_between
 
+    def respond_to?(name, include_private = false)
+      return true if self.class.repeat_parameter_mappings.values.include?(name.to_sym)
+      super
+    end
+
   private
 
     def read_repeat_parameter(param_name)
-      send(self.class.repeat_parameter_mappings[param_name])
+      param_method = self.class.repeat_parameter_mappings[param_name.to_sym] || param_name.to_sym
+      return nil unless respond_to?(param_method)
+
+      send(param_method)
     end
 
     def read_repeat_params
@@ -24,34 +32,30 @@ module IceCubeModel
         :repeat_year => read_repeat_parameter(:repeat_year),
         :repeat_month => read_repeat_parameter(:repeat_month),
         :repeat_day => read_repeat_parameter(:repeat_day),
-        :repeat_weekday => read_repeat_parameter(:repeat_weekday)
+        :repeat_weekday => read_repeat_parameter(:repeat_weekday),
+        :repeat_until => read_repeat_parameter(:repeat_until)
       }
     end
 
     module ClassMethods
       def repeat_parameter_mappings
-        mappings_name = :@@repeat_parameter_mappings
-
-        unless class_variable_defined?(mappings_name)
-          class_variable_set(mappings_name,             :repeat_start_date => :repeat_start_date,
-                                                        :repeat_interval   => :repeat_interval,
-                                                        :repeat_year       => :repeat_year,
-                                                        :repeat_month      => :repeat_month,
-                                                        :repeat_day        => :repeat_day,
-                                                        :repeat_weekday    => :repeat_weekday)
+        @repeat_parameter_mappings ||= begin
+          if superclass.respond_to?(:repeat_parameter_mappings)
+            superclass.repeat_parameter_mappings.dup
+          else
+            {}
+          end
         end
-
-        class_variable_get(mappings_name)
       end
 
       def with_repeat_param(param_name, replacement)
-        repeat_parameter_mappings[param_name] = method_name = "repeat #{param_name}"
+        repeat_parameter_mappings[param_name] = param_sym = "ice_cube_model #{param_name}".to_sym
         if replacement.is_a?(::Proc)
-          define_method(method_name) do
+          define_method(param_sym) do
             replacement.call
           end
         else
-          define_method(method_name) do
+          define_method(param_sym) do
             send(replacement)
           end
         end

data/lib/ice_cube_model/version.rb

@@ -1,3 +1,3 @@
 module IceCubeModel
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/lib/ice_cube_model/base_spec.rb

@@ -10,7 +10,8 @@ describe ::IceCubeModel do
         :repeat_month => nil,
         :repeat_day => nil,
         :repeat_weekday => nil,
-        :repeat_week => nil
+        :repeat_week => nil,
+        :repeat_until => nil
       }.merge(attributes)
     end
 
@@ -24,6 +25,10 @@ describe ::IceCubeModel do
 
       fail ArgumentError, "Method `#{m}` doesn't exist."
     end
+
+    def respond_to?(name, _include_private = false)
+      @attributes.key?(name)
+    end
   end
 
   class IceCubeObj < HashAttrs
@@ -254,6 +259,20 @@ describe ::IceCubeModel do
     end
   end
 
+  context 'every month until date' do
+    let(:ice_cube_model) do
+      ::IceCubeObj.new(
+        :repeat_start_date => ::Date.new(2015, 1, 1),
+        :repeat_day => '1',
+        :repeat_until => ::Date.new(2015, 3, 1)
+      )
+    end
+
+    it 'ends on specified end date' do
+      expect(ice_cube_model.events_between(::Date.new(2015, 1, 1), ::Date.new(2015, 6, 30))).to eq([::Date.new(2015, 1, 1), ::Date.new(2015, 2, 1), ::Date.new(2015, 3, 1)])
+    end
+  end
+
   context 'input types' do
     let(:ice_cube_model) do
       ::IceCubeObj.new(
@@ -290,7 +309,7 @@ describe ::IceCubeModel do
 
         with_repeat_param(:repeat_start_date, :start_date) # remap attribute to another
         with_repeat_param(:repeat_interval, :interval)     # remap attribute to a method
-        with_repeat_param(:repeat_day, -> { 1 })           # map parameter to lambda
+        with_repeat_param(:repeat_day, -> { 5 })           # map parameter to lambda
 
         def initialize(options = {})
           super(
@@ -313,35 +332,62 @@ describe ::IceCubeModel do
       end
 
       it 'should use class mappings' do
-        expect(ice_cube_model.events_between(::Date.new(2015, 1, 1), ::Date.new(2015, 12, 31))).to eq([::Date.new(2015, 2, 1)])
+        expect(ice_cube_model.events_between(::Date.new(2015, 1, 1), ::Date.new(2015, 12, 31))).to eq([::Date.new(2015, 2, 5)])
       end
 
-      class IceCubeObjWithParameterMappingsChild < IceCubeObjWithParameterMappings
-        # Adding these currently mess up parent class mappings
-        # with_repeat_param(:repeat_start_date, :starting) # remap attribute to another
-        # with_repeat_param(:repeat_interval, :interval)   # remap attribute to a method
+      context 'with inheritance' do
+        class IceCubeObjWithParameterMappingsChild < IceCubeObjWithParameterMappings
+          with_repeat_param(:repeat_start_date, :starting) # remap attribute to another
+          with_repeat_param(:repeat_interval, :interval)   # remap attribute to a method
+          # with_repeat_param(:repeat_day, -> { 5 })       # comes from parent ::IceCubeObjWithParameterMappings
+
+          def initialize(options = {})
+            super(
+              {
+                :starting => nil
+              }.merge(options)
+            )
+          end
+
+          def interval
+            2
+          end
+        end
 
-        def initialize(options = {})
-          super(
-            {
-              :starting => nil
-            }.merge(options)
+        let(:ice_cube_model) do
+          ::IceCubeObjWithParameterMappingsChild.new(
+            :starting => ::Date.new(2015, 1, 1)
           )
         end
 
-        def interval
-          2
+        it 'should inherit mappings and remap new mappings' do
+          expect(ice_cube_model.events_between(::Date.new(2015, 1, 1), ::Date.new(2015, 4, 30))).to eq([::Date.new(2015, 1, 5), ::Date.new(2015, 3, 5)])
         end
       end
 
-      it 'should support inheritance' do
-        ice_cube_model = ::IceCubeObjWithParameterMappingsChild.new(
-          :starting => ::Date.new(2015, 1, 1),
-          :repeat_day => 2
-        )
+      context 'with missing parameters' do
+        class IceCubeObjWithMissingParameters
+          include ::IceCubeModel::Base
 
-        skip 'Not supported yet'
-        expect(ice_cube_model.events_between(::Date.new(2015, 1, 1), ::Date.new(2015, 4, 30))).to eq([::Date.new(2015, 1, 2), ::Date.new(2015, 3, 2)])
+          attr_accessor :repeat_start_date
+          attr_accessor :repeat_day
+        end
+
+        it 'should work when class missing parameters' do
+          ice_cube_model = ::IceCubeObjWithMissingParameters.new
+
+          ice_cube_model.repeat_start_date = ::Date.new(2015, 1, 1)
+          ice_cube_model.repeat_day = 2
+
+          expect(ice_cube_model.events_between(::Date.new(2015, 1, 1), ::Date.new(2015, 2, 28))).to eq([::Date.new(2015, 1, 2), ::Date.new(2015, 2, 2)])
+        end
+
+        it '#respond_to?' do
+          ice_cube_model = ::IceCubeObjWithMissingParameters.new
+          expect(ice_cube_model.respond_to?(:repeat_day)).to be(true)
+          expect(ice_cube_model.respond_to?(:repeat_interval)).to be(false)
+          expect(ice_cube_model.respond_to?(:methods)).to be(true)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube_model
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Matt Nichols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube_cron
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement