omniauth-bookingsync 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df17b738000344d67445ce81236c1ec2e068cf4e
-  data.tar.gz: c8a9705d350b64234ea4d4e7de76ce6b6a108dfb
+  metadata.gz: bae9c4da86dca7f00aaad6b49d0e0186238f7aa7
+  data.tar.gz: 79f7916e128c0a8caacf5d6db9aabb61fcd2bc7d
 SHA512:
-  metadata.gz: 8a48828bfdb7baa312b046daac5e22a5a3f9f7baa5bf1152f73d8f1558e13dbe926cbfce98de79fc7150cd8572dafb0236297ab70433209b1ac5c7a57c3b1bc4
-  data.tar.gz: e04b5c0986428aecc1d542a7e0340594d05f03860fb1040179bcec02fe92b1f05c37264ad959a9b13162d6a888d70837b7a09f29b28a7a44cf5bbdcafe969b3f
+  metadata.gz: f9252f455c913e3ef984340dfa1b57f31dfc13d201717006148e8e05fedb57cf9b952dee7cdeedcfd9e1a2108baf43ce802956546552e4033959cb7eb16e2b98
+  data.tar.gz: 7627343b15c0af7b6f07ccbb44b72ea218ac34adb2385f4955fa37ed27a1a4ed0856179cc7a16925da4b758ccbd449bf70e8bf990e1fd28d04f42a0a7bd612f5

data/.gitignore

@@ -6,6 +6,7 @@
 .rbx
 .rvmrc
 .yardoc
+.ruby-version
 bin
 coverage*
 doc
@@ -15,3 +16,4 @@ rdoc
 rerun.txt
 tags
 tmp
+example/.powenv

data/.travis.yml

@@ -1,8 +1,10 @@
 sudo: false
 language: ruby
+before_install:
+  - gem install bundler
+  - gem update bundler
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
+  - 2.2.5
+  - 2.3.1
   - ruby-head
-  - jruby
+  - jruby-head

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 #master
 
+* bump oauth2 to 1.2
+* add Ruby 2.3.1 to travis, drop Ruby 2.0 and 2.1 (end of maintenance)
+* Update example application to work over SSL
+
 # 0.3.1
 
 * Lock oauth2 version to 1.0 due to 1.1 having some breaking changes

data/Gemfile.lock

@@ -1,63 +1,62 @@
 PATH
   remote: .
   specs:
-    omniauth-bookingsync (0.3.1)
-      oauth2 (= 1.0)
+    omniauth-bookingsync (0.4.0)
+      oauth2 (~> 1.2.0)
       omniauth (~> 1.1)
       omniauth-oauth2 (< 1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.1.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
+    ast (2.3.0)
     diff-lcs (1.2.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    hashie (3.4.3)
-    jwt (1.5.2)
-    multi_json (1.11.2)
+    hashie (3.4.4)
+    jwt (1.5.4)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    oauth2 (1.0.0)
+    oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
+      rack (>= 1.2, < 3)
     omniauth (1.3.1)
       hashie (>= 1.2, < 4)
       rack (>= 1.0, < 3)
     omniauth-oauth2 (1.3.1)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
-    parser (2.2.2.6)
-      ast (>= 1.1, < 3.0)
+    parser (2.3.1.2)
+      ast (~> 2.2)
     powerpack (0.1.1)
-    rack (1.6.4)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rack (2.0.1)
+    rainbow (2.1.0)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    rubocop (0.34.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.2.5, < 3.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.42.0)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.5)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    unicode-display_width (1.1.0)
 
 PLATFORMS
   ruby
@@ -69,4 +68,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.10.6
+   1.12.5

data/README.md

@@ -36,14 +36,14 @@ this will skip the account selection process and show the accept/deny page.
 
 ## Supported Rubies
 
-OmniAuth BookingSync is tested under 2.0, 2.1, 2.2, Ruby-head, JRuby.
+OmniAuth BookingSync is tested under 2.2, 2.3, Ruby-head, JRuby.
 
 [![CI Build
 Status](https://secure.travis-ci.org/BookingSync/omniauth-bookingsync.png)](http://travis-ci.org/BookingSync/omniauth-bookingsync)
 
 ## License
 
-Copyright (c) 2014 Sébastien Grosjean and [BookingSync.com](http://www.bookingsync.com)
+Copyright (c) 2014-present Sébastien Grosjean and [BookingSync.com](http://www.bookingsync.com)
 
 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:
 

data/example/.powenv.sample

@@ -0,0 +1,3 @@
+export BOOKINGSYNC_CLIENT_ID=""
+export BOOKINGSYNC_CLIENT_SECRET=""
+export BOOKINGSYNC_SCOPE=""

data/example/Gemfile.lock

@@ -0,0 +1,45 @@
+GEM
+  specs:
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    hashie (3.4.3)
+    json (1.8.3)
+    jwt (1.5.4)
+    multi_json (1.11.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    omniauth (1.3.1)
+      hashie (>= 1.2, < 4)
+      rack (>= 1.0, < 3)
+    omniauth-bookingsync (0.3.1)
+      oauth2 (= 1.0)
+      omniauth (~> 1.1)
+      omniauth-oauth2 (< 1.4)
+    omniauth-oauth2 (1.3.1)
+      oauth2 (~> 1.0)
+      omniauth (~> 1.2)
+    rack (1.6.4)
+    rack-protection (1.5.3)
+      rack
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    tilt (2.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  json
+  omniauth-bookingsync
+  sinatra
+
+BUNDLED WITH
+   1.12.5

data/example/ReadMe.md

@@ -5,12 +5,34 @@ This is specially useful to play around BookingSync API v3.
 
 ## Usage
 
+### Requirements:
+
+[POW](http://pow.cx/) - To run this Sinatra application.
+[Tunnelss](https://github.com/rchampourlier/tunnelss) - To use SSL
+
+_Note: Tricks for [persiting SSL with Tunnelss over reboot](http://www.sebgrosjean.com/en/news/2014/2/9/rails-with-ssl-in-development-with-pow-and-tunnels)_
+
+### 1) Install dependencies
+
+```sh
+bundle install
 ```
-$ bundle install
-$ bundle exec ruby bookingsync_oauth_helper.rb
+
+### 2) Setup your BookingSync Application credentials
+
+```sh
+cp .powenv.sample .powenv
 ```
 
-Follow the guide until you get your OAuth Token back.
+Edit the `BOOKINGSYNC_CLIENT_ID`, `BOOKINGSYNC_CLIENT_SECRET` and `BOOKINGSYNC_SCOPE` environment variables from the `.powenv` file.
+
+### 3) Restart Pow
+
+Make sure to restart Pow, using:
+
+```sh
+touch tmp/restart.txt
+```
 
 You can then use the [BookingSync API gem](https://github.com/BookingSync/bookingsync-api) to consume the API
 
@@ -25,7 +47,7 @@ api.rentals.first.name
 
 ## License
 
-Copyright (c) 2014 Sébastien Grosjean and [BookingSync.com](http://www.bookingsync.com)
+Copyright (c) 2014-present Sébastien Grosjean and [BookingSync.com](http://www.bookingsync.com)
 
 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:
 

data/example/bookingsync_oauth_helper.rb

@@ -1,36 +1,13 @@
 require "sinatra"
-require "omniauth-bookingsync"
 require "json"
-
-puts "-" * 60
-puts "BookingSync OAuth helper for API v3".center(60)
-puts "-" * 60
-puts ""
-puts "Requirements:"
-puts "  => Create a BookingSync Application from"
-puts "  https://www.bookingsync.com/en/partners/applications"
-puts ""
-puts "  => Use http://localhost:4567/auth/bookingsync/callback as return URL"
-puts ""
-puts "Enter your Application's Client ID"
-set :client_id, gets.strip
-puts ""
-puts "Enter your Application's Client Secret"
-set :client_secret, gets.strip
-puts ""
-puts "Enter your desired scopes (space separated)"
-set :scope, gets.strip
-puts "-" * 60
-puts "Visit http://localhost:4567".center(60)
-puts "-" * 60
-puts "Press CMD + C to stop"
-puts ""
+require "omniauth-bookingsync"
 
 use Rack::Session::Cookie
 
 use OmniAuth::Builder do
-  provider :bookingsync, settings.client_id, settings.client_secret,
-           scope: settings.scope
+  provider :bookingsync, ENV['BOOKINGSYNC_CLIENT_ID'], ENV['BOOKINGSYNC_CLIENT_SECRET'], {
+    scope: ENV['BOOKINGSYNC_SCOPE']
+  }
 end
 
 get "/" do
@@ -66,7 +43,6 @@ HTML
 end
 
 get "/auth/:provider/callback" do
-  content_type "application/json"
   request.env["omniauth.auth"].to_hash.to_json
 end
 

data/example/config.ru

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'bundler'
+Bundler.setup
+
+require './bookingsync_oauth_helper'
+
+run Sinatra::Application

data/lib/omniauth/bookingsync/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module BookingSync
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

data/lib/omniauth/strategies/bookingsync.rb

@@ -30,6 +30,8 @@ module OmniAuth
   end
 end
 
-OAuth2::Response::CONTENT_TYPES["application/vnd.api+json"] ||= :json
+OAuth2::Response.register_parser(:json, ["application/vnd.api+json"]) do |body|
+  MultiJson.load(body) rescue body # rubocop:disable RescueModifier
+end
 
 OmniAuth.config.add_camelization "bookingsync", "BookingSync"

data/omniauth-bookingsync.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   # this constraint is to change in 1.4 breaking redirect url generation
   # https://github.com/intridea/omniauth-oauth2/issues/81
   gem.add_dependency "omniauth-oauth2", "< 1.4"
-  gem.add_dependency "oauth2", "1.0"
+  gem.add_dependency "oauth2", "~> 1.2.0"
 
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake"

data/spec/omniauth/strategies/bookingsync_spec.rb

@@ -45,12 +45,37 @@ describe OmniAuth::Strategies::BookingSync do
   end
 
   describe '#raw_info' do
-    it "fetches account info from api v3" do
+    let(:body) { '{"accounts": [{"id": 1}]}' }
+    let(:response) { double("response", headers: headers, status: 200, body: body) }
+
+    before do
       allow(subject).to receive(:access_token).and_return(double)
-      response = double(parsed: { "accounts" => [{ "id" => 1 }] })
       expect(subject.access_token).to receive(:get).with("/api/v3/accounts")
-        .and_return(response)
-      expect(subject.raw_info).to eq("id" => 1)
+        .and_return(OAuth2::Response.new(response))
+    end
+
+    context "when Content-Type not supported" do
+      let(:headers) { { "Content-Type" => "application/foo-bar" } }
+
+      it "blows up with NoMethodError" do
+        expect { subject.raw_info }.to raise_error(NoMethodError)
+      end
+    end
+
+    context "when Content-Type supported" do
+      let(:headers) { { "Content-Type" => "application/vnd.api+json" } }
+
+      it "fetches account info from api v3" do
+        expect(subject.raw_info).to eq("id" => 1)
+      end
+    end
+
+    context "when Content-Type supported" do
+      let(:headers) { { "Content-Type" => "application/json" } }
+
+      it "fetches account info from api v3" do
+        expect(subject.raw_info).to eq("id" => 1)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-bookingsync
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Sebastien Grosjean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -42,16 +42,16 @@ dependencies:
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -111,9 +111,12 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- example/.powenv.sample
 - example/Gemfile
+- example/Gemfile.lock
 - example/ReadMe.md
 - example/bookingsync_oauth_helper.rb
+- example/config.ru
 - lib/omniauth-bookingsync.rb
 - lib/omniauth/bookingsync/version.rb
 - lib/omniauth/strategies/bookingsync.rb
@@ -140,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An OmniAuth 1.0 strategy for BookingSync OAuth2 identification.