acts_as_flux_capacitor 0.5.3 → 0.5.4

data/History.txt

@@ -1,3 +1,9 @@
+== 0.5.3 2008-05-21
+
+* Fixed git stuff
+* Fixed more newgem config stuff
+* add the most basic of documentation
+
 == 0.5.2 2008-05-21
 
 * Fixed rakefiles b/c of odd VERSION module naming

data/lib/acts_as_flux_capacitor/acts_as_flux_capacitor.rb

@@ -290,7 +290,7 @@ private
         module CompareEvents   
           def overlaps_with?(other_event)
 						#this method possesses the associative property.
-            self.to_range.overlap?(other_event.to_range)
+            self.to_range.overlaps?(other_event.to_range)
           end
           
 					def overlap_with(other_event)

data/lib/acts_as_flux_capacitor/range_overlap.rb

@@ -1,22 +1,19 @@
 class Range
 	
-	# the overlap?(range) method and most of its tests were written by Jack Christensen
+	# the overlaps?(range) method comes from ActiveSupport::CoreExtensions::Range
+	# thanks to Nick Ang for suggesting its use.
+	# most of its tests were written by Jack Christensen of
 	# http://www.jackchristensen.com/article/2/detecting-overlapping-ranges
   
   # Returns true if ranges overlap, false otherwise
-  def overlap?( other_range )
-   not( 
-				last < other_range.first || 
-				(last == other_range.first && exclude_end?) ||
-        other_range.last < first || 
-				(other_range.last == first && other_range.exclude_end?) 
-			)
+  def overlaps? other
+		include?(other.first) || other.include?(first)
 	end
 
 	# all of this added by jim cropcho:
 
 	def overlap(other_range)
-		return 0 unless self.overlap?(other_range)
+		return 0 unless self.overlaps?(other_range)
 		
 		overlap_range = greater_of(self.first,other_range.first)..smaller_of(self.last,other_range.last)
 #		puts "overlap range: #{overlap_range}"
@@ -55,4 +52,4 @@ private
 	def smaller_of(num1,num2)
 		num1 < num2 ? num1 : num2
 	end
-end
+end

data/lib/acts_as_flux_capacitor/version.rb

@@ -5,7 +5,7 @@ module HolmesLabs #:nodoc:
         
         MAJOR = 0
         MINOR = 5
-        TINY  = 3
+        TINY  = 4
 
         STRING = [MAJOR, MINOR, TINY].join('.')
         

data/spec/acts_as_flux_capacitor_spec.rb

@@ -188,3 +188,56 @@ describe "The TimePeriod modification helpers" do
   end
   
 end
+
+describe "The Range overlap helpers" do
+
+  it "should determine if two ranges do not overlap" do
+    # 1-------10
+    #             20-------30
+    (1..10).overlaps?(20..30).should be_false
+    (1..10).overlap(20..30).should eql(0)
+
+    #             20-------30
+    # 1-------10
+    (20..30).overlaps?(1..10).should be_false
+    (20..30).overlap(1..10).should eql(0)
+    
+    # 1-------10
+    #         10-------20
+    (1...10).overlaps?(10..20).should be_false
+    (1...10).overlap(10..20).should eql(0)
+  end
+  
+  it "should determine if two ranges do overlap" do
+		tolerance = 0.01
+		
+    # 1-------10
+    #         10-------20
+    (1..10).overlaps?(10..20).should be_true
+    (1..10).overlap(10..20).size.should be_close(1.0,tolerance)
+
+    # 1-----------15
+    #         10-------20
+    (1..15).overlaps?(10..20).should be_true
+    (1..15).overlap(10..20).size.should be_close(6.0,tolerance)
+
+    #     5--------15
+    # 1-------10
+    (5..15).overlaps?(1..10).should be_true
+    (5..15).overlap(1..10).size.should be_close(6.0,tolerance)
+    
+    #         10--------20
+    # 1-------10
+    (10..20).overlaps?(1..10).should be_true
+    (10..20).overlap(1..10).size.should be_close(1.0,tolerance)
+		
+    # 1-----------------20
+    #     5---------15
+    (1..20).overlaps?(5..15).should be_true
+    (1..20).overlap(5..15).size.should be_close(11.0,tolerance)
+    
+    (5..15).overlaps?(1..20).should be_true
+    (5..15).overlap(1..20).size.should be_close(11.0,tolerance)
+  end
+  
+end

data/spec/report.html

@@ -179,95 +179,104 @@ a {
 <div class="example_group">
   <dl>
   <dt id="example_group_1">The Temporal mixin</dt>
-    <script type="text/javascript">moveProgressBar('3.3');</script>
+    <script type="text/javascript">moveProgressBar('3.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should make Time, Date and DateTime into Temporal objects</span></dd>
-    <script type="text/javascript">moveProgressBar('6.6');</script>
+    <script type="text/javascript">moveProgressBar('6.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine the length of time between two Temporal objects</span></dd>
-    <script type="text/javascript">moveProgressBar('10.0');</script>
+    <script type="text/javascript">moveProgressBar('9.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine the length of time until a Temporal object</span></dd>
-    <script type="text/javascript">moveProgressBar('13.3');</script>
+    <script type="text/javascript">moveProgressBar('12.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine if a temporal object is in the future</span></dd>
-    <script type="text/javascript">moveProgressBar('16.6');</script>
+    <script type="text/javascript">moveProgressBar('15.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine the length of time since a Temporal object</span></dd>
-    <script type="text/javascript">moveProgressBar('20.0');</script>
+    <script type="text/javascript">moveProgressBar('18.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine if a temporal object is in the past</span></dd>
-    <script type="text/javascript">moveProgressBar('23.3');</script>
+    <script type="text/javascript">moveProgressBar('21.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine if one Temporal object is before another</span></dd>
-    <script type="text/javascript">moveProgressBar('26.6');</script>
+    <script type="text/javascript">moveProgressBar('25.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine if one Temporal object is after another</span></dd>
   </dl>
 </div>
 <div class="example_group">
   <dl>
   <dt id="example_group_2">The class TimePeriod &lt; ActiveRecord::Base</dt>
-    <script type="text/javascript">moveProgressBar('30.0');</script>
+    <script type="text/javascript">moveProgressBar('28.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be a flux capacitor</span></dd>
-    <script type="text/javascript">moveProgressBar('33.3');</script>
+    <script type="text/javascript">moveProgressBar('31.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be a Temporal object</span></dd>
-    <script type="text/javascript">moveProgressBar('36.6');</script>
+    <script type="text/javascript">moveProgressBar('34.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should possess all four bitemporal database attributes</span></dd>
-    <script type="text/javascript">moveProgressBar('40.0');</script>
+    <script type="text/javascript">moveProgressBar('37.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should not be valid if either of the two time spans are 0 or less</span></dd>
   </dl>
 </div>
 <div class="example_group">
   <dl>
   <dt id="example_group_3">The TimePeriod.find extensions</dt>
-    <script type="text/javascript">moveProgressBar('43.3');</script>
+    <script type="text/javascript">moveProgressBar('40.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should find time_periods in the present</span></dd>
-    <script type="text/javascript">moveProgressBar('46.6');</script>
+    <script type="text/javascript">moveProgressBar('43.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should find time_periods in the past</span></dd>
-    <script type="text/javascript">moveProgressBar('50.0');</script>
+    <script type="text/javascript">moveProgressBar('46.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should find time_periods in the future</span></dd>
-    <script type="text/javascript">moveProgressBar('53.3');</script>
+    <script type="text/javascript">moveProgressBar('50.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should find time_periods occuring at a specific time</span></dd>
-    <script type="text/javascript">moveProgressBar('56.6');</script>
+    <script type="text/javascript">moveProgressBar('53.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should find time_periods occuring within a specific range of time</span></dd>
   </dl>
 </div>
 <div class="example_group">
   <dl>
   <dt id="example_group_4">The TimePeriod comparison helpers</dt>
-    <script type="text/javascript">moveProgressBar('60.0');</script>
+    <script type="text/javascript">moveProgressBar('56.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should calculate the time between time_periods</span></dd>
-    <script type="text/javascript">moveProgressBar('63.3');</script>
+    <script type="text/javascript">moveProgressBar('59.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine whether two time_periods overlap</span></dd>
-    <script type="text/javascript">moveProgressBar('66.6');</script>
+    <script type="text/javascript">moveProgressBar('62.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine the length of time by which two time_periods overlap</span></dd>
-    <script type="text/javascript">moveProgressBar('70.0');</script>
+    <script type="text/javascript">moveProgressBar('65.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine if two time_periods are back-to-back</span></dd>
-    <script type="text/javascript">moveProgressBar('73.3');</script>
+    <script type="text/javascript">moveProgressBar('68.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine if a time_period is between two other time_periods</span></dd>
   </dl>
 </div>
 <div class="example_group">
   <dl>
   <dt id="example_group_5">The TimePeriod status helpers</dt>
-    <script type="text/javascript">moveProgressBar('76.6');</script>
+    <script type="text/javascript">moveProgressBar('71.8');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine if a time_period has started</span></dd>
-    <script type="text/javascript">moveProgressBar('80.0');</script>
+    <script type="text/javascript">moveProgressBar('75.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine how much time has elapsed since an event started</span></dd>
-    <script type="text/javascript">moveProgressBar('83.3');</script>
+    <script type="text/javascript">moveProgressBar('78.1');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine what percentage of time has elapsed since an event started</span></dd>
-    <script type="text/javascript">moveProgressBar('86.6');</script>
+    <script type="text/javascript">moveProgressBar('81.2');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine how much time is remaining until an event ends</span></dd>
-    <script type="text/javascript">moveProgressBar('90.0');</script>
+    <script type="text/javascript">moveProgressBar('84.3');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine what percentage of time is remaining until an event ends</span></dd>
-    <script type="text/javascript">moveProgressBar('93.3');</script>
+    <script type="text/javascript">moveProgressBar('87.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine if a time_period has ended</span></dd>
-    <script type="text/javascript">moveProgressBar('96.6');</script>
+    <script type="text/javascript">moveProgressBar('90.6');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine the duration of a time_period</span></dd>
   </dl>
 </div>
 <div class="example_group">
   <dl>
   <dt id="example_group_6">The TimePeriod modification helpers</dt>
-    <script type="text/javascript">moveProgressBar('100.0');</script>
+    <script type="text/javascript">moveProgressBar('93.7');</script>
     <dd class="spec passed"><span class="passed_spec_name">should shift a time_period into the past or future</span></dd>
   </dl>
 </div>
-<script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>0.280847 seconds</strong>";</script>
-<script type="text/javascript">document.getElementById('totals').innerHTML = "30 examples, 0 failures";</script>
+<div class="example_group">
+  <dl>
+  <dt id="example_group_7">The Range overlap helpers</dt>
+    <script type="text/javascript">moveProgressBar('96.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should determine if two ranges do not overlap</span></dd>
+    <script type="text/javascript">moveProgressBar('100.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should determine if two ranges do overlap</span></dd>
+  </dl>
+</div>
+<script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>0.321167 seconds</strong>";</script>
+<script type="text/javascript">document.getElementById('totals').innerHTML = "32 examples, 0 failures";</script>
 </div>
 </div>
 </body>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_flux_capacitor
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Jim Cropcho
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-21 00:00:00 -04:00
+date: 2008-05-22 00:00:00 -04:00
 default_executable: 
 dependencies: []