new_base_60 1.0.4 → 1.1

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+=== 1.1 / 2013-01-10
+
+* 1 minor enhancement
+
+  * Added command line script `sxg_to_dec` and `dec_to_sxg` for converting on the command line by Aaron Parecki (@aaronpk)
+
 === 1.0.4 / 2011-02-15
 
 * 1 minor enhancement
@@ -14,8 +20,8 @@
 
 * 2 minor enhancement
 
-  * Code cleanup thanks to John Barnette
-  * Credits section added to README, props to Tantek Çelik for original idea
+  * Code cleanup thanks to John Barnette (@jbarnette)
+  * Credits section added to README, props to Tantek Çelik (@tantek) for original idea
 
 === 1.0.1 / 2010-06-11
 

data/Manifest.txt

@@ -4,4 +4,6 @@ Manifest.txt
 README.rdoc
 Rakefile
 lib/new_base_60.rb
+bin/dec_to_sxg
+bin/sxg_to_dec
 test/test_new_base_60.rb

data/README.rdoc

@@ -15,7 +15,7 @@ Based on work done by Tantek Çelik : http://tantek.pbworks.com/New_base_60
 == FEATURES/PROBLEMS:
 
 * Converts Base10 (like 147124) to Base60 (like fs4)
-* Converts Base60 (like fs4) to Base60 (like 147124)
+* Converts Base60 (like fs4) to Base10 (like 147124)
 * Converts Base60 (like fs4) to a Time object (Mon Oct 23 23:00:00 -0800 2372)
 
 == SYNOPSIS:
@@ -30,15 +30,28 @@ How to use:
   puts n.to_date.to_s     # => "2010-06-04"
   puts n.to_date.to_sxg   # => "464"
 
+Or, on the command line:
+
+  $ dec_to_sxg 115727
+  Y8n
+  $ sxg_to_dec Y8n
+  115727
+
+If you want a shortcut, add this to your .bash_profile:
+
+  alias sd="sxg_to_dec"
+  alias ds="dec_to_sxg"
+
 == INSTALL:
 
 * sudo gem install new_base_60
 
 == CREDITS:
 
-* Original Idea : Tantek Çelik
-* Ruby Port : Shane Becker
-* Lotsa Cleanup : John Barnette
+* Original Idea : Tantek Çelik (@tantek)
+* Ruby Port : Shane Becker (@veganstraightedge)
+* Lotsa Cleanup : John Barnette (@jbarnette)
+* Command Line Scripts : Aaron Parecki (@aaronpk)
 
 == LICENSE:
 

data/bin/dec_to_sxg

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require 'new_base_60'
+puts ARGV[0].to_i.to_sxg

data/bin/sxg_to_dec

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'new_base_60'
+n = NewBase60.new(ARGV[0])
+puts n.to_i

data/lib/new_base_60.rb

@@ -2,7 +2,7 @@ require "date"
 require "time"
 
 class NewBase60
-  VERSION = '1.0.4'
+  VERSION = '1.1'
   VOCABULARY = "0123456789ABCDEFGHJKLMNPQRSTUVWXYZ_abcdefghijkmnopqrstuvwxyz"
 
   def initialize(base_60)
@@ -39,12 +39,7 @@ class NewBase60
 
   # Converts into a Date.
   def to_date
-    # HACK this is smelly
-    # days since epoch * seconds * minutes * hours + timezone
-    time = Time.at(NewBase60.new(@base_60).to_i *
-                   60 * 60 * 24 + Time.now.gmtoff.abs)
-
-    Date.parse(time.strftime("%Y/%m/%d"))
+    Time.at(to_i * 60 * 60 * 24).utc.to_date
   end
 end
 
@@ -67,20 +62,12 @@ class Integer
 
   # Converts a base 10 integer into a NewBase60 string,
   # padding with leading zeroes.
-  def to_sxgf(padding)
-    num = self
-
-    str = num.to_sxg
+  def to_sxgf(padding=1)
+    str = to_sxg
 
-    padding = 1 if padding.nil?
     padding -= str.length
 
-    while padding > 0
-      str = "0#{str}"
-      padding -= 1
-    end
-
-    str
+    padding.times.map { "0" }.join + str
   end
 end
 

data/test/test_new_base_60.rb

@@ -1,29 +1,34 @@
-require "test/unit"
-require "new_base_60"
+require 'minitest/autorun'
+require 'new_base_60'
 
-class TestNewBase60 < Test::Unit::TestCase
+class TestCase < MiniTest::Spec
   def test_base60_to_base10
-    assert_equal     NewBase60.new("464").to_i, 14764
-    assert_not_equal NewBase60.new("464").to_i, 12345
+    assert NewBase60.new("464").to_i == 14764
+    refute NewBase60.new("464").to_i == 12345
   end
 
   def test_base60_to_date
-    assert_equal     NewBase60.new("464").to_date, Date.parse("2010/06/04")
-    assert_not_equal NewBase60.new("464").to_date, Date.parse("2010/06/05")
+    assert NewBase60.new("").to_date == Date.parse("1970/01/01")
+    assert NewBase60.new("4JG").to_date == Date.parse("2012/06/05")
+    assert NewBase60.new("464").to_date == Date.parse("2010/06/04")
+    refute NewBase60.new("464").to_date == Date.parse("2010/06/05")
   end
 
   def test_date_to_base60
-    assert_equal     Date.parse("2010/06/04").to_sxg, NewBase60.new("464").to_s
-    assert_not_equal Date.parse("2010/06/05").to_sxg, NewBase60.new("464")
+    assert Date.parse("2010/06/04").to_sxg == NewBase60.new("464").to_s
+    refute Date.parse("2010/06/05").to_sxg == NewBase60.new("464")
   end
 
   def test_base10_to_base60
-    assert_equal     14764.to_sxg, "464"
-    assert_not_equal 12345.to_sxg, "464"
+    assert 14764.to_sxg == "464"
+    refute 12345.to_sxg == "464"
   end
 
   def test_base10_to_base60_with_leading_zeroes
-    assert_equal     14764.to_sxgf(9), "000000464"
-    assert_not_equal 12345.to_sxgf(9), "000000464"
+    assert 14764.to_sxgf(1) == "464"
+    assert 14764.to_sxgf(5) == "00464"
+    assert 14764.to_sxgf()  == "464"
+    assert 14764.to_sxgf(9) == "000000464"
+    refute 12345.to_sxgf(9) == "000000464"
   end
 end

metadata

@@ -1,98 +1,109 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: new_base_60
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: '1.1'
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 4
-  version: 1.0.4
 platform: ruby
-authors: 
+authors:
 - Shane Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-15 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
+date: 2013-01-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 2
-        - 9
-        - 1
-        version: 2.9.1
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.4'
   type: :development
-  version_requirements: *id001
-description: "Handy Conversion Sexagesimal (base 60) for Short URLs\n\
-  Cuts out ambiguous characters like:\n\
-  * l : lowercase l (looks like a 1 : one)\n\
-  * I : capital   I (looks like a 1 : one)\n\
-  * O : capital   O (looks like a 0 : zero)\n\n\
-  Based on work done by Tantek \xC3\x87elik : http://tantek.pbworks.com/New_base_60"
-email: 
-- veganstraightedge@example.com
-executables: []
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.4'
+description: ! 'Handy Conversion Sexagesimal (base 60) for Short URLs
 
-extensions: []
+  Cuts out ambiguous characters like:
 
-extra_rdoc_files: 
-- Manifest.txt
+  * l : lowercase l (looks like a 1 : one)
+
+  * I : capital   I (looks like a 1 : one)
+
+  * O : capital   O (looks like a 0 : zero)
+
+
+  Based on work done by Tantek Çelik : http://tantek.pbworks.com/New_base_60'
+email:
+- veganstraightedge@example.com
+executables:
+- dec_to_sxg
+- sxg_to_dec
+extensions: []
+extra_rdoc_files:
 - CHANGELOG.rdoc
+- Manifest.txt
 - README.rdoc
-files: 
+files:
 - .autotest
 - CHANGELOG.rdoc
 - Manifest.txt
 - README.rdoc
 - Rakefile
 - lib/new_base_60.rb
+- bin/dec_to_sxg
+- bin/sxg_to_dec
 - test/test_new_base_60.rb
 - .gemtest
-has_rdoc: true
 homepage: http://github.com/veganstraightedge/new_base_60
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: new_base_60
-rubygems_version: 1.5.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: "Handy Conversion Sexagesimal (base 60) for Short URLs Cuts out ambiguous characters like: * l : lowercase l (looks like a 1 : one) * I : capital   I (looks like a 1 : one) * O : capital   O (looks like a 0 : zero)  Based on work done by Tantek \xC3\x87elik : http://tantek.pbworks.com/New_base_60"
-test_files: 
+summary: ! 'Handy Conversion Sexagesimal (base 60) for Short URLs Cuts out ambiguous
+  characters like: * l : lowercase l (looks like a 1 : one) * I : capital   I (looks
+  like a 1 : one) * O : capital   O (looks like a 0 : zero)  Based on work done by
+  Tantek Çelik : http://tantek.pbworks.com/New_base_60'
+test_files:
 - test/test_new_base_60.rb