ruby-bitly 0.0.3 → 0.0.4

data/README

@@ -0,0 +1,34 @@
+# This app is a simple bitly ruby client.
+
+## Examples
+     bitly -s http://long-url.com.whatever/
+     bitly -e http://bit.ly/whatever
+     bitly --user-clicks http://bit.ly/whatever
+     bitly --global-clicks http://bit.ly/whatever
+
+### Other examples:
+     bitly -q -s http://long-url.com.whatever/
+     bitly --verbose -e http://bit.ly/whatever
+
+## Usage 
+     bitly [options] url
+
+     For help: bitly -h
+
+## Options
+     -s, --shorten        Shorten a long url
+     -e, --expand         Expand a short bitly url
+     -u, --user-clicks    Show user clicks from the short bitly url
+     -g, --global-clicks  Show global clicks from the short bitly url
+                          
+     -h, --help           Displays help message, then exit
+     -v, --version        Display the version, then exit
+     -q, --quiet          Output as little as possible, overrides verbose
+     -V, --verbose        Verbose output
+
+## Author
+     rafaeldx7 ~ rafaeldx7(a)gmail.com
+
+## Copyright
+     Copyright (c) 2010 rafaeldx7. Licensed under the MIT License:
+     http://www.opensource.org/licenses/mit-license.php

data/README.rdoc

@@ -1,17 +1,34 @@
-= ruby-bitly
+= This app is a simple bitly ruby client.
 
-Description goes here.
+ == Examples
+     bitly -s http://long-url.com.whatever/
+     bitly -e http://bit.ly/whatever
+     bitly --user-clicks http://bit.ly/whatever
+     bitly --global-clicks http://bit.ly/whatever
 
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+   Other examples:
+     bitly -q -s http://long-url.com.whatever/
+     bitly --verbose -e http://bit.ly/whatever
 
-== Copyright
+ == Usage 
+     bitly [options] url
 
-Copyright (c) 2010 Rafael. See LICENSE for details.
+     For help: bitly -h
+
+ == Options
+     -s, --shorten        Shorten a long url
+     -e, --expand         Expand a short bitly url
+     -u, --user-clicks    Show user clicks from the short bitly url
+     -g, --global-clicks  Show global clicks from the short bitly url
+                          
+     -h, --help           Displays help message, then exit
+     -v, --version        Display the version, then exit
+     -q, --quiet          Output as little as possible, overrides verbose
+     -V, --verbose        Verbose output
+
+ == Author
+     rafaeldx7 ~ rafaeldx7(a)gmail.com
+
+ == Copyright
+     Copyright (c) 2010 rafaeldx7. Licensed under the MIT License:
+     http://www.opensource.org/licenses/mit-license.php

data/Rakefile

@@ -5,12 +5,15 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "ruby-bitly"
-    gem.summary = %Q{bit.ly ruby client}
-    gem.description = %Q{bit.ly ruby client}
+    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_development_dependency "rest-client", "1.5.1"
+    gem.add_runtime_dependency "rest-client", "1.5.1"
+    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

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/bitly

@@ -1,19 +1,146 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby 
+#     This app is a simple bitly ruby client.
+#
+# == Examples
+#     bitly -s http://long-url.com.whatever/
+#     bitly -e http://bit.ly/whatever
+#     bitly --user-clicks http://bit.ly/whatever
+#     bitly --global-clicks http://bit.ly/whatever
+#
+#   Other examples:
+#     bitly -q -s http://long-url.com.whatever/
+#     bitly --verbose -e http://bit.ly/whatever
+#
+# == Usage 
+#     bitly [options] url
+#
+#     For help: bitly -h
+#
+# == Options
+#     -s, --shorten        Shorten a long url
+#     -e, --expand         Expand a short bitly url
+#     -u, --user-clicks    Show user clicks from the short bitly url
+#     -g, --global-clicks  Show global clicks from the short bitly url
+#                          
+#     -h, --help           Displays help message, then exit
+#     -v, --version        Display the version, then exit
+#     -q, --quiet          Output as little as possible, overrides verbose
+#     -V, --verbose        Verbose output
+#
+# == Author
+#     rafaeldx7 ~ rafaeldx7(a)gmail.com
+#
+# == Copyright
+#     Copyright (c) 2010 rafaeldx7. Licensed under the MIT License:
+#     http://www.opensource.org/licenses/mit-license.php
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'ruby-bitly'
+require 'optparse' 
+require 'rdoc/usage'
+require 'ostruct'
+require 'date'
 
-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" << "\tbitly --user-clicks <url>\n" << "\tbitly --global-clicks <url>\n" << "\n"
+class App
+  VERSION = File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
+  
+  attr_reader :options
+
+  def initialize(arguments, stdin)
+    @arguments = arguments
+    @stdin = stdin
+    
+    # Set defaults
+    @options = OpenStruct.new
+    @options.verbose = false
+    @options.quiet = false
+  end
+
+  # Parse options, check arguments, then process the command
+  def run
+        
+    if parsed_options? && arguments_valid? 
+      
+      puts "Start at #{DateTime.now}\n\n" if @options.verbose
+      
+      output_options if @options.verbose # [Optional]
+            
+      process_arguments            
+      puts process_command.to_s
+      
+      puts "\nFinished at #{DateTime.now}" if @options.verbose
+      
+    else
+      output_usage
+    end
+    
+  end
+  
+  protected
+  
+    def parsed_options?
+      
+      # Specify options
+      opts = OptionParser.new 
+      
+      opts.on('-s', '--shorten')       { @options.shorten = true }
+      opts.on('-e', '--expand')        { @options.expand = true }
+      opts.on('-u', '--user-clicks')   { @options.user_clicks = true }
+      opts.on('-g', '--global-clicks') { @options.global_clicks = true }
+      
+      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 }
+
+      opts.parse!(@arguments) rescue return false
+
+      process_options
+      true      
+    end
+
+    # Performs post-parse processing on options
+    def process_options
+      @options.verbose = false if @options.quiet
+    end
+    
+    def output_options
+      puts "Options:\n"
+      
+      @options.marshal_dump.each do |name, val|        
+        puts "  #{name} = #{val}"
+      end
+    end
+
+    # True if required arguments were provided
+    def arguments_valid?
+      @arguments.length == 1 and (@options.shorten or @options.expand or @options.user_clicks or @options.global_clicks)
+    end
+    
+    # Setup the arguments
+    def process_arguments
+    end
+    
+    def output_help
+      RDoc::usage() #exits app
+    end
+    
+    def output_usage
+      RDoc::usage('usage') # gets usage from comments above
+    end
+    
+    def output_version
+      puts "#{File.basename(__FILE__)} version #{VERSION}"
+    end
+    
+    def process_command
+      return Bitly.shorten(@arguments[0]).short_url if @options.shorten
+      return Bitly.expand(@arguments[0]).long_url if @options.expand
+      return Bitly.clicks(@arguments[0]).user_clicks.to_s if @options.user_clicks
+      return Bitly.clicks(@arguments[0]).global_clicks.to_s if @options.global_clicks
+    end
 end
 
-puts result
+app = App.new(ARGV, STDIN)
+app.run

data/lib/ruby-bitly.rb

@@ -43,61 +43,76 @@ class Bitly
   
   def shorten
     unless read_only?
-      @response = Bitly.post_shorten(@long_url)
+      if @response = Bitly.post_shorten(@long_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
+  end
+  
+  def expand
+    if @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"]
-      @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)
+  def clicks
+    if @response = Bitly.get_clicks(@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"]
+      @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!
+      read_only_now!
+    end
   end
   
-  def clicks
-    @response = Bitly.get_clicks(@short_url)
+  def Bitly.request
+    Bitly.load_personal_data
     
-    @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!
+    begin
+      response = yield
+      JSON.parse(response)
+    rescue
+      response[:error] = "error"
+    end
   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 })
-    JSON.parse(response)
+    Bitly.request do
+      RestClient.post(REST_API_URL + ACTION_PATH[:shorten], { :longURL => new_long_url, :login => @@login, :apiKey => @@key })
+    end
   end
   
   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)
+    Bitly.request do
+      RestClient.post(REST_API_URL + ACTION_PATH[:expand], { :shortURL => new_short_url, :login => @@login, :apiKey => @@key })
+    end
   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)
+    Bitly.request do
+      RestClient.get("#{REST_API_URL}#{ACTION_PATH[:clicks]}?login=#{@@login}&apiKey=#{@@key}&shortUrl=#{new_short_url}")
+      # RestClient.get(REST_API_URL + ACTION_PATH[:clicks], { :login => @@login, :apiKey => @@key, :shortUrl => new_short_url })
+    end
   end
     
   def Bitly.shorten(new_long_url)

data/ruby-bitly.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-bitly}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["rafaeldx7"]
-  s.date = %q{2010-07-02}
+  s.date = %q{2010-08-04}
   s.default_executable = %q{bitly}
-  s.description = %q{bit.ly ruby client}
+  s.description = %q{This is a simple bit.ly ruby client}
   s.email = %q{rafaeldx7@gmail.com}
   s.executables = ["bitly"]
   s.extra_rdoc_files = [
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{bit.ly ruby client}
+  s.summary = %q{This is a simple bit.ly ruby client}
   s.test_files = [
     "spec/ruby-bitly_spec.rb",
      "spec/spec_helper.rb"
@@ -49,12 +49,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rest-client>, ["= 1.5.1"])
+      s.add_runtime_dependency(%q<rest-client>, ["= 1.5.1"])
+      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.5.1"])
+      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.5.1"])
+    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
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-bitly
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - rafaeldx7
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 -03:00
+date: 2010-08-04 00:00:00 -03:00
 default_executable: bitly
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,9 +32,57 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  type: :development
+  type: :runtime
   version_requirements: *id001
-description: bit.ly ruby client
+- !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 
+  name: rake
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id004
+description: This is a simple bit.ly ruby client
 email: rafaeldx7@gmail.com
 executables: 
 - bitly
@@ -91,7 +139,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: bit.ly ruby client
+summary: This is a simple bit.ly ruby client
 test_files: 
 - spec/ruby-bitly_spec.rb
 - spec/spec_helper.rb