timespan 0.4.3 → 0.4.4

data/README.md

@@ -107,9 +107,19 @@ da:
 
 ## Timespan for Mongoid
 
-Tested and works with Mongoid 2.4 and 3.0.0.rc
+Tested and works with Mongoid 2.4 and 3.0+
+
+Custom Timespan datatype:
+
+`Mongoid::Timespanned` adds the following class level macros:
+
+* `timespan_methods name`
+* `timespan_delegates name`
+* `timespan_setters name`
+
+* `timespan_container_delegates container, timespan_field, *names`
+* `timespan_container_delegate container, timespan_field, name`
 
-Custom Timespan datatype
 
 ```ruby
 require 'timespan/mongoid'
@@ -118,17 +128,25 @@ class Account
   include Mongoid::Document
   include Mongoid::Timespanned
 
-  field :period, :type => TimeSpan
+  field :period, :type => Timespan
 
   timespan_methods :period
+
+  embeds_one :time_period
+  timespan_container_delegates :time_period, :dates, :start, :end  
 end
-```
 
-`Mongoid::Timespanned` adds the following class level macros:
+class TimePeriod
+  include Mongoid::Document
+  include Mongoid::Timespanned
 
-* `timespan_methods name`
-* `timespan_delegates name`
-* `timespan_setters name`
+  field :dates, :type => ::Timespan, :between => true
+
+  embedded_in :account
+
+  timespan_methods :dates
+end
+```
 
 Usage example:
 
@@ -140,11 +158,17 @@ account.period.end_date
 account.period.days
 account.period.duration # => Duration
 
+# using timespan setters defined by timespan_methods
 account.period_start = tomorrow
 account.period_end = 5.days.from_now
 
+# using timespan delegates defined by timespan_methods
 account.start_date == tomorrow
 account.end_date == tomorrow
+
+# using timespan_container_delegates on time_period
+account.start_date = tomorrow
+account.end_date = tomorrow + 5.days
 ```
 
 ## Searching periods
@@ -162,7 +186,7 @@ Make it easier by introducing a class helper:
 ```ruby
 class Account
   include Mongoid::Document
-  field :period, :type => TimeSpan
+  field :period, :type => Timespan
 
   def self.between from, to
     Account.where(:'period.from'.gt => from.to_i, :'period.to'.lte => to.to_i)

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/timespan/mongoid/timespanned.rb

@@ -8,21 +8,51 @@ module Mongoid
         timespan_setters name
       end
 
-      def timespan_delegates name = :period  
+      # 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 
+        names.flatten.each do |name|
+          timespan_container_delegate container, timespan, name
+        end
+      end
+
+      def timespan_container_delegate container, timespan, name      
+        case name.to_sym
+        when :start
+          define_method "start_date=" do |date|
+            send(container).send("#{timespan}_start=", date)
+          end
+        when :end
+          define_method "end_date=" do |date|
+            send(container).send("#{timespan}_end=", date)
+          end
+        when :duration
+          define_method "duration=" do |date|
+            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_setters name = :period  
         define_method :"#{name}_start=" do |date|
-          self.send "#{name}=", ::Timespan.new(start_date: date, end_date: self.send(name).end_date)
+          options = self.send(name) ? {end_date: self.send(name).end_date} : {}
+          self.send "#{name}=", ::Timespan.new(options.merge(start_date: date))
         end
 
         define_method :"#{name}_end=" do |date|
-          self.send "#{name}=", ::Timespan.new(start_date: self.send(name).start_date, end_date: date)
+          options = self.send(name) ? {start_date: self.send(name).start_date} : {}
+          self.send "#{name}=", ::Timespan.new(options.merge(end_date: date))
         end
 
-        define_method :"#{name}duration=" do |duration|
-          self.send "#{name}=", ::Timespan.new(start_date: self.send(name).start_date, duration: duration)
+        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))
         end
       end
     end

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

@@ -1,3 +1,5 @@
+require 'timespan/mongoid/models/time_period'
+
 class Account
   include Mongoid::Document
   include Mongoid::Timespanned
@@ -6,9 +8,13 @@ class Account
 
   timespan_methods :period
 
+  embeds_one :time_period
+  timespan_container_delegates :time_period, :dates, :all#:start, :end
+
   def self.create_it! duration
-    t = ::Timespan.new(duration: duration)
-    self.new period: t
+    acc = self.new period: ::Timespan.new(duration: duration), time_period: ::TimePeriod.new
+    acc.time_period.dates_duration = 1.day
+    acc
   end
 
   def self.between from, to

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

@@ -0,0 +1,10 @@
+class TimePeriod
+  include Mongoid::Document
+  include Mongoid::Timespanned
+
+  field :dates, :type => ::Timespan, :between => true
+
+  embedded_in :account
+
+  timespan_methods :dates
+end

data/spec/timespan/mongoid/mongoid_timespan_spec.rb

@@ -44,16 +44,37 @@ describe TimeSpan do
         DateTime.parse(subject.period.start_date.to_s).strftime('%d %b %Y').should == Date.today.strftime('%d %b %Y')
       end
     end
+  end
+
+  context 'Setters and delegates' do
+    let(:account) do 
+      Account.create_it! 2.days
+    end
 
     describe 'set new start_date' do
       before :each do
         subject.period_start = tomorrow
+        subject.period_end = tomorrow + 5.days
+
+        subject.end_date = tomorrow + 3.days
+      end
+
+      specify do
+        Date.parse(subject.time_period.end_date.to_s).should == tomorrow + 3.days
+      end
+
+      specify do
+        subject.period.should be_a Timespan
       end
 
       specify do
         subject.start_date.should == subject.period.start_date
       end
 
+      specify do
+        subject.end_date.should == subject.period.end_date
+      end
+
       specify do
         Date.parse(subject.start_date.to_s).should == tomorrow
       end

data/timespan.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
     "spec/timespan/locales/duration_da.yml",
     "spec/timespan/mongoid/models/account_2x.rb",
     "spec/timespan/mongoid/models/account_3x.rb",
+    "spec/timespan/mongoid/models/time_period.rb",
     "spec/timespan/mongoid/mongoid_search_spec.rb",
     "spec/timespan/mongoid/mongoid_setup.rb",
     "spec/timespan/mongoid/mongoid_timespan_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timespan
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -220,6 +220,7 @@ files:
 - spec/timespan/locales/duration_da.yml
 - spec/timespan/mongoid/models/account_2x.rb
 - spec/timespan/mongoid/models/account_3x.rb
+- spec/timespan/mongoid/models/time_period.rb
 - spec/timespan/mongoid/mongoid_search_spec.rb
 - spec/timespan/mongoid/mongoid_setup.rb
 - spec/timespan/mongoid/mongoid_timespan_spec.rb
@@ -247,7 +248,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3678905643700355626
+      hash: 1165470586481426530
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: