ruby-bitly 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/bitly

@@ -8,8 +8,12 @@ if ARGV[0] == "s"
   result = Bitly.shorten(ARGV[1]).short_url
 elsif ARGV[0] == "e"
   result = Bitly.expand(ARGV[1]).long_url
+elsif ARGV[0] == "--user-clicks"
+  result = Bitly.clicks(ARGV[1]).user_clicks.to_s
+elsif ARGV[0] == "--global-clicks"
+  result = Bitly.clicks(ARGV[1]).global_clicks.to_s
 else
-  result = "Invalid Option!\n" << "Use:\n" << "\tbitly s <url> to shorten url.\n" << "\tbitly e <url> to expand url.\n\n"
+  result = "Invalid Option!\n" << "Use:\n" << "\tbitly s <url> to shorten url.\n" << "\tbitly e <url> to expand url.\n" << "\tbitly --user-clicks <url>\n" << "\tbitly --global-clicks <url>\n" << "\n"
 end
 
 puts result

data/lib/ruby-bitly.rb

@@ -5,11 +5,11 @@ require 'json'
 
 class Bitly
   
-  attr_reader :response, :status_code, :status_txt, :new_hash, :global_hash, :user_hash, :hash, :response, :long_url, :short_url
+  attr_reader :response, :status_code, :status_txt, :new_hash, :global_hash, :user_hash, :hash, :response, :long_url, :short_url, :global_clicks, :user_clicks
   
   PERSONAL_FILE_PATH = "#{ENV['HOME']}/.bitly"
   REST_API_URL = "http://api.bit.ly"
-  ACTION_PATH = { :shorten => '/v3/shorten', :expand => '/v3/expand' }
+  ACTION_PATH = { :shorten => '/v3/shorten', :expand => '/v3/expand', :clicks => '/v3/clicks' }
   
   def initialize
     @read_only = false
@@ -59,6 +59,7 @@ class Bitly
   
   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"]
@@ -68,6 +69,19 @@ class Bitly
     read_only_now!
   end
   
+  def clicks
+    @response = Bitly.get_clicks(@short_url)
+    
+    @global_clicks = @response["data"]["clicks"].first["global_clicks"]
+    @user_clicks = @response["data"]["clicks"].first["user_clicks"]
+    @global_hash = @response["data"]["clicks"].first["global_hash"]
+    @user_hash = @response["data"]["clicks"].first["user_hash"]
+    @status_code = @response["status_code"]
+    @status_txt = @response["status_txt"]
+
+    read_only_now!
+  end
+  
   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 })
@@ -80,6 +94,12 @@ class Bitly
     JSON.parse(response)
   end
   
+  def Bitly.get_clicks(new_short_url)
+    Bitly.load_personal_data
+    response = RestClient.get("#{REST_API_URL}#{ACTION_PATH[:clicks]}?login=#{@@login}&apiKey=#{@@key}&shortUrl=#{new_short_url}")
+    JSON.parse(response)
+  end
+    
   def Bitly.shorten(new_long_url)
     bitly = Bitly.new
     bitly.long_url = new_long_url
@@ -93,4 +113,11 @@ class Bitly
     bitly.expand
     bitly
   end
+  
+  def Bitly.clicks(new_short_url)
+    bitly = Bitly.new
+    bitly.short_url = new_short_url
+    bitly.clicks
+    bitly
+  end
 end

data/ruby-bitly.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-bitly}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["rafaeldx7"]

data/spec/ruby-bitly_spec.rb

@@ -10,7 +10,7 @@ describe "RubyBitly" do
   
   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"
     response["data"]["new_hash"].should == 0
@@ -49,7 +49,7 @@ describe "RubyBitly" 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"
@@ -68,7 +68,7 @@ describe "RubyBitly" do
   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"
@@ -93,6 +93,11 @@ describe "RubyBitly" do
     url.read_only?.should be true
   end
   
+  it "Stats object should be read only" do
+    url = Bitly.clicks "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"
@@ -111,11 +116,11 @@ describe "RubyBitly" do
     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"
@@ -124,6 +129,19 @@ describe "RubyBitly" do
     url.status_txt.should == "OK"
   end
   
+  it "Get clicks and return an object" do
+    url = Bitly.clicks "http://bit.ly/xlii42"
+    url.should be_an_instance_of(Bitly)
+  
+    url.status_code.should == 200
+    url.status_txt.should == "OK"
+    url.global_clicks.should be_an_instance_of Fixnum
+    url.user_clicks.should be_an_instance_of Fixnum
+    url.short_url.should == "http://bit.ly/xlii42"
+    url.global_hash == "cunZEP"
+    url.user_hash.should == "cT1Izu"
+  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"
@@ -142,4 +160,30 @@ describe "RubyBitly" do
     url.short_url = "http://bit.ly/bcvNe5"
     url.short_url.should == "http://bit.ly/xlii42"
   end
+  
+  it "Get clicks by short_url" do
+    bitly = Bitly.get_clicks("http://bit.ly/xlii42")
+    
+    bitly["status_txt"].should == "OK"
+    bitly["status_code"].should == 200
+    bitly["data"]["clicks"].first["global_clicks"].should be_an_instance_of Fixnum
+    bitly["data"]["clicks"].first["user_clicks"].should be_an_instance_of Fixnum
+    bitly["data"]["clicks"].first["short_url"].should == "http://bit.ly/xlii42"
+    bitly["data"]["clicks"].first["global_hash"].should == "cunZEP"
+    bitly["data"]["clicks"].first["user_hash"].should == "cT1Izu"
+  end
+  
+  it "Clicks with an object" do
+    url = Bitly.new
+    url.short_url = "http://bit.ly/xlii42"
+    url.clicks
+    
+    url.status_code.should == 200
+    url.status_txt.should == "OK"
+    url.global_clicks.should be_an_instance_of Fixnum
+    url.user_clicks.should be_an_instance_of Fixnum
+    url.short_url.should == "http://bit.ly/xlii42"
+    url.global_hash == "cunZEP"
+    url.user_hash.should == "cT1Izu"
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-bitly
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - rafaeldx7