dotiw 1.0.0 → 1.1.0

data/.gitignore

@@ -2,3 +2,4 @@ tmp
 pkg
 spec/fixtures/database.yml
 .rvmrc
+Gemfile.lock

data/lib/dotiw/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module DOTIW
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/dotiw.rb

@@ -39,13 +39,14 @@ module ActionView
           options.symbolize_keys!
           I18n.locale = options[:locale] if options[:locale]
 
-          time_measurements = { :years    => I18n.t(:years,   :default => "years"),
-                                :months   => I18n.t(:months,  :default => "months"),
-                                :weeks    => I18n.t(:weeks,   :default => "weeks"),
-                                :days     => I18n.t(:days,    :default => "days"),
-                                :hours    => I18n.t(:hours,   :default => "hours"),
-                                :minutes  => I18n.t(:minutes, :default => "minutes"),
-                                :seconds  => I18n.t(:seconds, :default => "seconds") }
+          time_measurements = ActiveSupport::OrderedHash.new
+          time_measurements[:years]   = I18n.t(:years,   :default => "years")
+          time_measurements[:months]  = I18n.t(:months,  :default => "months")
+          time_measurements[:weeks]   = I18n.t(:weeks,   :default => "weeks")
+          time_measurements[:days]    = I18n.t(:days,    :default => "days")
+          time_measurements[:hours]   = I18n.t(:hours,   :default => "hours")
+          time_measurements[:minutes] = I18n.t(:minutes, :default => "minutes")
+          time_measurements[:seconds] = I18n.t(:seconds, :default => "seconds")
 
           hash.delete(time_measurements[:seconds]) if !include_seconds && hash[time_measurements[:minutes]]
 

data/spec/lib/dotiw_spec.rb

@@ -206,7 +206,7 @@ describe "A better distance_of_time_in_words" do
       [Time.now,
        Time.now + 2.year + 3.months + 4.days + 5.hours + 6.minutes + 7.seconds,
        { :singularize => :always },
-       "2 year, 3 month, 4 day, 4 hour, 6 minute, and 7 second"]
+       "2 year, 3 month, 4 day, 5 hour, 6 minute, and 7 second"]
     ].each do |start, finish, options, output|
       it "should be #{output}" do
         distance_of_time_in_words(start, finish, true, options).should eql(output)

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dotiw
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors: 
 - Ryan Bigg
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id002
@@ -58,10 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
         version: "2.0"
   type: :development
   version_requirements: *id003
@@ -74,10 +55,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .bundle/config
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.markdown
 - Rakefile
@@ -105,25 +84,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Better distance_of_time_in_words for Rails

data/.bundle/config

@@ -1,3 +0,0 @@
---- 
-BUNDLE_DISABLE_SHARED_GEMS: "1"
-BUNDLE_WITHOUT: production

data/Gemfile.lock

@@ -1,53 +0,0 @@
-PATH
-  remote: .
-  specs:
-    dotiw (1.0.0)
-      actionpack (~> 3.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.3)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.6)
-      rack (>= 1.0)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    tzinfo (0.3.23)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionpack (~> 3.0.0)
-  bundler (~> 1.0.0)
-  dotiw!
-  rspec (~> 2.0)