google_url_shortener 0.0.8 → 0.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7e051c5d1187a75d31c1719c3049fa07abc54239
+  data.tar.gz: 453977d8dc8274bfed9aba278d1e75d06ea72e84
+SHA512:
+  metadata.gz: 15a9a2a96f4bf9df9230ad93f6cea91f2222017a5327603ad7782342e6e31a11454a16f5f5e29d5a650fde4fa03c378217178ed1543e8267fec381782dd83f0c
+  data.tar.gz: e067b5f8f38d281c5d0b2107cc3b6e64cc492df1bec87cb94f2e7d09996aec694cb7bf0185a52d0ffac026bcfdfcd138dfb6606ad0de0a95143fa17233d8a0cd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    google_url_shortener (0.0.7)
+    google_url_shortener (0.0.9)
       json (>= 1.4.6)
       rest-client (>= 1.6.7)
       trollop (= 1.16.2)

data/lib/google/url_shortener/request.rb

@@ -5,12 +5,12 @@ module Google
       REQUEST_HEADERS = { :content_type => :json, :accept => :json }
 
       def post(params={})
-        response = RestClient.post(BASE_URL, format_post_params(params), REQUEST_HEADERS)
+        response = RestClient.post(format_url, format_post_params(params), REQUEST_HEADERS)
         parse(response)
       end
 
       def get(params={})
-        full_url = [BASE_URL, "?", format_get_params(params)].join
+        full_url = [format_url, "&", format_get_params(params)].join
         response = RestClient.get(full_url)
         parse(response)
       end
@@ -20,6 +20,10 @@ module Google
         JSON.parse(response)
       end
 
+      def format_url
+        "#{BASE_URL}?key=#{self.class.api_key}"
+      end
+
       def format_post_params(params={})
         params.to_json
       end

data/lib/google/url_shortener/url.rb

@@ -3,47 +3,41 @@ module Google
     class Url < Base
       include Request
       attr_reader :long_url, :short_url, :status, :created_at, :analytics
-      
+
       def initialize(opts={})
         opts.each_pair do |k, v|
           self.instance_variable_set(:"@#{k}", v)
         end
       end
-      
+
       def decode!
         params   = validate_and_prepare_params(:shortUrl => self.short_url, :projection => Analytics::PROJECTION_LEVEL)
         response = get(params)
-        
+
         @created_at = Date.parse(response["created"])
         @analytics  = Analytics.from_hash(response["analytics"])
         @long_url   = response["longUrl"]
       end
       alias_method :expand!, :decode!
-      
+
       def encode!
         params   = validate_and_prepare_params(:longUrl => self.long_url)
         response = post(params)
-        
+
         @short_url = response["id"]
       end
       alias_method :shorten!, :encode!
-      
-      private
+
+    private
+
       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 validate(key, hash={})
         if hash[key].nil? || hash[key].empty?
           raise "Key :#{key} missing from request parameters!"

data/lib/google/url_shortener/version.rb

@@ -1,5 +1,5 @@
 module Google
   module UrlShortener
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/spec/lib/google/analytics_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 module Google
   module UrlShortener
     describe Analytics do

data/spec/lib/google/base_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 module Google
   module UrlShortener
     describe Base do

data/spec/lib/google/url_spec.rb

@@ -1,9 +1,11 @@
+require 'spec_helper'
+
 module Google
   module UrlShortener
     describe Url do
       
       it "should have the correct attributes after shortening a URL" do
-        stub_request(Google::UrlShortener::Request::BASE_URL, :method => :post, :fixture => "shorten")
+        stub_request(Google::UrlShortener::Request::BASE_URL + "?key=#{@key}", :method => :post, :fixture => "shorten")
         
         url = Google::UrlShortener::Url.new(:long_url => @long_url)
         url.shorten!

data/spec/lib/url_shortener_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 module Google
   describe UrlShortener do
     

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: google_url_shortener
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Josh Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70213475899700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70213475899700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70213475911420 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70213475911420
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.7
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70213475908640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *70213475908640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.16.2
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70213471842280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70213471842280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70213471840160 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70213471840160
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 description: Google URL Shortener is a library to compress and expand goo.gl URL's.
   It also provides an interface to review the analytics of a short URL.
 email:
@@ -75,7 +89,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -104,26 +118,25 @@ files:
 - spec/spec_helper.rb
 homepage: http://rubygems.org/gems/google_url_shortener
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: google_url_shortener
-rubygems_version: 1.8.10
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple library to shorten and expand goo.gl URL's.
 test_files: []