ice_cube_model 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b96485ea1cc05ea45c25c4a59d311a583697ca09
-  data.tar.gz: 4874513770391540298d29be1dfe90c24dd526fc
+  metadata.gz: edf86a2a7d7d80588e3965e382facda1e36284f5
+  data.tar.gz: 567a5ff73291f7ef031072d47b95f0d1303fd096
 SHA512:
-  metadata.gz: 5d1cc3024fff992cc68a3e93f421621de8b0db0224c65e38a36a2e708565472df3745d9f082ab05b2083f9783d33dfbb6d1375ea5e1ba3cacbe1f3585fddf1ca
-  data.tar.gz: 4f916dc2e3dc2d28984cc5c7e8849a32c58462ca3f2f73f962996c3257562ca6afcdcf41ebac2252a7f35dbede46670a4071b3349cc9f3a265e7b2662dc3882a
+  metadata.gz: bbd4dc7514a93379baf57c39891eded3f3eb7f27d8b93faeaa998794117f86cc0d57b0d6566c0a5d2a8f557471e0c0062e13f57ef6c7036ce86a22c31c4b21c4
+  data.tar.gz: 290d0270530a2467df0c4c2ecafde88d3ed4763e818a62709f909afd551941ff1bcf376ca9a1cbe73a3a05b5b0fe13798b485453381ebc6db7121a15d3c66a27

data/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     ice_cube_model (0.0.3)
-      ice_cube_cron (>= 0.0.3)
+      ice_cube_cron (~> 0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -20,16 +20,16 @@ GEM
     diff-lcs (1.2.5)
     i18n (0.7.0)
     ice_cube (0.13.0)
-    ice_cube_cron (0.0.3)
-      activesupport (>= 3.0.0)
-      ice_cube (= 0.13.0)
+    ice_cube_cron (0.0.4)
+      activesupport (~> 4)
+      ice_cube (~> 0.13)
     json (1.8.3)
     method_source (0.8.2)
     minitest (5.8.2)
     parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.1)
-    pry (0.10.2)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -65,10 +65,10 @@ PLATFORMS
 
 DEPENDENCIES
   ice_cube_model!
-  pry
-  rake
-  rspec
-  rubocop
+  pry (~> 0)
+  rake (~> 10)
+  rspec (~> 3.3)
+  rubocop (~> 0.34)
 
 BUNDLED WITH
    1.10.6

data/README.md

@@ -115,7 +115,6 @@ end
 
 ## notes
 - This gem is a work-in-progress.
-- `occurrences_between` is the only method currently supported.
 - Does not yet support all recurrence options. More coming.
 - Supports inheritance but will not pick up dynamic changes in parent class parameter mappings.
 

data/ice_cube_model.gemspec

@@ -3,14 +3,14 @@ $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'ice_cube_model/version'
 
 Gem::Specification.new do |s|
-  s.name        = 'ice_cube_model'
-  s.version     = IceCubeModel::VERSION
-  s.authors     = ['Matt Nichols']
-  s.email       = ['matt@nichols.name']
-  s.homepage    = 'https://github.com/mattnichols/ice_cube_model'
-  s.summary     = 'Extend any class with ice_cube (calendar repeating events) capabilities.'
-  s.description = 'Add ice_cube methods to classes (e.g. active_record, active_model).'
-
+  s.name          = 'ice_cube_model'
+  s.version       = IceCubeModel::VERSION
+  s.authors       = ['Matt Nichols']
+  s.email         = ['matt@nichols.name']
+  s.homepage      = 'https://github.com/mattnichols/ice_cube_model'
+  s.summary       = 'Extend any class with ice_cube (calendar repeating events) capabilities.'
+  s.description   = 'Add ice_cube methods to classes (e.g. active_record, active_model).'
+  s.license       = 'MIT'
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ['lib']
@@ -18,13 +18,13 @@ Gem::Specification.new do |s|
   ##
   # Dependencies
   #
-  s.add_dependency 'ice_cube_cron', '>= 0.0.3'
+  s.add_runtime_dependency 'ice_cube_cron', '~> 0.0'
 
   ##
   # Development Dependencies
   #
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop'
+  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'
 end

data/lib/ice_cube_model/base.rb

@@ -1,22 +1,57 @@
 module IceCubeModel
   module Base
+    DELEGATED_METHODS = [
+      :occurrences,
+      :all_occurrences,
+      :all_occurrences_enumerator,
+      :next_occurrences,
+      :next_occurrence,
+      :previous_occurrences,
+      :previous_occurrence,
+      :remaining_occurrences,
+      :remaining_occurrences_enumerator,
+      :occurrences_between,
+      :occurs_between?,
+      :occurring_between?,
+      :occurs_on?,
+      :first,
+      :last
+    ]
+
     def self.included(base)
       base.extend(::IceCubeModel::Base::ClassMethods)
     end
 
-    def events_between(start, through)
-      params = read_repeat_params
-      schedule = ::IceCube::Schedule.from_cron(read_repeat_parameter(:repeat_start_date), params)
-
-      schedule.occurrences_between(::IceCubeModel::Util.sanitize_date_param(start), ::IceCubeModel::Util.sanitize_date_param(through))
+    def schedule
+      ::IceCube::Schedule.from_cron(read_repeat_parameter(:repeat_start_date), read_repeat_params)
     end
-    alias_method :occurrences_between, :events_between
 
     def respond_to?(name, include_private = false)
+      ## Does respond to delegated methods. method_missing will lazy define them as they are used.
+      return true if DELEGATED_METHODS.include?(name.to_sym)
       return true if self.class.repeat_parameter_mappings.values.include?(name.to_sym)
       super
     end
 
+    # TODO: For backward compatibility. Remove before prod ready release.
+    delegate :occurrences_between, :to => :schedule
+    alias_method :events_between, :occurrences_between
+
+    ##
+    # Implementing method_missing as a *lazy* delegator. Doing this to prevent overwriting
+    # target class' methods.
+    #
+    def method_missing(name, *args, &block)
+      if DELEGATED_METHODS.include?(name.to_sym)
+        self.class.send(:define_method, name.to_sym) do |*method_args|
+          schedule.send(name, *method_args, &block)
+        end
+        send(name, *args)
+      else
+        super
+      end
+    end
+
   private
 
     def read_repeat_parameter(param_name)

data/lib/ice_cube_model/version.rb

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

data/spec/lib/ice_cube_model/base_spec.rb

@@ -27,7 +27,9 @@ describe ::IceCubeModel do
     end
 
     def respond_to?(name, _include_private = false)
-      @attributes.key?(name)
+      return true if @attributes.key?(name)
+
+      super
     end
   end
 
@@ -283,12 +285,12 @@ describe ::IceCubeModel do
     end
 
     it 'handles ::DateTime as input' do
-      expect(ice_cube_model.events_between(::DateTime.new(2015, 7, 1), ::DateTime.new(2015, 7, 31))).to eq([::DateTime.new(2015, 7, 1)])
+      expect(ice_cube_model.events_between(::Date.new(2015, 7, 1), ::Date.new(2015, 7, 31))).to eq([::Date.new(2015, 7, 1)])
     end
 
     it 'handles integer (epoch) as input' do
       ice_cube_model.repeat_start_date = 1_430_438_400 # Fri, 01 May 2015 00:00:00 GMT
-      expect(ice_cube_model.events_between(::DateTime.new(2015, 7, 1), ::DateTime.new(2015, 7, 31))).to eq([::DateTime.new(2015, 7, 1)])
+      expect(ice_cube_model.events_between(::Date.new(2015, 7, 1), ::Date.new(2015, 7, 31))).to eq([::DateTime.new(2015, 7, 1)])
     end
   end
 
@@ -391,4 +393,91 @@ describe ::IceCubeModel do
       end
     end
   end
+
+  describe 'delagated methods' do
+    let(:ice_cube_model) do
+      ::IceCubeObj.new(
+        :repeat_start_date => ::Date.new(2015, 6, 1),
+        :repeat_day => 5
+      )
+    end
+
+    it '#occurrences' do
+      expect(ice_cube_model.occurrences(::Date.new(2015, 8, 1))).to eq([::Date.new(2015, 6, 5), ::Date.new(2015, 7, 5)])
+    end
+
+    it '#all_occurrences' do
+      ice_cube_model.repeat_until = ::Date.new(2015, 8, 1)
+      expect(ice_cube_model.all_occurrences).to eq([::Date.new(2015, 6, 5), ::Date.new(2015, 7, 5)])
+    end
+
+    it '#all_occurrences_enumerator' do
+      ice_cube_model.repeat_until = ::Date.new(2015, 8, 1)
+      expect(ice_cube_model.all_occurrences_enumerator.map { |occurrence| occurrence }).to eq([::Date.new(2015, 6, 5), ::Date.new(2015, 7, 5)])
+    end
+
+    it '#next_occurrences' do
+      expect(ice_cube_model.next_occurrences(2, ::Date.new(2015, 6, 1))).to eq([::Date.new(2015, 6, 5), ::Date.new(2015, 7, 5)])
+    end
+
+    it '#next_occurrence' do
+      expect(ice_cube_model.next_occurrence(::Date.new(2015, 6, 1))).to eq(::Date.new(2015, 6, 5))
+    end
+
+    it '#previous_occurrences' do
+      expect(ice_cube_model.previous_occurrences(2, ::Date.new(2015, 8, 1))).to eq([::Date.new(2015, 6, 5), ::Date.new(2015, 7, 5)])
+    end
+
+    it '#previous_occurrence' do
+      expect(ice_cube_model.previous_occurrence(::Date.new(2015, 8, 1))).to eq(::Date.new(2015, 7, 5))
+    end
+
+    it '#remaining_occurrences' do
+      ice_cube_model.repeat_until = ::Date.new(2015, 8, 1)
+      expect(ice_cube_model.remaining_occurrences(::Date.new(2015, 6, 1))).to eq([::Date.new(2015, 6, 5), ::Date.new(2015, 7, 5)])
+    end
+
+    it '#remaining_occurrences_enumerator' do
+      ice_cube_model.repeat_until = ::Date.new(2015, 8, 1)
+      expect(ice_cube_model.remaining_occurrences_enumerator(::Date.new(2015, 6, 1)).map { |occurrence| occurrence }).to eq([::Date.new(2015, 6, 5), ::Date.new(2015, 7, 5)])
+    end
+
+    it '#occurrences_between' do
+      expect(ice_cube_model.occurrences_between(::Date.new(2015, 6, 1), ::Date.new(2015, 8, 1))).to eq([::Date.new(2015, 6, 5), ::Date.new(2015, 7, 5)])
+      expect(ice_cube_model.events_between(::Date.new(2015, 6, 1), ::Date.new(2015, 8, 1))).to eq([::Date.new(2015, 6, 5), ::Date.new(2015, 7, 5)])
+    end
+
+    it '#occurs_between?' do
+      expect(ice_cube_model.occurs_between?(::Date.new(2015, 7, 1), ::Date.new(2015, 8, 1))).to be(true)
+    end
+
+    it '#occurring_between?' do
+      expect(ice_cube_model.occurring_between?(::Date.new(2015, 6, 1), ::Date.new(2015, 8, 1))).to be(true)
+    end
+
+    it '#occurs_on?' do
+      expect(ice_cube_model.occurs_on?(::Date.new(2015, 6, 5))).to be(true)
+    end
+
+    it '#occurring_at?' do
+      skip 'Time options not implemented yet'
+    end
+
+    it '#conflicts_with?' do
+      skip 'Time options not implemented yet'
+    end
+
+    it '#occurs_at?' do
+      skip 'Time options not implemented yet'
+    end
+
+    it '#first' do
+      expect(ice_cube_model.first(2)).to eq([::Date.new(2015, 6, 5), ::Date.new(2015, 7, 5)])
+    end
+
+    it '#last' do
+      ice_cube_model.repeat_until = ::Date.new(2015, 8, 1)
+      expect(ice_cube_model.last(2)).to eq([::Date.new(2015, 6, 5), ::Date.new(2015, 7, 5)])
+    end
+  end
 end

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: ice_cube_model
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Matt Nichols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube_cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.34'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.34'
 description: Add ice_cube methods to classes (e.g. active_record, active_model).
 email:
 - matt@nichols.name
@@ -102,7 +102,8 @@ files:
 - spec/lib/ice_cube_model/util_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mattnichols/ice_cube_model
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []