omniauth-roomorama 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWRkODJmODM5ZTEwMDBmZDM4OTNhMzI0MmY1ZDk1MGMyZTA1OTgxOQ==
+  data.tar.gz: !binary |-
+    Nzg2YWVkZWQwNWFkYWM0MWYxNmY0OGFiOTcxNDk0MTQzYTQ2MDg0YQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OGI4M2ZlMjVjOTU1ZjMxZmEwNTY4MmY2MWIxNTg0NDA3NzUzMDg5NDVmMjJl
+    YTdmYjExMWRmYjhjMzM1YTgzMWYyYTdmNTM3MjVhZjRlOTYzYTZjYWJhYTIx
+    MmZlNzUxMDk0NDJjYWY3ZWQ3ZjU2NTZjYzVkMDc0YWM0NmM5YWU=
+  data.tar.gz: !binary |-
+    YTMyNWQ5MjVmYTZjNjQyNzQ1NTQzYjk1Mjc1OTM5ZDE4MTA1NTU1YjcyODQ2
+    YzVmYWVkMmJmMDFkZTBmNDUwYTkxMmFjZDIxMjU0OTE1OTVjY2FkYWFjZDRj
+    Y2RmZjFjZTFhZWU4ZjY0MWNmODRiNjMyNzdkM2ZlMDBkNjRiMTU=

data/.gitignore

@@ -6,6 +6,7 @@
 .rbx
 .rvmrc
 .yardoc
+.idea
 Gemfile.lock
 bin
 coverage*
@@ -15,4 +16,4 @@ pkg
 rdoc
 rerun.txt
 tags
-tmp
+tmp

data/.rspec

@@ -1,2 +1,2 @@
 --format=nested
---colour
+--colour

data/.travis.yml

@@ -1,11 +1,12 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - ruby-head
-  - ree
+  - "1.8.7"
+  - "1.9.2"
+  - "1.9.3"
+  - "2.0.0"
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-18mode
   - rbx-19mode
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

data/Gemfile

@@ -1,7 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gemspec
-
-group :example do
-  gem 'sinatra'
-end
+gemspec

data/README.md

@@ -1,6 +1,9 @@
 # OmniAuth Roomorama
 
-This is an OmniAuth 1.0 strategy for authenticating to Roomorama. To
+[![Build Status](https://travis-ci.org/roomorama/omniauth-roomorama.png)](https://travis-ci.org/roomorama/omniauth-roomorama)
+
+
+This is an OmniAuth 1.1 strategy for authenticating to Roomorama. To
 use it, you'll need to sign up for an OAuth2 Application ID and Secret
 on the [Roomorama Application's Registration Page](https://roomorama.com/oauth_clients/new).
 
@@ -16,7 +19,7 @@ Then `bundle install`.
 
 ## Usage
 
-`OmniAuth::Strategies::Roomorama` is simply a Rack middleware. Read the OmniAuth 1.0 docs for detailed instructions: https://github.com/intridea/omniauth.
+`OmniAuth::Strategies::Roomorama` is simply a Rack middleware. Read the OmniAuth 1.1 docs for detailed instructions: https://github.com/intridea/omniauth.
 
 Here's a quick example, adding the middleware to a Rails app in `config/initializers/omniauth.rb`:
 
@@ -28,17 +31,14 @@ end
 
 ## Supported Rubies
 
-OmniAuth Roomorama is tested under 1.8.7, 1.9.2, 1.9.3, Ruby-head, Ruby Enterprise Edition, JRuby (1.8 and 1.9 mode) and Rubinius (1.8 and 1.9 mode).
-
-[![CI Build
-Status](https://secure.travis-ci.org/BookingSync/omniauth-roomorama.png)](http://travis-ci.org/BookingSync/omniauth-roomorama)
+OmniAuth Roomorama Admin is tested under 1.9.3 but will probably work under other rubies
 
 ## License
 
-Copyright (c) 2012 Sébastien Grosjean and [BookingSync.com](http://www.bookingsync.com)
+Copyright (c) 2013 Roomorama
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/omniauth-roomorama.rb

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

data/lib/omniauth/roomorama.rb

@@ -0,0 +1 @@
+require 'omniauth/strategies/roomorama'

data/lib/{omniauth-roomorama → omniauth/roomorama}/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Roomorama
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/lib/omniauth/strategies/roomorama.rb

@@ -1,13 +1,42 @@
-require 'omniauth-oauth2'
+require 'omniauth/strategies/oauth2'
 
 module OmniAuth
   module Strategies
     class Roomorama < OmniAuth::Strategies::OAuth2
       option :name, 'roomorama'
 
-      option :client_options, { :site => 'https://roomorama.com' }
+      option :client_options, { 
+        :site => 'https://api.roomorama.com', 
+        :authorize_url => "https://roomorama.com/oauth/authorize",
+        :token_url => "https://roomorama.com/oauth/token"
+      }
+      
+      uid { raw_info['id'] }
+      
+      info do
+        {
+          :name => raw_info['login'],
+          :email => raw_info['email'],
+          :nickname => raw_info['login'],
+          :first_name => raw_info['first_name'],
+          :last_name => raw_info['last_name'],
+          :location => [raw_info['city'], raw_info['country']].delete_if(&:blank?).join(', '),
+          :description => raw_info['description'],
+          :phone => raw_info['phone_number'],
+        }
+      end
+      
+      extra do
+        {
+          :raw_info => raw_info
+        }
+      end
+      
+      def raw_info
+        @raw_info ||= access_token.get('/v1.0/me').parsed['result']
+      end
     end
   end
 end
 
-OmniAuth.config.add_camelization 'roomorama', 'Roomorama'
+OmniAuth.config.add_camelization 'roomorama', 'Roomorama'

data/omniauth-roomorama.gemspec

@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/omniauth-roomorama/version', __FILE__)
+require File.expand_path('../lib/omniauth/roomorama/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors = ["Sebastien Grosjean"]
-  gem.email = ["dev@bookingsync.com"]
-  gem.description = %q{An OmniAuth 1.0 strategy for Roomorama oauth2 identification.}
+  gem.authors = ["Donald Piret"]
+  gem.email = ["donald@roomorama.com"]
+  gem.description = %q{Roomorama OmniAuth strategy.}
   gem.summary = %q{An OmniAuth 1.0 strategy for Roomorama oauth2 identification.}
-  gem.homepage = "https://github.com/BookingSync/omniauth-roomorama"
+  gem.homepage = "https://github.com/roomorama/omniauth-roomorama"
+  gem.license = 'MIT'
 
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files = `git ls-files`.split("\n")
@@ -15,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version = OmniAuth::Roomorama::VERSION
 
-  gem.add_dependency 'omniauth', '~> 1.0'
-  gem.add_dependency 'omniauth-oauth2', '~> 1.0'
+  gem.add_dependency 'omniauth', '~> 1.1'
+  gem.add_dependency 'omniauth-oauth2', '~> 1.1'
 
   gem.add_development_dependency 'rspec', '~> 2.7'
   gem.add_development_dependency 'rake'

data/spec/omniauth/strategies/roomorama_spec.rb

@@ -1,7 +1,11 @@
 require 'spec_helper'
-require 'omniauth-roomorama'
+require 'omniauth/roomorama'
 
 describe OmniAuth::Strategies::Roomorama do
+  before do
+    OmniAuth.config.test_mode = true
+  end
+  
   subject do
     OmniAuth::Strategies::Roomorama.new(nil, @options || {})
   end
@@ -10,15 +14,15 @@ describe OmniAuth::Strategies::Roomorama do
 
   describe '#client' do
     it 'should have the correct site' do
-      subject.client.site.should eq("https://roomorama.com")
+      subject.client.site.should eq("https://api.roomorama.com")
     end
 
     it 'should have the correct authorization url' do
-      subject.client.options[:authorize_url].should eq("/oauth/authorize")
+      subject.client.options[:authorize_url].should eq("https://roomorama.com/oauth/authorize")
     end
 
     it 'should have the correct token url' do
-      subject.client.options[:token_url].should eq('/oauth/token')
+      subject.client.options[:token_url].should eq('https://roomorama.com/oauth/token')
     end
   end
 

data/spec/spec_helper.rb

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

metadata

@@ -1,63 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-roomorama
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
-- Sebastien Grosjean
+- Donald Piret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70231885663260 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70231885663260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &70231885661960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70231885661960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70231885660480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70231885660480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70231885659280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70231885659280
-description: An OmniAuth 1.0 strategy for Roomorama oauth2 identification.
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Roomorama OmniAuth strategy.
 email:
-- dev@bookingsync.com
+- donald@roomorama.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -68,37 +79,37 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- example/sinatra.rb
 - lib/omniauth-roomorama.rb
-- lib/omniauth-roomorama/version.rb
+- lib/omniauth/roomorama.rb
+- lib/omniauth/roomorama/version.rb
 - lib/omniauth/strategies/roomorama.rb
 - omniauth-roomorama.gemspec
 - spec/omniauth/strategies/roomorama_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb
-homepage: https://github.com/BookingSync/omniauth-roomorama
-licenses: []
+homepage: https://github.com/roomorama/omniauth-roomorama
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An OmniAuth 1.0 strategy for Roomorama oauth2 identification.
 test_files:
 - spec/omniauth/strategies/roomorama_spec.rb

data/example/sinatra.rb

@@ -1,31 +0,0 @@
-require 'rubygems'
-require 'bundler'
-
-Bundler.setup :default, :development, :example
-require 'sinatra'
-require 'omniauth'
-require 'omniauth-roomorama'
-
-use Rack::Session::Cookie
-
-use OmniAuth::Builder do
-  provider :roomorama, "xhphaTy1kl0Yjqan1ZgHGw", "E9PVZNSWbluCqqSjy9wH8tUb6ttTkaHy6wV38724o"
-end
-
-get '/' do
-  <<-HTML
-<ul>
-<li><a href='/auth/roomorama'>Sign in with Roomorama</a></li>
-</ul>
-HTML
-end
-
-get '/auth/:provider/callback' do
-  content_type 'text/plain'
-  request.env['omniauth.auth'].to_hash.inspect
-end
-
-get '/auth/failure' do
-  content_type 'text/plain'
-  params[:message]
-end