timespan 0.5.5 → 0.5.6

data/README.md

@@ -324,6 +324,13 @@ dr.between?(4.days) # => true
 
 You can also use Range#intersect from *sugar-high* gem to test intersection of time ranges ;)
 
+See https://github.com/kristianmandrup/sugar-high/blob/master/spec/sugar-high/range_spec.rb
+
+```ruby
+date_range.intersect(other_date_range).should == intersecting_range
+subject.intersect(other).should == nil # if no intersection
+```
+
 The duration range by default supports the following units: [seconds, minutes, hours, days, weeks, months, years]
 
 You can subclass the DurationRange to supply your own list of time units to fit your particular scenario.

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/lib/timespan/core_ext/hash.rb

@@ -8,6 +8,16 @@ class Hash
 
   def __evolve_to_duration_range__
     range = Range.new (self['from'] || self[:from]), (self['to'] || self[:to])
-    ::DurationRange.new range, :seconds
+    length = self['length'] || self[:length]
+    clazz = case length.to_sym
+    when :long 
+      ::LongDurationRange
+    when :short 
+      ::ShortDurationRange
+    else
+      ::DurationRange
+    end
+
+    clazz.new range, (self['unit'] || self[:unit] || :seconds)
   end
 end

data/lib/timespan/core_ext/range.rb

@@ -18,6 +18,8 @@ class TimespanRange < DelegateDecorator
 end
 
 class DurationRange < DelegateDecorator
+  include Comparable
+
   attr_accessor :unit, :range
 
   def initialize range, unit = :minutes
@@ -34,6 +36,30 @@ class DurationRange < DelegateDecorator
     @range = range
   end
 
+  alias_method :units, :unit
+
+  def <=> other_dur_range
+    min_secs = self.min
+    max_secs = self.max
+    omin_secs = other_dur_range.min
+    omax_secs = other_dur_range.max
+
+    # puts "self: #{self.inspect} vs #{other_dur_range.inspect} #{other_dur_range.class}"
+
+    if min_secs == omin_secs && max_secs == omax_secs
+      return 0
+    end
+
+    if min_secs < omin_secs || (min_secs == omin_secs && max_secs < omax_secs) 
+      -1
+    else
+      1
+    end
+  end
+
+  def length
+    :default
+  end
 
   def self.allowed_unit? unit
     allowed_units.include? unit.to_sym
@@ -55,12 +81,8 @@ class DurationRange < DelegateDecorator
     range.min.nil? ? 'no duration range' : "#{range.min} to #{range.max} #{unit}"
   end
 
-  def __evolve_to_duration_range__
-    self
-  end
-
-  def mongoize
-    {:from => range.min.to_i, :to => range.max.to_i}
+  def time
+    "#{min + max} #{unit}"
   end
 
   def between? duration
@@ -73,6 +95,20 @@ class DurationRange < DelegateDecorator
     obj.total >= min && obj.total <= max
   end
 
+  def to_hash
+    {:from => range.min.to_i, :to => range.max.to_i, unit: unit.to_s, length: length.to_s}
+  end
+
+  def mongoize
+    to_hash
+  end
+
+  protected
+
+  def __evolve_to_duration_range__
+    self
+  end
+
   class << self
     # See http://mongoid.org/en/mongoid/docs/upgrading.html        
 
@@ -105,6 +141,8 @@ class DurationRange < DelegateDecorator
       demongoized = case object
       when Hash
         object.__evolve_to_duration_range__
+      when Range
+        object.__evolve_to_duration_range__
       else
         raise "Unable to demongoize DurationRange from: #{object}"
       end    
@@ -146,6 +184,16 @@ class DurationRange < DelegateDecorator
 end
 
 class LongDurationRange < DurationRange
+  # include Comparable
+
+  # def <=> other_dur_range
+  #   super
+  # end
+
+  def length
+    :long
+  end
+
   def self.allowed_units
     [:days, :weeks, :months, :years]
   end
@@ -156,6 +204,16 @@ class LongDurationRange < DurationRange
 end
 
 class ShortDurationRange < DurationRange
+  # include Comparable
+
+  # def <=> other_dur_range
+  #   super
+  # end
+
+  def length
+    :short
+  end
+
   def self.allowed_units
     [:seconds, :minutes, :hours]
   end
@@ -163,10 +221,13 @@ class ShortDurationRange < DurationRange
   def allowed_units
     ShortDurationRange.allowed_units
   end
-end  
-
+end
 
 class Range
+  def __evolve_to_duration_range__
+    ::DurationRange.new self, :seconds
+  end    
+
   [:seconds, :minutes, :hours, :days, :weeks, :months, :years].each do |unit|
     define_method "#{unit}!" do
       time_length = ::ShortDurationRange.allowed_unit?(unit.to_sym) ? :short : :long

data/spec/timespan/core_ext/duration_range_spec.rb

@@ -4,52 +4,56 @@ describe Range do
   subject { timerange }
 
   describe 'create DurationRange' do
-    let(:range) { (1..5) }
-    let (:timerange) { range.days }
+    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 }
+    its(:min)   { should be_a Fixnum }
+    its(:max)   { should be_a Fixnum }
+    its(:unit)  { should == :days }
 
     specify { subject.min.should == 1.day }
     specify { subject.max.should == 5.days }
   end
 
   describe 'create ShortDurationRange with hours(:short)' do
-    let(:range) { (1..5) }
-    let (:timerange) { range.hours(:short) }
+    let(:range)       { (1..5) }
+    let (:timerange)  { range.hours(:short) }
   
     specify { subject.should be_a ShortDurationRange }
 
-    its(:min) { should be_a Fixnum }
-    its(:max) { should be_a Fixnum }
+    its(:min)   { should be_a Fixnum }
+    its(:max)   { should be_a Fixnum }
+    its(:unit)  { should == :hours }
 
     specify { subject.min.should == 1.hour }
     specify { subject.max.should == 5.hours }
   end
 
   describe 'create LongDurationRange with weeks(:long)' do
-    let(:range) { (1..5) }
-    let (:timerange) { range.weeks(:long) }
+    let(:range)       { (1..5) }
+    let (:timerange)  { range.weeks(:long) }
   
     specify { subject.should be_a LongDurationRange }
 
-    its(:min) { should be_a Fixnum }
-    its(:max) { should be_a Fixnum }
+    its(:min)   { should be_a Fixnum }
+    its(:max)   { should be_a Fixnum }
+    its(:unit)  { should == :weeks }
 
     specify { subject.min.should == 1.weeks }
     specify { subject.max.should == 5.weeks }
   end
 
   describe 'create LongDurationRange with weeks!' do
-    let(:range) { (1..5) }
-    let (:timerange) { range.weeks! }
+    let(:range)       { (1..5) }
+    let (:timerange)  { range.weeks! }
   
     specify { subject.should be_a LongDurationRange }
 
-    its(:min) { should be_a Fixnum }
-    its(:max) { should be_a Fixnum }
+    its(:min)   { should be_a Fixnum }
+    its(:max)   { should be_a Fixnum }
+    its(:unit)  { should == :weeks }
 
     specify { subject.min.should == 1.weeks }
     specify { subject.max.should == 5.weeks }

data/spec/timespan/mongoid/mongoid_duration_range_spec.rb

@@ -18,33 +18,139 @@ describe TimeSpan do
   let(:to)   { Time.now }
 
   context 'Mongoid' do
-    describe 'DurationRange'
+    describe 'DurationRange' do
 
-    let(:account) do 
-      Account.create_it! 2.days, (0..3).minutes
+      let(:account) do 
+        Account.create_it! 2.days, (0..3).minutes
+      end
+
+          # subject.time_period.dates_end = tomorrow + 3.days
+          # subject.end_date = tomorrow + 3.days
+
+      context 'set start of period to tomorrow' do
+        before do
+          subject.period_start = tomorrow
+
+          puts "period: #{subject.period}"
+        end
+
+        it 'should set start_date to tomorrow' do
+          format_date(subject.period.start_date).should == format_date(tomorrow)
+        end
+      end
+
+      context 'set end of period to tomorrow + 5 days' do
+        before do
+          subject.period_end = tomorrow + 5.days
+        end
+
+        it 'should set start_date to tomorrow' do
+          format_date(subject.period.end_date).should == format_date(tomorrow + 5.days)
+        end
+      end
+
+      context 'set flex to 1-3 days' do
+        before do
+          subject.time_period.flex = (1..3).days
+        end
+
+        it 'should set flex duration range to a DurationRange' do
+          expect(subject.time_period.flex).to be_a ::DurationRange
+        end
+
+        it 'should set flex duration range to days' do
+          expect(subject.time_period.flex.unit).to eq :days
+        end
+
+        it 'should set flex duration to min 1 days' do
+          expect(subject.time_period.flex.min).to eq 1.days
+        end
+
+        it 'should set flex duration to max 3 days' do
+          expect(subject.time_period.flex.max).to eq 3.days
+        end
+      end
+    end
+
+    describe 'LongDurationRange' do
+      let(:account) do 
+        Account.create_it! 2.days
+      end
+
+      before do
+        subject.time_period.flex = (2..3).weeks!
+      end
+
+      it 'should set flex duration range to a LongDurationRange' do
+        expect(subject.time_period.flex).to be_a ::LongDurationRange
+      end
+
+      it 'should set flex duration range to 2-3 weeks' do
+        expect(subject.time_period.flex.unit).to eq :weeks
+      end
+
+      it 'should set flex duration to min 2 week' do
+        expect(subject.time_period.flex.min).to eq 2.weeks
+      end
+
+      it 'should set flex duration to max 3 weeks' do
+        expect(subject.time_period.flex.max).to eq 3.weeks
+      end
     end
 
-    describe 'set new start_date' do
+    describe 'ShortDurationRange' do
+      context 'preset to 2-4 days' do
+        let(:account) do 
+          Account.create_it! 2.days, (2..4).days!
+        end
+
+        specify do
+          ((2..5).days! == (2..4).days!).should be_false
+        end
+
+        specify do
+          ((2..5).days! > (2..4).days!).should be_true
+        end
+
+        specify do
+          ((1..3).days! < (2..4).days!).should be_true
+        end
+
+        specify do
+          subject.time_period.flex.should be_a ::LongDurationRange
+        end
 
-      specify do
-        subject.period_start = tomorrow
-        subject.period_end = tomorrow + 5.days
+        it 'should be set to 2-4 days time' do
+          expect(subject.time_period.flex.time).to eq (2..4).days!.time
+        end
 
-        subject.time_period.dates_end = tomorrow + 3.days
-        subject.end_date = tomorrow + 3.days
+        it 'should be set to 2-4 days' do
+          expect(subject.time_period.flex.to_s).to eq (2..4).days!.to_s
+        end
 
-        subject.time_period.flex = (0..3).minutes
+        it 'should be set to min 2 days' do
+          expect(subject.time_period.flex.min).to eq 2.days
+        end
 
+        it 'should be set to max 4 days' do
+          expect(subject.time_period.flex.max).to eq 4.days
+        end
 
-        # puts "time period: #{subject.time_period}"
-        
-        # puts "period: #{subject.period}"
+        context 'set to 1-4 minutes' do
+          before do
+            subject.time_period.flex = (2..3).minutes!
+          end
 
-        # puts "time period"
-        # puts "dates: #{subject.time_period.dates}"
-        # puts "flex: #{subject.time_period.flex}"
+          it 'should set flex duration range to a LongDurationRange' do
+            expect(subject.time_period.flex).to be_a ::ShortDurationRange
+          end
 
-        format_date(subject.period.start_date).should == format_date(tomorrow)
+          it 'should set flex duration range to 2-3 minutes' do
+            expect(subject.time_period.flex.unit).to eq :minutes
+            expect(subject.time_period.flex.min).to eq 2.minutes
+            expect(subject.time_period.flex.max).to eq 3.minutes
+          end
+        end
       end
     end
   end

data/timespan.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "timespan"
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   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.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -293,7 +293,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -910273826810424952
+      hash: -3092894469197231264
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: