acts_as_flux_capacitor 0.6.0 → 0.6.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.6.1 2008-05-24
+
+* Cleanup, get rid of excess methods, ie within? (thanks to nick ang again!)
+* Added specs for core class extensions
+
 == 0.6.0 2008-05-23
 
 * WAAAY more hardcore spec'ng

data/lib/acts_as_flux_capacitor/acts_as_flux_capacitor.rb

@@ -280,7 +280,6 @@ private
 				
         module CompareEvents   
           def overlaps_with?(other_event)
-						#this method possesses the associative property.
             self.to_range.overlaps?(other_event.to_range)
           end
           
@@ -289,10 +288,8 @@ private
 					end
 					alias overlap overlap_with
 					
-          def back_to_back_with?(other_event,tolerance = 0)
+          def back_to_back_with?(other_event,tolerance = 2.seconds)
 						# tolerance is in seconds.
-            # first_event,second_event = self.class.send(:ordered_tuple,self,other_event)
-						# first_event.ends_at.approx_eql?(second_event.begins_at,tolerance)
 						self.start_time.before?(other_event.start_time) ? first_to_start = self : first_to_start = other_event
 						first_to_start.ends_at.approx_eql?(other_event.begins_at,tolerance)
           end

data/lib/acts_as_flux_capacitor/core_class_extensions.rb

@@ -10,26 +10,9 @@ class Time
 		@@approx_eql_tolerance_in_seconds = seconds
 	end
 	
-	def approx_eql?(other_time,tolerance = @@approx_eql_tolerance_in_seconds)		
+	def approx_eql? other_time,tolerance = @@approx_eql_tolerance_in_seconds
 		times_to_i = [self,other_time].collect { |time| time.to_i }
-		times_to_i.within?(tolerance)
-	end
-end
-
-class Array
-	def within? tolerance
-
-		# thanks, nick ang!
-		unless self.size == 2
-			raise ArgumentError <<ERROR_STRING
-within? only works with arrays of two numbers. do something like 
-([a,b,c].max,[a,b,c].min).within?(tolerance) as an implementation
-for an array with more than two values
-ERROR_STRING
-		end
-		
-		difference = self.first - self.last
-		difference.abs <= tolerance
+		(self - other_time).abs < tolerance
 	end
 end
 

data/lib/acts_as_flux_capacitor/version.rb

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

data/spec/acts_as_flux_capacitor_spec.rb

@@ -109,8 +109,6 @@ describe "The class TimePeriod < ActiveRecord::Base" do
 end
 
 describe "The TimePeriod.find extensions" do
-
-  include TimePeriodFixtures
   
   it "should find time_periods in the present" do
     TimePeriod.find(:first,:present=>true   ,:current_time => present_time).
@@ -171,8 +169,6 @@ describe "The TimePeriod.find extensions" do
 end
 
 describe "The TimePeriod comparison helpers" do
-
-  include TimePeriodFixtures
   
   it "should determine if one time period is before another" do
     present_period.before_or_at?(future_period).should be_true
@@ -201,6 +197,11 @@ describe "The TimePeriod comparison helpers" do
   it "should determine if two time_periods are back-to-back" do
     long_period.back_to_back_with?(future_period).should be_false
     past_period.back_to_back_with?(present_period).should be_true
+    
+    long_period.back_to_back_with?(future_period,1.minute).should be_false
+    past_period.back_to_back_with?(present_period,1.minute).should be_true
+    
+    long_period.back_to_back_with?(future_period,50.years).should be_true
   end
   
   it "should determine if a time_period is between two other time_periods" do
@@ -355,3 +356,26 @@ describe "The Range overlap helpers" do
   end
   
 end
+
+describe "The extensions to" do
+
+  describe "the Time class" do
+    
+    it "should determine if two times are approximately equal (tolerance @ 1 second)" do
+      Time.freeze do
+        Time.now.approx_eql?(Time.now+(0.5).seconds,1.second).should be_true
+        Time.now.approx_eql?(Time.now+10.seconds,1.second).should be_false
+        (Time.now+(0.5).seconds).approx_eql?(Time.now,1.second).should be_true
+        (Time.now+10.seconds).approx_eql?(Time.now,1.second).should be_false
+      end
+    end
+    
+    it "should determine if two times are approximately equal (tolerance @ 0.1 seconds)" do
+      Time.freeze do
+        Time.now.approx_eql?(Time.now+(0.01).seconds,(0.1).seconds).should be_true
+        Time.now.approx_eql?(Time.now+10.seconds,(0.1).seconds).should be_false
+      end
+    end   
+  end
+end
+

data/spec/report.html

@@ -179,116 +179,125 @@ a {
 <div class="example_group">
   <dl>
   <dt id="example_group_1">The Temporal mixin</dt>
-    <script type="text/javascript">moveProgressBar('2.6');</script>
+    <script type="text/javascript">moveProgressBar('2.5');</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('5.2');</script>
+    <script type="text/javascript">moveProgressBar('5.0');</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('7.8');</script>
+    <script type="text/javascript">moveProgressBar('7.5');</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('10.5');</script>
+    <script type="text/javascript">moveProgressBar('10.0');</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('13.1');</script>
+    <script type="text/javascript">moveProgressBar('12.5');</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('15.7');</script>
+    <script type="text/javascript">moveProgressBar('15.0');</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('18.4');</script>
+    <script type="text/javascript">moveProgressBar('17.5');</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('21.0');</script>
+    <script type="text/javascript">moveProgressBar('20.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('23.6');</script>
+    <script type="text/javascript">moveProgressBar('22.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be a flux capacitor</span></dd>
-    <script type="text/javascript">moveProgressBar('26.3');</script>
+    <script type="text/javascript">moveProgressBar('25.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should be a Temporal object</span></dd>
-    <script type="text/javascript">moveProgressBar('28.9');</script>
+    <script type="text/javascript">moveProgressBar('27.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should possess all four bitemporal database attributes</span></dd>
-    <script type="text/javascript">moveProgressBar('31.5');</script>
+    <script type="text/javascript">moveProgressBar('30.0');</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('34.2');</script>
+    <script type="text/javascript">moveProgressBar('32.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should find time_periods in the present</span></dd>
-    <script type="text/javascript">moveProgressBar('36.8');</script>
+    <script type="text/javascript">moveProgressBar('35.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should find time_periods in the past</span></dd>
-    <script type="text/javascript">moveProgressBar('39.4');</script>
+    <script type="text/javascript">moveProgressBar('37.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should find time_periods in the future</span></dd>
-    <script type="text/javascript">moveProgressBar('42.1');</script>
+    <script type="text/javascript">moveProgressBar('40.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('44.7');</script>
+    <script type="text/javascript">moveProgressBar('42.5');</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('47.3');</script>
+    <script type="text/javascript">moveProgressBar('45.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine if one time period is before another</span></dd>
-    <script type="text/javascript">moveProgressBar('50.0');</script>
+    <script type="text/javascript">moveProgressBar('47.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine if one time period is after another</span></dd>
-    <script type="text/javascript">moveProgressBar('52.6');</script>
+    <script type="text/javascript">moveProgressBar('50.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should calculate the time between time_periods</span></dd>
-    <script type="text/javascript">moveProgressBar('55.2');</script>
+    <script type="text/javascript">moveProgressBar('52.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine whether two time_periods overlap</span></dd>
-    <script type="text/javascript">moveProgressBar('57.8');</script>
+    <script type="text/javascript">moveProgressBar('55.0');</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('60.5');</script>
+    <script type="text/javascript">moveProgressBar('57.5');</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('63.1');</script>
+    <script type="text/javascript">moveProgressBar('60.0');</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('65.7');</script>
+    <script type="text/javascript">moveProgressBar('62.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine the length of time until a time_period</span></dd>
-    <script type="text/javascript">moveProgressBar('68.4');</script>
+    <script type="text/javascript">moveProgressBar('65.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine if a time_period is in the future</span></dd>
-    <script type="text/javascript">moveProgressBar('71.0');</script>
+    <script type="text/javascript">moveProgressBar('67.5');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine the length of time since a time_period ended</span></dd>
-    <script type="text/javascript">moveProgressBar('73.6');</script>
+    <script type="text/javascript">moveProgressBar('70.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should determine if a time_period is in the past</span></dd>
-    <script type="text/javascript">moveProgressBar('76.3');</script>
+    <script type="text/javascript">moveProgressBar('72.5');</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('78.9');</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('81.5');</script>
+    <script type="text/javascript">moveProgressBar('77.5');</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('84.2');</script>
+    <script type="text/javascript">moveProgressBar('80.0');</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('86.8');</script>
+    <script type="text/javascript">moveProgressBar('82.5');</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('89.4');</script>
+    <script type="text/javascript">moveProgressBar('85.0');</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('92.1');</script>
+    <script type="text/javascript">moveProgressBar('87.5');</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('94.7');</script>
+    <script type="text/javascript">moveProgressBar('90.0');</script>
     <dd class="spec passed"><span class="passed_spec_name">should shift a time_period into the past or future</span></dd>
   </dl>
 </div>
 <div class="example_group">
   <dl>
   <dt id="example_group_7">The Range overlap helpers</dt>
-    <script type="text/javascript">moveProgressBar('97.3');</script>
+    <script type="text/javascript">moveProgressBar('92.5');</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>
+    <script type="text/javascript">moveProgressBar('95.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.368839 seconds</strong>";</script>
-<script type="text/javascript">document.getElementById('totals').innerHTML = "38 examples, 0 failures";</script>
+<div class="example_group">
+  <dl>
+  <dt id="example_group_8">The extensions to the Time class</dt>
+    <script type="text/javascript">moveProgressBar('97.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should determine if two times are approximately equal (tolerance @ 1 second)</span></dd>
+    <script type="text/javascript">moveProgressBar('100.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should determine if two times are approximately equal (tolerance @ 0.1 seconds)</span></dd>
+  </dl>
+</div>
+<script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>0.476378 seconds</strong>";</script>
+<script type="text/javascript">document.getElementById('totals').innerHTML = "40 examples, 0 failures";</script>
 </div>
 </div>
 </body>

data/spec/schema.rb

@@ -1,7 +1,9 @@
 ActiveRecord::Schema.define(:version => 1) do
 
   create_table "time_periods", :force => true do |t|
+    
     t.string   "contents"
+    
     t.datetime "begins_at"
     t.datetime "ends_at"
     t.datetime "created_at"

metadata

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