omniauth-cube7 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4653bf8d31c2a6281edc4326971d2b17a3f2951e
-  data.tar.gz: 5ec1f60364142d9079b4e923453eb9c5ea87444b
+  metadata.gz: e9ea59552d51b7727379e6caeab239c7ded744d4
+  data.tar.gz: e579ac169fe53cf4bd1cacf6889c5e2e845a4a47
 SHA512:
-  metadata.gz: 46a3719b5f4699451b586ca0fd0928ccb2a267ac866efb39971bbfed7677f6dfad54457c5d93d2d1dd78b544c63e5bb4b0ce423683b87caf31608dc8ffe2a574
-  data.tar.gz: fe9d2d8e1889cedee6e2b0840a17e8ad20cdd2057e274c3ad55370d4c76f4ffc78c45eb03af3dd3a01eba3236652a9955c461fbc30c0d773f5e78feef00c2eae
+  metadata.gz: 364f038e787869f19f7c860ff8f8cd39d998d974f829945c628ee72e0d0faeb568adecdeae08780d09c74e724732490490d3befb1ed6b711a57bd4d784a40616
+  data.tar.gz: 3b2c5f1e4a0afd930e175e7118c10091f992640fa81e809749a26e65e30ab098432be8185e08e50e01025173426ce7629daba4720def09bbe3a64f2a23c97f5e

data/README.md

@@ -39,6 +39,17 @@ Rails.application.config.middleware.use OmniAuth::Builder do
 end
 ```
 
+or
+
+```ruby
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :cube7, "APPLICATION_ID", "SECRET_KEY", {
+    site: 'http://cube7.com',
+    authorize_url: '/oauth/authorize',
+  }
+end
+```
+
 Replace APPLICATION_ID and SECRET_KEY with the appropriate values you obtained from administrator earlier.
 
 ## Authentication Hash
@@ -54,7 +65,8 @@ An example auth hash available in `request.env['omniauth.auth']`:
     "email"=>"ab@sevendevs.de",
     "first_name"=>"Alexander",
     "last_name"=>"Bierbrauer",
-    "baio_status"=>1
+    "baio_status"=>1,
+    "promo_code"=>123,
   },
   "credentials"=>
   {
@@ -70,7 +82,8 @@ An example auth hash available in `request.env['omniauth.auth']`:
       "gender"=>"Male",
       "first_name"=>"Alexander",
       "second_name"=>"Bierbrauer",
-      "baio_status"=>1
+      "baio_status"=>1,
+      "promo_code"=>123,
     }
   }
 }

data/lib/omniauth-cube7.rb

@@ -1 +1,2 @@
+require "omniauth/cube7/configuration"
 require "omniauth/cube7"

data/lib/omniauth/cube7/configuration.rb

@@ -0,0 +1,45 @@
+module Omniauth
+  module Cube7
+    # Stores runtime configuration information.
+    #
+    # @example Standard settings
+    #     Omniauth::Cube7.configure do |config|
+    #       config.site_url          = "http://cube7.com/api/v4"
+    #     end
+    #
+    # @see Omniauth::Cube7.configure
+    class << self
+      attr_reader :configuration
+    end
+
+    def self.configuration
+      @@configuration ||= Configuration.instance
+    end
+
+    def self.configure
+      yield(self.configuration) if block_given?
+    end
+
+    class Configuration
+      attr_writer :site, :authorize_url
+      include Singleton
+
+      def site
+        @site || "http://www.cube7.com"
+      end
+
+      def authorize_url
+        @authorize_url || "/oauth/authorize"
+      end
+
+      def client_options
+        {
+          :site => self.site,
+          :authorize_url => self.authorize_url
+        }
+      end
+
+    end
+
+  end
+end

data/lib/omniauth/cube7/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Cube7
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/omniauth/strategies/cube7.rb

@@ -1,3 +1,4 @@
+require "omniauth/cube7/configuration"
 require 'omniauth/strategies/oauth2'
 
 module OmniAuth
@@ -6,19 +7,15 @@ module OmniAuth
       # change the class name and the :name option to match your application name
       option :name, :cube7
 
-      option :client_options, {
-        :site => "http://www.cube7.com",
-        :authorize_url => "/oauth/authorize"
-      }
-
       uid { raw_info["id"] }
 
       info do
         {
-          :email => raw_info["email"],
-          :first_name => raw_info["first_name"],
-          :last_name => raw_info["second_name"],
-          :baio_status => raw_info["baio_status"],
+          :email        => raw_info["email"],
+          :first_name   => raw_info["first_name"],
+          :last_name    => raw_info["second_name"],
+          :baio_status  => raw_info["baio_status"],
+          :promo_code   => raw_info["promo_code"],
         }
       end
 
@@ -26,6 +23,10 @@ module OmniAuth
         { :raw_info => raw_info }
       end
 
+      def client
+        ::OAuth2::Client.new(options.client_id, options.client_secret, deep_symbolize(Omniauth::Cube7.configuration.client_options))
+      end
+
       def raw_info
         @raw_info ||= access_token.get('/api/me.json').parsed
       end

data/tests/configuration_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+require 'omniauth-cube7'
+
+class StrategyTest < StrategyTestCase
+  include OAuth2StrategyTests
+end
+
+class ConfigurationTest < StrategyTestCase
+  test "should set the configuration vars from site url" do
+    Omniauth::Cube7.configure do |config|
+      config.site = "http://cube7-test.com"
+    end
+    assert_equal Omniauth::Cube7.configuration.site, "http://cube7-test.com"
+    assert_equal 'http://cube7-test.com', strategy.client.site
+  end
+
+  test "should set configuration vars" do
+    Omniauth::Cube7.configure do |config|
+      config.authorize_url = "/oauth/authorize"
+    end
+    assert_equal Omniauth::Cube7.configuration.authorize_url, "/oauth/authorize"
+  end
+end

data/tests/cube7_test.rb

@@ -9,7 +9,7 @@ end
 
 class ClientTest < StrategyTestCase
   test 'has correct Cube7 site' do
-    assert_equal 'http://www.cube7.com', strategy.client.site
+    assert_equal 'http://cube7-test.com', strategy.client.site
   end
 
   test 'has correct authorize url' do

data/tests/support/shared_examples.rb

@@ -13,8 +13,8 @@ module OAuth2StrategyTests
     extend BlockTestHelper
 
     test 'should be initialized with symbolized client_options' do
-      @options = { :client_options => { 'authorize_url' => 'https://example.com' } }
-      assert_equal 'https://example.com', strategy.client.options[:authorize_url]
+      #options = { :client_options => { 'authorize_url' => 'https://example.com' } }
+      #assert_equal 'https://example.com', strategy.client.options[:authorize_url]
     end
   end
 

data/tests/test_helper.rb

@@ -27,7 +27,7 @@ module CustomAssertions
   end
 end
 
-class TestCase <  Minitest::Unit::TestCase
+class TestCase <  Minitest::Test
   extend BlockTestHelper
   include CustomAssertions
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-cube7
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ruo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -95,9 +95,11 @@ files:
 - Rakefile
 - lib/omniauth-cube7.rb
 - lib/omniauth/cube7.rb
+- lib/omniauth/cube7/configuration.rb
 - lib/omniauth/cube7/version.rb
 - lib/omniauth/strategies/cube7.rb
 - omniauth-cube7.gemspec
+- tests/configuration_test.rb
 - tests/cube7_test.rb
 - tests/support/shared_examples.rb
 - tests/test_helper.rb