asf-rest-adapter 0.4.5 → 0.4.6

data/Gemfile.lock

@@ -15,7 +15,7 @@ GEM
     mime-types (1.16)
     multi_json (1.0.3)
     multi_xml (0.2.2)
-    multipart-post (1.1.1)
+    multipart-post (1.1.2)
     net-ldap (0.2.2)
     nokogiri (1.4.4)
     oa-basic (0.2.6)
@@ -55,12 +55,12 @@ GEM
       oa-more (= 0.2.6)
       oa-oauth (= 0.2.6)
       oa-openid (= 0.2.6)
-    pyu-ruby-sasl (0.0.3.2)
+    pyu-ruby-sasl (0.0.3.3)
     rack (1.3.0)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rake (0.9.0)
+    rake (0.9.1)
     rest-client (1.6.1)
       mime-types (>= 1.16)
     rforce (0.7)

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/asf-rest-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{asf-rest-adapter}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   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-29}
+  s.date = %q{2011-06-03}
   s.description = %q{REST based adapter for Salesforce}
   s.email = %q{raygao2000@yahoo.com}
   s.extra_rdoc_files = [

data/lib/Salesforce/oauth2/forcedotcom.rb

@@ -24,7 +24,31 @@ module OmniAuth
         OmniAuth::Utils.deep_merge(super, {
             'uid' => @access_token['id'],
             'credentials' => {
-              'instance_url' => @access_token['instance_url']
+              'instance_url' => @access_token['instance_url'],
+              'credentials' => {"refresh_token" => @access_token.refresh_token,
+                                "consumer_key" => @access_token.client.id,
+                                "consumer_secret" => @access_token.client.secret
+              }
+            },
+            'extra' => {'user_hash' => data},
+            'user_info' => {
+              'email' => data['email'],
+              'name' => data['display_name']
+            }
+          })
+      end
+
+
+      def auth_hash
+        data = user_data
+        OmniAuth::Utils.deep_merge(super, {
+            'uid' => @access_token['id'],
+            'credentials' => {
+              "instance_url" => @access_token['instance_url'],
+              "refresh_token" => @access_token.refresh_token,
+              "consumer_key" => @access_token.client.id,
+              "consumer_secret" => @access_token.client.secret
+
             },
             'extra' => {'user_hash' => data},
             'user_info' => {

data/lib/Salesforce/rest/asf_rest.rb

@@ -190,6 +190,9 @@ module Salesforce
         #Again the delete feature from ActiveResource does not work out of the box.
         #Providing a custom update function
         svr_url_4_http = rest_svr.gsub(/https:\/\//mi, "" )  #strip http:// prefix from the url. Otherwise, it will fail.
+        if @@ssl_port.nil?
+          @@ssl_port = 443
+        end
         http = Net::HTTP.new(svr_url_4_http, @@ssl_port)
         http.use_ssl = true
         class_name = self.name.gsub(/\S+::/mi, "")

data/lib/Salesforce/rest/asf_rest_authenticate.rb

@@ -68,7 +68,7 @@ module Authenticate
 
           #setup the default adapter with relevant auth schema (username/password) or (Omniauth)
           case auth_scheme
-          when "username_password":
+          when "username_password" then
               puts 'Setting up adapter using username/password'
             username = asf_rest_config["asf-rest-config"]["username"]
             password = asf_rest_config["asf-rest-config"]["password"]
@@ -84,7 +84,7 @@ module Authenticate
             puts 'Security Token: ' + security_token
             puts 'rest_svr: ' + rest_svr
             puts 'rest_version: ' + rest_version
-          when"omni_auth":
+          when"omni_auth" then
               consumer_key = asf_rest_config["asf-rest-config"]["consumer_key"]
             consumer_secret = asf_rest_config["asf-rest-config"]["consumer_secret"]
 

data/nbproject/private/rake-d.txt

@@ -1,26 +0,0 @@
-build=
-clobber=
-clobber_rdoc=
-console[script]=
-default=
-gemcutter\:release=
-gemspec=
-gemspec\:debug=
-gemspec\:generate=
-gemspec\:release=
-gemspec\:validate=
-gemspec_required=
-git\:release=
-install=
-rcov=
-rdoc=
-rdoc/index.html=
-release=
-rerdoc=
-test=
-version=
-version\:bump\:major=
-version\:bump\:minor=
-version\:bump\:patch=
-version\:write=
-version_required=

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: asf-rest-adapter
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Raymond Gao @ Are4Us Technologies
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-29 00:00:00 -05:00
+date: 2011-06-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency