googl 0.4.0 → 0.4.1

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 gem "httparty", ">= 0.6.1"
+gem "json", "1.5.1"
 
 group :development do
   gem "rspec", "~> 2.3.0"

data/Gemfile.lock

@@ -5,12 +5,13 @@ GEM
     crack (0.1.8)
     diff-lcs (1.1.2)
     git (1.2.5)
-    httparty (0.6.1)
+    httparty (0.7.4)
       crack (= 0.1.8)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    json (1.5.1)
     rake (0.8.7)
     rcov (0.9.9)
     rspec (2.3.0)
@@ -32,6 +33,7 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   httparty (>= 0.6.1)
   jeweler (~> 1.5.2)
+  json (= 1.5.1)
   rcov
   rspec (~> 2.3.0)
   webmock (~> 1.6.2)

data/Rakefile

@@ -19,9 +19,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{Small library for Google URL Shortener API}
   gem.email = "jlopes@zigotto.com.br"
   gem.authors = ["Jesus Lopes"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  gem.add_dependency "httparty", ">= 0.6.1"
+  # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/googl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{googl}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jesus Lopes"]
-  s.date = %q{2011-01-19}
+  s.date = %q{2011-02-16}
   s.description = %q{Small library for Google URL Shortener API}
   s.email = %q{jlopes@zigotto.com.br}
   s.extra_rdoc_files = [
@@ -67,29 +67,29 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, [">= 0.6.1"])
+      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<webmock>, ["~> 1.6.2"])
-      s.add_runtime_dependency(%q<httparty>, [">= 0.6.1"])
     else
       s.add_dependency(%q<httparty>, [">= 0.6.1"])
+      s.add_dependency(%q<json>, ["= 1.5.1"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<webmock>, ["~> 1.6.2"])
-      s.add_dependency(%q<httparty>, [">= 0.6.1"])
     end
   else
     s.add_dependency(%q<httparty>, [">= 0.6.1"])
+    s.add_dependency(%q<json>, ["= 1.5.1"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<webmock>, ["~> 1.6.2"])
-    s.add_dependency(%q<httparty>, [">= 0.6.1"])
   end
 end
 

data/lib/googl.rb

@@ -1,5 +1,6 @@
 require 'httparty'
 require 'ostruct'
+require 'json'
 
 require 'googl/base'
 require 'googl/request'

data/lib/googl/shorten.rb

@@ -10,7 +10,7 @@ module Googl
     #
     def initialize(long_url)
       modify_headers('Content-Type' => 'application/json')
-      options = {"longUrl" => long_url}.inspect
+      options = {"longUrl" => long_url}.to_json
       resp = Request.post(API_URL, :body => options)
       if resp.code == 200
         @short_url  = resp['id']

data/spec/client_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Googl::ClientLogin do
 
   before :each do
-    fake_urls
+    fake_urls? true
   end
 
   context "request a new client login" do

data/spec/expand_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Googl::Expand do
 
   before :each do
-    fake_urls
+    fake_urls? true
   end
 
   context "when expand any goo.gl short URL" do

data/spec/shorten_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Googl::Shorten do
 
   before :each do
-    fake_urls
+    fake_urls? true
   end
 
   context "when request new short url" do

data/spec/spec_helper.rb

@@ -12,76 +12,80 @@ def load_fixture(name)
   File.new(File.join(File.expand_path(File.dirname(__FILE__)), '/fixtures', name))
 end
 
-def fake_urls
-
-  # Shorten
-  url_shorten = "https://www.googleapis.com/urlshortener/v1/url"
-  params = {"longUrl" => "http://www.zigotto.com"}.inspect
-  stub_request(:post, url_shorten).
-    with(:body => params,
-         :headers => {'Content-Type'=>'application/json'}).
-         to_return(load_fixture('shorten.json'))
-
-  # Shorten Unsupported content with type
-  url_shorten = "https://www.googleapis.com/urlshortener/v1/url"
-  params = {"longUrl" => "http://www.uol.com"}.inspect
-  stub_request(:post, url_shorten).
-    with(:body => params).
-         to_return(load_fixture('shorten_invalid_content_type.json'))
-
-  # Expand
-  url_expand = "https://www.googleapis.com/urlshortener/v1/url?shortUrl=http://goo.gl/7lob"
-  stub_request(:get, url_expand).to_return(load_fixture('expand.json'))
-  
-  # Expand with projection FULL
-  url_expand = "https://www.googleapis.com/urlshortener/v1/url?projection=full&shortUrl=http://goo.gl/DWDfi"
-  stub_request(:get, url_expand).to_return(load_fixture('expand_projection_full.json'))
-
-  # Expand with projection ANALYTICS_CLICKS
-  url_expand = "https://www.googleapis.com/urlshortener/v1/url?projection=analytics_clicks&shortUrl=http://goo.gl/DWDfi"
-  stub_request(:get, url_expand).to_return(load_fixture('expand_projection_clicks.json'))
-  
-  # Expand with projection ANALYTICS_TOP_STRINGS
-  url_expand = "https://www.googleapis.com/urlshortener/v1/url?projection=analytics_top_strings&shortUrl=http://goo.gl/DWDfi"
-  stub_request(:get, url_expand).to_return(load_fixture('expand_projection_strings.json'))
-  
-  # Expand error 404
-  url_expand = "https://www.googleapis.com/urlshortener/v1/url?shortUrl=http://goo.gl/blajjddkksijj"
-  stub_request(:get, url_expand).to_return(load_fixture('expand_404.json'))
-  
-  # Expand REMOVED
-  url_expand = "https://www.googleapis.com/urlshortener/v1/url?shortUrl=http://goo.gl/R7f68"
-  stub_request(:get, url_expand).to_return(load_fixture('expand_removed.json'))
-
-  # Authentication
-  url_login = "https://www.google.com/accounts/ClientLogin"
-
-  # ClientLogin valid
-  params = "Passwd=my_valid_password&service=urlshortener&accountType=HOSTED_OR_GOOGLE&Email=my_user%40gmail.com&source=gem-googl-ruby"
-  stub_request(:post, url_login).
-    with(:body => params,
-         :headers => {'Content-Type'=>'application/x-www-form-urlencoded'}).
-         to_return(load_fixture('client_login_valid.json'))
-
-  # ClientLogin invalid
-  params = "Passwd=my_invalid_passwod&service=urlshortener&accountType=HOSTED_OR_GOOGLE&Email=my_invalid_gmail&source=gem-googl-ruby"
-  stub_request(:post, url_login).with(:body => params).to_return(load_fixture('client_login_invalid.json'))
-
-  # Shorten authenticated
-  params = {"longUrl" => "http://www.zigotto.net"}.inspect
-  stub_request(:post, url_shorten).
-    with(:body => params, 
-         :headers => {'Authorization'=>'GoogleLogin auth=DQAAAK8AAAC9ahL-o7g', 'Content-Type'=>'application/json'}).
-         to_return(load_fixture('shorten_authenticated.json'))
-
-  # History
-  stub_request(:get, "https://www.googleapis.com/urlshortener/v1/url/history").
-    with(:headers => {'Authorization'=>'GoogleLogin auth=DQAAAK8AAAC9ahL-o7g'}).
-         to_return(load_fixture('history.json'))
-
-  # History with projection ANALYTICS_CLICKS
-  stub_request(:get, "https://www.googleapis.com/urlshortener/v1/url/history?projection=analytics_clicks").
-    with(:headers => {'Authorization'=>'GoogleLogin auth=DQAAAK8AAAC9ahL-o7g'}).
-         to_return(load_fixture('history_projection_clicks.json'))
+def fake_urls?(status)
+
+  if status
+    # Shorten
+    url_shorten = "https://www.googleapis.com/urlshortener/v1/url"
+    params = "{\"longUrl\":\"http://www.zigotto.com\"}" #json
+    stub_request(:post, url_shorten).
+      with(:body => params,
+           :headers => {'Content-Type'=>'application/json'}).
+           to_return(load_fixture('shorten.json'))
+
+    # Shorten Unsupported content with type
+    url_shorten = "https://www.googleapis.com/urlshortener/v1/url"
+    params = "{\"longUrl\":\"http://www.uol.com\"}" #json
+    stub_request(:post, url_shorten).
+      with(:body => params).
+      to_return(load_fixture('shorten_invalid_content_type.json'))
+
+    # Expand
+    url_expand = "https://www.googleapis.com/urlshortener/v1/url?shortUrl=http://goo.gl/7lob"
+    stub_request(:get, url_expand).to_return(load_fixture('expand.json'))
+
+    # Expand with projection FULL
+    url_expand = "https://www.googleapis.com/urlshortener/v1/url?projection=full&shortUrl=http://goo.gl/DWDfi"
+    stub_request(:get, url_expand).to_return(load_fixture('expand_projection_full.json'))
+
+    # Expand with projection ANALYTICS_CLICKS
+    url_expand = "https://www.googleapis.com/urlshortener/v1/url?projection=analytics_clicks&shortUrl=http://goo.gl/DWDfi"
+    stub_request(:get, url_expand).to_return(load_fixture('expand_projection_clicks.json'))
+
+    # Expand with projection ANALYTICS_TOP_STRINGS
+    url_expand = "https://www.googleapis.com/urlshortener/v1/url?projection=analytics_top_strings&shortUrl=http://goo.gl/DWDfi"
+    stub_request(:get, url_expand).to_return(load_fixture('expand_projection_strings.json'))
+
+    # Expand error 404
+    url_expand = "https://www.googleapis.com/urlshortener/v1/url?shortUrl=http://goo.gl/blajjddkksijj"
+    stub_request(:get, url_expand).to_return(load_fixture('expand_404.json'))
+
+    # Expand REMOVED
+    url_expand = "https://www.googleapis.com/urlshortener/v1/url?shortUrl=http://goo.gl/R7f68"
+    stub_request(:get, url_expand).to_return(load_fixture('expand_removed.json'))
+
+    # Authentication
+    url_login = "https://www.google.com/accounts/ClientLogin"
+
+    # ClientLogin valid
+    params = "Passwd=my_valid_password&service=urlshortener&accountType=HOSTED_OR_GOOGLE&Email=my_user%40gmail.com&source=gem-googl-ruby"
+    stub_request(:post, url_login).
+      with(:body => params,
+           :headers => {'Content-Type'=>'application/x-www-form-urlencoded'}).
+           to_return(load_fixture('client_login_valid.json'))
+
+    # ClientLogin invalid
+    params = "Passwd=my_invalid_passwod&service=urlshortener&accountType=HOSTED_OR_GOOGLE&Email=my_invalid_gmail&source=gem-googl-ruby"
+    stub_request(:post, url_login).with(:body => params).to_return(load_fixture('client_login_invalid.json'))
+
+    # Shorten authenticated
+    params = "{\"longUrl\":\"http://www.zigotto.net\"}"
+    stub_request(:post, url_shorten).
+      with(:body => params, 
+           :headers => {'Authorization'=>'GoogleLogin auth=DQAAAK8AAAC9ahL-o7g', 'Content-Type'=>'application/json'}).
+           to_return(load_fixture('shorten_authenticated.json'))
+
+    # History
+    stub_request(:get, "https://www.googleapis.com/urlshortener/v1/url/history").
+      with(:headers => {'Authorization'=>'GoogleLogin auth=DQAAAK8AAAC9ahL-o7g'}).
+      to_return(load_fixture('history.json'))
+
+    # History with projection ANALYTICS_CLICKS
+    stub_request(:get, "https://www.googleapis.com/urlshortener/v1/url/history?projection=analytics_clicks").
+      with(:headers => {'Authorization'=>'GoogleLogin auth=DQAAAK8AAAC9ahL-o7g'}).
+      to_return(load_fixture('history_projection_clicks.json'))
+  else
+    WebMock.allow_net_connect!
+  end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: googl
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Jesus Lopes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -02:00
+date: 2011-02-16 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,11 +34,27 @@ dependencies:
         - 1
         version: 0.6.1
   requirement: *id001
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: json
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
+        version: 1.5.1
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: rspec
   type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,12 +65,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  requirement: *id002
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: bundler
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,12 +81,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id003
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: jeweler
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,12 +97,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: rcov
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -95,12 +111,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: webmock
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,22 +127,6 @@ dependencies:
         - 6
         - 2
         version: 1.6.2
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: httparty
-  type: :runtime
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
-        version: 0.6.1
   requirement: *id007
 description: Small library for Google URL Shortener API
 email: jlopes@zigotto.com.br