timespan 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/timespan/mongoid/timespanned.rb

@@ -2,6 +2,18 @@ module Mongoid
   module Timespanned
     extend ActiveSupport::Concern
 
+    class << self
+      attr_accessor :log
+
+      def log msg
+        puts msg # if log?
+      end
+
+      def log?
+        @log
+      end
+    end
+
     module ClassMethods
       attr_writer :max_asap, :min_asap
 
@@ -50,22 +62,29 @@ module Mongoid
 
       def timespan_container_delegate container, timespan, name, options = {}
         override = options[:override]
+        mt = Mongoid::Timespanned
         case name.to_sym
         when :start
           meth = "start_date="
           raise ArgumentError, "method #{meth} already defined on #{self}" if self.respond_to?(meth) && ! override
+
+          mt.log "#{self} define container delegate: #{meth} to #{container}.#{timespan}_start="
           define_method meth do |date|            
             self.send(container).send("#{timespan}_start=", date)
           end
         when :end
           meth = "end_date="
           raise ArgumentError, "method #{meth} already defined on #{self}" if self.respond_to?(meth) && !override
+
+          mt.log "#{self} define container delegate: #{meth} to #{container}.#{timespan}_end="
           define_method meth do |date|
             self.send(container).send("#{timespan}_end=", date)
           end
         when :duration
           meth = "duration="
           raise ArgumentError, "method duration= already defined on #{self}" if self.respond_to?(meth) && !override
+
+          mt.log "#{self} define container delegate: #{meth} to #{container}.#{timespan}_duration="
           define_method meth do |date|
             self.send(container).send("#{timespan}_duration=", date)
           end
@@ -98,7 +117,10 @@ module Mongoid
 
       def timespan_delegate meth, target = :period, options = {}
         override = options[:override]
+        mt = Mongoid::Timespanned
         raise ArgumentError, "method #{meth} already defined on #{self}" if self.respond_to?(meth) && !override
+
+        mt.log "#{self} define delegate: #{meth} to #{target}"
         delegate meth, to: target
       end
 
@@ -113,12 +135,14 @@ module Mongoid
 
       def timespan_setter name, meth_name, options = {}
         override = options[:override]
+        mt = Mongoid::Timespanned
         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|
+          mt.log "#{self} define setter: #{meth}"
+          define_method meth 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
@@ -127,7 +151,8 @@ module Mongoid
           meth = "#{name}_end="
           raise ArgumentError, "method #{meth} already defined on #{self}" if self.respond_to?(meth) && !override
 
-          define_method :"#{name}_end=" do |date|
+          mt.log "#{self} define setter: #{meth}"
+          define_method meth 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
@@ -136,7 +161,9 @@ module Mongoid
           meth = "#{name}_duration="
           raise ArgumentError, "method #{meth} already defined on #{self}" if self.respond_to?(meth) && !override
 
-          define_method :"#{name}_duration=" do |duration|
+          mt.log "#{self} define setter: #{meth}"
+
+          define_method meth do |duration|
             options = self.send(name) ? {start_date: self.send(name).start_date} : {}
             timespan = ::Timespan.new(options.merge(duration: duration))
             self.send "#{name}=", timespan

data/spec/timespan/mongoid/advanced_search_spec.rb

@@ -1,4 +1,5 @@
 require 'timespan/mongoid/spec_helper'
+load_models!
 
 describe TimeSpan do
   subject { account }

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

@@ -12,7 +12,6 @@ class Account
   embeds_one :time_period
   
   timespan_container_delegates :time_period, :dates, :all
-  timespan_container_delegates :time_period, :flex, :all
 
   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

@@ -1,4 +1,5 @@
 require 'timespan/mongoid/spec_helper'
+load_models!
 
 describe TimeSpan do
   subject { account }

data/spec/timespan/mongoid/mongoid_timespan_spec.rb

@@ -1,5 +1,8 @@
 require 'timespan/mongoid/spec_helper'
 
+Mongoid::Timespanned.log = true
+load_models!
+
 describe TimeSpan do
 	subject { account }
 
@@ -13,7 +16,15 @@ describe TimeSpan do
   context 'factory method #from' do
     describe ':today' do
       let(:account) do 
-        Account.create period: Timespan.from(:today, 5.days)
+        Account.create period: ::Timespan.from(:today, 5.days)
+      end
+
+      describe '.to_s' do
+        it 'should return a non-empty String starting with from' do      
+          subject.period.to_s.should be_a String
+          subject.period.to_s.should_not be_empty
+          subject.period.to_s.should match(/^from/)
+        end
       end
 
       describe '.start_date' do
@@ -154,6 +165,7 @@ describe TimeSpan do
         subject.period_start = tomorrow
         subject.period_end = tomorrow + 5.days
 
+        subject.time_period.dates_end = tomorrow + 3.days
         subject.end_date = tomorrow + 3.days
       end
 

data/spec/timespan/mongoid/spec_helper.rb

@@ -28,4 +28,6 @@ end
 
 require 'timespan/mongoid'
 
-require "timespan/mongoid/models/account_#{Mongoid::MAJOR_VERSION}x"
+def load_models!
+  require "timespan/mongoid/models/account_#{Mongoid::MAJOR_VERSION}x"
+end

data/timespan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-09-26"
+  s.date = "2012-10-18"
   s.description = "Makes it easy to calculate time distance in different units"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timespan
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -302,7 +302,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3316997137060640016
+      hash: -4354095327562693822
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: