asf-rest-adapter 0.4.3 → 0.4.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.5)
+    addressable (2.2.4)
     builder (3.0.0)
     faraday (0.6.1)
       addressable (~> 2.2.4)
@@ -13,55 +13,54 @@ GEM
       git (>= 1.2.5)
       rake
     mime-types (1.16)
-    multi_json (0.0.5)
-    multipart-post (1.1.0)
-    net-ldap (0.1.1)
+    multi_json (1.0.3)
+    multi_xml (0.2.2)
+    multipart-post (1.1.1)
+    net-ldap (0.2.2)
     nokogiri (1.4.4)
-    oa-basic (0.2.2)
-      multi_json (~> 0.0.2)
-      nokogiri (~> 1.4.2)
-      oa-core (= 0.2.2)
+    oa-basic (0.2.6)
+      oa-core (= 0.2.6)
       rest-client (~> 1.6.0)
-    oa-core (0.2.2)
-      rack (~> 1.1)
-    oa-enterprise (0.2.2)
-      net-ldap (~> 0.1.1)
+    oa-core (0.2.6)
+    oa-enterprise (0.2.6)
+      addressable (= 2.2.4)
+      net-ldap (~> 0.2.2)
       nokogiri (~> 1.4.2)
-      oa-core (= 0.2.2)
+      oa-core (= 0.2.6)
       pyu-ruby-sasl (~> 0.0.3.1)
       rubyntlm (~> 0.1.1)
-    oa-more (0.2.2)
-      multi_json (~> 0.0.2)
-      oa-core (= 0.2.2)
+    oa-more (0.2.6)
+      multi_json (~> 1.0.0)
+      oa-core (= 0.2.6)
       rest-client (~> 1.6.0)
-    oa-oauth (0.2.2)
+    oa-oauth (0.2.6)
       faraday (~> 0.6.1)
-      multi_json (~> 0.0.2)
-      nokogiri (~> 1.4.2)
-      oa-core (= 0.2.2)
+      multi_json (~> 1.0.0)
+      multi_xml (~> 0.2.2)
+      oa-core (= 0.2.6)
       oauth (~> 0.4.0)
-      oauth2 (~> 0.3.0)
-    oa-openid (0.2.2)
-      oa-core (= 0.2.2)
-      rack-openid (~> 1.2.0)
-      ruby-openid-apps-discovery
+      oauth2 (~> 0.4.1)
+    oa-openid (0.2.6)
+      oa-core (= 0.2.6)
+      rack-openid (~> 1.3.1)
+      ruby-openid-apps-discovery (~> 1.2.0)
     oauth (0.4.4)
-    oauth2 (0.3.0)
-      faraday (~> 0.6.0)
-      multi_json (~> 0.0.4)
-    omniauth (0.2.2)
-      oa-basic (= 0.2.2)
-      oa-core (= 0.2.2)
-      oa-enterprise (= 0.2.2)
-      oa-more (= 0.2.2)
-      oa-oauth (= 0.2.2)
-      oa-openid (= 0.2.2)
+    oauth2 (0.4.1)
+      faraday (~> 0.6.1)
+      multi_json (>= 0.0.5)
+    omniauth (0.2.6)
+      oa-basic (= 0.2.6)
+      oa-core (= 0.2.6)
+      oa-enterprise (= 0.2.6)
+      oa-more (= 0.2.6)
+      oa-oauth (= 0.2.6)
+      oa-openid (= 0.2.6)
     pyu-ruby-sasl (0.0.3.2)
-    rack (1.2.2)
-    rack-openid (1.2.0)
+    rack (1.3.0)
+    rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rake (0.8.7)
+    rake (0.9.0)
     rest-client (1.6.1)
       mime-types (>= 1.16)
     rforce (0.7)

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/asf-rest-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{asf-rest-adapter}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Raymond Gao @ Are4Us Technologies"]
-  s.date = %q{2011-05-05}
+  s.date = %q{2011-05-23}
   s.description = %q{REST based adapter for Salesforce}
   s.email = %q{raygao2000@yahoo.com}
   s.extra_rdoc_files = [
@@ -26,6 +26,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "asf-rest-adapter.gemspec",
+    "lib/.DS_Store",
+    "lib/Salesforce/.DS_Store",
     "lib/Salesforce/oauth2/config_file/asf_rest_config.yml",
     "lib/Salesforce/oauth2/enviornments/environment.rb",
     "lib/Salesforce/oauth2/forcedotcom.rb",

data/lib/Salesforce/oauth2/forcedotcom.rb

@@ -1,41 +1,49 @@
-require 'omniauth/oauth'
-require 'multi_json'
+#require 'omniauth/oauth'
+#require 'multi_json'
 
-# Omniauth strategy for using oauth2 and force.com 
-# Author: qwall@salesforce.com
-#
+require 'omniauth/strategies/oauth2'
 module OmniAuth
   module Strategies
-    class Forcedotcom < OAuth2
-      # Initialize the middleware
-      #
-      # @option options [Boolean, true] :sign_in When true, use a sign-in flow instead of the authorization flow.
-      # @option options [Boolean, false] :mobile When true, use the mobile sign-in interface.
-      def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
+    class Forcedotcom <  OmniAuth::Strategies::OAuth2
+
+      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
         client_options = {
-          :site => "https://login.salesforce.com",
-          :authorize_path      => "/services/oauth2/authorize",
-          :access_token_path   => "/services/oauth2/token"
+          :site => 'https://login.salesforce.com',
+          :authorize_path => '/services/oauth2/authorize',
+          :access_token_path => '/services/oauth2/token'
         }
-        super(app, :forcedotcom, client_id, client_secret, client_options, &block) 
-      end
 
-      def request_phase
-        options[:response_type] ||= 'code'
-        super
-      end
+        # 'code' locks you into one org; 'token' works across all orgs.
+        options.merge!(:response_type => 'token', :grant_type => 'authorization_code')
 
-      def callback_phase
-        options[:grant_type] ||= 'authorization_code'
-        super
+        super(app, :forcedotcom, consumer_key, consumer_secret, client_options, options, &block)
       end
 
-       def auth_hash
-          OmniAuth::Utils.deep_merge(super, {
-            'instance_url' => @access_token['instance_url']
+      def auth_hash
+        data = user_data
+        OmniAuth::Utils.deep_merge(super, {
+            'uid' => @access_token['id'],
+            'credentials' => {
+              'instance_url' => @access_token['instance_url']
+            },
+            'extra' => {'user_hash' => data},
+            'user_info' => {
+              'email' => data['email'],
+              'name' => data['display_name']
+            }
           })
-       end
-      
+      end
+
+      def user_data
+        @data ||= MultiJson.decode(@access_token.get(@access_token['id']))
+      rescue ::OAuth2::HTTPError => e
+        if e.response.status == 302
+          @data ||= MultiJson.decode(@access_token.get(e.response.headers['location']))
+        else
+          raise e
+        end
+      end
     end
+
   end
-end
+end

data/nbproject/private/rake-d.txt

@@ -1,26 +0,0 @@
-build=Build gem into pkg/
-clobber=
-clobber_rdoc=Remove rdoc products
-console[script]=Start IRB with all runtime dependencies loaded
-default=
-gemcutter\:release=Release gem to Gemcutter
-gemspec=Generate and validate gemspec
-gemspec\:debug=Display the gemspec for debugging purposes, as jeweler knows it (not from the filesystem)
-gemspec\:generate=Regenreate the gemspec on the filesystem
-gemspec\:release=Regenerate and validate gemspec, and then commits and pushes to git
-gemspec\:validate=Validates the gemspec on the filesystem
-gemspec_required=
-git\:release=Tag and push release to git. (happens by default with `rake release`)
-install=Build and install gem using `gem install`
-rcov=
-rdoc=Build the rdoc HTML Files
-rdoc/index.html=
-release=Release gem
-rerdoc=Force a rebuild of the RDOC files
-test=Run tests
-version=Displays the current version
-version\:bump\:major=Bump the major version by 1
-version\:bump\:minor=Bump the a minor version by 1
-version\:bump\:patch=Bump the patch version by 1
-version\:write=Writes out an explicit version. Respects the following environment variables, or defaults to 0: MAJOR, MINOR, PATCH. Also recognizes BUILD, which defaults to nil
-version_required=

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: asf-rest-adapter
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Raymond Gao @ Are4Us Technologies
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 -05:00
+date: 2011-05-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,6 +125,8 @@ files:
 - Rakefile
 - VERSION
 - asf-rest-adapter.gemspec
+- lib/.DS_Store
+- lib/Salesforce/.DS_Store
 - lib/Salesforce/oauth2/config_file/asf_rest_config.yml
 - lib/Salesforce/oauth2/enviornments/environment.rb
 - lib/Salesforce/oauth2/forcedotcom.rb