ruby-bitly 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/bitly

@@ -4,5 +4,12 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'ruby-bitly'
 
-url = Bitly.new ARGV[0]
-puts url.bitly
+if ARGV[0] == "s"
+  result = Bitly.shorten(ARGV[1]).short_url
+elsif ARGV[0] == "e"
+  result = Bitly.expand(ARGV[1]).long_url
+else
+  result = "Invalid Option!\n" << "Use:\n" << "\tbitly s <url> to shorten url.\n" << "\tbitly e <url> to expand url.\n\n"
+end
+
+puts result

data/lib/ruby-bitly.rb

@@ -5,15 +5,26 @@ require 'json'
 
 class Bitly
   
-  attr_reader :response, :long_url, :status_code, :status_txt, :new_hash, :global_hash, :hash
+  attr_reader :response, :status_code, :status_txt, :new_hash, :global_hash, :user_hash, :hash, :response, :long_url, :short_url
   
   PERSONAL_FILE_PATH = "#{ENV['HOME']}/.bitly"
   REST_API_URL = "http://api.bit.ly"
-  ACTION_PATH = { :shorten => '/v3/shorten' }
+  ACTION_PATH = { :shorten => '/v3/shorten', :expand => '/v3/expand' }
   
-  def initialize(url)
-    @long_url = url
-    Bitly.load_personal_data
+  def initialize
+    @read_only = false
+  end
+  
+  def read_only?
+    @read_only
+  end
+  
+  def long_url=(url)
+    @long_url = url unless read_only?
+  end
+
+  def short_url=(url)
+    @short_url = url unless read_only?
   end
   
   def Bitly.load_personal_data
@@ -26,26 +37,60 @@ class Bitly
     end
   end
   
+  def read_only_now!
+    @read_only = true
+  end
+  
   def shorten
-    unless @response
-      @response = Bitly.shorten(@long_url)
+    unless read_only?
+      @response = Bitly.post_shorten(@long_url)
     
-      @status_code = response["status_code"]
-      @status_txt = response["status_txt"]
-      @new_hash = response["data"]["new_hash"]
-      @global_hash = response["data"]["global_hash"]
-      @hash = response["data"]["hash"]
-      @bitly = response["data"]["url"]
+      @status_code = @response["status_code"]
+      @status_txt = @response["status_txt"]
+      @long_url = @response["data"]["long_url"]
+      @new_hash = @response["data"]["new_hash"]
+      @global_hash = @response["data"]["global_hash"]
+      @hash = @response["data"]["hash"]
+      @short_url = @response["data"]["url"]
+      
+      read_only_now!
     end
+  end
+  
+  def expand
+    @response = Bitly.post_expand(@short_url)
+    @long_url = @response["data"]["expand"].first["long_url"]
+    @global_hash = @response["data"]["expand"].first["global_hash"]
+    @user_hash = @response["data"]["expand"].first["user_hash"]
+    @status_code = @response["status_code"]
+    @status_txt = @response["status_txt"]
 
-    @bitly
+    read_only_now!
   end
   
-  def Bitly.shorten(new_long_url)
+  def Bitly.post_shorten(new_long_url)
     Bitly.load_personal_data
     response = RestClient.post(REST_API_URL + ACTION_PATH[:shorten], { :longURL => new_long_url, :login => @@login, :apiKey => @@key })
     JSON.parse(response)
   end
   
-  alias :bitly :shorten
+  def Bitly.post_expand(new_short_url)
+    Bitly.load_personal_data
+    response = RestClient.post(REST_API_URL + ACTION_PATH[:expand], { :shortURL => new_short_url, :login => @@login, :apiKey => @@key })
+    JSON.parse(response)
+  end
+  
+  def Bitly.shorten(new_long_url)
+    bitly = Bitly.new
+    bitly.long_url = new_long_url
+    bitly.shorten
+    bitly
+  end
+  
+  def Bitly.expand(new_short_url)
+    bitly = Bitly.new
+    bitly.short_url = new_short_url
+    bitly.expand
+    bitly
+  end
 end

data/ruby-bitly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-bitly}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["rafaeldx7"]
-  s.date = %q{2010-07-01}
+  s.date = %q{2010-07-02}
   s.default_executable = %q{bitly}
   s.description = %q{bit.ly ruby client}
   s.email = %q{rafaeldx7@gmail.com}

data/spec/ruby-bitly_spec.rb

@@ -3,11 +3,13 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "RubyBitly" do
   
   it "Load personal data from ~/.bitly" do
-    Bitly.load_personal_data.should == { "key" => "R_59c1b174b21d92b2beeb4787a6d7ebaf", "login" => "rafaeldx7" }
+    file_data = Bitly.load_personal_data
+    file_data["key"].should_not be_empty
+    file_data["login"].should_not be_empty
   end
   
-  it "Shorten log url staticaly" do
-    response = Bitly.shorten("http://google.com")
+  it "Shorten log url staticaly and return a hash" do
+    response = Bitly.post_shorten "http://google.com"
 
     response["status_code"].should == 200
     response["status_txt"].should == "OK"
@@ -17,15 +19,127 @@ describe "RubyBitly" do
     response["data"]["url"].should match /^http:\/\/bit\.ly\/[A-Za-z0-9]*/
   end
   
-  it "Shorten log url OO" do
-    url = Bitly.new("http://google.com")
-    url.shorten.should match /^http:\/\/bit\.ly\/[A-Za-z0-9]*/
+  it "Shorten log url with an object" do
+    url = Bitly.new
+    url.long_url = "http://google.com"
+    url.shorten
     
     url.status_code.should == 200
     url.status_txt.should == "OK"
     url.new_hash.should == 0
     url.global_hash == "zzzzzzz"
     url.hash.length.should_not == 0
-    url.bitly.should match /^http:\/\/bit\.ly\/[A-Za-z0-9]*/
+    url.short_url.should match /^http:\/\/bit\.ly\/[A-Za-z0-9]*/
+  end
+  
+  it "Expand short url to long url staticaly and return a hash" do
+    Bitly.post_expand("http://bit.ly/bcvNe5").should == { "data"=> 
+                                                            { "expand" => [ 
+                                                              { "long_url" => "http://google.com",
+                                                                "short_url" => "http://bit.ly/bcvNe5",
+                                                                "global_hash" => "zzzzzzz", 
+                                                                "user_hash" => "bcvNe5"}]
+                                                              }, 
+                                                          "status_txt" => "OK", 
+                                                          "status_code" => 200
+                                                        }
+  end
+  
+  it "Expand short url to long url with an object" do
+    url = Bitly.new
+    url.short_url = "http://bit.ly/bcvNe5"
+    url.expand
+
+    url.long_url.should == "http://google.com"
+    url.short_url.should == "http://bit.ly/bcvNe5"
+    url.global_hash.should == "zzzzzzz"
+    url.user_hash.should == "bcvNe5"
+    url.status_code.should == 200
+    url.status_txt.should == "OK"
+  end
+  
+  it "Update object as read only" do
+    url = Bitly.new
+    url.read_only?.should be false
+    url.read_only_now!
+    url.read_only?.should be true
+  end
+  
+  it "Shorten url and return an object" do
+    url = Bitly.shorten("http://google.com")
+    url.should be_an_instance_of(Bitly)
+
+    url.status_code.should == 200
+    url.status_txt.should == "OK"
+    url.long_url.should == "http://google.com"
+    url.new_hash.should == 0
+    url.global_hash.should == "zzzzzzz"
+    url.hash.should match /^[A-Za-z0-9]*$/
+    url.short_url.should match /^http:\/\/bit\.ly\/[A-Za-z0-9]*/
+  end
+  
+  it "New bitly object should be not read only" do
+    url = Bitly.new
+    url.read_only?.should be false
+  end
+  
+  it "Shortened object should be read only" do
+    url = Bitly.shorten "http://google.com"
+    url.read_only?.should be true
+  end
+  
+  it "Expanded object should be read only" do
+    url = Bitly.expand "http://bit.ly/bcvNe5"
+    url.read_only?.should be true
+  end
+  
+  it "Attribute long_url should be updatable when object is not read only" do
+    url = Bitly.new
+    url.long_url = "http://google.com"
+    url.long_url.should == "http://google.com"
+    
+    url.long_url = "http://xlii.com.br"
+    url.long_url.should == "http://xlii.com.br"
+  end
+  
+  it "Attribute long_url should not be updatable when object is read only" do
+    url = Bitly.new
+    url.long_url = "http://google.com"
+    url.long_url.should == "http://google.com"
+    url.read_only_now!
+    
+    url.long_url = "http://xlii.com.br"
+    url.long_url.should == "http://google.com"
+  end
+
+  it "Expand url and return an object" do
+    url = Bitly.expand "http://bit.ly/bcvNe5"
+    url.should be_an_instance_of(Bitly)
+
+    url.long_url.should == "http://google.com"
+    url.short_url.should == "http://bit.ly/bcvNe5"
+    url.global_hash.should == "zzzzzzz"
+    url.user_hash.should == "bcvNe5"
+    url.status_code.should == 200
+    url.status_txt.should == "OK"
+  end
+  
+  it "Attribute short_url should be updated when object is not read only" do
+    url = Bitly.new
+    url.short_url = "http://bit.ly/bcvNe5"
+    url.short_url.should == "http://bit.ly/bcvNe5"
+    
+    url.short_url = "http://bit.ly/xlii42"
+    url.short_url.should == "http://bit.ly/xlii42"
+  end
+  
+  it "Attribute short_url should not be updated when object is read only" do
+    url = Bitly.new
+    url.short_url = "http://bit.ly/xlii42"
+    url.short_url.should == "http://bit.ly/xlii42"
+    url.read_only_now!
+    
+    url.short_url = "http://bit.ly/bcvNe5"
+    url.short_url.should == "http://bit.ly/xlii42"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-bitly
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - rafaeldx7
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 -03:00
+date: 2010-07-02 00:00:00 -03:00
 default_executable: bitly
 dependencies: 
 - !ruby/object:Gem::Dependency