omniauth-meetup 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWQzNDZkNTgwNjk4NTdkN2JhZTEwZDVlNzVhZDk1MWQwMDNjYjM4NA==
-  data.tar.gz: !binary |-
-    MWU5OGZmOTRlNjVmYmI0ZWZhMDU2OWYyOTU4ZTBiYTI4YjhlZmE2Yg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MzczYjI4ZWRhY2RmY2NlNGEwMTlkOTFlZDhiZGZkZjRkMDg2MWQ5NzM3NDAz
-    M2VhMzE4YWFkNjk5MmRkOWYzYjZjZDAyNzZmODBkYWQyZTVmYTEwMzJiOTVh
-    NzIzM2QwY2M5M2ZmZTQ5MzBkODM3ZGNhNjIzYjZiMjZkNTllZTQ=
-  data.tar.gz: !binary |-
-    ZDY1NDM4MGE1MjkzZDJiMTUxYWVjMzY2ZTU1YWFlZDUzYjVmY2E3NmZhNzNk
-    Y2I1ZjliODMyOGMyOGFhNThmMDA3NTNhZGIyYTNjNzgxNTY1YWQzZDg1ZTRi
-    OGI3MWVlOTNmYzRiYzQ0ZTc1NWRkNmNjMWY4MmY1YTBhMzAwM2I=
+SHA1:
+  metadata.gz: c9abf71008da990179408266afa4a38e1ee484d1
+  data.tar.gz: 03e363e9e2a322d36ae3d3d3042c365aeddcb2a8
+SHA512:
+  metadata.gz: 392ef42c2fd9aca7e2bf9eec8e6e7934bd0c7c3940e4a50c9655c3eac5f4a35bab15c5bee8ad905b73ba0b22607b005b0b0877526277286e428c8e79fdab9d63
+  data.tar.gz: ed6eec0f6c82522cec0ef091ded032276079df5ae5d855d0112ce26f53b09c52c55a29fd947603ba8a6c49d93c738e355afc48a72841af9f44c7f86295067a2b

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in omniauth-meetup.gemspec
 gemspec

data/README.md

@@ -13,7 +13,7 @@ implementation of OAuth2
 Add to your `Gemfile`:
 
 ```ruby
-    gem 'omniauth-meetup'
+  gem 'omniauth-meetup'
 ```
 
 Then `bundle install`.
@@ -32,6 +32,13 @@ Rails.application.config.middleware.use OmniAuth::Builder do
   provider :meetup, ENV['MEETUP_KEY'], ENV['MEETUP_SECRET']
 end
 ```
+or with Devise
+
+```ruby
+  config.omniauth :meetup, ENV['MEETUP_KEY'], ENV['MEETUP_SECRET'], callback_url: 'http://example.com/users/auth/meetup/callback'
+```
+**Starting from version 1.4 in omniauth-oauth2 you must provide same callback url you have provided on API dashboard otherwise authentication won't work.**
+
 You can then implement your authentication as usual with OmniAuth as
 shown in the excellent [Railscast
 241](http://railscasts.com/episodes/241-simple-omniauth)

data/Rakefile

@@ -1,8 +1,8 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new do |t|
 end
 
-task :default  => :spec
+task default: :spec

data/lib/omniauth-meetup.rb

@@ -1,2 +1,2 @@
-require "omniauth-meetup/version"
-require "omniauth/strategies/meetup"
+require 'omniauth-meetup/version'
+require 'omniauth/strategies/meetup'

data/lib/omniauth-meetup/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Meetup
-    VERSION = "0.0.7"
+    VERSION = '0.0.8'.freeze
   end
 end

data/lib/omniauth/strategies/meetup.rb

@@ -2,30 +2,30 @@ require 'omniauth-oauth2'
 
 module OmniAuth
   module Strategies
+    # Meetup omniauth-oauth2 strategy
     class Meetup < OmniAuth::Strategies::OAuth2
-      option :name, "meetup"
+      option :name, 'meetup'
 
-      option :client_options, {
-        :site => "https://api.meetup.com",
-        :authorize_url => 'https://secure.meetup.com/oauth2/authorize',
-        :token_url => 'https://secure.meetup.com/oauth2/access'
-      }
+      option :client_options,
+             site: 'https://api.meetup.com',
+             authorize_url: 'https://secure.meetup.com/oauth2/authorize',
+             token_url: 'https://secure.meetup.com/oauth2/access'
 
       def request_phase
         super
       end
 
-      uid{ raw_info['id'] }
+      uid { raw_info['id'] }
 
       info do
         {
-          :id => raw_info['id'],
-          :name => raw_info['name'],
-          :photo_url => (raw_info.key?('photo') ? raw_info['photo']['photo_link'] : nil),
-          :image => (raw_info.key?('photo') ? raw_info['photo']['photo_link'] : nil),
-          :urls => { :public_profile => raw_info['link'] },
-          :description => raw_info['bio'],
-          :location => [raw_info['city'], raw_info['state'], raw_info['country']].reject{|v| !v || v.empty?}.join(', ')
+          id: raw_info['id'],
+          name: raw_info['name'],
+          photo_url: meetup_photo_url,
+          image: meetup_photo_url,
+          urls: { public_profile: raw_info['link'] },
+          description: raw_info['bio'],
+          location: meetup_location
         }
       end
 
@@ -33,10 +33,26 @@ module OmniAuth
         { 'raw_info' => raw_info }
       end
 
+      def callback_url
+        # Fixes regression in omniauth-oauth2 v1.4.0 by https://github.com/intridea/omniauth-oauth2/commit/85fdbe117c2a4400d001a6368cc359d88f40abc7
+        options[:callback_url] || (full_host + script_name + callback_path)
+      end
+
       def raw_info
         @raw_info ||= JSON.parse(access_token.get('/2/member/self').body)
       end
 
+      private
+
+      def meetup_location
+        [raw_info['city'], raw_info['state'], raw_info['country']].reject do |v|
+          !v || v.empty?
+        end.join(', ')
+      end
+
+      def meetup_photo_url
+        raw_info.key?('photo') ? raw_info['photo']['photo_link'] : nil
+      end
     end
   end
 end

data/omniauth-meetup.gemspec

@@ -1,26 +1,21 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "omniauth-meetup/version"
-
 Gem::Specification.new do |gem|
-  gem.name        = "omniauth-meetup"
-  gem.version     = Omniauth::Meetup::VERSION
-  gem.authors     = ["Miles Woodroffe"]
-  gem.email       = ["miles@thespecials.com"]
-  gem.homepage    = "http://github.com/tapster/omniauth-meetup"
-  gem.description = %q{Meetup.com authentication handler for OmniAuth}
+  gem.name        = 'omniauth-meetup'
+  gem.version     = '0.0.8'
+  gem.authors     = ['Miles Woodroffe']
+  gem.email       = ['miles@thespecials.com']
+  gem.homepage    = 'http://github.com/tapster/omniauth-meetup'
+  gem.description = 'Meetup.com authentication handler for OmniAuth'
   gem.summary     = gem.description
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
+  gem.files = ['.gitignore', '.rspec', '.travis.yml', 'Gemfile', 'README.md', 'Rakefile', 'lib/omniauth-meetup.rb', 'lib/omniauth-meetup/version.rb', 'lib/omniauth/strategies/meetup.rb', 'omniauth-meetup.gemspec']
+  gem.test_files = ['./spec/omniauth/strategies/meetup_spec.rb', 'spec/spec_helper.rb']
 
   # specify any dependencies here; for example:
   gem.add_dependency 'omniauth', '~> 1.0'
   gem.add_dependency 'omniauth-oauth2', '~> 1.0'
   gem.add_development_dependency 'rspec', '~> 2.7'
   gem.add_development_dependency 'rack-test'
-  gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'webmock'
 end

data/spec/omniauth/strategies/meetup_spec.rb

@@ -6,69 +6,69 @@ describe OmniAuth::Strategies::Meetup do
   end
 
   describe '#client' do
-    it 'should have the correct meetup site' do
-      subject.client.site.should eq("https://api.meetup.com")
+    it 'has a correct api url' do
+      expect(subject.client.site).to eq('https://api.meetup.com')
     end
 
-    it 'should have the correct authorization url' do
-      subject.client.options[:authorize_url].should eq("https://secure.meetup.com/oauth2/authorize")
+    it 'has a correct api authorization url' do
+      expect(subject.client.options[:authorize_url]).to eq('https://secure.meetup.com/oauth2/authorize')
     end
 
-    it 'should have the correct token url' do
-      subject.client.options[:token_url].should eq('https://secure.meetup.com/oauth2/access')
+    it 'has a correct api token auth url' do
+      expect(subject.client.options[:token_url]).to eq('https://secure.meetup.com/oauth2/access')
     end
   end
 
   describe '#callback_path' do
-    it 'should have the correct callback path' do
-      subject.callback_path.should eq('/auth/meetup/callback')
+    it 'has a correct callback path' do
+      expect(subject.callback_path).to eq('/auth/meetup/callback')
     end
   end
 
   describe '#uid' do
     it 'returns the uid from raw_info' do
-      subject.stub(:raw_info) { { 'id' => '999' } }
-      subject.uid.should == '999'
+      allow(subject).to receive(:raw_info).and_return('id' => '999')
+      expect(subject.uid).to eq('999')
     end
   end
 
   describe '#info' do
     it 'returns the name from raw_info' do
-      subject.stub(:raw_info) { { 'name' => 'Bert' }}
-      subject.info[:name].should == 'Bert'
+      allow(subject).to receive(:raw_info).and_return('name' => 'Bert')
+      expect(subject.info[:name]).to eq('Bert')
     end
 
     it 'returns the photo_url from raw_info if available' do
-      subject.stub(:raw_info) { { 'photo' => { 'photo_link' => 'http://meetup.com/bert.jpg' } }}
-      subject.info[:photo_url].should == 'http://meetup.com/bert.jpg'
-      subject.stub(:raw_info) {{}}
-      subject.info[:photo_url].should == nil
+      allow(subject).to receive(:raw_info).and_return('photo' => { 'photo_link' => 'http://meetup.com/bert.jpg' })
+      expect(subject.info[:photo_url]).to eq('http://meetup.com/bert.jpg')
+      allow(subject).to receive(:raw_info).and_return({})
+      expect(subject.info[:photo_url]).to eq(nil)
     end
 
     it 'returns the image from raw_info if available' do
-      subject.stub(:raw_info) { { 'photo' => { 'photo_link' => 'http://meetup.com/bert.jpg' } }}
-      subject.info[:image].should == 'http://meetup.com/bert.jpg'
-      subject.stub(:raw_info) {{}}
-      subject.info[:image].should == nil
+      allow(subject).to receive(:raw_info).and_return('photo' => { 'photo_link' => 'http://meetup.com/bert.jpg' })
+      expect(subject.info[:image]).to eq('http://meetup.com/bert.jpg')
+      allow(subject).to receive(:raw_info).and_return({})
+      expect(subject.info[:image]).to eq(nil)
     end
-    
+
     it 'returns the public_profile url' do
-      subject.stub(:raw_info) { { 'link' => 'http://meetup.com/bert' }}
-      subject.info[:urls][:public_profile].should == 'http://meetup.com/bert'
+      allow(subject).to receive(:raw_info).and_return('link' => 'http://meetup.com/bert')
+      expect(subject.info[:urls][:public_profile]).to eq('http://meetup.com/bert')
     end
 
     it 'returns the description from raw_info' do
-      subject.stub(:raw_info) { { 'bio' => 'My name is Bert.' }}
-      subject.info[:description].should == 'My name is Bert.'
+      allow(subject).to receive(:raw_info).and_return('bio' => 'My name is Bert.')
+      expect(subject.info[:description]).to eq('My name is Bert.')
     end
 
     it 'returns the location from raw_info' do
-      subject.stub(:raw_info) { { 'city' => 'Los Angeles', 'state' => 'CA', 'country' => 'USA' }}
-      subject.info[:location].should == 'Los Angeles, CA, USA'
-      subject.stub(:raw_info) { { 'city' => 'Tokyo', 'country' => 'Japan' }}
-      subject.info[:location].should == 'Tokyo, Japan'
-      subject.stub(:raw_info) {{}}
-      subject.info[:location].should == ''
+      allow(subject).to receive(:raw_info).and_return('city' => 'Los Angeles', 'state' => 'CA', 'country' => 'USA')
+      expect(subject.info[:location]).to eq('Los Angeles, CA, USA')
+      allow(subject).to receive(:raw_info).and_return('city' => 'Tokyo', 'country' => 'Japan')
+      expect(subject.info[:location]).to eq('Tokyo, Japan')
+      allow(subject).to receive(:raw_info).and_return({})
+      expect(subject.info[:location]).to eq('')
     end
   end
 end

data/spec/spec_helper.rb

@@ -9,5 +9,5 @@ require 'omniauth-meetup'
 RSpec.configure do |config|
   config.include WebMock::API
   config.include Rack::Test::Methods
-  config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
+  config.extend  OmniAuth::Test::StrategyMacros, type: :strategy
 end

metadata

@@ -1,97 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-meetup
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Miles Woodroffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   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'
 - !ruby/object:Gem::Dependency
   name: rack-test
   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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Meetup.com authentication handler for OmniAuth
@@ -101,9 +87,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- "./spec/omniauth/strategies/meetup_spec.rb"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -111,7 +98,6 @@ files:
 - lib/omniauth-meetup/version.rb
 - lib/omniauth/strategies/meetup.rb
 - omniauth-meetup.gemspec
-- spec/omniauth/strategies/meetup_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/tapster/omniauth-meetup
 licenses: []
@@ -122,20 +108,20 @@ 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.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Meetup.com authentication handler for OmniAuth
 test_files:
-- spec/omniauth/strategies/meetup_spec.rb
+- "./spec/omniauth/strategies/meetup_spec.rb"
 - spec/spec_helper.rb