timespan 0.4.9 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.9
+0.5.0

data/lib/timespan/mongoid/timespanned.rb

@@ -3,6 +3,40 @@ module Mongoid
     extend ActiveSupport::Concern
 
     module ClassMethods
+      attr_writer :max_asap, :min_asap
+
+      def max_asap time = nil
+        @max_asap ||= (time || 10.days.from_now).to_i
+      end
+
+      def min_asap time = nil
+        @min_asap ||= (time || 1.day.ago).to_i        
+      end
+
+      def asap_method path
+        define_singleton_method :asap do
+          {:"#{path}.from".gte => min_asap, :"#{path}.from".lte => max_asap}
+        end
+      end
+
+      def duration_methods path
+        define_singleton_method :exactly do |period|
+          [{:"#{path}.from" => period.to_i}, {:"#{path}.to" => period.to_i}]
+        end
+
+        define_singleton_method :in_between do |range|
+          [{:"#{path}.from" => range.min.to_i}, {:"#{path}.to" => range.max.to_i}]
+        end
+
+        define_singleton_method :at_least do |period|
+          {:"#{path}.to".gte => period.to_i }
+        end
+
+        define_singleton_method :at_most do |period|
+          {:"#{path}.to".lte => period.to_i }
+        end
+      end
+
       # fx Account.timespan_container_delegates :period, :dates, :start, :end
       #   start_date= -> period.dates_start=
       #   end_date= -> period.dates_end=

data/spec/timespan/mongoid/advanced_search_spec.rb

@@ -54,35 +54,11 @@ describe TimeSpan do
                              time_period: TimePeriod.new(flex: (3..6).minutes)
     end
 
-    def yesterday
-      1.day.ago.to_i
-    end
-
-    def where_hash
-      {:'period.from'.gte => yesterday, :'period.from'.lte => max_asap}
-    end
-
-    def exactly
-      [{:'time_period.flex.from' => period}, {:'time_period.flex.to' => period}]
-    end
-
-    def in_between
-      [{:'time_period.flex.from' => min_period}, {:'time_period.flex.to' => max_period}]
-    end
-
-    def at_least type = :min
-      {:'time_period.flex.to'.gte => send("#{type}_period") }
-    end
-
-    def at_most type = :max
-      {:'time_period.flex.to'.lte => send("#{type}_period") }
-    end
-
     describe 'ASAP 2 minutes' do
       let(:period) { 2.minutes.to_i }
 
       let(:criteria) do
-        Account.where(where_hash).or(exactly)
+        Account.where(TimePeriod.asap).or(TimePeriod.exactly period)
       end
 
       # it 'should have a nice criteria' do
@@ -90,6 +66,14 @@ describe TimeSpan do
       #   criteria.selector["period.from"].should be_a Hash
       # end
 
+      it 'should have custom max_asap' do
+        TimePeriod.max_asap.should == 14.days.from_now.to_i
+      end
+
+      it 'should have custom min_asap' do
+        TimePeriod.min_asap.should == 2.days.ago.to_i
+      end
+
       it 'should find #1, #2, #3, #4, #5' do
         criteria.to_a.map(&:name).should include '1', '2', '5', '7'
       end
@@ -107,7 +91,7 @@ describe TimeSpan do
       let(:period) { 3.minutes.to_i }
 
       let(:criteria) do
-        Account.where(where_hash).or(exactly)
+        Account.where(TimePeriod.asap).or(TimePeriod.exactly period)
       end
 
       it 'should find #4, #10' do
@@ -120,7 +104,7 @@ describe TimeSpan do
       let(:period) { 4.minutes.to_i }
 
       let(:criteria) do
-        Account.where(where_hash).or(exactly)
+        Account.where(TimePeriod.asap).or(TimePeriod.exactly period)
       end
 
       it 'should find #2, #3' do
@@ -129,11 +113,10 @@ describe TimeSpan do
     end
 
     describe 'ASAP 1-4 minutes' do
-      let(:min_period) { 1.minute }
-      let(:max_period) { 4.minutes }
+      let(:period) { 1.minute..4.minutes }
 
       let(:criteria) do
-        Account.where(where_hash).or(in_between)
+        Account.where(TimePeriod.asap).or(TimePeriod.in_between period)
       end
 
       it 'should find #2, #3' do
@@ -146,8 +129,7 @@ describe TimeSpan do
     end
 
     describe 'ASAP 3-5 minutes' do
-      let(:min_period) { 3.minutes }
-      let(:max_period) { 5.minutes }
+      let(:period) { 3.minutes..5.minutes }
 
       it 'should have a nice criteria' do
         # puts "ASAP 3-5 minutes"
@@ -158,7 +140,7 @@ describe TimeSpan do
       end
 
       let(:criteria) do
-        Account.where(where_hash).or(in_between)
+        Account.where(TimePeriod.asap).or(TimePeriod.in_between period)
       end
 
       it 'should find #2, #3' do
@@ -169,11 +151,10 @@ describe TimeSpan do
     end
 
     describe 'ASAP 5-7 minutes' do
-      let(:min_period) { 5.minutes }
-      let(:max_period) { 7.minutes }
+      let(:period) { 5.minutes..7.minutes }
 
       let(:criteria) do
-        Account.where(where_hash).or(in_between)
+        Account.where(TimePeriod.asap).or(TimePeriod.in_between period)
       end
 
       it 'should find #2, #3' do
@@ -184,10 +165,10 @@ describe TimeSpan do
     end
 
     describe 'ASAP at least 4 minutes' do
-      let(:min_period) { 4.minutes }
+      let(:period) { 4.minutes }
 
       let(:criteria) do
-        Account.where where_hash.merge(at_least)
+        Account.where TimePeriod.asap.merge(TimePeriod.at_least period)
       end
 
       it 'should find #2, #3' do
@@ -199,10 +180,10 @@ describe TimeSpan do
     end
 
     describe 'ASAP at most 3 minutes' do
-      let(:max_period) { 3.minutes }
+      let(:period) { 3.minutes }
 
       let(:criteria) do
-        Account.where where_hash.merge(at_most)
+        Account.where TimePeriod.asap.merge(TimePeriod.at_most period)
       end
 
       it 'should find #2, #3' do

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

@@ -8,4 +8,11 @@ class TimePeriod
   embedded_in :account
 
   timespan_methods :dates
+
+  # override defaults
+  max_asap 14.days.from_now
+  min_asap 2.days.ago
+
+  asap_method :period
+  duration_methods 'time_period.flex'
 end

data/timespan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.4.9"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-09-25"
+  s.date = "2012-09-26"
   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.4.9
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-09-26 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: -4405468294374256560
+      hash: 3316997137060640016
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: