as-duration 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efd76209348cb343f2ef4b2d5039cb1dd033640c
-  data.tar.gz: 3110aaa5b289824b2d18291a2acf675c1b8cffa0
+  metadata.gz: 0f6bacd1545efa2a36143899ac06d0aac39e0b88
+  data.tar.gz: f1df67155ed5e3a1214f8b21809bd4b72d2964b4
 SHA512:
-  metadata.gz: bc6cf946e1a327453b91a30b3282a0478085039b909a538bb0bd9aecfcda44e9aa2a5e8cf06121668fc3867f3a9bd418c40a021d22d65938acfd8899ef764f82
-  data.tar.gz: 6f38f2966c070df139baca861f030c62d1456331a5cd5538190fbf63e1fe43c91c0bc421f261a490be168ec81f40e41ec1803ede3c9dcd6e66ec527746ad68ea
+  metadata.gz: d899e350fd9c36bb7487d9a403a240cba3a7acacc3db2cf9706bad718c0f164225f7c14aa59ce6ae49b538b4cb5427fbfaad061a52d10eef621dac2f4e50210d
+  data.tar.gz: 583fef2d66ea1db4c79eb7d57f57ae7ca75fe36c0a586b5ded2d147a05a545b2859eb5fad2ba00f2e366e07621e7c943ae4eb2b53cd7e318b598e7bd731092cb

data/README.md

@@ -30,7 +30,7 @@ gem 'as-duration'
 
 ## Features
 
-*DISCLAIMER: In most cases `as-duration` should work exactly like
+*NOTE: In most cases `as-duration` should work exactly like
 `ActiveSupport::Duration`. However, there are a few modifications made, mostly
 removing some of the magic, see [Modifications](#modifications-to-activesupportduration).*
 

data/lib/as/duration.rb

@@ -5,48 +5,24 @@ module AS
   class Duration
     include Comparable
 
-    attr_reader :parts
+    attr_accessor :value, :parts
 
-    def initialize(parts)
-      parts = parts.dup
-
-      # Remove partial weeks and days for accurate date behaviour
-      if Float === parts[:weeks]
-        parts[:weeks], partial_weeks = parts[:weeks].divmod(1)
-        parts[:days] = parts.fetch(:days, 0) + 7 * partial_weeks
-      end
-      if Float === parts[:days]
-        parts[:days], partial_days = parts[:days].divmod(1)
-        parts[:hours] = parts.fetch(:hours, 0) + 24 * partial_days
-      end
-
-      @parts = parts.freeze
+    def initialize(value, parts)
+      @value, @parts = value, parts
     end
 
     def to_i
-      @parts.inject(0) do |sum, (type, value)|
-        case type
-        when :seconds    then sum + value
-        when :minutes    then sum + value * 60
-        when :hours      then sum + value * 60 * 60
-        when :days       then sum + value * 60 * 60 * 24
-        when :weeks      then sum + value * 60 * 60 * 24 * 7
-        when :fortnights then sum + value * 60 * 60 * 24 * 14
-        when :months     then sum + value * 60 * 60 * 24 * 30
-        when :years      then sum + value * 60 * 60 * 24 * 365
-        end
-      end
+      @value
     end
 
     def <=>(other)
       return nil if not Duration === other
-      self.to_i <=> other.to_i
+      self.value <=> other.value
     end
 
     def +(other)
       raise TypeError, "can only add Duration objects" if not Duration === other
-      added_parts = parts.merge(other.parts) { |key, old, new| old + new }
-      Duration.new(added_parts)
+      Duration.new(value + other.value, parts + other.parts)
     end
 
     def -(other)
@@ -55,8 +31,7 @@ module AS
     end
 
     def -@
-      negated_parts = parts.inject({}) { |h, (k, v)| h.update(k => -v) }
-      Duration.new(negated_parts)
+      Duration.new(-value, parts.map { |type, number| [type, -number] })
     end
 
     def from(time)
@@ -82,52 +57,80 @@ module AS
     protected
 
     def advance(time)
-      case time
-      when Time then advance_time(time)
-      when Date then advance_date(time)
-      else
-        raise ArgumentError, "expected Time or Date, got #{time.inspect}"
-      end
+      Calculator.new(parts).advance(time)
     end
 
-    def advance_time(time)
-      date = advance_date_part(time.to_date)
+    class Calculator
+      def initialize(parts)
+        options = parts.inject({}) do |options, (type, number)|
+          options.update(type => number) { |key, old, new| old + new }
+        end
+
+        # Remove partial weeks and days for accurate date behaviour
+        if Float === options[:weeks]
+          options[:weeks], partial_weeks = options[:weeks].divmod(1)
+          options[:days] = options.fetch(:days, 0) + 7 * partial_weeks
+        end
+        if Float === options[:days]
+          options[:days], partial_days = options[:days].divmod(1)
+          options[:hours] = options.fetch(:hours, 0) + 24 * partial_days
+        end
 
-      time_advanced_by_date_args =
-        if time.utc?
-          Time.utc(date.year, date.month, date.day, time.hour, time.min, time.sec)
-        elsif time.zone
-          Time.local(date.year, date.month, date.day, time.hour, time.min, time.sec)
+        @options = options
+      end
+
+      def advance(time)
+        case time
+        when Time then advance_time(time)
+        when Date then advance_date(time)
         else
-          Time.new(date.year, date.month, date.day, time.hour, time.min, time.sec, time.utc_offset)
+          raise ArgumentError, "expected Time or Date, got #{time.inspect}"
         end
+      end
 
-      time_advanced_by_date_args + seconds_to_advance
-    end
+      private
 
-    def advance_date(date)
-      date = advance_date_part(date)
+      attr_reader :options
 
-      if seconds_to_advance == 0
-        date
-      else
-        date.to_time + seconds_to_advance
+      def advance_time(time)
+        date = advance_date_part(time.to_date)
+
+        time_advanced_by_date_args =
+          if time.utc?
+            Time.utc(date.year, date.month, date.day, time.hour, time.min, time.sec)
+          elsif time.zone
+            Time.local(date.year, date.month, date.day, time.hour, time.min, time.sec)
+          else
+            Time.new(date.year, date.month, date.day, time.hour, time.min, time.sec, time.utc_offset)
+          end
+
+        time_advanced_by_date_args + seconds_to_advance
       end
-    end
 
-    def advance_date_part(date)
-      date = date >> parts.fetch(:years, 0) * 12
-      date = date >> parts.fetch(:months, 0)
-      date = date +  parts.fetch(:weeks, 0) * 7
-      date = date +  parts.fetch(:days, 0)
-      date = date.gregorian if date.julian?
-      date
-    end
+      def advance_date(date)
+        date = advance_date_part(date)
+
+        if seconds_to_advance == 0
+          date
+        else
+          date.to_time + seconds_to_advance
+        end
+      end
 
-    def seconds_to_advance
-      parts.fetch(:seconds, 0) +
-      parts.fetch(:minutes, 0) * 60 +
-      parts.fetch(:hours, 0) * 3600
+      def advance_date_part(date)
+        date = date >> options.fetch(:years, 0) * 12
+        date = date >> options.fetch(:months, 0)
+        date = date +  options.fetch(:weeks, 0) * 7
+        date = date +  options.fetch(:days, 0)
+        date = date.gregorian if date.julian?
+        date
+      end
+
+      def seconds_to_advance
+        options.fetch(:seconds, 0) +
+        options.fetch(:minutes, 0) * 60 +
+        options.fetch(:hours, 0) * 3600
+      end
     end
   end
 end

data/lib/as/duration/core_ext/integer.rb

@@ -1,11 +1,11 @@
 class Integer
   def months
-    AS::Duration.new(months: self)
+    AS::Duration.new(self * 30*24*60*60, [[:months, self]])
   end
   alias month months
 
   def years
-    AS::Duration.new(years: self)
+    AS::Duration.new(self * 365*24*60*60, [[:years, self]])
   end
   alias year years
 end

data/lib/as/duration/core_ext/numeric.rb

@@ -1,31 +1,31 @@
 class Numeric
   def seconds
-    AS::Duration.new(seconds: self)
+    AS::Duration.new(self, [[:seconds, self]])
   end
   alias second seconds
 
   def minutes
-    AS::Duration.new(minutes: self)
+    AS::Duration.new(self * 60, [[:minutes, self]])
   end
   alias minute minutes
 
   def hours
-    AS::Duration.new(hours: self)
+    AS::Duration.new(self * 60*60, [[:hours, self]])
   end
   alias hour hours
 
   def days
-    AS::Duration.new(days: self)
+    AS::Duration.new(self * 24*60*60, [[:days, self]])
   end
   alias day days
 
   def weeks
-    AS::Duration.new(weeks: self)
+    AS::Duration.new(self * 7*24*60*60, [[:weeks, self]])
   end
   alias week weeks
 
   def fortnights
-    AS::Duration.new(weeks: self * 2)
+    AS::Duration.new(self * 14*24*60*60, [[:weeks, self * 2]])
   end
   alias fortnight fortnights
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: as-duration
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest