asf-rest-adapter 0.3.3 → 0.4.2

data/Gemfile

@@ -5,6 +5,9 @@ source "http://rubygems.org"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
+gem "rforce"
+gem "omniauth"
+
 group :development do
   #gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -1,12 +1,76 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.5)
+    builder (3.0.0)
+    faraday (0.6.1)
+      addressable (~> 2.2.4)
+      multipart-post (~> 1.1.0)
+      rack (< 2, >= 1.1.0)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    mime-types (1.16)
+    multi_json (0.0.5)
+    multipart-post (1.1.0)
+    net-ldap (0.1.1)
+    nokogiri (1.4.4)
+    oa-basic (0.2.2)
+      multi_json (~> 0.0.2)
+      nokogiri (~> 1.4.2)
+      oa-core (= 0.2.2)
+      rest-client (~> 1.6.0)
+    oa-core (0.2.2)
+      rack (~> 1.1)
+    oa-enterprise (0.2.2)
+      net-ldap (~> 0.1.1)
+      nokogiri (~> 1.4.2)
+      oa-core (= 0.2.2)
+      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)
+      rest-client (~> 1.6.0)
+    oa-oauth (0.2.2)
+      faraday (~> 0.6.1)
+      multi_json (~> 0.0.2)
+      nokogiri (~> 1.4.2)
+      oa-core (= 0.2.2)
+      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
+    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)
+    pyu-ruby-sasl (0.0.3.2)
+    rack (1.2.2)
+    rack-openid (1.2.0)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
     rake (0.8.7)
+    rest-client (1.6.1)
+      mime-types (>= 1.16)
+    rforce (0.7)
+      builder (~> 3.0)
+      oauth (~> 0.4)
+    ruby-openid (2.1.8)
+    ruby-openid-apps-discovery (1.2.0)
+      ruby-openid (>= 2.1.7)
+    rubyntlm (0.1.1)
 
 PLATFORMS
   ruby
@@ -14,3 +78,5 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
+  omniauth
+  rforce

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.2

data/asf-rest-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{asf-rest-adapter}
-  s.version = "0.3.3"
+  s.version = "0.4.2"
 
   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-04-11}
+  s.date = %q{2011-04-20}
   s.description = %q{REST based adapter for Salesforce}
   s.email = %q{raygao2000@yahoo.com}
   s.extra_rdoc_files = [
@@ -26,9 +26,10 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "asf-rest-adapter.gemspec",
+    "lib/Salesforce/oauth2/config_file/asf_rest_config.yml",
     "lib/Salesforce/oauth2/enviornments/environment.rb",
     "lib/Salesforce/oauth2/forcedotcom.rb",
-    "lib/Salesforce/oauth2/initializers/omniauth.rb",
+    "lib/Salesforce/oauth2/initializers/asf_rest_adapter.rb",
     "lib/Salesforce/oauth2/routes/routes.rb",
     "lib/Salesforce/oauth2/templates/rails",
     "lib/Salesforce/oauth2/templates/ssl_templates/README",
@@ -82,7 +83,6 @@ Gem::Specification.new do |s|
     "lib/asf-rest-adapter.rb",
     "nbproject/private/private.properties",
     "nbproject/private/private.xml",
-    "nbproject/private/rake-d.txt",
     "nbproject/project.properties",
     "nbproject/project.xml",
     "test/asf-rest-adapter-rails-app/.gitignore",
@@ -280,17 +280,23 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rforce>, [">= 0"])
+      s.add_runtime_dependency(%q<omniauth>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_runtime_dependency(%q<asf-soap-adapter>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
     else
+      s.add_dependency(%q<rforce>, [">= 0"])
+      s.add_dependency(%q<omniauth>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<asf-soap-adapter>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rforce>, [">= 0"])
+    s.add_dependency(%q<omniauth>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<asf-soap-adapter>, [">= 0"])

data/lib/Salesforce/oauth2/config_file/asf_rest_config.yml

@@ -0,0 +1,12 @@
+asf-rest-config:
+  # Either "username_password" or "omni_auth"
+  auth_scheme: <username_password> or <omni_auth>
+  #username_password
+  adapter: activesalesforce
+  url: https://login.salesforce.com
+  username: <e-mail address>
+  password: <password + security_token>
+  api_version: 21.0
+  #omni_auth
+  consumer_key: <your consumer key>
+  consumer_secret: <your consumer secret>

data/lib/Salesforce/oauth2/initializers/asf_rest_adapter.rb

@@ -0,0 +1,65 @@
+#require 'forcedotcom' # no longer needed, it is a part of the asf-rest-adapter
+require 'asf-rest-adapter'
+
+# Set the default hostname for omniauth to send callbacks to.
+# seems to be a bug in omniauth that it drops the httpS
+# this still exists in 0.2.0
+OmniAuth.config.full_host = 'https://localhost:3000'
+
+module OmniAuth
+  module Strategies
+    #tell omniauth to load our strategy
+    autoload :Forcedotcom, 'lib/forcedotcom'
+  end
+end
+
+
+#Read the config
+asf_rest_config_file = Rails.root.to_s + "/config/asf_rest_config.yml"
+ASF_REST_CONFIG = YAML::load(File.open(asf_rest_config_file))
+
+auth_scheme =  ASF_REST_CONFIG["asf-rest-config"] ["auth_scheme"]
+puts "ASF-REST-Adapter setting:"
+puts "Auth name:" + auth_scheme
+
+#setup the default adapter with relevant auth schema (username/password) or (Omniauth)
+case auth_scheme
+when "username_password":
+    puts 'Setting up adapter using username/password'
+    username = ASF_REST_CONFIG["asf-rest-config"]["username"]
+    password = ASF_REST_CONFIG["asf-rest-config"]["password"]
+    login_svr = ASF_REST_CONFIG["asf-rest-config"]["api_version"].to_s
+    api_version = ASF_REST_CONFIG["asf-rest-config"]["api_version"].to_s
+
+    puts "Salesforce url: " + ASF_REST_CONFIG["asf-rest-config"]["url"]
+    puts "Username: " + username
+    puts "Password: " + password
+    puts "API Version " + login_svr
+
+    security_token, rest_svr, rest_version = Salesforce::Rest::AsfRest.bootup_rest_adapter(username, password, api_version)
+    puts 'Security Token: ' + security_token
+    puts 'rest_svr: ' + rest_svr
+    puts 'rest_version: ' + rest_version
+when"omni_auth":
+    consumer_key = ASF_REST_CONFIG["asf-rest-config"]["consumer_key"]
+    consumer_secret = ASF_REST_CONFIG["asf-rest-config"]["consumer_secret"]
+
+    puts "Salesforce consumer_key is:" + consumer_key.to_s
+    puts "Salesforce consumser_secret is: " + consumer_secret.to_s
+
+    Rails.application.config.middleware.use OmniAuth::Builder do
+      provider :forcedotcom, consumer_key, consumer_secret
+    end
+end
+
+
+
+OT2::Application.routes.draw do
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
+
+  #add our oauth redirect route - qw
+  match '/auth/:provider/callbackzzz', :to => 'sessions#create'
+  match '/auth/failurezzz', :to => 'sessions#fail'
+
+end

data/lib/Salesforce/oauth2/routes/routes.rb

@@ -1,15 +1,11 @@
 # This is a template for the Route file
 OmniauthDemo::Application.routes.draw do
-  get "sessions/create"
-
   # The priority is based upon order of creation:
   # first created -> highest priority.
 
   #add our oauth redirect route - qw
   match '/auth/:provider/callback', :to => 'sessions#create'
   match '/auth/failure', :to => 'sessions#fail'
-
-
 end
 
 #TODO, need to dynamically add to the Application's Route class.

data/lib/Salesforce/rest/asf_rest.rb

@@ -17,6 +17,7 @@ require 'net/https'
 require 'net/http'
 require 'active_resource'
 require 'httparty'
+require 'rforce'
 
 
 module Salesforce

data/lib/Salesforce/rest/asf_rest_authenticate.rb

@@ -21,29 +21,6 @@ module Authenticate
   #class methods
   def self.included(base)
     class << base
-      # Initializes the adapter, the 1st step of using the adapter. A good place to invoke
-      # it includes 'setup()' method in the 'test_helper' and Rails init file.
-      # TODO, to be removed in the 1.0 version
-      # usage ->     bootup_rest_adapter_old_adapter()
-      def bootup_rest_adapter_with_old_adapter()
-        #require 'asf-soap-adapter'
-        p "*" * 80
-        p 'Set up code'
-        @u = Salesforce::User.first
-        @version = "v" + @u.connection.config[:api_version].to_s
-        puts "Sf User name is: " + @u.name
-
-        @oauth_token = @u.connection.binding.instance_variable_get("@session_id")
-        puts "oauth token is: " + @oauth_token
-
-        @soap_url = @u.connection.binding.instance_variable_get("@server").address
-        @rest_svr = @soap_url.gsub(/-api\S*/mi, "") + ".salesforce.com"
-        puts 'rest_svr' + @rest_svr
-
-        self.setup(@oauth_token, @rest_svr, @version)
-        return [@oauth_token, @rest_svr, @version]
-      end
-
       # Initializes the adapter, using username, password. A good place to invoke
       # it includes 'setup()' method in the 'test_helper' and Rails init files.
       # usage ->     bootup_rest_adapter(username, password, api_version)
@@ -75,6 +52,55 @@ module Authenticate
 
         return [security_token, rest_svr, rest_version]
       end
+
+      # Ignite the adapter, using the config_file, This will in term invoke
+      # bootup_rest_adapter(username, password, api_version) or set up with
+      # consumer key/secret with omniauth
+      def ignite_adapter(config_file)
+        #Read the configuration file
+
+        begin
+          asf_rest_config = YAML::load(File.open(config_file))
+
+          auth_scheme =  asf_rest_config["asf-rest-config"] ["auth_scheme"]
+          puts "ASF-REST-Adapter setting:"
+          puts "Auth name:" + auth_scheme
+
+          #setup the default adapter with relevant auth schema (username/password) or (Omniauth)
+          case auth_scheme
+          when "username_password":
+              puts 'Setting up adapter using username/password'
+            username = asf_rest_config["asf-rest-config"]["username"]
+            password = asf_rest_config["asf-rest-config"]["password"]
+            login_svr = asf_rest_config["asf-rest-config"]["api_version"].to_s
+            api_version = asf_rest_config["asf-rest-config"]["api_version"].to_s
+
+            puts "Salesforce url: " + asf_rest_config["asf-rest-config"]["url"]
+            puts "Username: " + username
+            puts "Password: " + password
+            puts "API Version " + login_svr
+
+            security_token, rest_svr, rest_version = Salesforce::Rest::AsfRest.bootup_rest_adapter(username, password, api_version)
+            puts 'Security Token: ' + security_token
+            puts 'rest_svr: ' + rest_svr
+            puts 'rest_version: ' + rest_version
+          when"omni_auth":
+              consumer_key = asf_rest_config["asf-rest-config"]["consumer_key"]
+            consumer_secret = asf_rest_config["asf-rest-config"]["consumer_secret"]
+
+            puts "Salesforce consumer_key is:" + consumer_key.to_s
+            puts "Salesforce consumser_secret is: " + consumer_secret.to_s
+
+            Rails.application.config.middleware.use OmniAuth::Builder do
+              provider :forcedotcom, consumer_key, consumer_secret
+            end
+          end
+        rescue Exception => e
+          puts e.message
+        end
+      end
+
+
     end
   end
 

data/lib/asf-rest-adapter.rb

@@ -56,3 +56,6 @@ require File.dirname(__FILE__) + '/Salesforce/rest/classes/user.rb'
 require File.dirname(__FILE__) + '/Salesforce/rest/classes/user_feed.rb'
 require File.dirname(__FILE__) + '/Salesforce/rest/classes/user_role.rb'
 require File.dirname(__FILE__) + '/Salesforce/rest/classes/user_profile_feed.rb'
+
+# OmniAuth/Salesforce Library
+require File.dirname(__FILE__) + '/Salesforce/oauth2/forcedotcom.rb'

data/test/asf-rest-adapter-rails-app/test/test_helper.rb

@@ -16,10 +16,7 @@ class ActiveSupport::TestCase
 
 
   def setup
-#    initalize_adapter()
-#    either use the classic ASF-SOAP-ADAPTER dependency
-    #Salesforce::Rest::AsfRest.bootup_rest_adapter_with_old_adapter()
-#   Or, use RFORCE to create a session directly.
+#   use RFORCE to create a session directly or use consumer secret/key with omniauth
 
     username = 'your SF usermame'
     password = 'SF password + token'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: asf-rest-adapter
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Raymond Gao @ Are4Us Technologies
@@ -15,11 +15,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -05:00
+date: 2011-04-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rforce
+  version_requirements: *id001
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: omniauth
+  version_requirements: *id002
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +58,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id001
   name: bundler
+  version_requirements: *id003
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +74,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  version_requirements: *id002
   name: jeweler
+  version_requirements: *id004
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,12 +88,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
   name: asf-soap-adapter
+  version_requirements: *id005
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -74,8 +102,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id004
   name: httparty
+  version_requirements: *id006
   prerelease: false
   type: :runtime
 description: REST based adapter for Salesforce
@@ -97,9 +125,10 @@ files:
 - Rakefile
 - VERSION
 - asf-rest-adapter.gemspec
+- lib/Salesforce/oauth2/config_file/asf_rest_config.yml
 - lib/Salesforce/oauth2/enviornments/environment.rb
 - lib/Salesforce/oauth2/forcedotcom.rb
-- lib/Salesforce/oauth2/initializers/omniauth.rb
+- lib/Salesforce/oauth2/initializers/asf_rest_adapter.rb
 - lib/Salesforce/oauth2/routes/routes.rb
 - lib/Salesforce/oauth2/templates/rails
 - lib/Salesforce/oauth2/templates/ssl_templates/README
@@ -153,7 +182,6 @@ files:
 - lib/asf-rest-adapter.rb
 - nbproject/private/private.properties
 - nbproject/private/private.xml
-- nbproject/private/rake-d.txt
 - nbproject/project.properties
 - nbproject/project.xml
 - test/asf-rest-adapter-rails-app/.gitignore

data/lib/Salesforce/oauth2/initializers/omniauth.rb

@@ -1,19 +0,0 @@
-# Initializer template
-require 'forcedotcom'
-
-# Set the default hostname for omniauth to send callbacks to.
-# seems to be a bug in omniauth that it drops the httpS
-# this still exists in 0.2.0
-OmniAuth.config.full_host = 'https://localhost:3000'
-
-module OmniAuth
-  module Strategies
-    #tell omniauth to load our strategy
-    autoload :Forcedotcom, 'lib/forcedotcom'
-  end
-end
-
-
-Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :forcedotcom, '3MVG9yZ.WNe6byQDkN5SfIbP0HhAvCqdjOcGL9cXboLq5TeFN9eHOdTuEn443ELqv4ka8ZmzXSbY_kUeg7zMn', '953858431687220560'
-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=