geoloqi 0.9.18 → 0.9.19

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.9.2
+  - rbx
+  - rbx-2.0
+  - jruby

data/README.markdown

@@ -1,4 +1,4 @@
-Geoloqi Library for Ruby
+Geoloqi Library for Ruby [![](https://secure.travis-ci.org/geoloqi/geoloqi-ruby.png)](http://travis-ci.org/geoloqi/geoloqi-ruby)
 ===
 Powerful, flexible, lightweight interface to the awesome Geoloqi platform API! Uses Faraday, and can be used with Ruby 1.9 and EM-Synchrony for really fast, highly concurrent development.
 
@@ -144,4 +144,4 @@ TODO / Possible projects
 ---
 * Plugin for Sinatra
 * Rails plugin (works fine as-is, but maybe we can make it easier?)
-* More Concrete API in addition to the simple one?
+* More Concrete API in addition to the simple one?

data/geoloqi.gemspec

@@ -22,4 +22,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest', '= 2.2.2'
   s.add_development_dependency 'webmock', '= 1.6.4'
   s.add_development_dependency 'hashie',  '= 1.0.0'
-end
+end

data/lib/geoloqi/session.rb

@@ -49,13 +49,15 @@ module Geoloqi
         raise ApiError.new(response.status, hash['error'], hash['error_description']) if hash.is_a?(Hash) && hash['error'] && @config.throw_exceptions
       rescue Geoloqi::ApiError
         raise Error.new('Unable to procure fresh access token from API on second attempt') if retry_attempt > 0
-        if hash['error'] == 'expired_token'
+        if hash['error'] == 'expired_token' && !(hash['error_description'] =~ /The auth code expired/)
           renew_access_token!
           retry_attempt += 1
           retry
         else
           fail
         end
+      rescue JSON::ParserError
+        raise Geoloqi::Error, "API returned invalid JSON. Status: #{response.status} Body: #{response.body}"
       end
       @config.use_hashie_mash ? Hashie::Mash.new(hash) : hash
     end

data/lib/geoloqi/version.rb

@@ -1,5 +1,5 @@
 module Geoloqi
   def self.version
-    '0.9.18'
+    '0.9.19'
   end
 end

data/spec/geoloqi_spec.rb

@@ -4,9 +4,7 @@ require './lib/geoloqi.rb'
 require 'minitest/autorun'
 require 'wrong'
 require 'wrong/adapters/minitest'
-require 'em-http-request' if RUBY_VERSION[0..2].to_f >= 1.9 # Preload for WebMock
 require 'webmock'
-require 'webmock/http_lib_adapters/em_http_request'
 
 CLIENT_ID = 'client_id1234'
 CLIENT_SECRET = 'client_secret1234'
@@ -145,6 +143,18 @@ describe Geoloqi::Session do
       @session = Geoloqi::Session.new :access_token => ACCESS_TOKEN
     end
 
+    it 'throws an exception on a hard request error' do
+      stub_request(:get, api_url('crashing_method')).
+        with(:headers => auth_headers).
+        to_return(:status => 500, :body => 'Something broke hard!')
+
+        expect { rescuing {Geoloqi::Session.new(:access_token => 'access_token1234').get('crashing_method')}.class == Geoloqi::Error }
+        expect { 
+          rescuing {Geoloqi::Session.new(:access_token => 'access_token1234').get('crashing_method')}.message == 
+          "API returned invalid JSON. Status: 500 Body: Something broke hard!"
+        }
+    end
+
     it 'successfully makes mock call with array' do
       stub_request(:post, api_url('play_record_at_geoloqi_hq')).
         with(:headers => auth_headers, :body => [{:artist => 'Television'}].to_json).
@@ -223,22 +233,6 @@ describe Geoloqi::Session do
     end
   end
 
-  # Ruby 1.9 only!
-  if RUBY_VERSION[0..2].to_f >= 1.9
-    begin
-      require 'em-synchrony'
-    rescue LoadError
-      puts 'NOTE: You need the em-synchrony gem for all tests to pass: gem install em-synchrony'
-    end
-    describe 'with em synchrony adapter and access token' do
-      it 'makes call to api' do
-        session = Geoloqi::Session.new :access_token => ACCESS_TOKEN, :config => {:adapter => :em_synchrony}
-        response = session.get 'layer/info/Gx'
-        expect { response['layer_id'] == 'Gx' }
-      end
-    end
-  end
-
   describe 'with client id, client secret, and access token via direct hash' do
     before do
       @session = Geoloqi::Session.new :access_token => ACCESS_TOKEN,
@@ -318,8 +312,6 @@ describe Geoloqi::Session do
                             :refresh_token => 'refresh_token1234'}.each do |k,v|
         expect { response[k] == v }
       end
-
-      expect { (5..10).include? (Time.rfc2822(response[:expires_at]) - (Time.now+86400)).abs }
     end
 
     it 'does not refresh when never expires' do
@@ -333,6 +325,10 @@ describe Geoloqi::Session do
                             :scope => nil,
                             :expires_in => '0',
                             :refresh_token => 'never_expires'}.to_json)
+                            
+      stub_request(:get, api_url('account/username')).
+        with(:headers => {'Authorization'=>'OAuth access_token1234'}).
+        to_return(:body => {:username => 'bulbasaurrulzok'}.to_json)
 
       response = @session.get_auth '1234', 'http://neverexpires.example.com/'
 
@@ -344,6 +340,25 @@ describe Geoloqi::Session do
       expect { @session.auth[:access_token] == 'access_token1234' }
       expect { response['username'] == 'bulbasaurrulzok' }
     end
+    
+    it 'does not attempt to refresh for auth code expire' do
+      stub_request(:post, api_url('oauth/token')).
+        with(:body => {:client_id => CLIENT_ID,
+                       :client_secret => CLIENT_SECRET,
+                       :grant_type => "authorization_code",
+                       :code => "1234",
+                       :redirect_uri => "http://expired_code.example.com/"}.to_json).
+        to_return(:body => {:access_token => 'access_token1234',
+                            :scope => nil,
+                            :expires_in => '0',
+                            :refresh_token => 'never_expires'}.to_json)
+      
+      stub_request(:get, api_url('account/username?code=1234')).
+        with(:headers => auth_headers).
+        to_return(:status => 200, :body => {:points => [1,2]}.to_json)
+      
+      # FINISH IMPLEMENTING
+    end
   end
 
   describe 'with config and expired auth' do

metadata

@@ -2,7 +2,7 @@
 name: geoloqi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.18
+  version: 0.9.19
 platform: ruby
 authors: 
 - Kyle Drake
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 -07:00
+date: 2011-08-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.markdown
 - Rakefile
@@ -142,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: geoloqi
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Powerful, flexible, lightweight interface to the awesome Geoloqi platform API