natural_time 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2d57766e0968c55b0bc7d844b30034f46bae8255
-  data.tar.gz: d78085265e9ddaee19ceec9dea81950a6a4e22dd
+SHA256:
+  metadata.gz: f93b0e487a332d71b0a5751d366950478e56275476f405a3747e8fdcfbbb7deb
+  data.tar.gz: 2031102f88c016a6503c41dcc8f5908f18fbe016952df23c7dfa5102150a17b4
 SHA512:
-  metadata.gz: 945dd465bac00fd0025fea1dc0d4099285172616153ea094086ed216cc04b19057f7ac9421140aa8ef2ff86a2cac4d30e50404afd902c094ecbba47bdc9bc5ab
-  data.tar.gz: ee8caa70551a844dafa434fb5b15d5395a1538ad8750957a204b934573fb2f833529b78f014e8314c5b892cfb41f15d4302861782c5508233b93c39b59628eff
+  metadata.gz: 79a73e4faab5d6931451851d26d3e82385807c6a0b10632bea5f6f85a6fc3113c5238c3c468575efde37319e9ec22370dda4bdcf015aa980a63bba13b78171b9
+  data.tar.gz: 202a0fd2e3bd54ba7cb2ab6bb51b2fa2025e816bd75ba9e6cafb174620c494b34fd9c56b4fbc60120ae282f1487e078fd1a21d9a599851d9ffa5baba56ec1c20

data/.gitignore

@@ -0,0 +1,11 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+# rspec failure tracking
+.rspec_status

data/.rspec

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,5 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.4.1
+before_install: gem install bundler -v 1.16.1

data/Gemfile

@@ -1,4 +1,6 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in natural_time.gemspec
 gemspec

data/Gemfile.lock

@@ -1,20 +1,54 @@
 PATH
   remote: .
   specs:
-    natural_time (0.0.5)
-      activesupport
+    natural_time (0.3.0)
+      activesupport (~> 5.1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.6)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    i18n (0.6.0)
-    multi_json (1.3.6)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    method_source (0.9.0)
+    minitest (5.11.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rake (10.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bundler (~> 1.16)
   natural_time!
+  pry (~> 0.11)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   1.16.1

data/{README.rdoc → README.md}

@@ -1,47 +1,47 @@
-= natural_time
+# NaturalTime
 
 NaturalTime outputs a duration in natural language.
 
-== Usage
+## Usage
 
-=== Sentence
+### Sentence
 
 The <tt>to_sentence</tt> method will output the duration in time in natural language
 and formatted like a sentence.
 
-  NaturalTime.new(65).to_sentence         #=> "1 minute and 5 seconds"
+    NaturalTime.new(65).to_sentence         #> "1 minute and 5 seconds"
 
-  NaturalTime.new(120).to_sentence        #=> "2 minutes"
+    NaturalTime.new(120).to_sentence        #> "2 minutes"
 
-  NaturalTime.new(10000).to_sentence      #=> "2 hours, 46 minutes, and 40 seconds"
+    NaturalTime.new(10000).to_sentence      #> "2 hours, 46 minutes, and 40 seconds"
 
-=== String
+### String
 
 The <tt>to_s</tt> command will separate the units with commas but with no "and":
 
-  NaturalTime.new(65).to_s                #=> "1 minute, 5 seconds"
+    NaturalTime.new(65).to_s                #> "1 minute, 5 seconds"
 
-  NaturalTime.new(10000).to_s             #=> "2 hours, 46 minutes, 40 seconds"
-  
-=== Array
+    NaturalTime.new(10000).to_s             #> "2 hours, 46 minutes, 40 seconds"
+
+### Array
 
 NaturalTime instances can also be output to an array with <tt>to_a</tt>:
 
-  NaturalTime.new(65).to_a                #=> ["1 minutes", "5 seconds"]
-  
-  NaturalTime.new(120).to_a               #=> ["2 minutes"]
+    NaturalTime.new(65).to_a                #> ["1 minutes", "5 seconds"]
+
+    NaturalTime.new(120).to_a               #> ["2 minutes"]
 
-=== Precision
+### Precision
 
 NaturalTime can return the amount of time to a specific precision.  If all you want is the greatest unit:
 
-  NaturalTime.new(65, :precision => 1).to_sentence     #=> "1 minute"
-  
-  NaturalTime.new(10000, :precision => 1).to_sentence  #=> "2 hours"
-  
-  NaturalTime.new(10000, :precision => 2).to_sentence  #=> "2 hours and 46 minutes"
+    NaturalTime.new(65, :precision#> 1).to_sentence    #=> "1 minute"
+
+    NaturalTime.new(10000, :precision#> 1).to_sentence #=> "2 hours"
 
-=== Distance
+    NaturalTime.new(10000, :precision#> 2).to_sentence #=> "2 hours and 46 minutes"
+
+### Distance
 
 If you want to use NaturalTime to show an elapsed time and you don't care if it's in the
 past or the future, use the <tt>natural_time</tt> or <tt>to_sentence</tt> methods, or the
@@ -50,19 +50,19 @@ past or the future, use the <tt>natural_time</tt> or <tt>to_sentence</tt> method
 If you're measuring distances that may be in the past or the future, the <tt>distance</tt>
 method will return a sentence indicating how long ago or in the future is your duration.
 
-  NaturalTime.new(65).distance                      #=> "1 minute and 5 seconds from now"
-  
-  NaturalTime.new(-65).distance                     #=> "1 minute and 5 seconds ago"
-  
+    NaturalTime.new(65).distance                      #> "1 minute and 5 seconds from now"
+
+    NaturalTime.new(-65).distance                     #> "1 minute and 5 seconds ago"
+
 It works with <tt>:precision</tt> too:
-  
-  NaturalTime.new(10000, :precision => 1).distance  #=> "2 hours from now"
-  
-  NaturalTime.new(-10000, :precision => 2).distance #=> "2 hours and 46 minutes ago"
 
+    NaturalTime.new(10000, :precision#> 1).distance #=> "2 hours from now"
+
+    NaturalTime.new(-10000, :precision#> 2).distance#=> "2 hours and 46 minutes ago"
+
+
+## Note on Patches/Pull Requests
 
-== Note on Patches/Pull Requests
- 
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
@@ -71,6 +71,6 @@ It works with <tt>:precision</tt> too:
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-== Copyright
+## Copyright
 
-Copyright (c) 2010 Jeff Coleman. See LICENSE for details.
+Copyright (c) 2018 Isaac Priestley. See LICENSE for details.

data/Rakefile

@@ -1,2 +1,6 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "natural_time"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/natural_time.rb

@@ -1,12 +1,11 @@
-require 'rubygems'
-require 'active_support/core_ext/integer'
-require 'active_support/core_ext/numeric'
+require "natural_time/version"
+require 'active_support/core_ext/integer/time'
 
 class NaturalTime
   attr_accessor :duration, :precision, :past
 
   UNITS_OF_TIME = [["year", "years"], ["month", "months"], ["week", "weeks"], ["day", "days"], ["hour", "hours"], ["minute", "minutes"]]
-  
+
   def initialize(duration_in_seconds, options={})
     @precision = options[:precision]
     duration_in_seconds = duration_in_seconds.to_i
@@ -14,27 +13,27 @@ class NaturalTime
     @duration = duration_in_seconds.abs
     elapsed_time = elapsed_time(duration_in_seconds)
   end
-  
+
   def to_sentence
     to_array.to_sentence
   end
-  
+
   def natural_time
     to_array.join(", ")
   end
-  
+
   def to_s
     natural_time
   end
-  
+
   def to_a
     [elapsed_time(duration)].flatten
   end
-  
+
   def to_array
     to_a
   end
-  
+
   def distance
     if past
       modifier = "ago"
@@ -43,25 +42,25 @@ class NaturalTime
     end
     "#{to_sentence} #{modifier}"
   end
-  
+
   def elapsed_time(duration_in_seconds)
     return "0 seconds" if duration_in_seconds <= 0
 
     elapsed_time = []
 
     seconds_left = duration_in_seconds
-    
+
     UNITS_OF_TIME.each do |period|
       amount = (seconds_left / 1.send(period.first)).to_i
       str = amount == 1 ? period[0] : period[1]
       elapsed_time << "#{amount} #{str}" if amount > 0
       seconds_left = seconds_left % 1.send(period.first)
     end
-    
+
     seconds = seconds_left % 1.minute
     str = seconds == 1 ? "second" : "seconds"
-    elapsed_time << "#{seconds.to_i} #{str}" unless (seconds == 0 && elapsed_time.compact.length > 0)    
-    
+    elapsed_time << "#{seconds.to_i} #{str}" unless (seconds == 0 && elapsed_time.compact.length > 0)
+
     if precision
       elapsed_time.compact.first(precision)
     else

data/lib/natural_time/version.rb

@@ -0,0 +1,3 @@
+class NaturalTime
+  VERSION = "0.3.0"
+end

data/natural_time.gemspec

@@ -1,52 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = "natural_time"
-  s.version = "0.2.1"
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "natural_time/version"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Isaac Priestley"]
-  s.date = "2013-08-26"
-  s.description = "Smart enumeration of durations in natural language--\"4 hours, 3 minutes and 2 seconds\""
-  s.email = "progressions@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".ruby-version",
-    "Gemfile",
-    "Gemfile.lock",
-    "History.txt",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/natural_time.rb",
-    "natural_time.gemspec",
-    "spec/natural_time_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = "http://github.com/progressions/natural_time"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.12"
-  s.summary = "Smart enumeration of durations in natural language"
+Gem::Specification.new do |spec|
+  spec.name          = "natural_time"
+  spec.version       = NaturalTime::VERSION
+  spec.authors       = ["Isaac Priestley"]
+  spec.email         = ["progressions@gmail.com"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  spec.summary       = "Smart enumeration of durations in natural language"
+  spec.description   = "Smart enumeration of durations in natural language--\"4 hours, 3 minutes and 2 seconds\""
+  spec.homepage      = "https://github.com/progressions/natural_time"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, [">= 0"])
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
   end
-end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
+  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "pry", "~> 0.11"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_dependency "activesupport", "~> 5.1.4"
+end

metadata

@@ -1,53 +1,106 @@
 --- !ruby/object:Gem::Specification
 name: natural_time
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Isaac Priestley
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.1.4
 description: Smart enumeration of durations in natural language--"4 hours, 3 minutes
   and 2 seconds"
-email: progressions@gmail.com
+email:
+- progressions@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
 files:
-- .document
-- .ruby-version
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
-- History.txt
-- LICENSE
-- README.rdoc
+- README.md
 - Rakefile
-- VERSION
+- bin/console
+- bin/setup
 - lib/natural_time.rb
+- lib/natural_time/version.rb
 - natural_time.gemspec
-- spec/natural_time_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-homepage: http://github.com/progressions/natural_time
+homepage: https://github.com/progressions/natural_time
 licenses: []
 metadata: {}
 post_install_message: 
@@ -56,18 +109,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.7.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Smart enumeration of durations in natural language
 test_files: []

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.0.0-p247@natural_time

data/History.txt

@@ -1,10 +0,0 @@
-== 0.0.3 2010-01-22
-  * major enhancements
-    * specify level of precision
-    * distance method shows whether it's past or future
-  * minor enhancements
-  * bug fixes
-
-== 0.0.2 2010-01-13
-  * major enhancements
-    * outputs duration of time in natural language

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Jeff Coleman
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/VERSION

@@ -1 +0,0 @@
-0.1.0

data/spec/natural_time_spec.rb

@@ -1,305 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Naturaltime" do
-  describe "seconds" do
-    it "should return zero seconds" do
-      NaturalTime.new(0).natural_time.should == "0 seconds"
-    end
-    
-    it "should return singular" do
-      NaturalTime.new(1).natural_time.should == "1 second"
-    end
-    
-    it "should return seconds" do
-      (2..59).each do |i|
-        NaturalTime.new(i).natural_time.should == "#{i} seconds"
-      end
-    end
-    
-    it "should not return 60 seconds" do
-      NaturalTime.new(60.seconds).natural_time.should_not match(/60 seconds/)
-    end
-    
-    it "should return remainder in seconds" do
-      NaturalTime.new(65.seconds).natural_time.should match(/ 5 seconds/)
-    end
-  end
-  
-  describe "minutes" do
-    it "should return singular" do
-      NaturalTime.new(60.seconds).natural_time.should == "1 minute"
-    end
-    
-    it "should return whole minutes" do
-      (2..59).each do |i|
-        NaturalTime.new(i.minutes).natural_time.should == "#{i} minutes"
-      end
-    end
-    
-    it "should not return 60 minutes" do
-      NaturalTime.new(60.minutes).natural_time.should_not match(/60 minutes/)
-    end
-    
-    it "should return remainder in seconds" do
-      NaturalTime.new(65.seconds).natural_time.should == "1 minute, 5 seconds"
-    end
-  end
-  
-  describe "hours" do
-    it "should return singular" do
-      NaturalTime.new(1.hour).natural_time.should == "1 hour"
-    end
-    
-    it "should return whole hours" do
-      (2..23).each do |i|
-        NaturalTime.new(i.hours).natural_time.should == "#{i} hours"
-      end
-    end
-    
-    it "should not return 24 hours" do
-      NaturalTime.new(24.hours).natural_time.should_not match(/24 hours/)
-    end
-    
-    it "should return remainder in minutes" do
-      NaturalTime.new(1.hour + 5.minutes).natural_time.should == "1 hour, 5 minutes"
-    end
-    
-    it "should return remainder in minutes and seconds" do
-      NaturalTime.new(1.hour + 5.minutes + 5.seconds).natural_time.should == "1 hour, 5 minutes, 5 seconds"
-    end
-  end
-  
-  describe "days" do
-    it "should return singular" do
-      NaturalTime.new(1.day).natural_time.should == "1 day"
-    end
-    
-    it "should return whole days" do
-      (2..6).each do |i|
-        NaturalTime.new(i.days).natural_time.should == "#{i} days"
-      end
-    end
-    
-    it "should not return 7 days" do
-      NaturalTime.new(7.days).natural_time.should_not match(/7 days/)
-    end
-    
-    it "should return remainder in hours" do
-      NaturalTime.new(1.day + 1.hour).natural_time.should == "1 day, 1 hour"
-    end
-    
-    it "should return remainder in hours and minutes" do
-      NaturalTime.new(1.day + 1.hour + 5.minutes).natural_time.should == "1 day, 1 hour, 5 minutes"
-    end
-    
-    it "should return remainder in hours and minutes and seconds" do
-      NaturalTime.new(1.day + 1.hour + 5.minutes + 5.seconds).natural_time.should == "1 day, 1 hour, 5 minutes, 5 seconds"
-    end
-  end
-  
-  describe "weeks" do
-    it "should return singular" do
-      NaturalTime.new(1.week).natural_time.should == "1 week"
-    end
-    
-    it "should return whole weeks" do
-      (2..4).each do |i|
-        NaturalTime.new(i.weeks).natural_time.should == "#{i} weeks"
-      end
-    end
-    
-    it "should not return 5 weeks" do
-      NaturalTime.new(5.weeks).natural_time.should_not match(/5 weeks/)
-    end
-    
-    it "should return remainder in days" do
-      NaturalTime.new(1.week + 1.day).natural_time.should == "1 week, 1 day"
-    end
-    
-    it "should return remainder in days and hours" do
-      NaturalTime.new(1.week + 1.day + 1.hour).natural_time.should == "1 week, 1 day, 1 hour"
-    end
-    
-    it "should return remainder in days and hours and minutes" do
-      NaturalTime.new(1.week + 1.day + 1.hour + 5.minutes).natural_time.should == "1 week, 1 day, 1 hour, 5 minutes"
-    end
-    
-    it "should return remainder in days and hours and minutes and seconds" do
-      NaturalTime.new(1.week + 1.day + 1.hour + 5.minutes + 5.seconds).natural_time.should == "1 week, 1 day, 1 hour, 5 minutes, 5 seconds"
-    end
-  end
-  
-  describe "months" do
-    it "should return singular" do
-      NaturalTime.new(1.month).natural_time.should == "1 month"
-    end
-    
-    it "should return whole months" do
-      (2..4).each do |i|
-        NaturalTime.new(i.months).natural_time.should == "#{i} months"
-      end
-    end
-    
-    it "should not return 12 months" do
-      NaturalTime.new(13.months).natural_time.should_not match(/13 months/)
-    end
-    
-    it "should return remainder in weeks" do
-      NaturalTime.new(1.month + 1.week).natural_time.should == "1 month, 1 week"
-    end
-    
-    it "should return remainder in days" do
-      NaturalTime.new(1.month + 1.week + 1.day).natural_time.should == "1 month, 1 week, 1 day"
-    end
-    
-    it "should return remainder in days and hours" do
-      NaturalTime.new(1.month + 1.week + 1.day + 1.hour).natural_time.should == "1 month, 1 week, 1 day, 1 hour"
-    end
-    
-    it "should return remainder in days and hours and minutes" do
-      NaturalTime.new(1.month + 1.week + 1.day + 1.hour + 5.minutes).natural_time.should == "1 month, 1 week, 1 day, 1 hour, 5 minutes"
-    end
-    
-    it "should return remainder in days and hours and minutes and seconds" do
-      NaturalTime.new(1.month + 1.week + 1.day + 1.hour + 5.minutes + 5.seconds).natural_time.should == "1 month, 1 week, 1 day, 1 hour, 5 minutes, 5 seconds"
-    end
-  end
-  
-  describe "years" do
-    it "should return singular" do
-      NaturalTime.new(1.year).natural_time.should == "1 year"
-    end
-    
-    it "should return whole years" do
-      (2..4).each do |i|
-        NaturalTime.new(i.years).natural_time.should == "#{i} years"
-      end
-    end
-    
-    it "should return remainder in months" do
-      NaturalTime.new(1.year + 1.month).natural_time.should == "1 year, 1 month"
-    end
-    
-    it "should return remainder in months and weeks" do
-      NaturalTime.new(1.year + 1.month + 1.week).natural_time.should == "1 year, 1 month, 1 week"
-    end
-    
-    it "should return remainder in months and days" do
-      NaturalTime.new(1.year + 1.month + 1.week + 1.day).natural_time.should == "1 year, 1 month, 1 week, 1 day"
-    end
-    
-    it "should return remainder in months and days and hours" do
-      NaturalTime.new(1.year + 1.month + 1.week + 1.day + 1.hour).natural_time.should == "1 year, 1 month, 1 week, 1 day, 1 hour"
-    end
-    
-    it "should return remainder in months and days and hours and minutes" do
-      NaturalTime.new(1.year + 1.month + 1.week + 1.day + 1.hour + 5.minutes).natural_time.should == "1 year, 1 month, 1 week, 1 day, 1 hour, 5 minutes"
-    end
-    
-    it "should return remainder in months and days and hours and minutes and seconds" do
-      NaturalTime.new(1.year + 1.month + 1.week + 1.day + 1.hour + 5.minutes + 5.seconds).natural_time.should == "1 year, 1 month, 1 week, 1 day, 1 hour, 5 minutes, 5 seconds"
-    end
-  
-    describe "precision" do
-      it "should limit the precision to 1" do
-        NaturalTime.new(1.week + 1.minutes + 1.second, :precision => 1).natural_time.should == "1 week"
-      end
-      
-      it "should limit the precision to 2" do
-        NaturalTime.new(1.week + 1.minutes + 1.second, :precision => 2).natural_time.should == "1 week, 1 minute"
-      end
-      
-      it "should show the distance with precision of 1 in the past" do
-        distance = -1 * (1.week + 1.minutes + 1.second)
-        NaturalTime.new(distance, :precision => 1).distance.should == "1 week ago"
-      end
-      
-      it "should show the distance with precision of 2 in the past" do
-        distance = -1 * (1.week + 1.minutes + 1.second)
-        NaturalTime.new(distance, :precision => 2).distance.should == "1 week and 1 minute ago"
-      end
-      
-      it "should show the distance with precision of 1 in the future" do
-        distance = (1.week + 1.minutes + 1.second)
-        NaturalTime.new(distance, :precision => 1).distance.should == "1 week from now"
-      end
-      
-      it "should show the distance with precision of 2 in the future" do
-        distance = (1.week + 1.minutes + 1.second)
-        NaturalTime.new(distance, :precision => 2).distance.should == "1 week and 1 minute from now"
-      end
-    end
-    
-    describe "distances" do
-      it "should give the distance in the past" do
-        NaturalTime.new(-1).distance.should == "1 second ago"
-      end
-      
-      it "should give the distance in the past" do
-        NaturalTime.new(-2).distance.should == "2 seconds ago"
-      end
-      it "should give the distance in the future" do
-        NaturalTime.new(1).distance.should == "1 second from now"
-      end
-      
-      it "should give the distance in the future" do
-        NaturalTime.new(2).distance.should == "2 seconds from now"
-      end
-    end
-  end
-  
-  describe "to_s" do
-    it "should equal natural_time" do
-      (1..100).each do |i|
-        @natural_time = NaturalTime.new(i)
-        @natural_time.to_s.should == @natural_time.natural_time
-      end
-    end
-  
-    describe "precision" do
-      it "should limit the precision to 1" do
-        NaturalTime.new(1.week + 1.minutes + 1.second, :precision => 1).to_s.should == "1 week"
-      end
-      
-      it "should limit the precision to 2" do
-        NaturalTime.new(1.week + 1.minutes + 1.second, :precision => 2).to_s.should == "1 week, 1 minute"
-      end
-    end
-  end
-  
-  describe "to_sentence" do
-    it "should put 'and' before the last entry in the list" do
-      NaturalTime.new(1.minute + 1.second).to_sentence.should == "1 minute and 1 second"
-    end
-  
-    describe "precision" do
-      it "should limit the precision to 1" do
-        NaturalTime.new(1.week + 1.minutes + 1.second, :precision => 1).to_sentence.should == "1 week"
-      end
-      
-      it "should limit the precision to 2" do
-        NaturalTime.new(1.week + 1.minutes + 1.second, :precision => 2).to_sentence.should == "1 week and 1 minute"
-      end
-    end
-  end
-  
-  describe "to_array" do
-    it "should return an array" do
-      NaturalTime.new(1.minutes + 1.second).to_array.should == ["1 minute", "1 second"]
-    end
-    
-    it "should return an array" do
-      NaturalTime.new(1.minutes + 1.second).to_a.should == ["1 minute", "1 second"]
-    end
-  
-    describe "precision" do
-      it "should limit the precision to 1" do
-        NaturalTime.new(1.week + 1.minutes + 1.second, :precision => 1).to_a.should == ["1 week"]
-      end
-      
-      it "should limit the precision to 2" do
-        NaturalTime.new(1.week + 1.minutes + 1.second, :precision => 2).to_a.should == ["1 week", "1 minute"]
-      end
-    end
-  end
-end

data/spec/spec.opts

@@ -1 +0,0 @@
---color

data/spec/spec_helper.rb

@@ -1,8 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'natural_time'
-require 'rspec'
-
-RSpec.configure do |config|
-  
-end