geoloqi 0.9.19 → 0.9.21

data/Gemfile

@@ -1,2 +1,6 @@
 source :rubygems
 gemspec
+
+platform :jruby do
+  gem 'jruby-openssl'
+end

data/README.markdown

@@ -11,14 +11,25 @@ Installation
 
 Basic Usage
 ---
-Geoloqi uses OAuth2 for authentication, but if you're only working with your own account, you don't need to go through the authorization steps! Simply go to your account settings on the [Geoloqi site](http://geoloqi.com), click on "Connections" and copy the OAuth 2 Access Token. You can use this token to run the following examples:
+Geoloqi uses OAuth2 for authentication, but if you're only working with your own account, you don't need to go through the authorization steps! Simply go to your account settings on the [Geoloqi site](http://geoloqi.com), click on "Connections" and copy the OAuth 2 Access Token. You can use this token to run the following examples.
+
+If you just need to make simple requests, you can just make a simple get or post request from Geoloqi:
+
+    require 'geoloqi'
+    result = Geoloqi.get 'YOUR ACCESS TOKEN', 'layer/info/Gx'
+    puts response.inspect
+
+    # or a POST!
+    result = Geoloqi.post 'YOUR ACCESS TOKEN', 'layer/create', :name => 'Test Layer'
+
+If you're using Geoloqi with OAuth or making multiple requests, we recommend using the Geoloqi::Session class:
 
 	require 'geoloqi'
-	geoloqi = Geoloqi::Session.new :access_token => 'YOUR OAUTH2 ACCESS TOKEN GOES HERE'
+	geoloqi = Geoloqi::Session.new :access_token => 'YOUR ACCESS TOKEN'
 	response = geoloqi.get 'layer/info/Gx'
 	puts response.inspect
 
-This example returns a hash with the following:
+Which returns a hash with the following:
 
 	{"layer_id"=>"Gx", "user_id"=>"4", "type"=>"normal", "name"=>"USGS Earthquakes",
 	 "description"=>"Real-time notifications of earthquakes near you.",

data/lib/geoloqi.rb

@@ -17,15 +17,29 @@ module Geoloqi
   @@enable_logging = false
   @@config = Config.new
 
-  def self.config(opts=nil)
-    return @@config if opts.nil?
-    @@config = Config.new opts
-  end
+  class << self
+    def config(opts=nil)
+      return @@config if opts.nil?
+      @@config = Config.new opts
+    end
+
+    def get(access_token, path, args={})
+      run :get, access_token, path, args
+    end
+
+    def post(access_token, path, args={})
+      run :post, access_token, path, args
+    end
+
+    def run(meth, access_token, path, args={})
+      Session.new(:access_token => access_token).run meth, path, args
+    end
 
-  def self.authorize_url(client_id=nil, redirect_uri=@@config.redirect_uri, opts={})
-    raise "client_id required to authorize url. Pass with Geoloqi.config" unless client_id
-    url = "#{OAUTH_URL}?response_type=code&client_id=#{Rack::Utils.escape client_id}&redirect_uri=#{Rack::Utils.escape redirect_uri}"
-    url += "&#{Rack::Utils.build_query opts}" unless opts.empty?
-    url
+    def authorize_url(client_id=nil, redirect_uri=@@config.redirect_uri, opts={})
+      raise "client_id required to authorize url. Pass with Geoloqi.config" unless client_id
+      url = "#{OAUTH_URL}?response_type=code&client_id=#{Rack::Utils.escape client_id}&redirect_uri=#{Rack::Utils.escape redirect_uri}"
+      url += "&#{Rack::Utils.build_query opts}" unless opts.empty?
+      url
+    end
   end
 end

data/lib/geoloqi/version.rb

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

data/spec/geoloqi_spec.rb

@@ -48,6 +48,25 @@ describe Geoloqi do
                                 "scope=can_party_hard" }
     end
   end
+
+  it 'makes get request' do
+    stub_request(:get, "https://api.geoloqi.com/1/quick_get?lol=cats").
+      with(:headers => {'Authorization'=>'OAuth access_token1234'}).
+      to_return(:body => {:result => 'ok'}.to_json)
+    
+    response = Geoloqi.get ACCESS_TOKEN, '/quick_get', :lol => 'cats'
+    expect { response['result'] == 'ok' }
+  end
+  
+  it 'makes post request' do
+    stub_request(:post, "https://api.geoloqi.com/1/quick_post").
+      with(:headers => {'Authorization'=>'OAuth access_token1234'},
+           :body => {:lol => 'dogs'}.to_json).
+      to_return(:body => {:result => 'ok'}.to_json)
+    
+    response = Geoloqi.post ACCESS_TOKEN, '/quick_post', :lol => 'dogs'
+    expect { response['result'] == 'ok' }
+  end
 end
 
 describe Geoloqi::ApiError do

metadata

@@ -2,99 +2,99 @@
 name: geoloqi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.19
+  version: 0.9.21
 platform: ruby
 authors: 
-- Kyle Drake
-- Aaron Parecki
+  - Kyle Drake
+  - Aaron Parecki
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 -07:00
+date: 2011-08-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: faraday
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.1
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: wrong
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.5.0
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: minitest
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.2.2
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: webmock
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.6.4
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: hashie
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :development
-  version_requirements: *id007
+  - !ruby/object:Gem::Dependency 
+    name: json
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: faraday
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.6.1
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: wrong
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 0.5.0
+    type: :development
+    version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: minitest
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 2.2.2
+    type: :development
+    version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: webmock
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 1.6.4
+    type: :development
+    version_requirements: *id006
+  - !ruby/object:Gem::Dependency 
+    name: hashie
+    prerelease: false
+    requirement: &id007 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 1.0.0
+    type: :development
+    version_requirements: *id007
 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
-- aaron@parecki.com
+  - kyledrake@gmail.com
+  - aaron@parecki.com
 executables: []
 
 extensions: []
@@ -102,23 +102,23 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gitignore
-- .travis.yml
-- Gemfile
-- README.markdown
-- Rakefile
-- examples/simple.rb
-- examples/sinatra.rb
-- examples/sinatra_synchrony.rb
-- geoloqi.gemspec
-- lib/geoloqi.rb
-- lib/geoloqi/config.rb
-- lib/geoloqi/error.rb
-- lib/geoloqi/response.rb
-- lib/geoloqi/session.rb
-- lib/geoloqi/version.rb
-- license.txt
-- spec/geoloqi_spec.rb
+  - .gitignore
+  - .travis.yml
+  - Gemfile
+  - README.markdown
+  - Rakefile
+  - examples/simple.rb
+  - examples/sinatra.rb
+  - examples/sinatra_synchrony.rb
+  - geoloqi.gemspec
+  - lib/geoloqi.rb
+  - lib/geoloqi/config.rb
+  - lib/geoloqi/error.rb
+  - lib/geoloqi/response.rb
+  - lib/geoloqi/session.rb
+  - lib/geoloqi/version.rb
+  - license.txt
+  - spec/geoloqi_spec.rb
 has_rdoc: true
 homepage: http://github.com/geoloqi/geoloqi-ruby
 licenses: []
@@ -127,23 +127,23 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.3.4
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.4
 requirements: []
 
 rubyforge_project: geoloqi
-rubygems_version: 1.5.2
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Powerful, flexible, lightweight interface to the awesome Geoloqi platform API