timespan 0.4.4 → 0.4.5

data/README.md

@@ -113,13 +113,16 @@ Custom Timespan datatype:
 
 `Mongoid::Timespanned` adds the following class level macros:
 
-* `timespan_methods name`
-* `timespan_delegates name`
-* `timespan_setters name`
+* `timespan_methods target, *names`
+* `timespan_delegates target, *names`
+* `timespan_delegate name, target = :period`
+* `timespan_setters target, *names`
+* `timespan_setter target, name`
 
 * `timespan_container_delegates container, timespan_field, *names`
 * `timespan_container_delegate container, timespan_field, name`
 
+Note that all the macros, take an `options` Hash as the last argument, where you can set `override: true` in order to override any existing methods. Otherwise an `ArgumentError` exception will be raised, to warn you of a method name conflict!
 
 ```ruby
 require 'timespan/mongoid'
@@ -148,6 +151,8 @@ class TimePeriod
 end
 ```
 
+Note: See `mongoid_timespan_spec.rb` for more examples of usage, and also see the `ClassMethods` module in `timespanned.rb` :)
+
 Usage example:
 
 ```ruby

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/timespan/mongoid/timespanned.rb

@@ -3,56 +3,110 @@ module Mongoid
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def timespan_methods name
-        timespan_delegates name
-        timespan_setters name
-      end
-
       # fx Account.timespan_container_delegates :period, :dates, :start, :end
       #   start_date= -> period.dates_start=
       #   end_date= -> period.dates_end=
       def timespan_container_delegates container, timespan, *names
-        names = [:start, :end, :duration] if names.first == :all 
+        options = names.extract_options!
+        names = [:start, :end, :duration] if names.first == :all || names.empty?
         names.flatten.each do |name|
-          timespan_container_delegate container, timespan, name
+          timespan_container_delegate container, timespan, name, options = {}
         end
       end
 
-      def timespan_container_delegate container, timespan, name      
+      def timespan_container_delegate container, timespan, name, options = {}
+        override = options[:override]
         case name.to_sym
         when :start
-          define_method "start_date=" do |date|
-            send(container).send("#{timespan}_start=", date)
+          meth = "start_date="
+          raise ArgumentError, "method #{meth} already defined on #{self}" if self.respond_to?(meth) && ! override
+          define_method meth do |date|            
+            self.send(container).send("#{timespan}_start=", date)
           end
         when :end
-          define_method "end_date=" do |date|
-            send(container).send("#{timespan}_end=", date)
+          meth = "end_date="
+          raise ArgumentError, "method #{meth} already defined on #{self}" if self.respond_to?(meth) && !override
+          define_method meth do |date|
+            self.send(container).send("#{timespan}_end=", date)
           end
         when :duration
-          define_method "duration=" do |date|
-            send(container).send("#{timespan}_duration=", date)
+          meth = "duration="
+          raise ArgumentError, "method duration= already defined on #{self}" if self.respond_to?(meth) && !override
+          define_method meth do |date|
+            self.send(container).send("#{timespan}_duration=", date)
           end
         end
       end
 
-      def timespan_delegates name = :period
-        delegate :time_left, :duration, :start_date, :end_date, to: name
-      end
+      def timespan_methods target = :period, *names
+        options = names.extract_options!        
+        names = [:start, :end, :duration] if names.first == :all || names.empty?
+        timespan_delegates target, names, options
+        timespan_setters target, names, options
+      end      
 
-      def timespan_setters name = :period  
-        define_method :"#{name}_start=" do |date|
-          options = self.send(name) ? {end_date: self.send(name).end_date} : {}
-          self.send "#{name}=", ::Timespan.new(options.merge(start_date: date))
+      def timespan_delegates target = :period, *names
+        options = names.extract_options!
+        names = names.flatten
+        names = [:start_date, :end_date, :duration] if names.first == :all || names.empty?
+        names.map! do |name|
+          case name.to_sym
+          when :start then :start_date
+          when :end then :end_date
+          else
+            name.to_sym
+          end
+        end
+        names.flatten.each do |name|
+          timespan_delegate name, target, options
         end
+      end
+
+      def timespan_delegate meth, target = :period, options = {}
+        override = options[:override]
+        raise ArgumentError, "method #{meth} already defined on #{self}" if self.respond_to?(meth) && !override
+        delegate meth, to: target
+      end
 
-        define_method :"#{name}_end=" do |date|
-          options = self.send(name) ? {start_date: self.send(name).start_date} : {}
-          self.send "#{name}=", ::Timespan.new(options.merge(end_date: date))
+      def timespan_setters target = :period, *names
+        options = names.extract_options!
+        names = [:start, :end, :duration] if names.first == :all || names.empty?
+
+        names.flatten.each do |name|
+          timespan_setter target, name, options
         end
+      end
+
+      def timespan_setter name, meth_name, options = {}
+        override = options[:override]
+        case meth_name.to_sym
+        when :start
+          meth = "#{name}_start="
+          raise ArgumentError, "method #{meth} already defined on #{self}" if self.respond_to?(meth) && !override
+
+          define_method :"#{name}_start=" do |date|
+            options = self.send(name) ? {end_date: self.send(name).end_date} : {}
+            timespan = ::Timespan.new(options.merge(start_date: date))
+            self.send "#{name}=", timespan
+          end
+        when :end
+          meth = "#{name}_end="
+          raise ArgumentError, "method #{meth} already defined on #{self}" if self.respond_to?(meth) && !override
 
-        define_method :"#{name}_duration=" do |duration|
-          options = self.send(name) ? {start_date: self.send(name).start_date} : {}
-          self.send "#{name}=", ::Timespan.new(options.merge(duration: duration))
+          define_method :"#{name}_end=" do |date|
+            options = self.send(name) ? {start_date: self.send(name).start_date} : {}
+            timespan = ::Timespan.new(options.merge(end_date: date))
+            self.send "#{name}=", timespan
+          end
+        when :duration
+          meth = "#{name}_duration="
+          raise ArgumentError, "method #{meth} already defined on #{self}" if self.respond_to?(meth) && !override
+
+          define_method :"#{name}_duration=" do |duration|
+            options = self.send(name) ? {start_date: self.send(name).start_date} : {}
+            timespan = ::Timespan.new(options.merge(duration: duration))
+            self.send "#{name}=", timespan
+          end
         end
       end
     end

data/spec/timespan/mongoid/models/account_3x.rb

@@ -9,7 +9,7 @@ class Account
   timespan_methods :period
 
   embeds_one :time_period
-  timespan_container_delegates :time_period, :dates, :all#:start, :end
+  timespan_container_delegates :time_period, :dates, :all #:start, :end
 
   def self.create_it! duration
     acc = self.new period: ::Timespan.new(duration: duration), time_period: ::TimePeriod.new

data/spec/timespan/mongoid/mongoid_search_spec.rb

@@ -9,8 +9,6 @@ describe TimeSpan do
       @acc1 = Account.create :period => Timespan.new(:start_date => 2.days.ago)
       @acc2 = Account.create :period => Timespan.new(:start_date => 5.days.ago, :end_date => 2.days.ago)
       @acc3 = Account.create :period => Timespan.new(:start_date => 10.days.ago)
-
-      # puts [@acc1._id, @acc2._id, @acc3._id]
     end
 
     describe 'find accounts within specific period' do

data/timespan.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timespan
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -248,7 +248,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1165470586481426530
+      hash: 4117334554078744124
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: