omniauth-mailchimp 1.0 → 1.0.1

data/Gemfile.lock

@@ -8,29 +8,14 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.1)
-      multi_json (~> 1.0)
     addressable (2.2.6)
     diff-lcs (1.1.3)
     faraday (0.7.5)
       addressable (~> 2.2.6)
       multipart-post (~> 1.1.3)
       rack (>= 1.1.0, < 2)
-    gibbon (0.3.1)
-      activesupport (>= 2.3.14)
-      activesupport (>= 2.3.14)
-      httparty (> 0.6.0)
-      httparty (> 0.6.0)
-      json (> 1.4.0)
-      json (> 1.4.0)
-      rdoc
     hashie (1.2.0)
-    httparty (0.8.1)
-      multi_json
-      multi_xml
-    json (1.6.1)
     multi_json (1.0.4)
-    multi_xml (0.3.0)
     multipart-post (1.1.4)
     oauth2 (0.5.1)
       faraday (~> 0.7.4)
@@ -45,8 +30,6 @@ GEM
     rack-protection (1.1.4)
       rack
     rake (0.9.2.2)
-    rdoc (3.11)
-      json (~> 1.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -65,7 +48,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  gibbon
   omniauth-mailchimp!
   rake
   rspec (~> 2.6.0)

data/examples/config.ru

@@ -6,9 +6,14 @@ require 'omniauth-mailchimp'
 
 get '/' do
   <<-HTML
-  <ul>
-    <li><a href='/auth/mailchimp'>Sign in with MailChimp</a></li>
-  </ul>
+	<div>
+		Your credentials are :
+		<ul>
+			<li>client id : #{ENV["MC_KEY"]}</li>
+			<li>secret key : #{ENV["MC_SECRET"]}</li>
+		</ul>
+	</div>
+  <a href='/auth/mailchimp'>Sign in with MailChimp</a>
   HTML
 end
 
@@ -28,6 +33,4 @@ use Rack::Session::Cookie, :secret => ENV['RACK_COOKIE_SECRET']
 
 use OmniAuth::Builder do
   provider :mailchimp, ENV["MC_KEY"], ENV["MC_SECRET"]
-end
-
-#run App.new
+end

data/lib/omniauth/mailchimp/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Mailchimp
-    VERSION = "1.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/omniauth/strategies/mailchimp.rb

@@ -17,7 +17,6 @@ module OmniAuth
         data = user_data
         OmniAuth::Utils.deep_merge(
           super, {
-            'uid' => @access_token.client.id,
             'extra'=> {
               'user_hash' => data
             }

data/spec/omniauth/strategies/mailchimp_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'omniauth-mailchimp'
+
+describe OmniAuth::Strategies::Mailchimp do
+  before :each do
+    @request = double('Request')
+    @request.stub(:params) { {} }
+  end
+  
+  subject do
+    OmniAuth::Strategies::Mailchimp.new(nil, @options || {}).tap do |strategy|
+      strategy.stub(:request) { @request }
+    end
+  end
+
+  it_should_behave_like 'an oauth2 strategy'
+
+  describe '#client' do
+    it 'has correct MailChimp site' do
+      subject.client.site.should eq('https://login.mailchimp.com')
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+require 'bundler/setup'
+require 'rspec'
+Dir[File.expand_path('../support/**/*', __FILE__)].each { |f| require f }
+
+RSpec.configure do |config|
+end

data/spec/support/shared_examples.rb

@@ -0,0 +1,37 @@
+# NOTE it would be useful if this lived in omniauth-oauth2 eventually
+shared_examples 'an oauth2 strategy' do
+  describe '#client' do
+    it 'should be initialized with symbolized client_options' do
+      @options = { :client_options => { 'authorize_url' => 'https://example.com' } }
+      subject.client.options[:authorize_url].should == 'https://example.com'
+    end
+  end
+
+  describe '#authorize_params' do
+    it 'should include any authorize params passed in the :authorize_params option' do
+      @options = { :authorize_params => { :foo => 'bar', :baz => 'zip' } }
+      subject.authorize_params['foo'].should eq('bar')
+      subject.authorize_params['baz'].should eq('zip')
+    end
+
+    it 'should include top-level options that are marked as :authorize_options' do
+      @options = { :authorize_options => [:scope, :foo], :scope => 'http://bar', :foo => 'baz' }
+      subject.authorize_params['scope'].should eq('http://bar')
+      subject.authorize_params['foo'].should eq('baz')
+    end
+  end
+
+  describe '#token_params' do
+    it 'should include any token params passed in the :token_params option' do
+      @options = { :token_params => { :foo => 'bar', :baz => 'zip' } }
+      subject.token_params['foo'].should eq('bar')
+      subject.token_params['baz'].should eq('zip')
+    end
+
+    it 'should include top-level options that are marked as :token_options' do
+      @options = { :token_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
+      subject.token_params['scope'].should eq('bar')
+      subject.token_params['foo'].should eq('baz')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-mailchimp
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000Z
+date: 2012-01-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70170874008840 !ruby/object:Gem::Requirement
+  requirement: &70341852345780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170874008840
+  version_requirements: *70341852345780
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &70170874006400 !ruby/object:Gem::Requirement
+  requirement: &70341852343840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170874006400
+  version_requirements: *70341852343840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70170874005820 !ruby/object:Gem::Requirement
+  requirement: &70341852343320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70170874005820
+  version_requirements: *70341852343320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70170874005280 !ruby/object:Gem::Requirement
+  requirement: &70341852342900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170874005280
+  version_requirements: *70341852342900
 description: MailChimp OAuth2 strategy for OmniAuth 1.0
 email:
 - florian.mhun@gmail.com
@@ -74,6 +74,10 @@ files:
 - lib/omniauth/mailchimp/version.rb
 - lib/omniauth/strategies/mailchimp.rb
 - omniauth-mailchimp.gemspec
+- spec/omniauth/.DS_Store
+- spec/omniauth/strategies/mailchimp_spec.rb
+- spec/spec_helper.rb
+- spec/support/shared_examples.rb
 homepage: http://floomoon.org/project/omniauth-mailchimp
 licenses: []
 post_install_message: 
@@ -98,4 +102,8 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: MailChimp OAuth2 strategy for OmniAuth 1.0.
-test_files: []
+test_files:
+- spec/omniauth/.DS_Store
+- spec/omniauth/strategies/mailchimp_spec.rb
+- spec/spec_helper.rb
+- spec/support/shared_examples.rb