time-lord 0.1.5 → 0.2.5

data/.rvmrc

@@ -4,7 +4,7 @@
 # development environment upon cd'ing into the directory
 
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.2-p180@time-lord"
+environment_id="ruby-1.9.3-p0@time-lord"
 
 #
 # First we attempt to load the desired environment directly from the environment

data/README.md

@@ -1,53 +1,135 @@
 time-lord
+=========
+
+**Current Version**: 0.1.5
+
+`time-lord` is a gem that builds on the Time class to give more human expressions.
+It adds a lot of nifty little ideas present in Rails helpers to the time class.
+Nothing too fancy, just a little human touch to data.
+
+
+Examples
+--------
+
+To use `time-lord` you need a Time, Date, or DateTime object.
+You can pass an object that doesn't act like those, but you'll have to tell it to try and parse.
+Even then it might not be able to, so be careful and just send Time-likes.
+Here's an example or two:
+
+``` ruby
+Time.now.ago_in_words
+  # => "just now"
+
+olden_times = Time.parse("1942-04-01")
+
+"I was dancing with Queen Elizabeth #{olden_times.ago_in_words} from now!"
+
+# => "I was dancing with Queen Elizabeth 7 decades ago from now!"
+```
+
+There's a lot more to come hopefully.
+Time is fun.
+
+
+Installing
+----------
+
+**Requirements**
+
+1. Any Ruby with a Time class
+2. Any Gem manager
+3. A blue telephone box
+
+Like any other gem you can install it via the `gem` command:
+
+``` terminal
+$ gem install time-lord
+```
+
+Although I suggest using `bundler`:
+
+``` ruby
+gem 'time-lord', '0.1.5'
+```
+
+
+**Testing**
+
+To make sure you did everything right, just do the following:
+
+```
+$ ruby -e "puts Time.now.ago_in_words"
+> just now
+```
+
+
+Issues & Documentation
+----------------------
+
+* [Documentation](https://github.com/krainboltgreene/time-lord/wiki)
+* [Issues](https://github.com/krainboltgreene/time-lord/issues)
+
+Absolutely feel free to contribute, please!
+
+
+Changelog
 ---------
-The ruby gem `time-lord` gives extra (needed) methods to the ruby `time` class.
-Originally started as gem that gave dwevelopers the `time-ago-in-words` method for the `time` class.
-It evolved into a multi-part boost to the `Time` class.
 
+**v0.1.5**
+
+* Changed the name of the gem, added some tests
 
-*postscript* This gem was previously called "time-ago-in-words".
-I changed this, obviously.
+**v0.1.0**
 
+* I didn't track changelogs when this version was released
 
-examples
-========
-Examples:
-    >> Time.now.ago_in_words # => "just now"
-    >> Time.parse("1942-04-01").ago_in_words # => "7 decades ago"
 
+Contributing
+------------
 
-future
-======
-  >> Time.yesterday
-  >> Time.last_month
-  >> Time.last_year
-  >> Time.now - 1.year
-  >> Time.now + 15.days
-  >> Time.last_month.last_day_of_the_month
-  >> Time.last_day_of_year
+* **Fork** the repository
+* **Clone the repository** locally, or **edit via Github**
+* Create a **new branch** using the [Git Flow Standard](http://yakiloo.com/getting-started-git-flow/) conventions
+* Commit **often** and **when important**
+* **DO NOT CHANGE** ANY OF THESE (without making a new branch for *that* change):
+  * `*.gemspec`
+  * `Rakefile`
+  * `.rvmrc`
+  * `.gitignore`
+  * Any part of the git history
+* **Write tests** specifically for the changes you've made, if no test exist
+* **Push** your feature or hotfix branch to Github.
+* Make a **Pull Request**
 
-install
-=======
-`gem install time-lord`
 
+Credits
+-------
 
-contribute
-==========
-Whatever you're cool with, really.
+* [Simon Hørup Eskildsen](https://github.com/Sirupsen)
+* [Henrik Enggaard](mailto: https://github.com/henrikh)
+* [James Larkby-Lahet](https://github.com/wolfwood)
 
 
-authors
-=======
-* https://github.com/krainboltgreene
-* https://github.com/sirupsen
+License
+-------
 
+Copyright (c) 2011 Kurtis Rainbolt-Greene
 
-helpers
-=======
-* https://github.com/wolfwood
-* https://github.com/henrikh
+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.
 
-credits
-=======
-* The guy who did the Rails version. I'll find out sometime.
+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/lib/time-lord.rb

@@ -20,22 +20,21 @@ class Time
   Eon        = 1.0/0
 
   def ago_in_words
-
     # Find the time difference between the time provided and the current time.
     difference = get_time_difference_from self
 
     # Catch less than 1 second differences.
-    return "just now" if difference < 1
+    return "just now" if (-1...1) === difference
 
     name   = get_unit_name_from difference
     amount = get_unit_amount_from difference
-    count  = get_unit_count_from difference, amount
+    count  = get_unit_count_from(difference, amount).abs
 
     # Determine if unit name needs pluralization.
     name += "s" if count > 1
 
     # Return the remaining string.
-    "#{count} #{name} ago"
+    difference >= 0 ? "#{count} #{name} ago" : "in #{count} #{name}"
   end
 
   private
@@ -49,7 +48,7 @@ class Time
   end
 
   def get_unit_name_from difference
-    case difference
+    case difference.abs
       when Second...Minute      then "second"
       when Minute...Hour        then "minute"
       when Hour...Day           then "hour"
@@ -64,7 +63,7 @@ class Time
   end
 
   def get_unit_amount_from difference
-    case difference
+    case difference.abs
       when Second...Minute      then Second
       when Minute...Hour        then Minute
       when Hour...Day           then Hour
@@ -79,4 +78,6 @@ class Time
   end
 
   alias_method :time_ago_in_words, :ago_in_words
+  alias_method :distance_in_words, :ago_in_words
+  alias_method :time_distance_in_words, :ago_in_words
 end

data/lib/time-lord/version.rb

@@ -1,3 +1,3 @@
 module TimeLord
-  VERSION = "0.1.5"
+  VERSION = "0.2.5"
 end

data/test/base.rb

@@ -13,90 +13,108 @@ describe Time do
   describe "seconds" do
     before do
       @past = Time.now - 30 * Time::Second
+      @future = Time.now + 30 * Time::Second
     end
 
     it 'returns the correct string' do
       @past.time_ago_in_words.must_equal "30 seconds ago"
+      @future.distance_in_words.must_equal "in 30 seconds"
     end
   end
 
   describe "minutes" do
     before do
       @past = Time.now - 15 * Time::Minute
+      @future = Time.now + 15 * Time::Minute
     end
 
     it 'returns the correct string' do
       @past.time_ago_in_words.must_equal "15 minutes ago"
+      @future.distance_in_words.must_equal "in 15 minutes"
     end
   end
 
   describe "singular form for 1" do
     before do
       @past = Time.now - 1 * Time::Minute
+      @future = Time.now + 1 * Time::Minute
     end
 
     it 'returns the correct string' do
       @past.time_ago_in_words.must_equal "1 minute ago"
+      @future.distance_in_words.must_equal "in 1 minute"
     end
   end
 
   describe 'hours' do
     before do
       @past = Time.now - 4 * Time::Hour
+      @future = Time.now + 4 * Time::Hour
     end
 
     it 'returns the correct string' do
       @past.time_ago_in_words.must_equal "4 hours ago"
+      @future.distance_in_words.must_equal "in 4 hours"
     end
   end
 
   describe 'days' do
     before do
       @past = Time.now - 3 * Time::Day
+      @future = Time.now + 3 * Time::Day
     end
 
     it 'returns the correct string' do
       @past.time_ago_in_words.must_equal "3 days ago"
+      @future.distance_in_words.must_equal "in 3 days"
     end
   end
 
   describe 'weeks' do
     before do
       @past = Time.now - 2 * Time::Week
+      @future = Time.now + 2 * Time::Week
     end
 
     it 'returns the correct string' do
       @past.time_ago_in_words.must_equal "2 weeks ago"
+      @future.distance_in_words.must_equal "in 2 weeks"
     end
   end
   
   describe 'months' do
     before do
       @past = Time.now - 7 * Time::Month
+      @future = Time.now + 7 * Time::Month
     end
 
     it 'returns the correct string' do
       @past.time_ago_in_words.must_equal "7 months ago"
+      @future.distance_in_words.must_equal "in 7 months"
     end
   end
 
   describe 'years' do
     before do
       @past = Time.now - 3 * Time::Year
+      @future = Time.now + 3 * Time::Year
     end
 
     it 'returns the correct string' do
       @past.time_ago_in_words.must_equal "3 years ago"
+      @future.distance_in_words.must_equal "in 3 years"
     end
   end
 
   describe 'millennium' do
     before do
       @past = Time.now - 4 * Time::Millennium
+      @future = Time.now + 4 * Time::Millennium
     end
 
     it 'returns the correct string' do
       @past.time_ago_in_words.must_equal "4 millenniums ago"
+      @future.distance_in_words.must_equal "in 4 millenniums"
     end
   end
 end

data/time-lord.gemspec

@@ -17,4 +17,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  s.add_development_dependency "rake"
 end

metadata

@@ -1,31 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: time-lord
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.5
   prerelease: 
-  version: 0.1.5
 platform: ruby
-authors: 
+authors:
 - Kurtis Rainbolt-Greene
-- "Simon H\xC3\xB8rup Eskildsen"
+- Simon Hørup Eskildsen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-16 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
+date: 2011-11-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2152296180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152296180
 description: This is a gem that adds a ton of extras to the Time class.
-email: 
+email:
 - kurtisrainboltgreene@gmail.com
 - sirup@sirupsen.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - .yardoc/checksums
@@ -56,34 +61,36 @@ files:
 - test/base.rb
 - test/helper.rb
 - time-lord.gemspec
-has_rdoc: true
 homepage: http://github.com/krainboltgreene/time-lord#README
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 504416042286362366
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 504416042286362366
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Adding various bonuses to the Time class.
-test_files: 
+test_files:
 - test/base.rb
 - test/helper.rb