omniauth-createsend 1.0.1 → 1.0.2

data/.gitignore

@@ -1,6 +1,5 @@
 .DS_Store
+coverage
 rdoc
 pkg
 *.gem
-/.buildpath
-/.project

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--format=progress

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.0.0
   - 1.9.3
   - 1.9.2
   - 1.8.7

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -5,8 +5,17 @@ PATH
       omniauth-oauth2 (~> 1.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
+    addressable (2.3.3)
+    colorize (0.5.8)
+    coveralls (0.6.3)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
+    crack (0.3.2)
     diff-lcs (1.1.3)
     faraday (0.8.5)
       multipart-post (~> 1.1)
@@ -14,6 +23,7 @@ GEM
     httpauth (0.2.0)
     jwt (0.1.5)
       multi_json (>= 1.0)
+    mime-types (1.21)
     multi_json (1.6.0)
     multipart-post (1.1.5)
     oauth2 (0.8.0)
@@ -29,7 +39,11 @@ GEM
       oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
     rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
     rake (10.0.3)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -38,11 +52,23 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    thor (0.18.0)
+    webmock (1.11.0)
+      addressable (>= 2.2.7)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  coveralls
   omniauth-createsend!
+  rack-test
   rake
   rspec (~> 2.12)
+  simplecov
+  webmock

data/HISTORY.md

@@ -0,0 +1,9 @@
+# omniauth-createsend history
+
+## v1.0.2 - 1 Apr, 2013 (1495a20)
+
+* Refactored out unnecessary code and brought test coverage to 100%.
+
+## v1.0.1 - 24 Feb, 2013 (40ffa0a)
+
+* Initial release ready for use in production.

data/README.md

@@ -1,9 +1,10 @@
 # OmniAuth CreateSend
-[![Build Status](https://secure.travis-ci.org/jdennes/omniauth-createsend.png)][travis] [![Dependency Status](https://gemnasium.com/jdennes/omniauth-createsend.png)][gemnasium] [![Gem Version](https://badge.fury.io/rb/omniauth-createsend.png)][gembadge]
+[![Build Status](https://secure.travis-ci.org/jdennes/omniauth-createsend.png)][travis] [![Coverage Status](https://coveralls.io/repos/jdennes/omniauth-createsend/badge.png?branch=master)][coveralls] [![Dependency Status](https://gemnasium.com/jdennes/omniauth-createsend.png)][gemnasium] [![Gem Version](https://badge.fury.io/rb/omniauth-createsend.png)][gembadge]
 
 This is the official [OmniAuth](http://www.omniauth.org/) strategy for authenticating with the [Campaign Monitor API](http://www.campaignmonitor.com/api/). You'll need to register an OAuth Application in your Campaign Monitor account to get a Client ID and Client Secret to use with this OmniAuth strategy.
 
 [travis]: http://travis-ci.org/jdennes/omniauth-createsend
+[coveralls]: https://coveralls.io/r/jdennes/omniauth-createsend
 [gemnasium]: https://gemnasium.com/jdennes/omniauth-createsend
 [gembadge]: http://badge.fury.io/rb/omniauth-createsend
 
@@ -39,7 +40,7 @@ Once you've authenticated, you should use the [createsend](http://campaignmonito
 
 ## Contributing
 1. Fork the repository
-2. Make your changes, including tests for your changes.
-3. Ensure that the build passes, by running `bundle exec rake` (CI runs on: `1.9.3`, `1.9.2`, `1.8.7` and `ree`)
+2. Make your changes, including tests for your changes which maintain [coverage][coveralls].
+3. Ensure that the build passes, by running `bundle exec rake` (CI runs on: `2.0.0`, `1.9.3`, `1.9.2`, `1.8.7`, and `ree`)
 4. It should go without saying, but do not increment the version number in your commits.
 5. Submit a pull request.

data/lib/omniauth/createsend/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module CreateSend
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/lib/omniauth/strategies/createsend.rb

@@ -9,21 +9,6 @@ module OmniAuth
         :authorize_url => '/oauth',
         :token_url => '/oauth/token'
       }
-
-      def request_phase
-        super
-      end
-
-      def authorize_params
-        super.tap do |params|
-          %w[scope client_options].each do |v|
-            if request.params[v]
-              params[v.to_sym] = request.params[v]
-            end
-          end
-        end
-      end
-
     end
   end
 end

data/omniauth-createsend.gemspec

@@ -19,5 +19,9 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'omniauth-oauth2', '~> 1.1'
   s.add_development_dependency 'rspec', '~> 2.12'
+  s.add_development_dependency 'rack-test'
+  s.add_development_dependency 'webmock'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'coveralls'
 end

data/spec/omniauth/strategies/createsend_spec.rb

@@ -1,28 +1,56 @@
 require 'spec_helper'
-require 'omniauth-createsend'
 
 describe OmniAuth::Strategies::CreateSend do
-  subject do
-    OmniAuth::Strategies::CreateSend.new({})
+  def app; lambda{|env| [200, {}, ["Hello."]]} end
+  let(:fresh_strategy){ Class.new(OmniAuth::Strategies::CreateSend) }
+
+  before do
+    OmniAuth.config.test_mode = true
+  end
+
+  after do
+    OmniAuth.config.test_mode = false
   end
 
   describe '#client' do
+    subject{ fresh_strategy }
+
     it 'should have the correct createsend site' do
-      subject.client.site.should eq("https://api.createsend.com")
+      instance = subject.new(app, {})
+      instance.client.site.should eq("https://api.createsend.com")
     end
 
     it 'should have the correct authorization url' do
-      subject.client.options[:authorize_url].should eq("/oauth")
+      instance = subject.new(app, {})
+      instance.client.options[:authorize_url].should eq("/oauth")
     end
 
     it 'should have the correct token url' do
-      subject.client.options[:token_url].should eq('/oauth/token')
+      instance = subject.new(app, {})
+      instance.client.options[:token_url].should eq('/oauth/token')
+    end
+  end
+
+  describe '#authorize_params' do
+    subject { fresh_strategy }
+
+    it 'should include the appropriate authorize params passed in the :authorize_params option' do
+      instance = subject.new('abc', 'def', :authorize_params => {:scope => 'ViewReports,ImportSubscribers', :something => 'else', :state => '4321'})
+      instance.authorize_params[:scope].should eq('ViewReports,ImportSubscribers')
+    end
+
+    it 'should include appropriate top-level options that are marked as :authorize_options' do
+      instance = subject.new('abc', 'def', :authorize_options => [:scope], :scope => 'ViewReports,ImportSubscribers', :something => 'else', :authorize_params => {:state => '4321'})
+      instance.authorize_params[:scope].should eq('ViewReports,ImportSubscribers')
     end
   end
 
   describe '#callback_path' do
+    subject{ fresh_strategy }
+
     it 'should have the correct callback path' do
-      subject.callback_path.should eq('/auth/createsend/callback')
+      instance = subject.new(app, {})
+      instance.callback_path.should eq('/auth/createsend/callback')
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,23 @@
 $:.unshift File.expand_path('..', __FILE__)
 $:.unshift File.expand_path('../../lib', __FILE__)
+
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
+
 require 'rspec'
+require 'rack/test'
+require 'webmock/rspec'
+require 'omniauth'
 require 'omniauth-createsend'
 
 RSpec.configure do |config|
+  config.include WebMock::API
+  config.include Rack::Test::Methods
+  config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-createsend
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-24 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -43,6 +43,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.12'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +91,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The official OmniAuth strategy for authenticating with the Campaign Monitor
   API.
 email:
@@ -68,9 +132,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - Gemfile.lock
+- HISTORY.md
 - LICENSE
 - README.md
 - Rakefile
@@ -95,21 +161,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1289819948662204167
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1289819948662204167
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Official OmniAuth strategy for the Campaign Monitor API.