googl 0.6.0 → 0.6.1

data/.travis.yml

@@ -1,4 +1,8 @@
 language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
 branches:
   only:
     - master

data/Gemfile

@@ -1,12 +1,12 @@
 source "http://rubygems.org"
 
-gem "httparty", ">= 0.6.1"
+gem "httparty", "~> 0.8.3"
 gem "json", ">= 1.4.6"
 
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
+  gem "rspec", "~> 2.10.0"
+  gem "bundler", "~> 1.1.3"
+  gem "jeweler", "~> 1.8.3"
   gem "rcov", ">= 0"
-  gem "webmock", "~> 1.6.2"
+  gem "webmock", "~> 1.8.6"
 end

data/Gemfile.lock

@@ -1,39 +1,45 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.2)
+    addressable (2.2.8)
     crack (0.1.8)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     git (1.2.5)
-    httparty (0.7.4)
-      crack (= 0.1.8)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    httparty (0.8.3)
+      multi_json (~> 1.0)
+      multi_xml
+    jeweler (1.8.3)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+      rdoc
     json (1.5.1)
-    rake (0.8.7)
+    multi_json (1.3.4)
+    multi_xml (0.4.4)
+    rake (0.9.2.2)
     rcov (0.9.9)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    webmock (1.6.2)
-      addressable (>= 2.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.0)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    webmock (1.8.6)
+      addressable (>= 2.2.7)
       crack (>= 0.1.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  httparty (>= 0.6.1)
-  jeweler (~> 1.5.2)
+  bundler (~> 1.1.3)
+  httparty (~> 0.8.3)
+  jeweler (~> 1.8.3)
   json (>= 1.4.6)
   rcov
-  rspec (~> 2.3.0)
-  webmock (~> 1.6.2)
+  rspec (~> 2.10.0)
+  webmock (~> 1.8.6)

data/README.rdoc

@@ -4,7 +4,7 @@ Google URL Shortener API in Ruby
 
 == Continuous Integration
 
-http://travis-ci.org/zigotto/googl.png Travis[http://travis-ci.org/zigotto/googl]
+{<img src="https://secure.travis-ci.org/zigotto/googl.png" />}[http://travis-ci.org/zigotto/googl]
 
 == Basic Usage
 

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/googl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "googl"
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jesus Lopes"]
@@ -66,47 +66,37 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/zigotto/googl"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
+  s.rubygems_version = "1.8.24"
   s.summary = "Wrapper for Google URL Shortener API"
-  s.test_files = [
-    "spec/googl/client_spec.rb",
-    "spec/googl/expand_spec.rb",
-    "spec/googl/oauth2/native_spec.rb",
-    "spec/googl/oauth2/server_spec.rb",
-    "spec/googl/request_spec.rb",
-    "spec/googl/shorten_spec.rb",
-    "spec/shared_examples.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     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<httparty>, ["~> 0.8.3"])
       s.add_runtime_dependency(%q<json>, [">= 1.4.6"])
-      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<rspec>, ["~> 2.10.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<webmock>, ["~> 1.6.2"])
+      s.add_development_dependency(%q<webmock>, ["~> 1.8.6"])
     else
-      s.add_dependency(%q<httparty>, [">= 0.6.1"])
+      s.add_dependency(%q<httparty>, ["~> 0.8.3"])
       s.add_dependency(%q<json>, [">= 1.4.6"])
-      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<rspec>, ["~> 2.10.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.1.3"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<webmock>, ["~> 1.6.2"])
+      s.add_dependency(%q<webmock>, ["~> 1.8.6"])
     end
   else
-    s.add_dependency(%q<httparty>, [">= 0.6.1"])
+    s.add_dependency(%q<httparty>, ["~> 0.8.3"])
     s.add_dependency(%q<json>, [">= 1.4.6"])
-    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<rspec>, ["~> 2.10.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.1.3"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<webmock>, ["~> 1.6.2"])
+    s.add_dependency(%q<webmock>, ["~> 1.8.6"])
   end
 end
 

data/lib/googl.rb

@@ -86,7 +86,7 @@ module Googl
   # For mor details, see http://code.google.com/intl/pt-BR/apis/urlshortener/v1/reference.html#resource_url
   #
   def expand(url=nil, options={})
-    raise ArgumentError.new("URL to expand is required") if url.blank?
+    raise ArgumentError.new("URL to expand is required") if url.nil? || url.strip.empty?
     options = {:shortUrl => url, :projection => nil}.merge!(options)
     Googl::Expand.new(options)
   end

data/lib/googl/client_login.rb

@@ -45,7 +45,7 @@ module Googl
     #   history = client.history(:projection => :analytics_clicks)
     #
     def history(options={})
-      resp = options.blank? ? get(Googl::Utils::API_HISTORY_URL) : get(Googl::Utils::API_HISTORY_URL, :query => options)
+      resp = (options.nil? || options.empty?) ? get(Googl::Utils::API_HISTORY_URL) : get(Googl::Utils::API_HISTORY_URL, :query => options)
       case resp.code
       when 200
         self.items = resp.parsed_response.to_openstruct

data/lib/googl/oauth2/utils.rb

@@ -18,7 +18,7 @@ module Googl
       #
       def history(options={})
         return unless authorized?
-        resp = options.blank? ? get(Googl::Utils::API_HISTORY_URL) : get(Googl::Utils::API_HISTORY_URL, :query => options)
+        resp = (options.nil? || options.empty?) ? get(Googl::Utils::API_HISTORY_URL) : get(Googl::Utils::API_HISTORY_URL, :query => options)
         case resp.code
         when 200
           self.items = resp.parsed_response.to_openstruct

data/spec/googl/client_spec.rb

@@ -71,7 +71,7 @@ describe Googl::ClientLogin do
       it { item.label.should == 'http://goo.gl/Ue8sQ' }
       it { item.long_url.should == 'http://facebook.com/' }
       it { item.status.should == 'OK' }
-      it { item.created.should be_instance_of(Time)}
+      it { item.created.should == "2011-01-13T21:39:17.271+00:00"}
 
     end
 

data/spec/googl/expand_spec.rb

@@ -64,7 +64,7 @@ describe Googl::Expand do
             let(:element) { subject.created }
 
             it "should be the time url was shortened" do
-              element.should == Time.iso8601("2011-01-13T03:48:10.309+00:00")
+              element.should == "2011-01-13T03:48:10.309+00:00"
             end
 
           end

data/spec/spec_helper.rb

@@ -58,15 +58,16 @@ def fake_urls?(status)
     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'))
+       with(:body => {"accountType"=>"HOSTED_OR_GOOGLE", "service"=>"urlshortener", "Email"=>"my_user@gmail.com", "source"=>"gem-googl-ruby", "Passwd"=>"my_valid_password"},
+            :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'))
+    stub_request(:post, url_login).
+       with(:body => {"Email"=>"my_invalid_gmail", "Passwd"=>"my_invalid_passwod", "source"=>"gem-googl-ruby", "service"=>"urlshortener", "accountType"=>"HOSTED_OR_GOOGLE"},
+            :headers => {'Authorization'=>'GoogleLogin auth=DQAAAK8AAAC9ahL-o7g', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+       to_return(load_fixture('client_login_invalid.json'))
 
     # Shorten authenticated
     params = "{\"longUrl\":\"http://www.zigotto.net\"}"

metadata

@@ -1,141 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: googl
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 0.6.1
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
 platform: ruby
-authors: 
+authors:
 - Jesus Lopes
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
-        version: 0.6.1
+date: 2012-05-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.3
   type: :runtime
   prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.3
+- !ruby/object:Gem::Dependency
   name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.6
   type: :runtime
   prerelease: false
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.6
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
   type: :development
   prerelease: false
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+- !ruby/object:Gem::Dependency
   name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
   type: :development
   prerelease: false
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+- !ruby/object:Gem::Dependency
   name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
   type: :development
   prerelease: false
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+- !ruby/object:Gem::Dependency
   name: rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 6
-        - 2
-        version: 1.6.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.6
   type: :development
   prerelease: false
-  requirement: *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.6
 description: Small library for Google URL Shortener API
 email: jlopes@zigotto.com.br
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -183,44 +177,31 @@ files:
 - spec/shared_examples.rb
 - spec/spec_helper.rb
 homepage: http://github.com/zigotto/googl
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2810844095798142690
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Wrapper for Google URL Shortener API
-test_files: 
-- spec/googl/client_spec.rb
-- spec/googl/expand_spec.rb
-- spec/googl/oauth2/native_spec.rb
-- spec/googl/oauth2/server_spec.rb
-- spec/googl/request_spec.rb
-- spec/googl/shorten_spec.rb
-- spec/shared_examples.rb
-- spec/spec_helper.rb
+test_files: []