philnash-bitly 0.1.4 → 0.2

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.2 / 2009-06-23
+
+* 1 enhancement
+
+  * Depends on Crack instead of JSON, so can run on Jruby
+  
+* 1 bug fix
+
+  * Does not choke when bit.ly chokes. Returns a BitlyError instead
+
 === 0.1.4 / 2009-04-13
 
 * 1 bug fix

data/README.txt

@@ -33,6 +33,10 @@ u.hash #=> "2V6CFi"
 u.info #=> a ruby hash of the JSON returned from the API
 u.stats #=> a ruby hash of the JSON returned from the API
 
+You should be able to specify a keyword when shortening (though at last test, this didn't seem to be working http://code.google.com/p/bitly-api/issues/detail?id=5). To do so, just add a keyword parameter:
+
+bitly.shorten('http://www.google.com', 'keyword')
+
 == LICENSE:
 
 (The MIT License)

data/Rakefile

@@ -5,12 +5,14 @@ require 'rake'
 require 'echoe'
 require './lib/bitly.rb'
 
+# modified by coryosborn to remove native JSON dependency
+
 Echoe.new('bitly', Bitly::VERSION) do |p|
   p.description = "Use the bit.ly API to shorten or expand URLs"
   p.url = "http://github.com/philnash/bitly"
   p.author = "Phil Nash"
   p.email = "philnash@gmail.com"
-  p.runtime_dependencies = ['json']
+  p.extra_deps      = [['crack', '>= 0.1.1']]
   p.development_dependencies = []
 end
 

data/bitly.gemspec

@@ -2,34 +2,33 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitly}
-  s.version = "0.1.4"
+  s.version = "0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phil Nash"]
-  s.date = %q{2009-04-13}
+  s.date = %q{2009-06-23}
   s.description = %q{Use the bit.ly API to shorten or expand URLs}
   s.email = %q{philnash@gmail.com}
   s.extra_rdoc_files = ["lib/bitly/client.rb", "lib/bitly/url.rb", "lib/bitly/utils.rb", "lib/bitly/version.rb", "lib/bitly.rb", "README.txt"]
   s.files = ["bitly.gemspec", "History.txt", "lib/bitly/client.rb", "lib/bitly/url.rb", "lib/bitly/utils.rb", "lib/bitly/version.rb", "lib/bitly.rb", "Manifest", "Rakefile", "README.txt", "test/test_bitly.rb"]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/philnash/bitly}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Bitly", "--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{bitly}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{Use the bit.ly API to shorten or expand URLs}
   s.test_files = ["test/test_bitly.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<crack>, [">= 0.1.1"])
     else
-      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<crack>, [">= 0.1.1"])
     end
   else
-    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<crack>, [">= 0.1.1"])
   end
 end

data/lib/bitly.rb

@@ -1,5 +1,9 @@
 $:.unshift File.dirname(__FILE__)
 
+require 'rubygems'
+gem 'crack'
+require 'crack'
+
 require 'bitly/utils'
 require 'bitly/client'
 require 'bitly/url'

data/lib/bitly/client.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'net/http'
 require 'uri'
-require 'json'
 
 module Bitly
   API_URL     = 'http://api.bit.ly/'

data/lib/bitly/utils.rb

@@ -39,7 +39,11 @@ module Bitly
     end
     
     def get_result(request)
-      result = JSON.parse(Net::HTTP.get(request))
+      begin
+        result = Crack::JSON.parse(Net::HTTP.get(request))
+      rescue
+        result = {'statusCode' => 'JSON Parse Error(Bit.ly messed up)', 'errorCode' => 69}
+      end
       if result['statusCode'] == "OK"
         result = result['results']
       else

data/lib/bitly/version.rb

@@ -1,3 +1,3 @@
 module Bitly
-  VERSION = '0.1.4'
+  VERSION = '0.2'
 end

data/test/test_bitly.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'rubygems'
 require 'bitly'
 
 class TestBitly < Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: philnash-bitly
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: "0.2"
 platform: ruby
 authors: 
 - Phil Nash
@@ -9,18 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-13 00:00:00 -07:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: crack
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.1.1
     version: 
 description: Use the bit.ly API to shorten or expand URLs
 email: philnash@gmail.com
@@ -47,7 +47,7 @@ files:
 - Rakefile
 - README.txt
 - test/test_bitly.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/philnash/bitly
 post_install_message: 
 rdoc_options: 
@@ -76,7 +76,7 @@ requirements: []
 rubyforge_project: bitly
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Use the bit.ly API to shorten or expand URLs
 test_files: 
 - test/test_bitly.rb