omniauth-constantcontact2 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 929d1c23ce6c29dd2eaa4748d4e8e38307d292c1
-  data.tar.gz: 6c9cff9903d99bf06a2048d900391d753d5473c3
+  metadata.gz: c363d7cfb0d2e9d549f4df63dcafdb50a71c1e88
+  data.tar.gz: 4a1260c79d1a5077104a84185c1da0caae06495a
 SHA512:
-  metadata.gz: 6506eee946a19a98d592dade936308e789940c392b20f466ac7254e700cb7d8c466896b5cfab639179ce7f691a355b15602d38c7e6124384be057a721132a1bd
-  data.tar.gz: 626ac0b305b02a55fa7261abd15be5d8cc53652f8d458d96811f7647c75a43331d9d4cb4480e6a1f5b225cd2f7a083944d35c4a520c9dd2e78758f9bc8abe435
+  metadata.gz: a2bec6eca8a9b4d6f718988e06988605232593c18b4eb2f341c153787b239ab4553c30b5cbdb39ebd79b29671f24ede4dbb45c1c5a186bbc3a62993818d2bdb6
+  data.tar.gz: a4c7112597e70985e71c37666143d9a5f725b599a1028cb3655ed64f33175d7f2361a0d4df5430c686c9914decfe0bed68db16385dd83b01ec4a2954766a800d

data/.travis.yml

@@ -1,3 +1,3 @@
 rvm:
-  - 1.8.7
   - 1.9.3
+  - 2.0.0

data/README.md

@@ -1,5 +1,7 @@
 # Omniauth::ConstantContact2
 
+[![Build Status](https://travis-ci.org/asanghi/omniauth-constantcontact2.svg?branch=master)](https://travis-ci.org/asanghi/omniauth-constantcontact2)
+
 This gem is an OmniAuth 2.0 Strategy for the [ConstantContact API](http://http://community.constantcontact.com/t5/Documentation/Authentication-using-OAuth-2-0-new-October-2011/ba-p/38313)
 
 It supports the OmniAuth REST API which uses OAuth 2.0

data/lib/omniauth-constantcontact2/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module ConstantContact2
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
   end
 end

data/lib/omniauth/strategies/constantcontact2.rb

@@ -8,6 +8,7 @@ module OmniAuth
       
       DEFAULT_RESPONSE_TYPE = 'code'
       DEFAULT_GRANT = 'authorization_code'
+      API_PATH = 'https://api.constantcontact.com/v2'
       
       option :name, "constantcontact"
 
@@ -37,16 +38,9 @@ module OmniAuth
       end
 
       info do
-        entries = raw_info['feed']['entry']
-        if entries.kind_of?(Array)
-          {
-              :email_entries => entries.map{|x|x["content"]["Email"]["EmailAddress"]}
-          }
-        else 
-          {
-              :email => entries["content"]["Email"]["EmailAddress"]
-          }
-        end
+        {
+          email: raw_info['email']
+        }
       end
 
       extra do
@@ -54,7 +48,11 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= MultiXml.parse(access_token.get("https://api.constantcontact.com/ws/customers/#{request.params['username'].strip}/settings/emailaddresses").body)
+        options = {
+          params: {api_key: client.id},
+          headers: {'Authorization' => "Bearer #{access_token.token}"}
+        }
+        @raw_info ||= JSON.parse(access_token.get("#{API_PATH}/account/info", options).body)
       end
     end
   end

data/omniauth-constantcontact2.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'omniauth', '~> 1.0'
   gem.add_dependency 'omniauth-oauth2', '~> 1.0'
   gem.add_dependency 'multi_json', '~> 1.0'
-  gem.add_dependency 'multi_xml'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 2.8'

data/spec/omniauth/strategies/constantcontact2_spec.rb

@@ -10,21 +10,21 @@ describe OmniAuth::Strategies::ConstantContact2 do
 
   describe '#client' do
     it 'should have the correct Constant Contact site' do
-      subject.client.site.should eq("https://oauth2.constantcontact.com")
+      expect(subject.client.site).to eq("https://oauth2.constantcontact.com")
     end
 
     it 'should have the correct authorization url' do
-      subject.client.options[:authorize_url].should eq("/oauth2/oauth/siteowner/authorize")
+      expect(subject.client.options[:authorize_url]).to eq("/oauth2/oauth/siteowner/authorize")
     end
 
     it 'should have the correct token url' do
-      subject.client.options[:token_url].should eq('/oauth2/oauth/token')
+      expect(subject.client.options[:token_url]).to eq('/oauth2/oauth/token')
     end
   end
 
   describe '#callback_path' do
     it 'should have the correct callback path' do
-      subject.callback_path.should eq('/auth/constantcontact/callback')
+      expect(subject.callback_path).to eq('/auth/constantcontact/callback')
     end
   end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,8 @@ require 'rack/test'
 require 'omniauth'
 require 'omniauth-constantcontact2'
 
+OmniAuth.config.test_mode = true
+
 Dir[File.expand_path('../support/**/*', __FILE__)].each { |f| require f }
 
 RSpec.configure do |config|

data/spec/support/shared_examples.rb

@@ -5,35 +5,35 @@ 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'
+      expect(subject.client.options[:authorize_url]).to eq('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')
+      expect(subject.authorize_params['foo']).to eq('bar')
+      expect(subject.authorize_params['baz']).to eq('zip')
     end
 
     it 'should include top-level options that are marked as :authorize_options' do
       @options = { :authorize_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
-      subject.authorize_params['scope'].should eq('bar')
-      subject.authorize_params['foo'].should eq('baz')
+      expect(subject.authorize_params['scope']).to eq('bar')
+      expect(subject.authorize_params['foo']).to 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')
+      expect(subject.token_params['foo']).to eq('bar')
+      expect(subject.token_params['baz']).to 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')
+      expect(subject.token_params['scope']).to eq('bar')
+      expect(subject.token_params['foo']).to eq('baz')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-constantcontact2
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Aditya Sanghi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: multi_xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: OmniAuth Strategy for Constant Contact using OAuth2