time_interval 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/time_interval.rb

@@ -1,9 +1,9 @@
 class TimeInterval
   # == Constants ============================================================
   
-  MASK = (0..30).to_a.collect { |i| (1 << 31) - (1 << (30 - i)) }.freeze
+  MASK = (0..30).to_a.collect { |i| (1 << 31) - (1 << (31 - i)) }.freeze
 
-  DEFAULT_SCALE = (0..30).to_a.collect { |i| [ i, MASK[i] ] }.freeze
+  DEFAULT_SCALE = (0..30).to_a.collect { |i| [ MASK[i], 2 ** i ] }.freeze
   DEFAULT_SCALE_NAME = (0..30).to_a.freeze
   
   # == Class Methods ========================================================
@@ -21,13 +21,18 @@ class TimeInterval
       
       scale_defn = { }
       scale_factor = 1
+      mask_offset = 0
 
       definition.each_with_index do |element, i|
         case (i % 2)
         when 0
           scale_factor *= element
         when 1
-          scale_defn[element] = [ MASK[scale_defn.length], scale_factor ]
+          unless (scale_factor == 1)
+            mask_offset += 1
+          end
+
+          scale_defn[element] = [ MASK[mask_offset], scale_factor ]
           scale_name_defn << element
         end
       end
@@ -111,7 +116,11 @@ class TimeInterval
     else
       scale_details = self.class.scale[at_scale]
       
-      -(scale_details[0] | (@time / scale_details[1]))
+      if (scale_details[1] == 1)
+        @time
+      else
+        -(scale_details[0] | (@time / scale_details[1]))
+      end
     end
   end
 end

data/test/test_time_interval.rb

@@ -9,6 +9,12 @@ class TestTimeInterval < Test::Unit::TestCase
     interval = TimeInterval.new
     
     assert_equal interval.to_i, Time.now.to_i
+    
+    assert_equal interval.to_i, interval.to_i(0)
+    assert_equal -(TimeInterval::MASK[1] | interval.to_i / 2), interval.to_i(1)
+    assert_equal -(TimeInterval::MASK[2] | interval.to_i / 4), interval.to_i(2)
+    assert_equal -(TimeInterval::MASK[3] | interval.to_i / 8), interval.to_i(3)
+    assert_equal -(TimeInterval::MASK[4] | interval.to_i / 16), interval.to_i(4)
   end
 
   def test_custom_interval
@@ -47,7 +53,12 @@ class TestTimeInterval < Test::Unit::TestCase
     
     # Different interval slices can be obtained by passing in the name from
     # the definition.
-    assert_equal -(TimeInterval::MASK[0] | seconds), interval.to_i(:second)
+
+    # A 1:1 scaling does not have a mask and is simply represented as-is
+    assert_equal seconds, interval.to_i(:second)
+    
+    # All other scaling factors have a reduction, so they need to be masked
+    # to indicate which scale level is used.
     assert_equal -(TimeInterval::MASK[1] | minutes), interval.to_i(:minute)
     assert_equal -(TimeInterval::MASK[2] | hours), interval.to_i(:hour)
     assert_equal -(TimeInterval::MASK[3] | days), interval.to_i(:day)

data/time_interval.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{time_interval}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["tadman"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - tadman