google_url_shortener 0.0.1 → 0.0.2

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/*
 *.gem
 .bundle
+examples/*

data/lib/google/url_shortener/base.rb

@@ -1,16 +1,12 @@
-# TODO: remove
-require 'rubygems'
-require 'restclient'
-require 'json'
-# EO TODO
-
 module Google
   module UrlShortener
     class Base
-      URL = "https://www.googleapis.com/urlshortener/v1/url"
-      
       class << self
         
+        def log=(logger)
+          RestClient.log = logger
+        end
+        
         def api_key=(key)
           @@api_key = key
         end

data/lib/google/url_shortener/request.rb

@@ -0,0 +1,32 @@
+module Google
+  module UrlShortener
+    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
+    end
+  end
+end

data/lib/google/url_shortener/url.rb

@@ -1,6 +1,7 @@
 module Google
   module UrlShortener
-    class Url
+    class Url < Base
+      include Request
       attr_reader :long_url, :short_url, :status
       
       def initialize(opts={})
@@ -10,33 +11,42 @@ module Google
       end
       
       def decode!
-        # check for short
-        resp = get(:shortUrl => self.short_url, :projection => "FULL")
+        params   = validate_and_prepare_params(:shortUrl => self.short_url, :projection => "FULL")
+        response = get(params)
+        
         # TODO: get more info from response
-        @long_url = resp["longUrl"]
+        @long_url = response["longUrl"]
       end
+      alias_method :expand!, :decode!
       
       def encode!
-        # check for long
-        resp = post(:longUrl => self.long_url)
-        @short_url = resp["id"]
+        params   = validate_and_prepare_params(:longUrl => self.long_url)
+        response = post(params)
+        
+        @short_url = response["id"]
       end
+      alias_method :shorten!, :encode!
       
       private
-      def post(params={})
-        # check for API key
-        params.merge!(:key => Base.api_key)
-        json = RestClient.post Base::URL, params.to_json, :content_type => :json, :accept => :json
-        JSON.parse(json)
+      def validate_and_prepare_params(params={})
+        params = params_for_request(params)
+        
+        params.each_pair do |k, v|
+          validate(k, params)
+        end
+        
+        params
+      end
+      
+      def params_for_request(params={})
+        base_params = { :key => self.class.api_key }
+        base_params.merge!(params)
       end
       
-      def get(params={})
-        # check for API key
-        params.merge!(:key => Base.api_key)
-
-        json = RestClient.get Base::URL + "?" + params.collect { |k, v| "#{k}=#{v}" }.join("&")
-        puts json
-        JSON.parse(json)
+      def validate(key, hash={})
+        if hash[key].nil? || hash[key].empty?
+          raise "Key :#{key} missing from request parameters!"
+        end
       end
     end
   end

data/lib/google/url_shortener/version.rb

@@ -1,6 +1,6 @@
 module Google
   module UrlShortener
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
     
   end
 end

data/lib/google_url_shortener.rb

@@ -1,16 +1,12 @@
-require 'google/url_shortener/version'
-require 'google/url_shortener/base'
-require 'google/url_shortener/url'
-
-RestClient.log = $stdout
-
-Google::UrlShortener::Base.api_key = "AIzaSyCDp22BuCNkkd_LwQmnzOKA-kA7GXjvOsI"
-
-url = Google::UrlShortener::Url.new(:long_url => "http://blog.josh-nesbitt.net")
-puts url.encode!.inspect
-
-url = Google::UrlShortener::Url.new(:short_url => url.short_url)
-puts url.decode!.inspect
-
-# http://code.google.com/apis/urlshortener/v1/reference.html#method_urlshortener_url_get
-
+# TODO: remove
+require 'rubygems'
+require 'restclient'
+require 'json'
+# EO TODO
+
+ROOT = File.expand_path(File.dirname(__FILE__) + "/..")
+
+%w{ version
+    request
+    base
+    url }.each { |f| require("#{ROOT}/lib/google/url_shortener/#{f}") }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: google_url_shortener
 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: 
 - Josh Nesbitt
@@ -52,6 +52,7 @@ files:
 - google_url_shortener.gemspec
 - lib/google/url_shortener/analytics.rb
 - lib/google/url_shortener/base.rb
+- lib/google/url_shortener/request.rb
 - lib/google/url_shortener/url.rb
 - lib/google/url_shortener/version.rb
 - lib/google_url_shortener.rb