usergrid_ironhorse 0.1.0 → 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 28f2b98a13d3b368760c5b908fc619f41a26b866
+  data.tar.gz: 2d8411645d057ac9101180369dd40e9c95f82cdc
+SHA512:
+  metadata.gz: ee348c8d8f12a749470810483f221a4635c2973f6bb42e4ea1c61e6efc7a70aa239c62a16481d98a9467ab6ac36c02243b9305d1a5b0af0bbe034dba1ad1cfb7
+  data.tar.gz: cbd3e2c9cb112ac2a938fed8de633fb84d9d5f53b35c7ef1ea583230f8c09f4cc24423ad4c58e05de959cf1f23604041c18f21de93d74fa40b0468be0127fb2a

data/README.md

@@ -38,17 +38,20 @@ auth_token is your application token):
 ```
 development:
   application_url: http://localhost:8080/my-organization/my-application
-  auth_token: YWMtc4WjqhcbEeK6UhQQn9SVgQAAATpryjMnLy9oFaPbP-0qIxoUx_4vtaOmpmE
+  client_id: YXA6BVYasLdNEeKBd1A2yYstg
+  client_secret: YXA60Dnbzaxg1ObkE8ffsIxsGzsSo8
   require_login: false
 
 test:
   application_url: http://localhost:8080/my-organization/my-application
-  auth_token: YWMtc4WjqhcbEeK6UhQQn9SVgQAAATpryjMnLy9oFaPbP-0qIxoUx_4vtaOmpmE
+  client_id: YXA6BVYasLdNEeKBd1A2yYstg
+  client_secret: YXA60Dnbzaxg1ObkE8ffsIxsGzsSo8
   require_login: false
 
 production:
   application_url: http://api.usergrid.com/my-organization/my-application
-  auth_token: YWMtc4WjqhcbEeK6UhQQn9SVgQAAATpryjMnLy9oFaPbP-0qIxoUx_4vtaOmpmE
+  client_id: YXA6BVYasLdNEeKBd1A2yYstg
+  client_secret: YXA60Dnbzaxg1ObkE8ffsIxsGzsSo8
   require_login: false
 ```
 
@@ -149,6 +152,10 @@ usergrid_ironhorse/spec/spec_settings.yaml to match.)
 
 ## Release notes
 
+### 0.1.0
+* New Features
+  1. Now prefer application client_id and client_secret (instead of auth_token) in usergrid.yml.
+
 ### 0.1.0
 * New Features
   1. next_page() added to return the next page of results from the server. An example of this used in conjunction

data/lib/extensions/resource.rb

@@ -1,15 +1,38 @@
 # overrides methods dealing with auth_token to operate on a thread basis
 module Usergrid
   class Resource
+
     def options
       options = @options.clone
-      require_login = Usergrid::Ironhorse::Base.settings[:require_login] != false
-      auth_token = require_login ? Thread.current[:usergrid_auth_token] : Usergrid::Ironhorse::Base.settings[:auth_token]
+      require_login = Ironhorse::Base.settings[:require_login] != false
+      if require_login
+        auth_token = Thread.current[:usergrid_auth_token]
+      else
+        unless Ironhorse::Base.settings[:auth_token]
+          as_admin {}
+        end
+        auth_token = Ironhorse::Base.settings[:auth_token]
+      end
       options[:headers].delete :Authorization
       options[:headers][:Authorization] = "Bearer #{auth_token}" if auth_token
       options
     end
 
+    def as_admin(&block)
+      save_auth_token = Thread.current[:usergrid_auth_token]
+      begin
+        unless Ironhorse::Base.settings[:auth_token]
+          resource = RestClient::Resource.new Ironhorse::Base.settings[:application_url]
+          response = resource['token'].post grant_type: 'client_credentials', client_id: Ironhorse::Base.settings[:client_id], client_secret: Ironhorse::Base.settings[:client_secret]
+          Ironhorse::Base.settings[:auth_token] = MultiJson.load(response)['access_token']
+        end
+        Thread.current[:usergrid_auth_token] = Ironhorse::Base.settings[:auth_token]
+        yield block
+      ensure
+        Thread.current[:usergrid_auth_token] = save_auth_token
+      end
+    end
+
     # gets user token and automatically set auth header for future requests on this Thread
     # precondition: resource must already be set to the correct context (application or management)
     def login(username, password)

data/lib/usergrid_ironhorse/user_context.rb

@@ -34,6 +34,11 @@ module Usergrid
       def as_admin(&block)
         save_auth_token = Thread.current[:usergrid_auth_token]
         begin
+          unless Base.settings[:auth_token]
+            resource = RestClient::Resource.new Base.settings[:application_url]
+            response = resource['token'].post grant_type: 'client_credentials', client_id: Base.settings[:client_id], client_secret: Base.settings[:client_secret]
+            Base.settings[:auth_token] = MultiJson.load(response)['access_token']
+          end
           Thread.current[:usergrid_auth_token] = Base.settings[:auth_token]
           yield block
         ensure
@@ -50,7 +55,7 @@ module Usergrid
       alias_method :set_context, :set_thread_context
 
       # clears auth from current thread
-      def clear_thread_context(session)
+      def clear_thread_context
         Thread.current[:usergrid_user_id] = nil
         Thread.current[:usergrid_auth_token] = nil
         Thread.current[:usergrid_current_user] = nil

data/lib/usergrid_ironhorse/version.rb

@@ -1,5 +1,5 @@
 module Usergrid
   module Ironhorse
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/spec/usergrid_ironhorse/base_spec.rb

@@ -28,6 +28,7 @@ describe Usergrid::Ironhorse::Base do
 
     it "do tasks as admin when requested" do
       organization = @foo.management.organization SPEC_SETTINGS[:organization][:name]
+      organization.logout
 
       # should fail under current user's context
       expect {
@@ -42,6 +43,7 @@ describe Usergrid::Ironhorse::Base do
 
     it "do tasks as admin if require_login is false" do
       organization = @foo.management.organization SPEC_SETTINGS[:organization][:name]
+      organization.logout
 
       # should fail under current user's context
       expect {
@@ -51,6 +53,7 @@ describe Usergrid::Ironhorse::Base do
       # should succeed once require_login is false
       User.settings[:require_login] = false
       organization.create_application "_test_app_#{SecureRandom.hex}"
+      User.settings[:require_login] = true
     end
 
     it 'be created and destroyed' do
@@ -372,5 +375,60 @@ describe Usergrid::Ironhorse::Base do
       count.should eq 13
       bars.each {|bar| bar.delete}
     end
+
+    it "perform as admin only when requested if require_login is true" do
+
+      organization = @foo.management.organization SPEC_SETTINGS[:organization][:name]
+
+      creds = nil
+      User.as_admin do
+        creds = organization.credentials
+      end
+
+      Usergrid::Ironhorse::Base.settings[:client_id] = creds.data.credentials.client_id
+      Usergrid::Ironhorse::Base.settings[:client_secret] = creds.data.credentials.client_secret
+      Usergrid::Ironhorse::Base.settings[:auth_token] = nil
+      User.clear_thread_context
+      organization.logout
+      User.settings[:require_login] = true
+
+      # should fail (login is required)
+      expect {
+        organization.create_application "_test_app_#{SecureRandom.hex}"
+      }.to raise_error RestClient::Unauthorized
+
+      # should succeed under admin context
+      User.as_admin do
+        organization.create_application "_test_app_#{SecureRandom.hex}"
+      end
+
+      Usergrid::Ironhorse::Base.settings[:client_id] = nil
+      Usergrid::Ironhorse::Base.settings[:client_secret] = nil
+    end
+
+    it "perform as admin if require_login is false" do
+
+      organization = @foo.management.organization SPEC_SETTINGS[:organization][:name]
+      organization.logout
+
+      creds = nil
+      User.as_admin do
+        creds = organization.credentials
+      end
+
+      Usergrid::Ironhorse::Base.settings[:client_id] = creds.data.credentials.client_id
+      Usergrid::Ironhorse::Base.settings[:client_secret] = creds.data.credentials.client_secret
+      Usergrid::Ironhorse::Base.settings[:auth_token] = nil
+      User.clear_thread_context
+      organization.logout
+
+      User.settings[:require_login] = false
+
+      # should succeed
+      organization.create_application "_test_app_#{SecureRandom.hex}"
+
+      Usergrid::Ironhorse::Base.settings[:client_id] = nil
+      Usergrid::Ironhorse::Base.settings[:client_secret] = nil
+    end
   end
 end

data/usergrid_ironhorse.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'usergrid_iron'
+  gem.add_dependency 'usergrid_iron', '0.9.1'
   gem.add_dependency 'activemodel'
   gem.add_dependency 'activerecord'
   gem.add_dependency 'i18n'

metadata

@@ -1,126 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: usergrid_ironhorse
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - Scott Ganyo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: usergrid_iron
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Rails ActiveModel gem to access Usergrid / Apigee App Services
@@ -151,27 +136,26 @@ files:
 - usergrid_ironhorse.gemspec
 homepage: https://github.com/scottganyo/usergrid_ironhorse
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Usergrid_ironhorse enables simple ActiveModel access to Apigee's App Services
   (aka Usergrid) REST API for Rails developers.
 test_files: