omniauth-twitter 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edfaab177e44aa04f7cfd4fa8068b019c76fbfe4
-  data.tar.gz: cfdf961107d830fd2e695c3a3970f934d0150fb6
+  metadata.gz: 35bac2bf2b4cec7b70d9652d5aa2a4c74abb2fe2
+  data.tar.gz: fbb4d0287de2e3bc2fdcf0fba42daaa4bca1be94
 SHA512:
-  metadata.gz: 3c76675fc707da726fc34f00f7369856a39886668fe8e8627b9c8cb228136fdb3bcad02035ae911991f0bc7de3f5d8a84e3aa4810ffd8bef01a8743a6c360422
-  data.tar.gz: 84303d1f90d44ae137e70a1f5da8fdcdb82e3bcb258815f4723dd745ab6b7b3a4fee839d94fe0d39c84e972de870bde7690b3752fe51a1cc9f8fd72190144084
+  metadata.gz: c8b0a40dd9df0bcdbbc3d30f3b87bc818e6c3a4b906b19bd86eccf634bb7161d64c73dba0a5fc957d62c0bf4762bc3315a9263be74786742646be631a29706aa
+  data.tar.gz: d13034c4b1c453f9b5f41eeb3ae6ed7d1fa98484ed51351630823ef6e48a41bebbe8d5db8d5da98e02e79e2cd560d5ca416f728533b7aeedcbbb934d80813fb0

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
+  - 2.2
   - jruby
   - rbx-2

data/Gemfile

@@ -1,5 +1,12 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem 'rake'
-# Specify your gem's dependencies in omniauth-twitter.gemspec
 gemspec
+
+gem 'rake'
+
+group :test do
+  gem 'rspec', '~> 3.2'
+  gem 'rack-test'
+  gem 'simplecov'
+  gem 'webmock'
+end

data/README.md

@@ -14,7 +14,7 @@ Twitter uses OAuth 1.0a. Twitter's developer area contains ample documentation o
 
 You should have already installed OmniAuth into your app; if not, read the [OmniAuth README](https://github.com/intridea/omniauth) to get started.
 
-Now sign in into the [Twitter developer area](https://dev.twitter.com) and create an application. Take note of your API Key and API Secret (not the Access Token and Access Token Secret) because that is what your web application will use to authenticate against the Twitter API. Make sure to set a callback URL or else you may get authentication errors. (It doesn't matter what it is, just that it is set.)
+Now sign in into the [Twitter developer area](https://dev.twitter.com/apps) and create an application. Take note of your API Key and API Secret (not the Access Token and Access Token Secret) because that is what your web application will use to authenticate against the Twitter API. Make sure to set a callback URL or else you may get authentication errors. (It doesn't matter what it is, just that it is set.)
 
 ## Using This Strategy
 
@@ -156,7 +156,7 @@ Ryan Bates has put together an excellent RailsCast on OmniAuth:
 
 ## Supported Rubies
 
-OmniAuth Twitter is tested under 1.9.3, 2.0.0, 2.1.0, JRuby, and Rubinius.
+OmniAuth Twitter is tested under 1.9.3, 2.0.0, 2.1.x, 2.2.x, JRuby, and Rubinius.
 
 ## Contributing
 

data/lib/omniauth-twitter/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Twitter
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/lib/omniauth/strategies/twitter.rb

@@ -1,5 +1,5 @@
 require 'omniauth-oauth'
-require 'multi_json'
+require 'json'
 
 module OmniAuth
   module Strategies
@@ -27,11 +27,11 @@ module OmniAuth
       end
 
       extra do
-        { :raw_info => raw_info }
+        skip_info? ? {} : { :raw_info => raw_info }
       end
 
       def raw_info
-        @raw_info ||= MultiJson.load(access_token.get('/1.1/account/verify_credentials.json?include_entities=false&skip_status=true').body)
+        @raw_info ||= JSON.load(access_token.get('/1.1/account/verify_credentials.json?include_entities=false&skip_status=true').body)
       rescue ::Errno::ETIMEDOUT
         raise ::Timeout::Error
       end

data/omniauth-twitter.gemspec

@@ -8,21 +8,16 @@ Gem::Specification.new do |s|
   s.authors     = ["Arun Agrawal"]
   s.email       = ["arunagw@gmail.com"]
   s.homepage    = "https://github.com/arunagw/omniauth-twitter"
-  s.summary     = %q{OmniAuth strategy for Twitter}
   s.description = %q{OmniAuth strategy for Twitter}
+  s.summary     = s.description
   s.license     = "MIT"
 
-  s.rubyforge_project = "omniauth-twitter"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'multi_json', '~> 1.3'
-  s.add_runtime_dependency 'omniauth-oauth', '~> 1.0'
-  s.add_development_dependency 'rspec', '~> 2.7'
-  s.add_development_dependency 'rack-test'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'webmock'
+  s.add_dependency 'json', '~> 1.3'
+  s.add_dependency 'omniauth-oauth', '~> 1.1'
+  s.add_development_dependency 'bundler', '~> 1.0'
 end

data/spec/omniauth/strategies/twitter_spec.rb

@@ -36,6 +36,14 @@ describe OmniAuth::Strategies::Twitter do
         expect(subject.info[:image]).to eq('http://twimg0-a.akamaihd.net/sticky/default_profile_images/default_profile_0.png')
       end
 
+      it 'should return bigger image when bigger size specified' do
+        @options = { :image_size => 'bigger' }
+        allow(subject).to receive(:raw_info).and_return(
+          { 'profile_image_url' => 'http://twimg0-a.akamaihd.net/sticky/default_profile_images/default_profile_0_normal.png' }
+        )
+        expect(subject.info[:image]).to eq('http://twimg0-a.akamaihd.net/sticky/default_profile_images/default_profile_0_bigger.png')
+      end
+
       it 'should return secure image with size specified' do
         @options = { :secure_image_url => 'true', :image_size => 'mini' }
         allow(subject).to receive(:raw_info).and_return(
@@ -53,6 +61,16 @@ describe OmniAuth::Strategies::Twitter do
     end
   end
 
+  describe 'skip_info option' do
+    context 'when skip info option is enabled' do
+      it 'should not include raw_info in extras hash' do
+        @options = { :skip_info => true }
+        allow(subject).to receive(:raw_info).and_return({:foo => 'bar'})
+        expect(subject.extra[:raw_info]).to eq(nil)
+      end
+    end
+  end
+
   describe 'request_phase' do
     context 'with no request params set and x_auth_access_type specified' do
       before do
@@ -70,15 +88,28 @@ describe OmniAuth::Strategies::Twitter do
     context "with no request params set and use_authorize options provided" do
       before do
         @options = { :use_authorize => true }
-        subject.stub(:request).and_return(
-          double('Request', {:params => {}})
-        )
-        subject.stub(:old_request_phase).and_return(:whatever)
+        allow(subject).to receive(:request) do
+          double('Request', {:params => {} })
+        end
+        allow(subject).to receive(:old_request_phase) { :whatever }
       end
 
       it "should switch authorize_path from authenticate to authorize" do
         expect { subject.request_phase }.to change { subject.options.client_options.authorize_path }.from('/oauth/authenticate').to('/oauth/authorize')
       end
     end
+
+    context "with no request params set and force_login specified" do
+      before do
+        allow(subject).to receive(:request) do
+          double('Request', {:params => { 'force_login' => true } })
+        end
+        allow(subject).to receive(:old_request_phase) { :whatever }
+      end
+
+      it "should change add force_login=true to authorize_params" do
+        expect { subject.request_phase }.to change {subject.options.authorize_params.force_login}.from(nil).to(true)
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,9 @@
 $:.unshift File.expand_path('..', __FILE__)
 $:.unshift File.expand_path('../../lib', __FILE__)
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start do
+  minimum_coverage(94.59)
+end
 require 'rspec'
 require 'rack/test'
 require 'webmock/rspec'

metadata

@@ -1,99 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-twitter
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Arun Agrawal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: bundler
   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: simplecov
-  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: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: OmniAuth strategy for Twitter
 email:
 - arunagw@gmail.com
@@ -101,9 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CONTRIBUTING.md
 - Gemfile
 - README.md
@@ -124,17 +82,17 @@ 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: omniauth-twitter
-rubygems_version: 2.2.2
+rubyforge_project: 
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for Twitter