google_url_shortener 0.0.6 → 0.0.7

data/lib/google/url_shortener/cli.rb

@@ -1,65 +1,65 @@
-require 'trollop'
+  require 'trollop'
 module Google
   module UrlShortener
     class CLI
       KEY_FILE = ".googl"
       KEY_PATH = "#{ENV["HOME"]}/#{KEY_FILE}"
       attr_reader :key, :options
-      
+
       def initialize(args)
         @options = parse!(args)
       end
-      
+
       def run!
         command = self.options[:command].to_sym
         args    = self.options[:args]
-        
+
         unless [:install].include?(command)
           validate_key!
         end
-        
+
         case command
         when :shorten, :s
           url   = validate!(:url, args.first)
           short = UrlShortener.shorten!(url)
-          
+
           log(short)
         when :expand, :e
           short = validate!(:url, args.first)
           url   = Url.new(:short_url => short)
           url.expand!
-          
+
           out = [url.long_url]
-          
+
           if self.options[:analytics]
             out << decode_analytics(url)
             out.flatten!
           end
-          
+
           log(out)
        when :install
          key = validate!(:key, args.first)
-         
+
          install_key!(key)
          log "+ Installed key '#{key}' to #{KEY_PATH}"
         else
           die("unknown command '#{self.options[:command]}'")
         end
       end
-      
+
       private
       def decode_analytics(url)
         out = [""]
         groups = [:all, :month, :week, :day, :two_hours]
         sub_groups = [:short_url_clicks, :long_url_clicks, :referrers, :countries, :browsers, :platforms]
-        
+
         groups.each do |g|
-          out << g.upcase
+          out << g.to_s.upcase
           group = url.analytics.send(g)
-          
+
           sub_groups.each do |s|
             sub = group.send(s)
-            
+
             if sub.is_a?(Hash)
               out << "#{" " * 2}#{s}:"
               out << sub.collect do |k, v|
@@ -69,51 +69,51 @@ module Google
               out << "#{" " * 2}#{s}: #{sub}"
             end
           end
-          
+
           out << ""
         end
-        
+
         out
       end
-      
+
       def parse!(args)
         opts = Trollop::options(args) do
           version VERSION
           banner File.read("#{GEM_ROOT}/USAGE")
-          
+
           opt :analytics, "Show analytics when expanding a URL", :short => "-a", :default => false
         end
-        
+
         opts.merge!(:command => args.shift)
         opts.merge!(:args => args)
-        
+
         die("missing parameter (command)") if opts[:command].nil?
-        
+
         opts
       end
-      
+
       def install_key!(key)
         File.open(KEY_PATH, 'w') {|f| f.write(key) }
       end
-      
+
       def validate_key!
         if File.exists?(KEY_PATH)
           @key = File.read(KEY_PATH)
-          
+
           Base.api_key = @key
         else
           die("could not find API key. Please run the 'install' command to initialize.")
         end
       end
-      
+
       def log(*things)
         $stdout.puts(*things)
       end
-      
+
       def validate!(key, value)
         value.nil? ? die("missing parameter (#{key})") : value
       end
-      
+
       def die(message)
         Trollop::die(message)
       end

data/lib/google/url_shortener/request.rb

@@ -3,27 +3,27 @@ module Google
     module Request
       BASE_URL = "https://www.googleapis.com/urlshortener/v1/url"
       REQUEST_HEADERS = { :content_type => :json, :accept => :json }
-      
+
       def post(params={})
         response = RestClient.post(BASE_URL, format_post_params(params), REQUEST_HEADERS)
         parse(response)
       end
-      
+
       def get(params={})
         full_url = [BASE_URL, "?", format_get_params(params)].join
         response = RestClient.get(full_url)
         parse(response)
       end
-      
+
       private
       def parse(response)
         JSON.parse(response)
       end
-      
+
       def format_post_params(params={})
         params.to_json
       end
-      
+
       def format_get_params(params={})
         params.collect { |k, v| "#{k}=#{v}" }.join("&")
       end

data/lib/google/url_shortener/version.rb

@@ -1,6 +1,6 @@
 module Google
   module UrlShortener
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
 
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: google_url_shortener
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Josh Nesbitt
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-02 00:00:00 +00:00
-default_executable: 
+date: 2012-07-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -105,7 +104,6 @@ files:
 - spec/lib/google/url_spec.rb
 - spec/lib/url_shortener_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/google_url_shortener
 licenses: []
 
@@ -129,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: google_url_shortener
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A simple library to shorten and expand goo.gl URL's.