ruby-bitly 0.1.3 → 0.1.5.beta3

data/CHANGELOG

@@ -1,3 +1,7 @@
+# 0.1.4
+
+- Code improvements
+
 # 0.1.3
 
 - Copy to clipboard for Mac users
@@ -7,4 +11,4 @@
 - Moving read file ~/.bitly from Bitly class to command line script
 - Using Bitly class is an OpenStruct
 - Simplified code
-- bit.ly credentials as parameters
+- bit.ly credentials as parameters

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in ruby-bitly.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,38 @@
+PATH
+  remote: .
+  specs:
+    ruby-bitly (0.1.5.beta3)
+      rest-client (~> 1.6.1)
+
+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)
+      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)
+    webmock (1.6.4)
+      addressable (> 2.2.5, ~> 2.2)
+      crack (>= 0.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake (~> 0.8.7)
+  rspec (~> 2.6.0)
+  ruby-bitly!
+  vcr (~> 1.10.0)
+  webmock (~> 1.6.4)

data/README.rdoc

@@ -1,6 +1,29 @@
-= A simple bitly ruby client.
+= A simple bit.ly ruby client.
 
 == Examples
+  require 'ruby-bitly'
+
+  bitly = Bitly.shorten("http://rafaeldx7.github.com", "username", "key-here")
+
+  bitly.url #=> "http://bit.ly/le0JRh"
+
+  y bitly
+    :long_url: http://rafaeldx7.github.com/
+    :url: http://bit.ly/le0JRh
+    :hash: le0JRh
+    :global_hash: micSj7
+    :new_hash: 0
+    :hash_path: le0JRh
+    :status_code: 200
+    :status_txt: OK
+
+== Command Line Examples
+  Usage
+    bitly [options] url
+
+    For help: bitly -h
+
+  Basic examples:
     bitly -s http://xlii.com.br
     bitly -e http://bit.ly/XLII42
     bitly --user-clicks http://bit.ly/XLII42
@@ -10,12 +33,7 @@
     bitly -q -s http://xlii.com.br
     bitly --verbose -e http://bit.ly/XLII42
 
-== Usage
-    bitly [options] url
-
-    For help: bitly -h
-
-== Options
+  Options
     -s, --shorten        Shorten a long url (default option)
     -e, --expand         Expand a short bitly url
     -u, --user-clicks    Show user clicks from the short bitly url
@@ -29,22 +47,22 @@
     -q, --quiet          Output as little as possible, overrides verbose
     -V, --verbose        Verbose output
 
-== Authentication
+=== Authentication
   bit.ly API require that authentication credentials be supplied.
 
   To get started, you'll need a free bit.ly user account and apiKey. Signup at: http://bit.ly/a/sign_up
   If you already have an account, you can find your apiKey at: http://bit.ly/a/your_api_key
-  
+
   You can supply credentials as parameters. By example:
-    bitly -l username -k key-here -s http://xlii.com.br
-  
+    bitly -l <username> -k <key-here> -s http://xlii.com.br
+
   Or you can create the file ~/.bitly (YAML format) with this content:
-    login: username
-    key: key-here
+    login: <username>
+    key: <key-here>
 
 == Author
     rafaeldx7 ~ rafaeldx7(a)gmail.com
 
 == Copyright
     Copyright (c) 2010 rafaeldx7. Licensed under the MIT License:
-    http://www.opensource.org/licenses/mit-license.php
+    http://www.opensource.org/licenses/mit-license.php

data/Rakefile

@@ -1,48 +1,7 @@
-require 'rubygems'
-require 'rake'
+# -*- encoding: utf-8 -*-
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "ruby-bitly"
-    gem.summary = %Q{This is a simple bit.ly ruby client}
-    gem.description = %Q{This is a simple bit.ly ruby client}
-    gem.email = "rafaeldx7@gmail.com"
-    gem.homepage = "http://github.com/rafaeldx7/ruby-bitly"
-    gem.authors = ["rafaeldx7"]
-    gem.add_runtime_dependency "rest-client", "1.6.0"
-    gem.add_runtime_dependency "json_pure", "1.4.3"
-    gem.add_development_dependency "rake", "0.8.7"
-    gem.add_development_dependency "rspec", "1.3.0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : "0.0.0"
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "ruby-bitly #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/bin/bitly

@@ -1,16 +1,15 @@
 #!/usr/bin/env ruby
+# -*- encoding: utf-8 -*-
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rubygems'
 require 'ruby-bitly'
-require 'optparse' 
-require 'readme'
+require 'optparse'
 require 'ostruct'
 require 'date'
 
 class App
-  VERSION = File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
   ACCOUNT_FILE_PATH = "#{ENV['HOME']}/.bitly"
 
   attr_accessor :arguments, :options
@@ -23,28 +22,28 @@ class App
 
   def run
     process_options
-    
-    if arguments_valid? 
+
+    if arguments_valid?
       output_options if options.verbose
-            
+
       post_process_options and process_arguments
-      
+
       result = process_command
-      
+
       puts "#{options.message} #{result}".strip
-      
+
       copy_to_clipboard(result)
     else
       output_help("ERROR: Invalid options", 'examples')
     end
   end
-  
+
   protected
-  
+
     def copy_to_clipboard(value)
       system "printf '#{value.strip}' 2> /dev/null | pbcopy 2> /dev/null" if RUBY_PLATFORM[/darwin/]
     end
-    
+
     def load_account_data
       begin
         account_data = YAML.load(File.read(ACCOUNT_FILE_PATH))
@@ -57,71 +56,75 @@ class App
         options.key = account_data["key"]
       end
     end
-    
+
     def default_options
       options.verbose = false
       options.quiet = false
     end
-    
+
     def process_options
       default_options
-      
-      opts = OptionParser.new 
-      
+
+      opts = OptionParser.new
+
       opts.on('-s', '--shorten')       { options.shorten = true; options.message = 'Short url:' }
       opts.on('-e', '--expand')        { options.expand = true; options.message = 'Original url:' }
       opts.on('-u', '--user-clicks')   { options.user_clicks = true; options.message = 'User clicks:' }
       opts.on('-g', '--global-clicks') { options.global_clicks = true; options.message = 'Global clicks:' }
-      
+
       opts.on('-l', '--login LOGIN')  { |login| options.login = login }
       opts.on('-k', '--key KEY')      { |key| options.key = key }
-      
+
       opts.on('-v', '--version')    { output_version ; exit 0 }
       opts.on('-h', '--help')       { output_help }
       opts.on('-V', '--verbose')    { options.verbose = true }
       opts.on('-q', '--quiet')      { options.quiet = true; options.verbose = false }
-      
+
       opts.parse!(arguments) rescue return false
     end
-    
+
     def post_process_options
       # Bitly API Login / Key
       load_account_data unless options.login and options.key
-      
+
       # Default option: --shorten
       options.shorten = true and options.message = 'Short url:' unless options.expand or options.user_clicks or options.global_clicks
-      
+
       # Message empty if option quiet exists
       options.message = '' if options.quiet
     end
 
     def output_options
       puts "Options:\n"
-      
-      options.marshal_dump.each do |name, val|        
+
+      options.marshal_dump.each do |name, val|
         puts "  #{name} = #{val}"
       end
-      
+
       puts "  URL: #{arguments.first}\n"
     end
 
     def arguments_valid?
       arguments.length == 1
     end
-    
+
     def process_arguments
     end
-    
+
     def output_help(message = nil, section = "")
       puts message if message
-      
-      Readme::usage(section) #exits app
+
+      File.open(File.join(File.dirname(__FILE__), '..', 'README.rdoc'), "r") do |infile|
+        while (line = infile.gets)
+          puts line
+        end
+      end
     end
-    
+
     def output_version
-      puts "bitly version #{VERSION.chomp} [gem ruby-bitly]"
+      puts "bitly version #{Bitly::VERSION} [gem ruby-bitly]"
     end
-    
+
     def process_command
       return Bitly.shorten(arguments.first, options.login, options.key).url if options.shorten
       return Bitly.expand(arguments.first, options.login, options.key).long_url if options.expand

data/fixtures/vcr_cassettes/expand_a_long_url_should_result_an_error.yml

@@ -0,0 +1,36 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  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
+    headers: 
+      accept: 
+      - "*/*; q=0.5, application/xml"
+      accept-encoding: 
+      - gzip, deflate
+      content-length: 
+      - "90"
+      content-type: 
+      - application/x-www-form-urlencoded
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      server: 
+      - nginx
+      date: 
+      - Sat, 28 May 2011 17:22:28 GMT
+      content-type: 
+      - application/json; charset=utf-8
+      connection: 
+      - keep-alive
+      mime-version: 
+      - "1.0"
+      content-length: 
+      - "131"
+    body: |
+      { "status_code": 200, "status_txt": "OK", "data": { "expand": [ { "error": "NOT_FOUND", "short_url": "http:\/\/google.com" } ] } }
+
+    http_version: "1.1"

data/fixtures/vcr_cassettes/expand_a_short_url_to_it_long_url.yml

@@ -0,0 +1,36 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  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
+    headers: 
+      accept: 
+      - "*/*; q=0.5, application/xml"
+      accept-encoding: 
+      - gzip, deflate
+      content-length: 
+      - "95"
+      content-type: 
+      - application/x-www-form-urlencoded
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      server: 
+      - nginx
+      date: 
+      - Sat, 28 May 2011 17:22:27 GMT
+      content-type: 
+      - application/json; charset=utf-8
+      connection: 
+      - keep-alive
+      mime-version: 
+      - "1.0"
+      content-length: 
+      - "197"
+    body: |
+      { "status_code": 200, "status_txt": "OK", "data": { "expand": [ { "short_url": "http:\/\/bit.ly\/bcvNe5", "long_url": "http:\/\/google.com", "user_hash": "bcvNe5", "global_hash": "zzzzzzz" } ] } }
+
+    http_version: "1.1"

data/fixtures/vcr_cassettes/get_clicks_by_short_url.yml

@@ -0,0 +1,30 @@
+--- 
+- !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
+    body: 
+    headers: 
+      accept: 
+      - "*/*; q=0.5, application/xml"
+      accept-encoding: 
+      - gzip, deflate
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      server: 
+      - nginx
+      date: 
+      - Sat, 28 May 2011 17:22:28 GMT
+      content-type: 
+      - application/json; charset=utf-8
+      connection: 
+      - keep-alive
+      content-length: 
+      - "187"
+      etag: 
+      - "\"20a0b40a65714ad5a2440caad07fd5c5518584b7\""
+    body: "{\"status_code\": 200, \"data\": {\"clicks\": [{\"short_url\": \"http://bit.ly/xlii42\", \"global_hash\": \"cunZEP\", \"user_clicks\": 1, \"user_hash\": \"cT1Izu\", \"global_clicks\": 1}]}, \"status_txt\": \"OK\"}"
+    http_version: "1.1"

data/fixtures/vcr_cassettes/shorten_bitly_url.yml

@@ -0,0 +1,34 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  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
+    headers: 
+      accept: 
+      - "*/*; q=0.5, application/xml"
+      accept-encoding: 
+      - gzip, deflate
+      content-length: 
+      - "94"
+      content-type: 
+      - application/x-www-form-urlencoded
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      server: 
+      - nginx
+      date: 
+      - Sat, 28 May 2011 17:22:26 GMT
+      content-type: 
+      - application/json; charset=utf-8
+      connection: 
+      - keep-alive
+      mime-version: 
+      - "1.0"
+      content-length: 
+      - "73"
+    body: "{ \"data\": [ ], \"status_code\": 500, \"status_txt\": \"ALREADY_A_BITLY_LINK\" }"
+    http_version: "1.1"

data/fixtures/vcr_cassettes/shorten_long_url.yml

@@ -0,0 +1,36 @@
+--- 
+- !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: 
+      - "*/*; q=0.5, application/xml"
+      accept-encoding: 
+      - gzip, deflate
+      content-length: 
+      - "89"
+      content-type: 
+      - application/x-www-form-urlencoded
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      server: 
+      - nginx
+      date: 
+      - Sat, 28 May 2011 17:11:14 GMT
+      content-type: 
+      - application/json; charset=utf-8
+      connection: 
+      - keep-alive
+      mime-version: 
+      - "1.0"
+      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 } }
+
+    http_version: "1.1"

data/lib/ruby-bitly.rb

@@ -1,45 +1,45 @@
-require 'rubygems'
+# -*- encoding: utf-8 -*-
 require 'yaml'
 require 'restclient'
 require 'json'
 require 'ostruct'
 
 class Bitly < OpenStruct
-  
+
+  VERSION = '0.1.5.beta3'
   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 })
-    
+
     bitly = Bitly.new response["data"]
-    
+
     bitly.hash_path = response["data"]["hash"] if response["status_code"] == 200
     bitly.status_code = response["status_code"]
     bitly.status_txt = response["status_txt"]
 
     bitly
   end
-  
+
   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 = 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}")
-    # 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
   end
-end
+end

data/ruby-bitly.gemspec

@@ -1,69 +1,22 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "ruby-bitly"
 
 Gem::Specification.new do |s|
-  s.name = %q{ruby-bitly}
-  s.version = "0.1.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["rafaeldx7"]
-  s.date = %q{2010-08-10}
-  s.default_executable = %q{bitly}
-  s.description = %q{This is a simple bit.ly ruby client}
-  s.email = %q{rafaeldx7@gmail.com}
-  s.executables = ["bitly"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "CHANGELOG",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/bitly",
-     "lib/readme.rb",
-     "lib/ruby-bitly.rb",
-     "ruby-bitly.gemspec",
-     "spec/ruby-bitly_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/rafaeldx7/ruby-bitly}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.name          = "ruby-bitly"
+  s.version       = Bitly::VERSION
+  s.authors       = ["rafaeldx7"]
+  s.email         = ["rafaeldx7@gmail.com"]
+  s.homepage      = "http://github.com/rafaeldx7/ruby-bitly"
+  s.summary       = %q{A simple bit.ly ruby client}
+  s.description   = %q{A simple bit.ly ruby client}
+  s.files         = `git ls-files`.split("\n")
+  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.rubygems_version = %q{1.3.7}
-  s.summary = %q{This is a simple bit.ly ruby client}
-  s.test_files = [
-    "spec/ruby-bitly_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-client>, ["= 1.6.0"])
-      s.add_runtime_dependency(%q<json_pure>, ["= 1.4.3"])
-      s.add_development_dependency(%q<rake>, ["= 0.8.7"])
-      s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
-    else
-      s.add_dependency(%q<rest-client>, ["= 1.6.0"])
-      s.add_dependency(%q<json_pure>, ["= 1.4.3"])
-      s.add_dependency(%q<rake>, ["= 0.8.7"])
-      s.add_dependency(%q<rspec>, ["= 1.3.0"])
-    end
-  else
-    s.add_dependency(%q<rest-client>, ["= 1.6.0"])
-    s.add_dependency(%q<json_pure>, ["= 1.4.3"])
-    s.add_dependency(%q<rake>, ["= 0.8.7"])
-    s.add_dependency(%q<rspec>, ["= 1.3.0"])
-  end
+  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_development_dependency('vcr', '~> 1.10.0')
+  s.add_development_dependency('webmock', '~> 1.6.4')
 end
-

data/spec/ruby-bitly_spec.rb

@@ -1,32 +1,39 @@
+# -*- encoding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "RubyBitly" do
-  
+
   before(:all) do
     @login = 'rafaeldx7'
     @key = 'R_59c1b174b21d92b2beeb4787a6d7ebaf'
   end
 
   it "Shorten long url" do
-    response = Bitly.shorten("http://google.com", @login, @key)
-    
+    response = VCR.use_cassette('shorten_long_url') do
+      Bitly.shorten("http://google.com", @login, @key)
+    end
+
     response.status_code.should == 200
     response.status_txt.should == "OK"
     response.new_hash.should == 0
-    response.global_hash.should == "zzzzzzz"
+    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]*/
   end
-  
+
   it "Shorten bitly url" do
-    response = Bitly.shorten("http://bit.ly/bcvNe5", @login, @key)
-    
+    response = VCR.use_cassette('shorten_bitly_url') do
+      Bitly.shorten("http://bit.ly/bcvNe5", @login, @key)
+    end
+
     response.status_code.should == 500
   end
 
   it "Expand a short url to it long url" do
-    response = Bitly.expand("http://bit.ly/bcvNe5", @login, @key)
-    
+    response = VCR.use_cassette('expand_a_short_url_to_it_long_url') do
+      Bitly.expand("http://bit.ly/bcvNe5", @login, @key)
+    end
+
     response.status_code.should == 200
     response.status_txt.should == "OK"
     response.long_url.should == "http://google.com"
@@ -35,18 +42,22 @@ describe "RubyBitly" do
   end
 
   it "Expand a long url should result an error" do
-    response = Bitly.expand("http://google.com", @login, @key)
-    
+    response = VCR.use_cassette('expand_a_long_url_should_result_an_error') do
+      Bitly.expand("http://google.com", @login, @key)
+    end
+
     response.status_code.should == 200
     response.status_txt.should == "OK"
     response.long_url.should == "NOT_FOUND"
     response.short_url.should == "http://google.com"
   end
 
-  
+
   it "Get clicks by short_url" do
-    bitly = Bitly.get_clicks("http://bit.ly/xlii42", @login, @key)
-    
+    bitly = VCR.use_cassette('get_clicks_by_short_url') do
+      Bitly.get_clicks("http://bit.ly/xlii42", @login, @key)
+    end
+
     bitly.status_txt.should == "OK"
     bitly.status_code.should == 200
     bitly.global_clicks.should be_an_instance_of Fixnum

data/spec/spec_helper.rb

@@ -1,9 +1,14 @@
+# -*- encoding: utf-8 -*-
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'ruby-bitly'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
+require 'vcr'
 
-Spec::Runner.configure do |config|
-  
+VCR.config do |c|
+  c.cassette_library_dir = 'fixtures/vcr_cassettes'
+  c.ignore_localhost = true
+  c.stub_with :webmock # or :fakeweb
+  c.default_cassette_options = { :record => :once }
 end

metadata

@@ -1,145 +1,126 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-bitly
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.1.5.beta3
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - rafaeldx7
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-10 00:00:00 -03:00
-default_executable: bitly
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-06-11 00:00:00.000000000 -03:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rest-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157460620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
-        version: 1.6.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json_pure
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 4
-        - 3
-        version: 1.4.3
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157460620
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2157459020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2157459020
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &2157457440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2157457440
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: &2157445900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.10.0
   type: :development
-  version_requirements: *id004
-description: This is a simple bit.ly ruby client
-email: rafaeldx7@gmail.com
-executables: 
+  prerelease: false
+  version_requirements: *2157445900
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &2157443140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :development
+  prerelease: false
+  version_requirements: *2157443140
+description: A simple bit.ly ruby client
+email:
+- rafaeldx7@gmail.com
+executables:
 - bitly
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
-- .document
+extra_rdoc_files: []
+files:
 - .gitignore
+- .rspec
 - CHANGELOG
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/bitly
-- lib/readme.rb
+- fixtures/vcr_cassettes/expand_a_long_url_should_result_an_error.yml
+- fixtures/vcr_cassettes/expand_a_short_url_to_it_long_url.yml
+- fixtures/vcr_cassettes/get_clicks_by_short_url.yml
+- fixtures/vcr_cassettes/shorten_bitly_url.yml
+- fixtures/vcr_cassettes/shorten_long_url.yml
 - lib/ruby-bitly.rb
 - ruby-bitly.gemspec
 - spec/ruby-bitly_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/rafaeldx7/ruby-bitly
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+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: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -71713400600843204
+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: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: This is a simple bit.ly ruby client
-test_files: 
+summary: A simple bit.ly ruby client
+test_files:
 - spec/ruby-bitly_spec.rb
 - spec/spec_helper.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/VERSION

@@ -1 +0,0 @@
-0.1.3

data/lib/readme.rb

@@ -1,137 +0,0 @@
-require 'rdoc/markup/simple_markup'
-require 'rdoc/markup/simple_markup/to_flow'
-require 'rdoc/ri/ri_formatter'
-require 'rdoc/ri/ri_options'
-
-module Readme
-
-  # Display usage information from the comment at the top of
-  # the file. String arguments identify specific sections of the
-  # comment to display. An optional integer first argument
-  # specifies the exit status  (defaults to 0)
-
-  def Readme.usage(*args)
-    exit_code = 0
-
-    if args.size > 0
-      status = args[0]
-      if status.respond_to?(:to_int)
-        exit_code = status.to_int
-        args.shift
-      end
-    end
-
-    # display the usage and exit with the given code
-    usage_no_exit(*args)
-    exit(exit_code)
-  end
-
-  # Display usage
-  def Readme.usage_no_exit(*args)
-    # main_program_file = caller[-1].sub(/:\d+$/, '') # ruby-bitly
-    main_program_file = File.join(File.dirname(__FILE__), '..', 'README.rdoc')
-    
-    comment = File.open(main_program_file) do |file|
-      find_comment(file)
-    end
-
-    comment = comment.gsub(/^\s*#/, '')
-
-    markup = SM::SimpleMarkup.new
-    flow_convertor = SM::ToFlow.new
-    
-    flow = markup.convert(comment, flow_convertor)
-
-    format = "plain"
-
-    unless args.empty?
-      flow = extract_sections(flow, args)
-    end
-
-    options = RI::Options.instance
-    if args = ENV["RI"]
-      options.parse(args.split)
-    end
-    formatter = options.formatter.new(options, "")
-    formatter.display_flow(flow)
-  end
-
-  ######################################################################
-
-  private
-
-  # Find the first comment in the file (that isn't a shebang line)
-  # If the file doesn't start with a comment, report the fact
-  # and return empty string
-
-  def Readme.gets(file)
-    if (line = file.gets) && (line =~ /^#!/) # shebang
-      throw :exit, find_comment(file)
-    else
-      line
-    end
-  end
-
-  def Readme.find_comment(file)
-    catch(:exit) do
-      # skip leading blank lines
-      0 while (line = gets(file)) && (line =~ /^\s*$/)
-
-      comment = []
-      while line # && line =~ /^\s*#/ # ruby-bitly
-        comment << line
-        line = gets(file)
-      end
-
-      0 while line && (line = gets(file))
-      return no_comment if comment.empty?
-      return comment.join
-    end
-  end
-
-
-  #####
-  # Given an array of flow items and an array of section names, extract those
-  # sections from the flow which have headings corresponding to
-  # a section name in the list. Return them in the order
-  # of names in the +sections+ array.
-
-  def Readme.extract_sections(flow, sections)
-    result = []
-    sections.each do |name|
-      name = name.downcase
-      copy_upto_level = nil
-
-      flow.each do |item|
-        case item
-        when SM::Flow::H
-          if copy_upto_level && item.level >= copy_upto_level
-            copy_upto_level = nil
-          else
-            if item.text.downcase == name
-              result << item
-              copy_upto_level = item.level
-            end
-          end
-        else
-          if copy_upto_level
-            result << item
-          end
-        end
-      end
-    end
-  
-    if result.empty?
-      # puts "Note to developer: requested section(s) [#{sections.join(', ')}] not found"
-      result = flow
-    end
-    result
-  end
-
-  #####
-  # Report the fact that no doc comment count be found
-  def Readme.no_comment
-    $stderr.puts "No usage information available for this program"
-    ""
-  end
-end