omniauth-cube7 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9ea59552d51b7727379e6caeab239c7ded744d4
-  data.tar.gz: e579ac169fe53cf4bd1cacf6889c5e2e845a4a47
+  metadata.gz: 56d33383a111384f96cd475722a6cf5f7bb37211
+  data.tar.gz: 8ee6fd15e9ed2a00cf6155d906feb5cd4a098bb7
 SHA512:
-  metadata.gz: 364f038e787869f19f7c860ff8f8cd39d998d974f829945c628ee72e0d0faeb568adecdeae08780d09c74e724732490490d3befb1ed6b711a57bd4d784a40616
-  data.tar.gz: 3b2c5f1e4a0afd930e175e7118c10091f992640fa81e809749a26e65e30ab098432be8185e08e50e01025173426ce7629daba4720def09bbe3a64f2a23c97f5e
+  metadata.gz: 46e75974e5322f12a4cfea344e266cd2873e9301d67804d169fb5a68737bac3f86fb818272e7635a81de0126ed086e6c1b341d5adc58a6cdfd6599a925ef65b7
+  data.tar.gz: 5110024b3672e3e4f9e660584d369aafb79203aa2700b803af9f4454253047be0d08e77670896e9f7df31ca7184d6d5f838b49793f5e7f629292d1a269bb3a08

data/lib/omniauth-cube7.rb

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

data/lib/omniauth/cube7/version.rb

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

data/lib/omniauth/strategies/cube7.rb

@@ -1,4 +1,3 @@
-require "omniauth/cube7/configuration"
 require 'omniauth/strategies/oauth2'
 
 module OmniAuth
@@ -6,6 +5,11 @@ module OmniAuth
     class Cube7 < OmniAuth::Strategies::OAuth2
       # change the class name and the :name option to match your application name
       option :name, :cube7
+      
+      option :client_options, {
+        :site           => "https://www.cube7.com",
+        :authorize_url  => "/oauth/authorize"
+      }
 
       uid { raw_info["id"] }
 
@@ -23,10 +27,6 @@ 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/cube7_test.rb

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

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-cube7
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ruo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Cube7 strategy for Omniauth
@@ -87,19 +87,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - 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
@@ -113,18 +111,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Cube7 strategy for Omniauth
 test_files: []
+has_rdoc: 

data/lib/omniauth/cube7/configuration.rb

@@ -1,45 +0,0 @@
-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/tests/configuration_test.rb

@@ -1,23 +0,0 @@
-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