ruby-bitly 0.1.5 → 0.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c173fdedc9e8eb666ec603ae9f8d3cee19e3b070
+  data.tar.gz: 7bf398863c2f068f3d52ca8f5d15347ae885101f
+SHA512:
+  metadata.gz: 7afbb33e8e8524bcd6c7259b5e831cfe51ece8292dd0d0486067d6bcd00299035d4a406a01ecf106fb8c1041c9682023253bbf485528ce87332c7f5c0aec07f0
+  data.tar.gz: f8369b7e41778a32a12ff74dc8222392982dd3142d41c4e3048abd5784427ff3b1419cc70e376bc3b4552ff6592f7a15d4fbb9118407526683b35e3048b574e6

data/Gemfile

@@ -2,3 +2,15 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in ruby-bitly.gemspec
 gemspec
+
+group :development, :test do
+
+  platforms :ruby_18 do
+    gem 'ruby-debug'
+  end
+
+  platforms :ruby_19, :ruby_20 do
+    gem 'debugger'
+  end
+
+end

data/Gemfile.lock

@@ -1,38 +1,58 @@
 PATH
   remote: .
   specs:
-    ruby-bitly (0.1.5)
-      rest-client (~> 1.6.1)
+    ruby-bitly (0.1.6)
+      json_pure (~> 1.7)
+      rest-client (~> 1.6)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.6)
-    crack (0.1.8)
-    diff-lcs (1.1.2)
-    mime-types (1.16)
-    rake (0.8.7)
-    rest-client (1.6.1)
+    addressable (2.3.3)
+    columnize (0.3.6)
+    crack (0.3.2)
+    debugger (1.4.0)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.2.0)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.2.0)
+    diff-lcs (1.2.1)
+    json_pure (1.7.7)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mime-types (1.21)
+    rake (10.0.3)
+    rbx-require-relative (0.0.9)
+    rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    vcr (1.10.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    vcr (1.10.3)
     webmock (1.6.4)
-      addressable (> 2.2.5, ~> 2.2)
+      addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rake (~> 0.8.7)
-  rspec (~> 2.6.0)
+  debugger
+  rake
+  rspec (~> 2.13)
   ruby-bitly!
+  ruby-debug
   vcr (~> 1.10.0)
   webmock (~> 1.6.4)

data/bin/bitly

@@ -41,7 +41,9 @@ class App
   protected
 
     def copy_to_clipboard(value)
-      system "printf '#{value.strip}' 2> /dev/null | pbcopy 2> /dev/null" if RUBY_PLATFORM[/darwin/]
+      unless value.nil?
+        system "printf '#{value.strip}' 2> /dev/null | pbcopy 2> /dev/null" if RUBY_PLATFORM[/darwin/]
+      end
     end
 
     def load_account_data
@@ -122,7 +124,7 @@ class App
     end
 
     def output_version
-      puts "bitly version #{Bitly::VERSION} [gem ruby-bitly]"
+      puts "bitly version #{BitlyGem::VERSION} [gem ruby-bitly]"
     end
 
     def process_command

data/fixtures/vcr_cassettes/expand_a_long_url_should_result_an_error.yml

@@ -3,7 +3,7 @@
   request: !ruby/struct:VCR::Request 
     method: :post
     uri: http://api.bit.ly:80/v3/expand
-    body: shortURL=http%3A%2F%2Fgoogle.com&login=rafaeldx7&apiKey=R_59c1b174b21d92b2beeb4787a6d7ebaf
+    body: shortURL=http%3A%2F%2Fgoogle.com&login=my-login&apiKey=my-secret-key
     headers: 
       accept: 
       - "*/*; q=0.5, application/xml"

data/fixtures/vcr_cassettes/expand_a_short_url_to_it_long_url.yml

@@ -3,7 +3,7 @@
   request: !ruby/struct:VCR::Request 
     method: :post
     uri: http://api.bit.ly:80/v3/expand
-    body: shortURL=http%3A%2F%2Fbit.ly%2FbcvNe5&login=rafaeldx7&apiKey=R_59c1b174b21d92b2beeb4787a6d7ebaf
+    body: shortURL=http%3A%2F%2Fbit.ly%2FbcvNe5&login=my-login&apiKey=my-secret-key
     headers: 
       accept: 
       - "*/*; q=0.5, application/xml"

data/fixtures/vcr_cassettes/get_clicks_by_short_url.yml

@@ -2,7 +2,7 @@
 - !ruby/struct:VCR::HTTPInteraction 
   request: !ruby/struct:VCR::Request 
     method: :get
-    uri: http://api.bit.ly:80/v3/clicks?apiKey=R_59c1b174b21d92b2beeb4787a6d7ebaf&login=rafaeldx7&shortUrl=http://bit.ly/xlii42
+    uri: http://api.bit.ly:80/v3/clicks?apiKey=my-secret-key&login=my-login&shortUrl=http://bit.ly/xlii42
     body: 
     headers: 
       accept: 

data/fixtures/vcr_cassettes/shorten_bitly_url.yml

@@ -3,7 +3,7 @@
   request: !ruby/struct:VCR::Request 
     method: :post
     uri: http://api.bit.ly:80/v3/shorten
-    body: longURL=http%3A%2F%2Fbit.ly%2FbcvNe5&login=rafaeldx7&apiKey=R_59c1b174b21d92b2beeb4787a6d7ebaf
+    body: longURL=http%3A%2F%2Fbit.ly%2FbcvNe5&login=my-login&apiKey=my-secret-key
     headers: 
       accept: 
       - "*/*; q=0.5, application/xml"

data/fixtures/vcr_cassettes/shorten_long_url.yml

@@ -1,36 +1,36 @@
---- 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
     method: :post
     uri: http://api.bit.ly:80/v3/shorten
-    body: longURL=http%3A%2F%2Fgoogle.com&login=rafaeldx7&apiKey=R_59c1b174b21d92b2beeb4787a6d7ebaf
-    headers: 
-      accept: 
+    body: longURL=http%3A%2F%2Fgoogle.com&login=my-login&apiKey=my-secret-key
+    headers:
+      accept:
       - "*/*; q=0.5, application/xml"
-      accept-encoding: 
+      accept-encoding:
       - gzip, deflate
-      content-length: 
+      content-length:
       - "89"
-      content-type: 
+      content-type:
       - application/x-www-form-urlencoded
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
       code: 200
       message: OK
-    headers: 
-      server: 
+    headers:
+      server:
       - nginx
-      date: 
+      date:
       - Sat, 28 May 2011 17:11:14 GMT
-      content-type: 
+      content-type:
       - application/json; charset=utf-8
-      connection: 
+      connection:
       - keep-alive
-      mime-version: 
+      mime-version:
       - "1.0"
-      content-length: 
+      content-length:
       - "184"
     body: |
-      { "status_code": 200, "status_txt": "OK", "data": { "long_url": "http:\/\/google.com\/", "url": "http:\/\/bit.ly\/lVW32C", "hash": "lVW32C", "global_hash": "3j4ir4", "new_hash": 0 } }
+      { "status_code": 200, "status_txt": "OK", "data": { "long_url": "http:\/\/google.com\/", "url": "http:\/\/bit.ly\/lVW32C", "hash": "lVW32C", "global_hash": "3j4ir4", "new_hash": 3 } }
 
     http_version: "1.1"

data/lib/ruby-bitly.rb

@@ -6,40 +6,44 @@ require 'ostruct'
 
 class Bitly < OpenStruct
 
-  VERSION = '0.1.5'
   REST_API_URL = "http://api.bit.ly"
   ACTION_PATH = { :shorten => '/v3/shorten', :expand => '/v3/expand', :clicks => '/v3/clicks' }
 
-  def Bitly.shorten(new_long_url, login, key)
-    response = JSON.parse RestClient.post(REST_API_URL + ACTION_PATH[:shorten], { :longURL => new_long_url, :login => login, :apiKey => key })
+  class << self
+    attr_accessor :login, :key
 
-    bitly = Bitly.new response["data"]
+    def shorten(new_long_url, login = self.login, key = self.key)
+      response = JSON.parse RestClient.post(REST_API_URL + ACTION_PATH[:shorten], { :longURL => new_long_url, :login => login, :apiKey => key })
+      response.delete("data") if response["data"].empty?
 
-    bitly.hash_path = response["data"]["hash"] if response["status_code"] == 200
-    bitly.status_code = response["status_code"]
-    bitly.status_txt = response["status_txt"]
+      bitly = new response["data"]
 
-    bitly
-  end
+      bitly.hash_path = response["data"]["hash"] if response["status_code"] == 200
+      bitly.status_code = response["status_code"]
+      bitly.status_txt = response["status_txt"]
 
-  def Bitly.expand(new_short_url, login, key)
-    response = JSON.parse RestClient.post(REST_API_URL + ACTION_PATH[:expand], { :shortURL => new_short_url, :login => login, :apiKey => key })
+      bitly
+    end
 
-    bitly = Bitly.new(response["data"]["expand"].first)
-    bitly.status_code = response["status_code"]
-    bitly.status_txt = response["status_txt"]
-    bitly.long_url = bitly.error if bitly.error
+    def expand(new_short_url, login = self.login, key = self.key)
+      response = JSON.parse RestClient.post(REST_API_URL + ACTION_PATH[:expand], { :shortURL => new_short_url, :login => login, :apiKey => key })
 
-    bitly
-  end
+      bitly = new(response["data"]["expand"].first)
+      bitly.status_code = response["status_code"]
+      bitly.status_txt = response["status_txt"]
+      bitly.long_url = bitly.error if bitly.error
+
+      bitly
+    end
 
-  def Bitly.get_clicks(new_short_url, login, key)
-    response = JSON.parse RestClient.get("#{REST_API_URL}#{ACTION_PATH[:clicks]}?login=#{login}&apiKey=#{key}&shortUrl=#{new_short_url}")
+    def get_clicks(new_short_url, login = self.login, key = self.key)
+      response = JSON.parse RestClient.get("#{REST_API_URL}#{ACTION_PATH[:clicks]}?login=#{login}&apiKey=#{key}&shortUrl=#{new_short_url}")
 
-    bitly = Bitly.new(response["data"]["clicks"].first)
-    bitly.status_code = response["status_code"]
-    bitly.status_txt = response["status_txt"]
+      bitly = new(response["data"]["clicks"].first)
+      bitly.status_code = response["status_code"]
+      bitly.status_txt = response["status_txt"]
 
-    bitly
+      bitly
+    end
   end
 end

data/lib/ruby-bitly/version.rb

@@ -0,0 +1,3 @@
+module BitlyGem
+  VERSION = '0.1.6'
+end

data/ruby-bitly.gemspec

@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "ruby-bitly"
+require "ruby-bitly/version"
 
 Gem::Specification.new do |s|
   s.name          = "ruby-bitly"
-  s.version       = Bitly::VERSION
+  s.version       = BitlyGem::VERSION
   s.authors       = ["rafaeldx7"]
   s.email         = ["rafaeldx7@gmail.com"]
   s.homepage      = "http://github.com/rafaeldx7/ruby-bitly"
@@ -14,9 +14,10 @@ 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_dependency('rest-client','~> 1.6.1')
-  s.add_development_dependency('rake', '~> 0.8.7')
-  s.add_development_dependency('rspec', '~> 2.6.0')
+  s.add_dependency('rest-client', '~> 1.6')
+  s.add_dependency('json_pure', '~> 1.7')
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rspec', '~> 2.13')
   s.add_development_dependency('vcr', '~> 1.10.0')
   s.add_development_dependency('webmock', '~> 1.6.4')
 end

data/spec/ruby-bitly_spec.rb

@@ -4,8 +4,8 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "RubyBitly" do
 
   before(:all) do
-    @login = 'rafaeldx7'
-    @key = 'R_59c1b174b21d92b2beeb4787a6d7ebaf'
+    @login = 'my-login'
+    @key = 'my-secret-key'
   end
 
   it "Shorten long url" do
@@ -15,7 +15,7 @@ describe "RubyBitly" do
 
     response.status_code.should == 200
     response.status_txt.should == "OK"
-    response.new_hash.should == 0
+    response.new_hash.should == 3
     response.global_hash.should_not be_empty
     response.hash_path.length.should_not == 0
     response.url.should match /^http:\/\/bit\.ly\/[A-Za-z0-9]*/

metadata

@@ -1,72 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: ruby-bitly
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors:
 - rafaeldx7
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-11 00:00:00.000000000 -03:00
-default_executable: 
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2153230060 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *2153230060
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2153224380 !ruby/object:Gem::Requirement
-    none: false
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153224380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153223140 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *2153223140
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2153221880 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.10.0
   type: :development
   prerelease: false
-  version_requirements: *2153221880
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2153221100 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2153221100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 description: A simple bit.ly ruby client
 email:
 - rafaeldx7@gmail.com
@@ -90,39 +117,32 @@ files:
 - fixtures/vcr_cassettes/shorten_bitly_url.yml
 - fixtures/vcr_cassettes/shorten_long_url.yml
 - lib/ruby-bitly.rb
+- lib/ruby-bitly/version.rb
 - ruby-bitly.gemspec
 - spec/ruby-bitly_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/rafaeldx7/ruby-bitly
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1233735729712306384
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1233735729712306384
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple bit.ly ruby client
 test_files:
 - spec/ruby-bitly_spec.rb