timespan 0.4.6 → 0.4.9

data/Gemfile

@@ -4,6 +4,7 @@ gem 'chronic'
 gem 'chronic_duration'
 gem 'activesupport', '>= 3.0.0'
 gem 'spanner'
+gem 'sugar-high', '~> 0.7.2' # for range intersect
 gem 'xduration', '~> 2.2'
 
 group :test, :development do
@@ -12,10 +13,12 @@ group :test, :development do
   # gem 'mongoid',  '>= 2.4'
   # gem 'bson',     '>= 1.6'
 
-  gem 'mongoid',  '~> 3.0.0' #, :git => 'git://github.com/mongoid/mongoid.git'  
+  gem 'mongoid',  '~> 3.0'
+  gem 'origin-selectable_ext', '~> 0.1.1'
   # gem 'i18n'
 end
 
+
 group :development do
   gem "rdoc", 		">= 3.12"
   gem "bundler", 	">= 1.0.0"

data/Gemfile.lock

@@ -58,7 +58,9 @@ GEM
     moped (1.2.0)
     multi_json (1.3.6)
     numerizer (0.1.1)
-    origin (1.0.4)
+    origin (1.0.9)
+    origin-selectable_ext (0.1.1)
+      origin
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -102,6 +104,7 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sugar-high (0.7.2)
     thor (0.15.4)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -121,10 +124,12 @@ DEPENDENCIES
   chronic
   chronic_duration
   jeweler (>= 1.8.3)
-  mongoid (~> 3.0.0)
+  mongoid (~> 3.0)
+  origin-selectable_ext (~> 0.1.1)
   rails (~> 3.2.7)
   rdoc (>= 3.12)
   rspec (>= 2.8.0)
   simplecov (>= 0.5)
   spanner
+  sugar-high (~> 0.7.2)
   xduration (~> 2.2)

data/README.md

@@ -309,6 +309,23 @@ TimeSpan.start_field = :start
 TimeSpan.end_field = :end
 ```
 
+## Ranges
+
+A Range can be converted into either a `Timespan` or a `DurationRange`
+
+### DurationRange
+
+```ruby
+dr = (1..5).days # => DurationRange 1..5, :days
+ts =(1..5).days(:timespan) # => Timespan start_date: 1.day.from_now, end_date: 5.days.from_now
+
+dr.between?(4.days) # => true
+```
+
+You can also use Range#intersect from *sugar-high* gem to test intersection of time ranges ;)
+
+### Timespan
+
 ## Contributing to Timespan
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.9

data/lib/timespan/core_ext/hash.rb

@@ -0,0 +1,12 @@
+class Hash
+  def __evolve_to_timespan__
+    serializer = Mongoid::Fields::Timespan
+    object = self
+    ::Timespan.new :from => serializer.from(object), :to => serializer.to(object), asap: serializer.asap(object)
+  end
+
+  def __evolve_to_duration_range__
+    range = Range.new self['from'], self['to']
+    ::DurationRange.new range, :seconds
+  end
+end

data/lib/timespan/core_ext/range.rb

@@ -0,0 +1,119 @@
+class TimespanRange < DelegateDecorator
+  attr_accessor :unit, :range
+
+  def initialize range, unit
+    super(range)
+    @range = Timespan.new between: range
+    @unit = unit.to_s.singularize.to_sym
+  end
+end
+
+class DurationRange < DelegateDecorator
+  attr_accessor :unit, :range
+
+  def initialize range, unit
+    super(range)
+    @unit = unit.to_s.singularize.to_sym
+    @range = range
+  end
+
+  def __evolve_to_duration_range__
+    self
+  end
+
+  def mongoize
+    {:from => range.min.to_i, :to => range.max.to_i}
+  end
+
+  def between? duration
+    obj = case duration
+    when Duration
+      duration
+    else
+      Duration.new duration
+    end
+    obj.total >= min && obj.total <= max
+  end
+
+  class << self
+    # See http://mongoid.org/en/mongoid/docs/upgrading.html        
+
+    # Serialize a Hash (with DurationRange keys) or a DurationRange to
+    # a BSON serializable type.
+    #
+    # @param [Timespan, Hash, Integer, String] value
+    # @return [Hash] Timespan in seconds
+    def mongoize object
+      mongoized = case object
+      when DurationRange then object.mongoize
+      when Hash
+        object
+      when Range
+        object.send(:seconds).mongoize
+      else
+        object
+      end
+      # puts "mongoized: #{mongoized} - Hash"
+      mongoized
+    end
+
+    # Deserialize a Timespan given the hash stored by Mongodb
+    #
+    # @param [Hash] Timespan as hash
+    # @return [Timespan] deserialized Timespan
+    def demongoize(object)
+      return if !object
+      
+      demongoized = case object
+      when Hash
+        object.__evolve_to_duration_range__
+      else
+        raise "Unable to demongoize DurationRange from: #{object}"
+      end    
+      # puts "demongoized: #{demongoized} - DurationRange"
+      demongoized
+    end
+
+    # Converts the object that was supplied to a criteria and converts it
+    # into a database friendly form.
+    def evolve(object)
+      object.__evolve_to_duration_range__.mongoize
+    end 
+
+    protected
+
+    def parse duration
+      if duration.kind_of? Numeric
+         return Duration.new duration
+      else
+        case duration
+        when Timespan
+          duration.duration
+        when Duration
+          duration
+        when Hash
+          Duration.new duration
+        when Time
+          duration.to_i
+        when DateTime, Date
+          duration.to_time.to_i
+        when String
+          Duration.new parse_duration(duration)
+        else
+          raise ArgumentError, "Unsupported duration type: #{duration.inspect} of class #{duration.class}"
+        end 
+      end
+    end
+
+  end 
+end
+
+
+class Range
+  [:seconds, :minutes, :hours, :days, :weeks, :months, :years].each do |unit|
+    define_method unit do |type = :duration|
+      timerange = Range.new self.min.send(unit), self.max.send(unit)
+      type == :timespan ? TimespanRange.new(timerange, unit) : DurationRange.new(timerange, unit)      
+    end
+  end
+end

data/lib/timespan/core_ext.rb

@@ -0,0 +1 @@
+require 'timespan/core_ext/range'

data/lib/timespan/mongoid/mongoid_3x.rb

@@ -1,6 +1,14 @@
+require 'origin-selectable_ext'
+require 'timespan/core_ext/hash'
+
 class Timespan
   Serializer = Mongoid::Fields::Timespan
 
+  def __evolve_to_timespan__
+    self
+  end
+
+
   # See http://mongoid.org/en/mongoid/docs/upgrading.html        
 
   # Serialize a Timespan or a Hash (with Timespan units) or a Duration in some form to
@@ -9,7 +17,7 @@ class Timespan
   # @param [Timespan, Hash, Integer, String] value
   # @return [Hash] Timespan in seconds
   def mongoize
-    {:from => Serializer.serialize_time(start_time), :to => Serializer.serialize_time(end_time), :duration => duration.total }
+    {:from => Serializer.serialize_time(start_time), :to => Serializer.serialize_time(end_time), :duration => duration.total, :asap => asap? }
   end
 
   class << self
@@ -38,7 +46,7 @@ class Timespan
       return if !object
       case object
       when Hash
-        ::Timespan.new :from => Serializer.from(object), :to => Serializer.to(object)
+        object.__evolve_to_timespan__
       else
         ::Timespan.new object
       end        
@@ -47,10 +55,43 @@ class Timespan
     # Converts the object that was supplied to a criteria and converts it
     # into a database friendly form.
     def evolve(object)
-      case object
-      when Timespan then object.mongoize
-      else object
+      object.__evolve_to_timespan__.mongoize
+    end
+
+    def custom_serialization?(operator)
+      return false unless operator
+      case operator
+        when '$gte', '$gt', '$lt', '$lte', '$eq', '$between', '$btw'
+          true
+      else
+        false
+      end
+    end
+
+    def custom_specify(name, operator, value, options = {})
+      puts "custom_specify: #{name}"
+      timespan = value.__evolve_to_timespan__
+      case operator
+        when '$gte', '$gt', '$lt', '$lte', '$eq', '$between', '$btw'
+          specify_with_asap(name, operator, timespan, options)
+      else
+        raise RuntimeError, "Unsupported operator"
+      end
+    end
+
+    def specify_with_asap(name, operator, timespan, options)
+      query = { 'from' => {}, 'to' => {} }
+      case operator      
+      when '$gte', '$gt'
+        query['from'][operator] = Serializer.serialize_time(timespan.min)
+      when '$lte', '$lt', '$eq'
+        query['to'][operator] = Serializer.serialize_time(timespan.min)
+      when '$between', '$btw'
+        query['from']['$gte'] = Serializer.serialize_time(timespan.min)
+        query['to']['$lte'] = Serializer.serialize_time(timespan.max)
       end
+      puts "query: #{query}"
+      query
     end
   end
 end

data/lib/timespan/mongoid.rb

@@ -39,6 +39,12 @@ module Mongoid
           deserialize_time to_value
         end
 
+        def asap hash
+          asap_value = hash['asap'] || hash[:asap]
+          raise ArgumentError, ":asap is nil, #{hash.inspect}" if ![true, false, nil].include? asap_value
+          asap_value
+        end
+
         def serialize_time time
           raise ArgumentError, "Can't serialize time from nil" if time.nil?
           time.to_i

data/lib/timespan.rb

@@ -3,6 +3,13 @@ require 'chronic'
 require 'chronic_duration'
 require 'spanner'
 
+# Range intersection that works with dates!
+require 'sugar-high/range'
+require 'sugar-high/delegate'
+require 'sugar-high/kind_of'
+
+require 'timespan/core_ext'
+
 require 'timespan/units'
 require 'timespan/compare'
 require 'timespan/printer'
@@ -44,7 +51,6 @@ class Timespan
 
 	def initialize options = {}
 		@is_new = true
-
 		@init_options = options
 		validate! if options == {}
 
@@ -60,41 +66,70 @@ class Timespan
 		@is_new = false
 	end
 
-	def self.from start, duration, options = {}
-		start = case start.to_sym
-		when :now, :asap
-			Time.now
-		when :today
-			Date.today
-		when :tomorrow
-			Date.today + 1.day
-		when :next_week # requires active_support
-			date = Date.today.next_week
-			options[:start] ? date.beginning_of_week : date
-		when :next_month			
-			date = Date.today.next_month
-			options[:start] ? date.at_beginning_of_month.next_month : date
-		else
-			start
+	class << self
+		def max_date
+			@max_date ||= Time.now + 10.years
 		end
 
-		self.new start_date: start, duration: duration
-	end
+		def min_date
+			@min_date ||= Time.now
+		end
 
-	def self.untill ending
-		ending = case ending.to_sym
-		when :tomorrow
-			Date.today + 1.day
-		when :next_week # requires active_support
-			date = Date.today.next_week
-			options[:start] ? date.beginning_of_week : date
-		when :next_month			
-			date = Date.today.next_month
-			options[:start] ? date.at_beginning_of_month.next_month : date
-		else
-			ending
+		def max_date= date
+			@max_date = date if valid_date?(date)
+		end
+
+		def min_date= date
+			@max_date = date if valid_date?(date)
+		end
+
+		def asap options = {}
+			self.new options.merge(asap: true)
+		end
+
+		def from start, duration, options = {}
+			start = case start.to_sym
+			when :now, :asap
+				Time.now
+			when :today
+				Date.today
+			when :tomorrow
+				Date.today + 1.day
+			when :next_week # requires active_support
+				date = Date.today.next_week
+				options[:start] ? date.beginning_of_week : date
+			when :next_month			
+				date = Date.today.next_month
+				options[:start] ? date.at_beginning_of_month.next_month : date
+			else
+				start
+			end
+
+			self.new start_date: start, duration: duration
+		end
+
+		def untill ending
+			ending = case ending.to_sym
+			when :tomorrow
+				Date.today + 1.day
+			when :next_week # requires active_support
+				date = Date.today.next_week
+				options[:start] ? date.beginning_of_week : date
+			when :next_month			
+				date = Date.today.next_month
+				options[:start] ? date.at_beginning_of_month.next_month : date
+			else
+				ending
+			end
+			self.new start_date: Date.now, end_date: ending
+		end
+		alias_method :until, :untill
+
+		protected
+
+		def valid_date? date
+			date.any_kind_of?(Date, Time, DateTime)
 		end
-		self.new start_date: Date.now, end_date: ending
 	end
 
 	def start_time= time
@@ -122,21 +157,37 @@ class Timespan
 	end
 	alias_method :end_date=, :end_time=
 
-	def until time
+	def asap?
+		@asap
+	end
+
+	def min
+		asap ? Time.now : start_time
+	end
+
+	def max
+		end_time
+	end
+
+	def untill time
 		self.end_time =	time
 		self
 	end
+	alias_method :until, :untill
 
 	def convert_to_time time
+		time = Duration.new time if time.kind_of? Numeric				 
 		case time
 		when String
 			Chronic.parse(time)
 		when Date, DateTime
 			time.to_time
+		when Duration
+			(Time.now + time).to_time
 		when Time
 			time
 		else
-			raise ArgumentError, "A valid time must be either a String, Date, Time or DateTime, was: #{time.inspect}"
+			raise ArgumentError, "A valid time must be either a String, Duration, Date, Time or DateTime, was: #{time.inspect} (#{time.class})"
 		end
 	end
 
@@ -153,18 +204,40 @@ class Timespan
 		from 	= options[first_from(START_KEYS, options)]
 		to 		= options[first_from(END_KEYS, options)]
 		dur 	= options[first_from(DURATION_KEYS, options)]
+		asap  = options[:asap]
+
+		if options[:at_least]
+			to = Timespan.max_date 
+			from = Time.now + options[:at_least]
+		end
+
+		if options[:at_most]
+			to   = Time.now + options[:at_most]
+			from = Time.now
+		end
+
+		if options[:between]
+			from = Time.now + options[:between].min
+			to = Time.now + options[:between].max
+		end
+
+		# puts "configure: to:#{to}, from:#{from}, dur:#{dur}, asap:#{asap}"
 
+		@asap 						= asap if asap
 		self.duration 		= dur if dur
 		self.start_time 	= from if from
 		self.end_time 		= to if to
 
+		# puts "configured: start:#{self.start_time}, end:#{self.end_time}, duration:#{self.duration}, asap:#{self.asap?}"
+
 		default_from_now!
 		calculate_miss!
 	rescue ArgumentError => e
 		raise TimeParseError, e.message
-	rescue Exception => e
-		calculate_miss!
-		validate!
+	# rescue Exception => e
+	# 	puts "Exception: #{e}"
+	# 	calculate_miss!
+	# 	validate!
 	end		
 
 	def default_from_now!

data/spec/timespan/core_ext/duration_range_spec.rb

@@ -0,0 +1,60 @@
+require 'timespan/mongoid/spec_helper'
+
+describe Range do
+  subject { timerange }
+
+  describe 'create DurationRange' do
+    let(:range) { (1..5) }
+    let (:timerange) { range.days }
+  
+    specify { subject.should be_a DurationRange }
+
+    its(:min) { should be_a Fixnum }
+    its(:max) { should be_a Fixnum }
+
+    specify { subject.min.should == 1.day }
+    specify { subject.max.should == 5.days }
+  end
+end
+
+describe DurationRange do
+  subject { timerange }
+
+  let(:range) { (1..5) }
+
+  context 'day range' do
+    let (:timerange) { range.days }
+
+    its(:range) { should be_a Range }
+    its(:min) { should == 1.day }
+    its(:max) { should == 5.days }
+    its(:unit) { should == :day }
+
+    specify { subject.between?(4.days).should be_true }
+  end
+
+  context 'week range' do
+    let (:timerange) { range.weeks }
+
+    its(:range) { should be_a Range }
+    its(:min) { should == 1.week }
+    its(:max) { should == 5.weeks }
+    its(:unit) { should == :week }
+  end
+
+  context 'month range' do
+    let (:timerange) { range.months }
+
+    its(:min) { should == 1.month }
+    its(:max) { should == 5.months }
+    its(:unit) { should == :month }
+  end
+
+  context 'year range' do
+    let (:timerange) { range.years }
+
+    its(:min) { should == 1.year }
+    its(:max) { should == 5.years }
+    its(:unit) { should == :year }
+  end
+end

data/spec/timespan/core_ext/timespan_range_spec.rb

@@ -0,0 +1,57 @@
+require 'timespan/mongoid/spec_helper'
+
+describe Range do
+  subject { timerange }
+
+  let(:range) { (1..5) }
+
+  describe 'create TimespanRange' do
+    
+    let (:timerange) { range.months(:timespan) }
+  
+    specify { subject.should be_a TimespanRange }
+    its(:range) { should be_a Timespan }
+  end
+end
+
+describe TimespanRange do
+  subject { timerange }
+
+  let(:range) { (1..5) }
+
+  context 'day range' do
+    let (:timerange) { range.days(:timespan) }
+
+    its(:range) { should be_a Timespan }
+    its(:min) { should == 1.day }
+    its(:max) { should == 5.days }
+    its(:unit) { should == :day }
+  end
+
+  context 'week range' do
+    let (:timerange) { range.weeks(:timespan) }
+
+    its(:range) { should be_a Timespan }
+    its(:min) { should == 1.week }
+    its(:max) { should == 5.weeks }
+    its(:unit) { should == :week }
+  end
+
+  context 'month range' do
+    let (:timerange) { range.months(:timespan) }
+
+    its(:range) { should be_a Timespan }
+    its(:min) { should == 1.month }
+    its(:max) { should == 5.months }
+    its(:unit) { should == :month }
+  end
+
+  context 'year range' do
+    let (:timerange) { range.years(:timespan) }
+
+    its(:range) { should be_a Timespan }
+    its(:min) { should == 1.year }
+    its(:max) { should == 5.years }
+    its(:unit) { should == :year }
+  end
+end

data/spec/timespan/mongoid/advanced_search_spec.rb

@@ -0,0 +1,216 @@
+require 'timespan/mongoid/spec_helper'
+
+describe TimeSpan do
+  subject { account }
+
+  before :all do
+    # Mongoid.logger.level = Logger::DEBUG
+    # Moped.logger.level = Logger::DEBUG
+    # Mongoid.logger = Logger.new($stdout)
+    # Moped.logger   = Logger.new($stdout)    
+  end
+
+  def max_asap
+    10.days.from_now.to_i
+  end
+
+  context '10 Accounts with period and duration-range' do
+
+    # TODO: 
+    # Doesn't handle dynamic ASAP as attempted 
+    # implemented via custom_specify
+
+    before do
+      Account.delete_all
+
+      @acc1 = Account.create name: '1', period: Timespan.from(:today, 5.days), 
+                             time_period: TimePeriod.new(flex: (2..5).minutes)
+
+      @acc2 = Account.create name: '2', period: Timespan.from(:today, 5.days), 
+                             time_period: TimePeriod.new(flex: (2..4).minutes)
+
+      @acc3 = Account.create name: '3', period: Timespan.from(:today, 5.days), 
+                             time_period: TimePeriod.new(flex: (0..4).minutes)
+
+      @acc4 = Account.create name: '4', period: Timespan.from(:today, 5.days), 
+                             time_period: TimePeriod.new(flex: (0..3).minutes)
+
+      @acc5 = Account.create name: '5', period: Timespan.from(:today, 5.days), 
+                             time_period: TimePeriod.new(flex: (0..2).minutes)
+
+      @acc6 = Account.create name: '6', period: Timespan.from(:next_month, 100.days), 
+                             time_period: TimePeriod.new(flex: (0..2).minutes)
+
+      @acc7 = Account.create name: '7', period: Timespan.from(:next_week, 100.days), 
+                             time_period: TimePeriod.new(flex: (0..2).minutes)
+
+      @acc8 = Account.create name: '8', period: Timespan.new(start_date: 9.days.from_now, duration: 100.days), 
+                             time_period: TimePeriod.new(flex: (5..10).minutes)
+
+      @acc9 = Account.create name: '9', period: Timespan.new(start_date: 40.days.from_now, duration: 100.days), 
+                             time_period: TimePeriod.new(flex: (0..3).minutes)
+
+      @acc8 = Account.create name: '10', period: Timespan.new(start_date: 1.week.from_now, duration: 100.days), 
+                             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)
+      end
+
+      # it 'should have a nice criteria' do
+      #   criteria.selector['$or'].should == [{"time_period.flex.from"=>120}, {"time_period.flex.to"=>120}]
+      #   criteria.selector["period.from"].should be_a Hash
+      # end
+
+      it 'should find #1, #2, #3, #4, #5' do
+        criteria.to_a.map(&:name).should include '1', '2', '5', '7'
+      end
+
+      let(:time_period) { criteria.first.time_period }
+
+      specify do
+        time_period.flex.should be_a DurationRange
+        time_period.flex.min.should == 2.minutes
+        time_period.flex.max.should == 5.minutes
+      end
+    end
+
+    describe 'ASAP 3 minutes' do
+      let(:period) { 3.minutes.to_i }
+
+      let(:criteria) do
+        Account.where(where_hash).or(exactly)
+      end
+
+      it 'should find #4, #10' do
+        # puts criteria.to_a.map(&:name)
+        criteria.to_a.map(&:name).should include '4', '10'
+      end
+    end
+
+    describe 'ASAP 4 minutes' do
+      let(:period) { 4.minutes.to_i }
+
+      let(:criteria) do
+        Account.where(where_hash).or(exactly)
+      end
+
+      it 'should find #2, #3' do
+        criteria.to_a.should include(@acc2, @acc3)
+      end
+    end
+
+    describe 'ASAP 1-4 minutes' do
+      let(:min_period) { 1.minute }
+      let(:max_period) { 4.minutes }
+
+      let(:criteria) do
+        Account.where(where_hash).or(in_between)
+      end
+
+      it 'should find #2, #3' do
+        # puts "ASAP 1-4 minutes"
+        # puts criteria.selector
+        # puts criteria.to_a.map(&:name)
+        criteria.to_a.map(&:name).should_not include('8', '9')
+        criteria.to_a.map(&:name).should include('2', '3')
+      end
+    end
+
+    describe 'ASAP 3-5 minutes' do
+      let(:min_period) { 3.minutes }
+      let(:max_period) { 5.minutes }
+
+      it 'should have a nice criteria' do
+        # puts "ASAP 3-5 minutes"
+        # puts criteria.selector
+        criteria.selector["time_period.flex.from"] = 180
+        criteria.selector["time_period.flex.to"] = 300
+        criteria.selector["period.from"].should be_a Hash
+      end
+
+      let(:criteria) do
+        Account.where(where_hash).or(in_between)
+      end
+
+      it 'should find #2, #3' do
+        # puts criteria.to_a.map(&:name)
+        criteria.to_a.map(&:name).should_not include('8', '9')
+        criteria.to_a.map(&:name).should include('10')
+      end
+    end
+
+    describe 'ASAP 5-7 minutes' do
+      let(:min_period) { 5.minutes }
+      let(:max_period) { 7.minutes }
+
+      let(:criteria) do
+        Account.where(where_hash).or(in_between)
+      end
+
+      it 'should find #2, #3' do
+        # puts criteria.to_a.map(&:name)
+        criteria.to_a.map(&:name).should_not include('6', '9', '10')
+        criteria.to_a.map(&:name).should include('8')
+      end
+    end
+
+    describe 'ASAP at least 4 minutes' do
+      let(:min_period) { 4.minutes }
+
+      let(:criteria) do
+        Account.where where_hash.merge(at_least)
+      end
+
+      it 'should find #2, #3' do
+        # puts criteria.selector
+        # puts criteria.to_a.map(&:name)
+        criteria.to_a.map(&:name).should_not include '9'
+        criteria.to_a.map(&:name).should include '1', '2', '3', '8', '10'
+      end
+    end
+
+    describe 'ASAP at most 3 minutes' do
+      let(:max_period) { 3.minutes }
+
+      let(:criteria) do
+        Account.where where_hash.merge(at_most)
+      end
+
+      it 'should find #2, #3' do
+        # puts criteria.selector
+        # puts criteria.to_a.map(&:name)
+        criteria.to_a.map(&:name).should_not include '8', '9', '10' 
+        criteria.to_a.map(&:name).should include '4', '5', '7'
+      end
+    end    
+  end
+end

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

@@ -4,12 +4,15 @@ class Account
   include Mongoid::Document
   include Mongoid::Timespanned
 
+  field :name
   field :period, :type => ::Timespan, :between => true
 
   timespan_methods :period
 
   embeds_one :time_period
-  timespan_container_delegates :time_period, :dates, :all #:start, :end
+  
+  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
@@ -17,6 +20,12 @@ class Account
     acc
   end
 
+#   def to_s
+#     %Q{
+# name: #{name}
+# }
+#   end
+
   def self.between from, to
     Account.where(:'period.from'.gt => from.to_i, :'period.to'.lte => to.to_i)
   end

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

@@ -2,7 +2,8 @@ class TimePeriod
   include Mongoid::Document
   include Mongoid::Timespanned
 
-  field :dates, :type => ::Timespan, :between => true
+  field :dates,     :type => ::Timespan, :between => true
+  field :flex,      :type => ::DurationRange
 
   embedded_in :account
 

data/timespan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.4.6"
+  s.version = "0.4.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-09-24"
+  s.date = "2012-09-25"
   s.description = "Makes it easy to calculate time distance in different units"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
@@ -28,6 +28,9 @@ Gem::Specification.new do |s|
     "config/locales/timespan/da.yml",
     "lib/timespan.rb",
     "lib/timespan/compare.rb",
+    "lib/timespan/core_ext.rb",
+    "lib/timespan/core_ext/hash.rb",
+    "lib/timespan/core_ext/range.rb",
     "lib/timespan/mongoid.rb",
     "lib/timespan/mongoid/mongoid_2x.rb",
     "lib/timespan/mongoid/mongoid_3x.rb",
@@ -38,8 +41,11 @@ Gem::Specification.new do |s|
     "lib/timespan/units.rb",
     "spec/spec_helper.rb",
     "spec/timespan/compare_spec.rb",
+    "spec/timespan/core_ext/duration_range_spec.rb",
+    "spec/timespan/core_ext/timespan_range_spec.rb",
     "spec/timespan/duration_macros_spec.rb",
     "spec/timespan/locales/duration_da.yml",
+    "spec/timespan/mongoid/advanced_search_spec.rb",
     "spec/timespan/mongoid/models/account_2x.rb",
     "spec/timespan/mongoid/models/account_3x.rb",
     "spec/timespan/mongoid/models/time_period.rb",
@@ -70,10 +76,12 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<chronic_duration>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<spanner>, [">= 0"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.7.2"])
       s.add_runtime_dependency(%q<xduration>, ["~> 2.2"])
       s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_development_dependency(%q<rails>, ["~> 3.2.7"])
-      s.add_development_dependency(%q<mongoid>, ["~> 3.0.0"])
+      s.add_development_dependency(%q<mongoid>, ["~> 3.0"])
+      s.add_development_dependency(%q<origin-selectable_ext>, ["~> 0.1.1"])
       s.add_development_dependency(%q<rdoc>, [">= 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.8.3"])
@@ -83,10 +91,12 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<chronic_duration>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_dependency(%q<spanner>, [">= 0"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.7.2"])
       s.add_dependency(%q<xduration>, ["~> 2.2"])
       s.add_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_dependency(%q<rails>, ["~> 3.2.7"])
-      s.add_dependency(%q<mongoid>, ["~> 3.0.0"])
+      s.add_dependency(%q<mongoid>, ["~> 3.0"])
+      s.add_dependency(%q<origin-selectable_ext>, ["~> 0.1.1"])
       s.add_dependency(%q<rdoc>, [">= 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 1.8.3"])
@@ -97,10 +107,12 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<chronic_duration>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
     s.add_dependency(%q<spanner>, [">= 0"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.7.2"])
     s.add_dependency(%q<xduration>, ["~> 2.2"])
     s.add_dependency(%q<rspec>, [">= 2.8.0"])
     s.add_dependency(%q<rails>, ["~> 3.2.7"])
-    s.add_dependency(%q<mongoid>, ["~> 3.0.0"])
+    s.add_dependency(%q<mongoid>, ["~> 3.0"])
+    s.add_dependency(%q<origin-selectable_ext>, ["~> 0.1.1"])
     s.add_dependency(%q<rdoc>, [">= 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 1.8.3"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timespan
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sugar-high
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: xduration
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +154,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: origin-selectable_ext
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +254,9 @@ files:
 - config/locales/timespan/da.yml
 - lib/timespan.rb
 - lib/timespan/compare.rb
+- lib/timespan/core_ext.rb
+- lib/timespan/core_ext/hash.rb
+- lib/timespan/core_ext/range.rb
 - lib/timespan/mongoid.rb
 - lib/timespan/mongoid/mongoid_2x.rb
 - lib/timespan/mongoid/mongoid_3x.rb
@@ -232,8 +267,11 @@ files:
 - lib/timespan/units.rb
 - spec/spec_helper.rb
 - spec/timespan/compare_spec.rb
+- spec/timespan/core_ext/duration_range_spec.rb
+- spec/timespan/core_ext/timespan_range_spec.rb
 - spec/timespan/duration_macros_spec.rb
 - spec/timespan/locales/duration_da.yml
+- spec/timespan/mongoid/advanced_search_spec.rb
 - spec/timespan/mongoid/models/account_2x.rb
 - spec/timespan/mongoid/models/account_3x.rb
 - spec/timespan/mongoid/models/time_period.rb
@@ -264,7 +302,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1422999725425630205
+      hash: -4405468294374256560
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: