cogsworth 1.0.1 → 1.0.2

data/README.md

@@ -6,11 +6,11 @@ The name of this gem is derived from *Cogsworth*, the character from Beauty and
 
 ## Usage
 
-    Cogsworth.parse('2 hours 30 minutes') => 9000
+    Cogsworth.string_to_seconds('2 hours 30 minutes') => 9000
 
-    Cogsworth.unparse(142510) => '1d 15h 35m 10s'
+    Cogsworth.seconds_to_string(142510) => '1d 15h 35m 10s'
     
-## Acceptable Formats
+## Acceptable String Formats
 
     '2 days 1 hour 35 minutes 25 seconds'
     '2days 1hr 35min 25sec'

data/lib/cogsworth.rb

@@ -7,21 +7,21 @@ module Cogsworth
       "d" => (60 * 60 * 24)
     }
     
-    def parse(string)
+    def string_to_seconds(string)
       string.gsub(' ','').downcase.scan(/(\d+)([a-zA-Z]+)/).inject(0) do |sum, pair|
         sum += pair[0].to_i * MULTIPLIERS[pair[1].slice(0,1)]
       end
     end
     
-    def unparse(seconds, results=[])
+    def seconds_to_string(seconds, results=[])
       return results.join(' ') if seconds == 0
       
       ['d','h','m','s'].each do |unit|
         occurrences = seconds/MULTIPLIERS[unit]
-        return unparse(seconds%MULTIPLIERS[unit], results.push("#{occurrences}#{unit}")) if occurrences > 0
+        return seconds_to_string(seconds%MULTIPLIERS[unit], results.push("#{occurrences}#{unit}")) if occurrences > 0
       end
       
-      return unparse(seconds, results)
+      return seconds_to_string(seconds, results)
     end
   end
 end

data/lib/cogsworth/version.rb

@@ -1,3 +1,3 @@
 module Cogsworth
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/cogsworth_spec.rb

@@ -1,83 +1,83 @@
 require "spec_helper"
 
 describe Cogsworth do
-  it { should respond_to(:parse).with(1).argument }
-  it { should respond_to(:unparse).with(1).argument }
+  it { should respond_to(:string_to_seconds).with(1).argument }
+  it { should respond_to(:seconds_to_string).with(1).argument }
     
   describe "parsing a string into seconds" do
     
     it "parses '1m' to 60 seconds" do
-      Cogsworth.parse("1m").should be(60)
+      Cogsworth.string_to_seconds("1m").should be(60)
     end
     
     it "parses '1 min' to 60 seconds" do
-      Cogsworth.parse("1 min").should be(60)
+      Cogsworth.string_to_seconds("1 min").should be(60)
     end
     
     it "parses '2m' to 120 seconds" do
-      Cogsworth.parse("2m").should be(120)
+      Cogsworth.string_to_seconds("2m").should be(120)
     end
     
     it "parses '2 minutes' to 120 seconds" do
-      Cogsworth.parse("2 minutes").should be(120)
+      Cogsworth.string_to_seconds("2 minutes").should be(120)
     end
     
     it "parses '2 mins' to 120 seconds" do
-      Cogsworth.parse("2 mins").should be(120)
+      Cogsworth.string_to_seconds("2 mins").should be(120)
     end
     
     it "parses '1h' to 3600 seconds" do
-      Cogsworth.parse("1h").should be(3600)
+      Cogsworth.string_to_seconds("1h").should be(3600)
     end
     
     it "parses '1h 20m' to 4800 seconds" do
-      Cogsworth.parse("1h 20m").should be(4800)
+      Cogsworth.string_to_seconds("1h 20m").should be(4800)
     end
     
     it "parses '2 days' to 172800 seconds" do
-      Cogsworth.parse("2 days").should be(172800)
+      Cogsworth.string_to_seconds("2 days").should be(172800)
     end
 
     it "parses '1d15h35m10s' to 142510 seconds" do
-      Cogsworth.parse("1d15h35m10s").should be(142510)
+      Cogsworth.string_to_seconds("1d15h35m10s").should be(142510)
     end
     
     it "parses '1H10M' to 4200 seconds" do
-      Cogsworth.parse("1H10M").should be(4200)
+      Cogsworth.string_to_seconds("1H10M").should be(4200)
     end
   end
   
   describe "converting seconds into a formatted string" do
     it "converts 30 seconds to 30s'" do
-      Cogsworth.unparse(30).should == '30s'
+      Cogsworth.seconds_to_string(30).should == '30s'
     end
     
     it "converts 60 seconds to '1m'" do
-      Cogsworth.unparse(60).should == '1m'
+      Cogsworth.seconds_to_string(60).should == '1m'
     end
     
     it "converts 120 seconds to '2m'" do
-      Cogsworth.unparse(120).should == '2m'
+      Cogsworth.seconds_to_string(120).should == '2m'
     end
     
     it "converts 150 seconds to '2m 30s'" do
-      Cogsworth.unparse(150).should == '2m 30s'
+      Cogsworth.seconds_to_string(150).should == '2m 30s'
     end
     
     it "converts 156 seconds to '2m 36s'" do
-       Cogsworth.unparse(156).should == '2m 36s'
+       Cogsworth.seconds_to_string(156).should == '2m 36s'
      end
     
     it "converts 3600 seconds to '1h'" do
-      Cogsworth.unparse(3600).should == '1h'
+      Cogsworth.seconds_to_string(3600).should == '1h'
     end
     
     it "converts 86400 seconds to '1d'" do
-      Cogsworth.unparse(86400).should == '1d'
+      Cogsworth.seconds_to_string(86400).should == '1d'
     end
     
     it "converts 142510 seconds to '1d 15h 35m 10s'" do
-      Cogsworth.unparse(142510).should == '1d 15h 35m 10s'
+      Cogsworth.seconds_to_string(142510).should == '1d 15h 35m 10s'
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cogsworth
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Jon buda
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -06:00
+date: 2011-05-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cogsworth
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A simple natural language time parser for Ruby