geoloqi 0.9.9 → 0.9.10

data/README.markdown

@@ -51,6 +51,17 @@ You can send query string parameters with get requests too:
 	# or
 	geoloqi.get 'location/history?count=2'
 
+Hashie::Mash support
+---
+Want to access in a more OOP/JSON style way? Use Hashie::Mash as the response object:
+
+    require 'geoloqi'
+    geoloqi = Geoloqi::Session.new :access_token => 'YOUR OAUTH2 ACCESS TOKEN GOES HERE', :config => {:use_hashie_mash => true}
+    response = geoloqi.get 'layer/info/Gx'
+    response.layer_id    # this works
+    response['layer_id'] # this works too
+    response[:layer_id]  # so does this
+
 Implementing OAuth2
 ---
 
@@ -80,8 +91,9 @@ Here is a simple Sinatra example implementing the OAuth2 flow with Geoloqi:
 	end
   
 	get '/?' do
-	  session[:geoloqi_auth] = geoloqi.get_auth(params[:code], GEOLOQI_REDIRECT_URI) if params[:code] && !geoloqi.access_token?
+	  geoloqi.get_auth(params[:code], GEOLOQI_REDIRECT_URI) if params[:code] && !geoloqi.access_token?
 	  redirect geoloqi.authorize_url(GEOLOQI_REDIRECT_URI) unless geoloqi.access_token?
+    
 	  username = geoloqi.get('account/username')['username']
 	  "You have successfully logged in as #{username}!"
 	end
@@ -132,5 +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?
-* Hashie::Mash and/or SymbolTable support out of the box
+* More Concrete API in addition to the simple one?

data/geoloqi.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'wrong', '= 0.5.0'
   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

data/lib/geoloqi/config.rb

@@ -1,9 +1,15 @@
 module Geoloqi
   class Config
-    attr_accessor :client_id, :client_secret, :adapter, :enable_logging, :redirect_uri
+    attr_accessor :client_id, :client_secret, :redirect_uri, :adapter, :enable_logging, :use_hashie_mash
     def initialize(opts={})
       opts.each {|k,v| send("#{k}=", v)}
       self.enable_logging ||= false
+      self.use_hashie_mash ||= false
+      begin
+        require 'hashie' if self.use_hashie_mash && !defined?(Hashie::Mash)
+      rescue LoadError
+        raise Error, "You've requested Hashie::Mash, but the gem is not available. Don't set use_hashie_mash in your config, or install the hashie gem"
+      end
       raise ArgumentError, 'enable_logging must be boolean' unless [true, false].include? self.enable_logging
     end
 
@@ -15,4 +21,4 @@ module Geoloqi
       !client_secret.nil? && !client_secret.empty?
     end
   end
-end
+end

data/lib/geoloqi/error.rb

@@ -12,4 +12,5 @@ module Geoloqi
   end
 
   class Error < StandardError; end
+  class ArgumentError < ArgumentError; end
 end

data/lib/geoloqi/session.rb

@@ -54,11 +54,11 @@ module Geoloqi
           end
         end
 
-        json = JSON.parse response.body
-        raise ApiError.new(json['error'], json['error_description']) if json.is_a?(Hash) && json['error']
+        hash = JSON.parse response.body
+        raise ApiError.new(hash['error'], hash['error_description']) if hash.is_a?(Hash) && hash['error']
       rescue Geoloqi::ApiError
         raise Error.new('Unable to procure fresh access token from API on second attempt') if retry_attempt > 0
-        if json['error'] == 'expired_token'
+        if hash['error'] == 'expired_token'
           renew_access_token!
           retry_attempt += 1
           retry
@@ -66,7 +66,7 @@ module Geoloqi
           fail
         end
       end
-      json
+      @config.use_hashie_mash ? Hashie::Mash.new(hash) : hash
     end
 
     def renew_access_token!

data/lib/geoloqi/version.rb

@@ -1,5 +1,5 @@
 module Geoloqi
   def self.version
-    '0.9.9'
+    '0.9.10'
   end
 end

data/spec/geoloqi_spec.rb

@@ -48,7 +48,7 @@ describe Geoloqi::Config do
   end
 
   it 'throws exception if non-boolean value is fed to logging' do
-    expect { rescuing { Geoloqi.config(:client_id => '', :client_secret => '', :enable_logging => :cats )}.class == ArgumentError }
+    expect { rescuing { Geoloqi.config(:client_id => '', :client_secret => '', :enable_logging => :cats )}.class == Geoloqi::ArgumentError }
   end
 
   it 'correctly checks booleans for client_id and client_secret' do
@@ -75,6 +75,19 @@ describe Geoloqi::Session do
     end
   end
 
+  describe 'with access token and hashie mash' do
+    before do
+      @session = Geoloqi::Session.new :access_token => 'access_token1234', :config => {:use_hashie_mash => true}
+    end
+
+    it 'should respond to method calls in addition to hash' do
+      response = @session.get 'account/username'
+      expect { response['username'] == 'bulbasaurrulzok' }
+      expect { response.username == 'bulbasaurrulzok' }
+      expect { response[:username] == 'bulbasaurrulzok' }
+    end
+  end
+
   describe 'with access token and no config' do
     before do
       @session = Geoloqi::Session.new :access_token => ARGV[2]
@@ -196,17 +209,17 @@ describe Geoloqi::Session do
       expect { (5..10).include? (Time.rfc2822(response[:expires_at]) - (Time.now+86400)).abs }
     end
 
-    it 'does not refresh when never expires' do    
+    it 'does not refresh when never expires' do
       WebMock.disable_net_connect!
       begin
         response = @session.get_auth '1234', 'http://neverexpires.example.com/'
       ensure
         WebMock.allow_net_connect!
       end
-      
+
       expect { @session.auth[:expires_in] == '0' }
       expect { @session.auth[:expires_at].nil? }
-      
+
       WebMock.disable_net_connect!
       begin
         response = @session.get 'account/username'

metadata

@@ -2,7 +2,7 @@
 name: geoloqi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Kyle Drake
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 -07:00
+date: 2011-07-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,17 @@ dependencies:
         version: 1.6.4
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: hashie
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  version_requirements: *id006
 description: 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.
 email: 
 - kyledrake@gmail.com