bookingsync-engine 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea0fd3e150abdace341f9898eecebd300b547250
-  data.tar.gz: cf2fea9ac3c75e756d57279456d7f924a586e088
+  metadata.gz: d2e9e1a1b065139938c74227068d00fa52244973
+  data.tar.gz: 29b802bfa945e74dd09ad882090303e13d19966c
 SHA512:
-  metadata.gz: 56acfa9eeb2a5ef113cd8c5cd22b55f8c8b7aa5b6ffd17faffc0f5ec3c77aedc15a28050f4eaedf8f2cd88bcbac507d810932ccec5164f7004457761ef418dc7
-  data.tar.gz: 2201599717c678de4a7d35609dc5d86f3730074b69275ff6cfbe8164c0082a8f28e96024b8ea73a1d14ac8ef4c2ee9ccce3d70e6fa8c353af8b6ba210ea3299c
+  metadata.gz: 79ec41bdd62cf2891666617393585a9e9ee008bc4e6009332c0cdd4c17e5e7043e7e203a6b7f4db60f484811e7dd97689e47d6ff40aac199d19ec85a91c25f63
+  data.tar.gz: 3e64fbceabffa3bb2211098586222228b424b9520c33e9ec4a3d67e3d7d00ed058c75295bf25e701383b3dd90a780e22e6acc2f70cf7170bf4c86c4147db3b64

data/README.md

@@ -25,11 +25,17 @@ Then bundle install:
 bundle install
 ```
 
-Then BookingSync routes need to be mounted inside you apps routes.rb:
+Then mount BookingSync Authorization routes inside `routes.rb`:
 ```ruby
 mount BookingSync::Engine => '/'
 ```
 
+This will add the following routes:
+
+* `/auth/bookingsync/callback`
+* `/auth/failure`
+* `/signout`
+
 BookingSync Engine uses the `Account` model to authenticate each BookingSync Account, if you do not have an `Account` model yet, create one:
 
 ```console
@@ -39,7 +45,7 @@ rails g model Account
 Then, generate a migration to add OAuth fields for the `Account` class:
 
 ```console
-rails g migration AddOAuthFieldsToAccounts provider:string uid:integer:index \
+rails g migration AddOAuthFieldsToAccounts provider:string synced_id:integer:index \
   name:string oauth_access_token:string oauth_refresh_token:string \
   oauth_expires_at:string
 ```

data/lib/bookingsync/engine.rb

@@ -25,13 +25,11 @@ module BookingSync
       require "bookingsync/engine/helpers"
       require "bookingsync/engine/session_helpers"
       require "bookingsync/engine/auth_helpers"
-      require "bookingsync/engine/token_helpers"
 
       ActiveSupport.on_load :action_controller do
         include BookingSync::Engine::Helpers
         include BookingSync::Engine::SessionHelpers
         include BookingSync::Engine::AuthHelpers
-        include BookingSync::Engine::TokenHelpers
       end
     end
 

data/lib/bookingsync/engine/auth_helpers.rb

@@ -11,16 +11,16 @@ module BookingSync::Engine::AuthHelpers
 
   # @return [Account, nil] currently authorized Account or nil if unauthorized
   def current_account
-    @current_account ||= ::Account.find_by(uid: session[:account_id]) if session[:account_id].present?
+    @current_account ||= ::Account.find_by(synced_id: session[:account_id]) if session[:account_id].present?
   end
 
   # Callback after account is authorized.
   #
-  # Stores the authorized account's uid in the session.
+  # Stores the authorized account's synced_id in the session.
   #
   # @param account [Account] the just authorized account
   def account_authorized(account)
-    session[:account_id] = account.uid.to_s
+    session[:account_id] = account.synced_id.to_s
   end
 
   # Clear authorization if the account passed from the BookingSync app store

data/lib/bookingsync/engine/model.rb

@@ -2,13 +2,13 @@ module BookingSync::Engine::Model
   extend ActiveSupport::Concern
 
   included do
-    validates :uid, uniqueness: true
+    validates :synced_id, uniqueness: true
     scope :authorized, -> { where.not(oauth_access_token: nil) }
   end
 
   module ClassMethods
     def from_omniauth(auth)
-      find_or_initialize_by(uid: auth.uid, provider: auth.provider).tap do |account|
+      find_or_initialize_by(synced_id: auth.uid, provider: auth.provider).tap do |account|
         account.name = auth.info.business_name
         account.update_token(auth.credentials)
         account.save!

data/lib/bookingsync/engine/version.rb

@@ -1,3 +1,3 @@
 module BookingSync
-  ENGINE_VERSION = "0.5.0"
+  ENGINE_VERSION = "1.0.0"
 end

data/lib/generators/bookingsync/install/templates/create_bookingsync_accounts.rb

@@ -2,7 +2,7 @@ class CreateAccounts < ActiveRecord::Migration
   def change
     create_table :accounts do |t|
       t.string :provider
-      t.integer :uid
+      t.integer :synced_id
       t.string :name
       t.string :oauth_access_token
       t.string :oauth_refresh_token

data/spec/dummy/config/environments/production.rb

@@ -20,7 +20,7 @@ Dummy::Application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/spec/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.

data/spec/dummy/db/migrate/20140522110454_add_o_auth_fields_to_accounts.rb

@@ -1,8 +1,8 @@
 class AddOAuthFieldsToAccounts < ActiveRecord::Migration
   def change
     add_column :accounts, :provider, :string
-    add_column :accounts, :uid, :integer
-    add_index :accounts, :uid
+    add_column :accounts, :synced_id, :integer
+    add_index :accounts, :synced_id
     add_column :accounts, :name, :string
     add_column :accounts, :oauth_access_token, :string
     add_column :accounts, :oauth_refresh_token, :string

data/spec/dummy/db/schema.rb

@@ -17,13 +17,13 @@ ActiveRecord::Schema.define(version: 20140522110454) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "provider"
-    t.integer  "uid"
+    t.integer  "synced_id"
     t.string   "name"
     t.string   "oauth_access_token"
     t.string   "oauth_refresh_token"
     t.string   "oauth_expires_at"
   end
 
-  add_index "accounts", ["uid"], name: "index_accounts_on_uid"
+  add_index "accounts", ["synced_id"], name: "index_accounts_on_synced_id"
 
 end

data/spec/fixtures/accounts.yml

@@ -2,7 +2,7 @@
 
 one:
   provider: MyString
-  uid: 1
+  synced_id: 1
   name: MyString
   oauth_access_token: MyString
   oauth_refresh_token: MyString
@@ -10,7 +10,7 @@ one:
 
 two:
   provider: MyString
-  uid: 1
+  synced_id: 1
   name: MyString
   oauth_access_token: MyString
   oauth_refresh_token: MyString

data/spec/models/account_spec.rb

@@ -14,16 +14,16 @@ RSpec.describe Account, type: :model do
   end
 
   describe "validations" do
-    it { is_expected.to validate_uniqueness_of(:uid) }
+    it { is_expected.to validate_uniqueness_of(:synced_id) }
   end
 
   describe ".from_omniauth" do
-    before { Account.create!(provider: "bookingsync", uid: 456) }
+    before { Account.create!(provider: "bookingsync", synced_id: 456) }
 
     let(:auth) { OmniAuth.config.mock_auth[:bookingsync] }
 
     context "when account exists" do
-      let!(:account) { Account.create!(provider: "bookingsync", uid: 123) }
+      let!(:account) { Account.create!(provider: "bookingsync", synced_id: 123) }
 
       it "loads the existing account" do
         expect(Account.from_omniauth(auth)).to eql(account)
@@ -49,8 +49,8 @@ RSpec.describe Account, type: :model do
       describe "the newly created account" do
         let!(:account) { Account.from_omniauth(auth) }
 
-        it "sets uid and provider from auth" do
-          expect(account.uid).to eq 123
+        it "sets synced_id and provider from auth" do
+          expect(account.synced_id).to eq 123
           expect(account.provider).to eq "bookingsync"
         end
 
@@ -61,7 +61,7 @@ RSpec.describe Account, type: :model do
 
   describe "#token" do
     let(:expires_at) { 1.day.from_now.to_i }
-    let!(:account) { Account.create!(uid: 123, oauth_access_token: "token",
+    let!(:account) { Account.create!(synced_id: 123, oauth_access_token: "token",
       oauth_refresh_token: "refresh_token", oauth_expires_at: expires_at) }
 
     context "when the stored token is fresh" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookingsync-engine
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Sebastien Grosjean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -158,7 +158,6 @@ files:
 - lib/bookingsync/engine/helpers.rb
 - lib/bookingsync/engine/model.rb
 - lib/bookingsync/engine/session_helpers.rb
-- lib/bookingsync/engine/token_helpers.rb
 - lib/bookingsync/engine/version.rb
 - lib/generators/bookingsync/install/install_generator.rb
 - lib/generators/bookingsync/install/templates/create_bookingsync_accounts.rb
@@ -236,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Rails engine to simplify integration with BookingSync API

data/lib/bookingsync/engine/token_helpers.rb

@@ -1,31 +0,0 @@
-module BookingSync::Engine::TokenHelpers
-  extend ActiveSupport::Concern
-
-  private
-
-  # OAuth access token for the current account. Will refresh the token
-  # if it's expired and store the new token in the database.
-  #
-  # @return [OAuth2::AccessToken] access token for current account
-  def current_account_token
-    current_account.token
-  end
-
-  # OAuth access token for the application. The token is obtained from
-  # {BookingSync::Engine#appliation_token}.
-  #
-  # Will fetch new token if the current one is expired.
-  #
-  # The token is stored in thread local storage, to reduce the amount of
-  # token requests.
-  #
-  # @return [OAuth2::AccessToken] access token for application
-  def application_token
-    token = Thread.current[:_bookingsync_application_token]
-    if token.nil? || token.expired?
-      token = Thread.current[:_bookingsync_application_token] =
-        BookingSync::Engine.application_token
-    end
-    token
-  end
-end