DateSetter 1.1.1 → 1.2.0

data/DateSetter.gemspec

@@ -15,4 +15,5 @@ Gem::Specification.new do |gem|
   gem.version       = DateSetter::VERSION
 
   gem.add_development_dependency("activesupport")
+  gem.add_development_dependency("mocha")
 end

data/lib/DateSetter.rb

@@ -1,6 +1,6 @@
 class DateSetter
   Infinity = 1.0 / 0.0
-  attr_accessor :reference_date, :min_date, :max_date, :result, :range, :min_hour, :max_hour
+  attr_accessor :reference_date, :min_date, :max_date, :result, :range, :start_of_day, :end_of_day
 
   def initialize(options = {})
     options.each do |key, value|
@@ -14,7 +14,7 @@ class DateSetter
   end
 
   def valid?
-    return if !reference_date || !range || !valid_ranges?
+    return false if !reference_date || !range || !valid_ranges?
     (min_date.to_f..max_date.to_f).cover?(reference_date.to_f)
   end
 
@@ -27,43 +27,96 @@ class DateSetter
   end
 
   def min_date
-    @min_date.try(:to_datetime) || -Infinity
+    @min_date.try(:to_datetime) || min_date_range - 1.second
   end
 
   def max_date
-    @max_date.try(:to_datetime) || Infinity
+    @max_date.try(:to_datetime) || max_date_range + 1.second
   end
 
   def result
-    rand(min_date_in_range..max_date_in_range) + rand(min_hour..max_hour) if valid?
+    if valid?
+      if the_same_day?
+        min_date_in_range + rand(intersection_of_range_and_hours_range)
+      elsif result_day == min_date_in_range
+        result_day + rand(hours_range_when_min_date)
+      elsif result_day == max_date_in_range
+        result_day + rand(hours_range_when_max_date)
+      else
+        result_day + rand(start_of_day..end_of_day)
+      end
+    else
+      raise ArgumentError, "Some argument is invalid"
+    end
+  end
+
+  def result_day
+    rand(min_date_in_range..max_date_in_range)
+  end
+
+  def start_of_day
+    @start_of_day ||= 0.hours
+  end
+
+  def end_of_day
+    @end_of_day ||= 24.hours - 1.second
+  end
+
+  def intersection(first_range, second_range)
+    return nil if (first_range.max < second_range.begin or second_range.max < first_range.begin)
+    [first_range.begin, second_range.begin].max..[first_range.max, second_range.max].min
+  end
+
+  def intersection_of_range_and_hours_range
+    intersection((min_date_time_in_range.hour.hours..max_date_time_in_range.hour.hours), (start_of_day..end_of_day))
+  end
+
+  def hours_range_when_min_date
+    (min_date_time_in_range.hour.hours..end_of_day)
   end
 
-  def min_hour
-    @min_hour ||= 0.hours
+  def hours_range_when_max_date
+    (start_of_day..max_date_time_in_range.hour.hours)
   end
 
-  def max_hour
-    @max_hour ||= 24.hours - 1.second
+  def the_same_day?
+    min_date_in_range == max_date_in_range
   end
 
   private
   def valid_ranges?
-    min_date.to_f <= max_date.to_f || min_hour.to_f <= max_hour.to_f
+    min_date.to_f <= max_date.to_f && start_of_day.to_f <= end_of_day.to_f && intersection_of_range_and_hours_range != nil
   end
 
-  def min_date_in_range
-    if (reference_date - range).to_f < min_date.to_f
-      min_date.to_date
+  def min_date_time_in_range
+    if (min_date_range).to_f < min_date.to_f
+      min_date
     else
-      (reference_date - range).to_date
+      min_date_range
     end
   end
 
-  def max_date_in_range
-    if (reference_date + range).to_f > max_date.to_f
-      max_date.to_date
+  def min_date_in_range
+    min_date_time_in_range.to_date
+  end
+
+  def max_date_time_in_range
+    if (max_date_range).to_f > max_date.to_f
+      max_date
     else
-      (reference_date + range).to_date
+      max_date_range
     end
   end
+
+  def max_date_in_range
+    max_date_time_in_range.to_date
+  end
+
+  def min_date_range
+    reference_date - range
+  end
+
+  def max_date_range
+    reference_date + range
+  end
 end

data/test/date_setter_test.rb

@@ -104,11 +104,23 @@ class DateSetterTest < MiniTest::Unit::TestCase
     assert (0.days.ago.at_midnight..1.days.from_now.at_midnight).cover?(@date_setter.result)
   end
 
-  def test_should_always_return_result_which_is_between_min_hour_and_max_hour
-    @date_setter.min_hour = 8.hours
-    @date_setter.max_hour = 9.hours
+  def test_should_return_exception_when_result_can_t_be_between_min_date_and_max_date
+    @date_setter.min_date = 2.days.ago
+    @date_setter.max_date = 1.day.ago
+
+    assert_raises ArgumentError do
+      @date_setter.result
+    end
+  end
 
-    assert (8..9).cover?(@date_setter.result.hour)
+  def test_should_return_exception_when_hours_range_is_incorrect
+    @date_setter.reference_date = Date.today + 10.hours
+    @date_setter.start_of_day = 8.hours
+    @date_setter.end_of_day = 9.hours
+
+    assert_raises ArgumentError do
+      @date_setter.result
+    end
   end
 
   def test_set_function_should_generate_correct_date
@@ -125,4 +137,55 @@ class DateSetterTest < MiniTest::Unit::TestCase
 
     assert @date_setter.valid?
   end
+
+  def test_intersection_method_should_return_common_part_of_two_ranges
+    assert_equal (11..11), @date_setter.intersection((10..11), (11..20))
+  end
+
+  def test_result_should_be_between_min_date_and_max_date_hours_when_this_is_the_same_day
+    @date_setter.reference_date = Date.today + 10.hours
+    @date_setter.range = 1.day
+    @date_setter.min_date = Date.today + 9.hours
+    @date_setter.max_date = Date.today + 11.hours
+    @date_setter.start_of_day = 11.hours
+    @date_setter.end_of_day = 14.hours
+
+    assert (9..11).cover?(@date_setter.result.hour)
+  end
+
+  def test_result_should_be_between_min_date_and_end_of_day_hours_when_result_day_is_min_date
+    @date_setter.reference_date = Date.today + 10.hours
+    @date_setter.range = 5.days
+    @date_setter.min_date = Date.yesterday + 9.hours
+    @date_setter.max_date = Date.tomorrow + 11.hours
+    @date_setter.start_of_day = 7.hours
+    @date_setter.end_of_day = 14.hours
+    @date_setter.stubs(:result_day).returns(@date_setter.min_date.to_date)
+
+    assert (9..14).cover?(@date_setter.result.hour)
+  end
+
+  def test_result_should_be_between_start_of_day_and_max_date_hours_when_result_day_is_max_date
+    @date_setter.reference_date = Date.today + 10.hours
+    @date_setter.range = 5.days
+    @date_setter.min_date = Date.yesterday + 9.hours
+    @date_setter.max_date = Date.tomorrow + 11.hours
+    @date_setter.start_of_day = 7.hours
+    @date_setter.end_of_day = 14.hours
+    @date_setter.stubs(:result_day).returns(@date_setter.max_date.to_date)
+
+    assert (7..11).cover?(@date_setter.result.hour)
+  end
+
+  def test_result_should_be_between_start_of_day_and_end_of_day_hours_when_result_day_is_other_than_min_or_max_date
+    @date_setter.reference_date = Date.today + 10.hours
+    @date_setter.range = 5.days
+    @date_setter.min_date = Date.yesterday + 9.hours
+    @date_setter.max_date = Date.tomorrow + 11.hours
+    @date_setter.start_of_day = 7.hours
+    @date_setter.end_of_day = 14.hours
+    @date_setter.stubs(:result_day).returns(@date_setter.reference_date.to_date)
+
+    assert (7..14).cover?(@date_setter.result.hour)
+  end
 end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require "minitest/unit"
 require "minitest/autorun"
 require "DateSetter"
-require "active_support/all"
+require "active_support/all"
+require "mocha/setup"

data/version.rb

@@ -1,3 +1,3 @@
 class DateSetter
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: DateSetter
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - rut.szymon@gmail.com