ruby-duration 2.1.4 → 3.0.0

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.3@ruby-duration
+rvm 1.9.3@ruby-duration --create

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - jruby-19mode
+  - ruby-head
+  - jruby-head

data/Gemfile

@@ -1,4 +1,4 @@
-source :gemcutter
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ruby-duration.gemspec
 gemspec

data/README.md

@@ -16,7 +16,7 @@ Features
   * Construtor can receive the amount of time in seconds or a Hash with unit and amount of time.
   * Format method to display the time with i18n support.
   * Mongoid serialization support. Use `require 'duration/mongoid'`.
-  * Tested on mri 1.8.7, ree 1.8.7, mri 1.9.2, jruby and rubinius. Kudos to rvm!
+  * Tested on mri 1.9.3 and jruby. Kudos to rvm!
 
 
 Show me the code
@@ -37,7 +37,10 @@ Show me the code
     Duration.new(:weeks => 1, :days => 20).iso8601 => "P3W6DT0H0M0S"
 
 ### Mongoid support
-The current version of this gem supports Mongoid >= [2.1.0](https://github.com/mongoid/mongoid). For lower Mongoid versions try the tag [v1.0.0](https://github.com/peleteiro/ruby-duration/tree/v1.0.0)
+The current version of this gem supports Mongoid >= [3.0.0](https://github.com/mongoid/mongoid).
+For lower Mongoid versions try:
+ * < 3.0.0 tag [v2.1.4](https://github.com/peleteiro/ruby-duration/tree/v2.1.4)
+ * < 2.1.0 tag [v1.0.0](https://github.com/peleteiro/ruby-duration/tree/v1.0.0)
 
     require 'duration/mongoid'
 
@@ -46,6 +49,11 @@ The current version of this gem supports Mongoid >= [2.1.0](https://github.com/m
       field :duration, type => Duration
     end
 
+### Dependencies
+The current version of this gem runs only on Ruby Versions >= 1.9.3. 
+If you are running a older version of Ruby try:
+* tag [v2.1.4](https://github.com/peleteiro/ruby-duration/tree/v2.1.4)
+
 
 Note on Patches/Pull Requests
 -----------------------------

data/lib/duration.rb

@@ -71,7 +71,7 @@ class Duration
   def %(other)
     Duration.new(@total % other.to_i)
   end
-  
+
   %w(minutes hours days).each do |meth|
     define_method("total_#{meth}") { @total / MULTIPLES[meth.to_sym] }
   end
@@ -134,7 +134,7 @@ class Duration
   #
   #   I18n.load_path << "path/to/your/locale"
   #   I18n.locale = :your_locale
-  # 
+  #
   # And you must use the following structure (example) for your locale file:
   #   pt:
   #     ruby_duration:
@@ -182,7 +182,7 @@ class Duration
 
   alias_method :to_i, :total
   alias_method :strftime, :format
-  
+
 private
 
   # Calculates the duration from seconds and figures out what the actual
@@ -219,4 +219,4 @@ private
 
     I18n.t(label, :scope => :ruby_duration, :default => label.to_s)
   end
-end
+end

data/lib/duration/mongoid.rb

@@ -5,32 +5,52 @@ require "mongoid/fields"
 module Mongoid
   module Fields
     class Duration
-      include Mongoid::Fields::Serializable
-    
-      # Deserialize a Duration given the amount of seconds stored by Mongodb
-      #
-      # @param [Integer, nil] duration in seconds
-      # @return [Duration] deserialized Duration
-      def deserialize(seconds)
-        return if !seconds
+
+      # Instantiates a new Duration object
+      def initialize(seconds)
         ::Duration.new(seconds)
       end
 
-      # Serialize a Duration or a Hash (with duration units) or a amount of seconds to
-      # a BSON serializable type.
-      #
-      # @param [Duration, Hash, Integer] value
-      # @return [Integer] duration in seconds
-      def serialize(value)
-        return if value.blank?
-        if value.is_a?(Hash)
-          value.delete_if{|k, v| v.blank? || !::Duration::UNITS.include?(k.to_sym)}
+      # Converts the Duration object into a MongoDB friendly value.
+      def mongoize
+        self.to_i
+      end
+
+      class << self
+        # Deserialize a Duration given the amount of seconds stored by Mongodb
+        #
+        # @param [Integer, nil] duration in seconds
+        # @return [Duration] deserialized Duration
+        def demongoize(seconds)
+          return if !seconds
+          ::Duration.new(seconds)
+        end
+
+        # Serialize a Duration or a Hash (with duration units) or a amount of seconds to
+        # a BSON serializable type.
+        #
+        # @param [Duration, Hash, Integer] value
+        # @return [Integer] duration in seconds
+        def mongoize(value)
           return if value.blank?
-          ::Duration.new(value).to_i
-        elsif value.respond_to?(:to_i)
-          value.to_i
+          if value.is_a?(Hash)
+            value.delete_if{|k, v| v.blank? || !::Duration::UNITS.include?(k.to_sym)}
+            return if value.blank?
+            ::Duration.new(value).to_i
+          elsif value.respond_to?(:to_i)
+            value.to_i
+          end
+        end
+
+        # Converts the object that was supplied to a criteria and converts it
+        # into a database friendly form.
+        def evolve(object)
+          case object
+          when ::Duration then object.mongoize
+          else object
+          end
         end
       end
     end
   end
-end
+end

data/lib/duration/version.rb

@@ -1,3 +1,3 @@
 class Duration
-  VERSION = "2.1.4"
+  VERSION = "3.0.0"
 end

data/lib/ruby-duration.rb

@@ -1,2 +1,2 @@
 # -*- encoding:  utf-8 -*-
-require "#{File.dirname(__FILE__)}/duration"
+require "#{File.dirname(__FILE__)}/duration"

data/ruby-duration.gemspec

@@ -22,8 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "yard", ">= 0"
   s.add_development_dependency "rake", ">= 0"
   s.add_development_dependency "simplecov", ">= 0.3.5"
-  s.add_development_dependency "bluecloth", ">= 0.3.5"
-  s.add_development_dependency "mongoid", "~> 2.4.0"
+  s.add_development_dependency "mongoid", ">= 3.0.0"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/test/fixtures/locales/pt.yml

@@ -9,4 +9,4 @@ pt:
     day: dia
     days: dias
     week: semana
-    weeks: semanas
+    weeks: semanas

data/test/test_duration.rb

@@ -27,29 +27,29 @@ describe "Duration" do
     assert_equal    219, d.total_hours
     assert_equal      9, d.total_days
   end
-  
+
   describe "mathematical operations" do
-    
+
     it "should +" do
       assert_equal Duration.new(15), Duration.new(10) + 5
       assert_equal Duration.new(15), Duration.new(10) + Duration.new(5)
     end
-    
+
     it "should -" do
       assert_equal Duration.new(5), Duration.new(10) - 5
       assert_equal Duration.new(5), Duration.new(10) - Duration.new(5)
     end
-    
+
     it "should *" do
       assert_equal Duration.new(20), Duration.new(10) * 2
       assert_equal Duration.new(20), Duration.new(10) * Duration.new(2)
     end
-    
+
     it "should /" do
       assert_equal Duration.new(5), Duration.new(10) / 2
       assert_equal Duration.new(5), Duration.new(10) / Duration.new(2)
     end
-    
+
     it "should %" do
       assert_equal Duration.new(1), Duration.new(10) % 3
       assert_equal Duration.new(1), Duration.new(10) % Duration.new(3)
@@ -66,79 +66,79 @@ describe "Duration" do
       d = Duration.new(:weeks => 1, :days => 1, :hours => 1, :minutes => 1, :seconds => 1)
       assert_equal "1 week 1 day 1 hour 1 minute 1 second", d.format("%w %~w %d %~d %h %~h %m %~m %s %~s")
     end
-    
+
     it "should display total seconds" do
       d = Duration.new(:hours => 1, :minutes => 15)
       assert_equal "4500 seconds", d.format("%tsu")
     end
-    
+
     it "should display total seconds in plural form when needed" do
       d = Duration.new(:minutes => 1, :seconds => 1)
       assert_equal "61 seconds", d.format("%tsu")
     end
-    
+
     it "should display total minutes as number" do
       d = Duration.new(:hours => 1, :minutes => 15)
       assert_equal "75", d.format("%tm")
     end
-    
+
     it 'should display total minutes with unit' do
       d = Duration.new(:hours => 1, :minutes => 15)
       assert_equal "75 minutes", d.format("%tmu")
     end
-      
+
     it "should display total minutes in plural form when needed" do
       d = Duration.new(:hours => 1, :minutes => 1)
       assert_equal "61 minutes", d.format("%tmu")
     end
-    
+
     it "should display total hours as number" do
       d = Duration.new(:days => 2, :hours => 1)
       assert_equal "49", d.format("%th")
     end
-    
+
     it 'should display total hours with unit' do
       d = Duration.new(:days => 2, :hours => 2)
       assert_equal "50 hours", d.format("%thu")
     end
-      
+
     it "should display total hours in plural form when needed" do
       d = Duration.new(:days => 1, :hours => 1)
       assert_equal "25 hours", d.format("%thu")
     end
-    
+
     it "should display total days as number" do
       d = Duration.new(:weeks => 1, :days => 3)
       assert_equal "10", d.format("%td")
     end
-    
+
     it 'should display total days with unit' do
       d = Duration.new(:weeks => 1, :days => 2)
       assert_equal "9 days", d.format("%tdu")
     end
-      
+
     it "should display total days in plural form when needed" do
       d = Duration.new(:weeks => 1, :days => 1)
       assert_equal "8 days", d.format("%tdu")
     end
   end
-  
+
   describe "#iso_6801" do
     it "should format seconds" do
       d = Duration.new(:seconds => 1)
       assert_equal "PT1S", d.iso8601
     end
-    
+
     it "should format minutes" do
       d = Duration.new(:minutes => 1)
       assert_equal "PT1M", d.iso8601
     end
-    
+
     it "should format hours" do
       d = Duration.new(:hours => 1)
       assert_equal "PT1H", d.iso8601
     end
-    
+
     it "should format days" do
       d = Duration.new(:days => 1)
       assert_equal "P1D", d.iso8601
@@ -164,17 +164,17 @@ describe "Duration" do
     end
 
   end
-  
+
   describe "utilities methods" do
     it "should respond to blank?" do
       assert Duration.new.blank?
       refute Duration.new(1).blank?
     end
-  
+
     it "should respond to present?" do
       refute Duration.new.present?
       assert Duration.new(1).present?
     end
   end
 
-end
+end

data/test/test_i18n.rb

@@ -3,7 +3,7 @@ require 'helper'
 
 I18n.load_path << File.join(File.dirname(__FILE__), 'fixtures', 'locales', 'pt.yml')
 
-describe "I18n" do  
+describe "I18n" do
   describe "when the locale is pt" do
     before do
       I18n.locale = :pt
@@ -30,7 +30,7 @@ describe "I18n" do
     end
 
     it "should translate to horas" do
-      assert_equal "horas", Duration.new.format("%~h") 
+      assert_equal "horas", Duration.new.format("%~h")
     end
 
     it "should translate to dia" do

data/test/test_mongoid.rb

@@ -7,11 +7,11 @@ describe "mongoid support" do
   before do
     class MyModel
       include Mongoid::Document
-      field :duration, type: Duration
+      field :duration, :type => Duration
     end
     @model = MyModel.new
   end
-  
+
   describe "assigning an integer value" do
     it "should return the duration given the total in seconds" do
       @model.duration = 90
@@ -23,14 +23,14 @@ describe "mongoid support" do
       assert_nil @model.duration
     end
   end
-  
+
   describe "assigning an array" do
     it "should return nil" do
       @model.duration = [1,2,3]
       assert_nil @model.duration
     end
   end
-  
+
   describe "assigning a valid hash" do
     it "should return total seconds given a duration in hash" do
       @model.duration = { :minutes => 1, :seconds => 30 }
@@ -59,12 +59,12 @@ describe "mongoid support" do
     it "should return total seconds given a duration in string" do
       @model.duration = "10"
       assert_equal Duration.new(10), @model.duration
-   
+
       @model.duration = "10string"
       assert_equal Duration.new(10), @model.duration
-         
+
       @model.duration = "string"
       assert_equal Duration.new(0), @model.duration
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-duration
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -125,13 +125,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.5
 - !ruby/object:Gem::Dependency
-  name: bluecloth
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,23 +139,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.5
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.0.0
 description: Duration type
 email:
 - jose@peleteiro.net
@@ -166,6 +150,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -193,6 +178,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 370806958351175358
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: ruby-duration
-rubygems_version: 1.8.18
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Duration type