g5_authenticatable 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93238b9dd28980b2722ffc334c98c7c29aed9952
-  data.tar.gz: cd9eaa8d01343dd9463a0a6a2cc082331ec89f49
+  metadata.gz: 747e24b3b4e7c12529e9a71fdbd83b7a21579d87
+  data.tar.gz: b6714d5b386412ef225a318e88ce06e43b7ce05d
 SHA512:
-  metadata.gz: 39a183780b26fb0bb1c730797504f549bd7510d10e76bf6946b52d818de6b5215649eebb48717150cffa551e337e0cea7c85e3891c9ee3a1196b6437aa4c080f
-  data.tar.gz: 036629738e9fd3c4f1888f9bd53b82a1bf61485bf01305cc97da8ebb32c9a342d792ec2e3b68abc5db9eb91ecf6202f8f03079d5f7dcaf66d981ca1423eed60d
+  metadata.gz: 625231160d764bfef77765411f6d9389b5ebd5f3863e15da3b66dfd2b26175820333041ea1e972537cdf5be04cf3ff514a648db13080b018a4738748e058b546
+  data.tar.gz: 5790baf85bc87b51c52e81a42dff189c5f2fcabf61a9cbb12c63e9dc7a090b0a1b56bf7d6fb51c8d20606125ad89e552ba8dccb3be931e085dc5fd0b9f753d3d

data/.travis.yml

@@ -12,3 +12,5 @@ before_script:
 env:
   global:
     - DEVISE_SECRET_KEY=foo
+addons:
+  postgresql: "9.2"

data/README.md

@@ -280,6 +280,11 @@ current_user.has_role?(:editor)
 G5 currently supports four different roles: `:super_admin`, `:admin`,
 `:editor`, and `:viewer` (the default role).
 
+Two convenience methods have been added to the `G5Authenticatable::User`:
+
+* `user.clients` will return a list of clients that the user has any access to. Will return all clients if the user has a global role
+* `user.client_roles` will return a list of roles that relate directly to a client
+
 #### Policies and Scopes ####
 
 G5 Authenticatable uses [pundit](https://github.com/elabs/pundit) to encapsulate

data/app/models/g5_authenticatable/user.rb

@@ -47,6 +47,10 @@ module G5Authenticatable
       end
     end
 
+    def clients
+      G5Updatable::ClientPolicy::Scope.new(user, G5Updatable::Client).resolve
+    end
+
     private
     def self.extended_auth_attributes(auth_data)
       {
@@ -59,5 +63,6 @@ module G5Authenticatable
     end
 
 
+
   end
 end

data/app/policies/g5_authenticatable/base_policy.rb

@@ -70,4 +70,8 @@ class G5Authenticatable::BasePolicy
   def viewer?
     user.present? && user.has_role?(:viewer)
   end
+
+  def has_global_role?
+    super_admin? || admin? || editor? || viewer?
+  end
 end

data/app/policies/g5_updatable/client_policy.rb

@@ -0,0 +1,23 @@
+module G5Updatable
+  class ClientPolicy < G5Authenticatable::BasePolicy
+    class Scope < G5Authenticatable::BasePolicy::BaseScope
+
+      def resolve
+        return scope.all if has_global_role?
+        scope.where(id: client_roles.map(&:resource_id))
+      end
+
+      def client_roles
+        G5Authenticatable::Role
+          .joins('INNER JOIN g5_updatable_clients ON g5_updatable_clients.id = g5_authenticatable_roles.resource_id')
+          .joins('INNER JOIN g5_authenticatable_users_roles ON g5_authenticatable_roles.id = g5_authenticatable_users_roles.role_id')
+          .where('g5_authenticatable_roles.resource_type = ? and g5_authenticatable_users_roles.user_id = ?', G5Updatable::Client.name, user.id)
+      end
+
+      def has_global_role?
+        G5Authenticatable::BasePolicy.new(user, G5Updatable::Client).has_global_role?
+      end
+    end
+
+  end
+end

data/g5_authenticatable.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'g5_authenticatable_api', '~> 0.4.1'
   spec.add_dependency 'rolify', '~> 4.0'
   spec.add_dependency 'pundit', '~> 1.0'
+  spec.add_dependency 'g5_updatable', '~> 0.6.0'
 end

data/lib/g5_authenticatable.rb

@@ -2,6 +2,7 @@ require 'g5_authenticatable/engine'
 
 require 'devise_g5_authenticatable'
 require 'g5_authenticatable_api'
+require 'g5_updatable'
 
 module G5Authenticatable
   # When enabled, access tokens are always validated against the auth

data/lib/g5_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module G5Authenticatable
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/spec/dummy/config/routes.rb

@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
+  mount G5Updatable::Engine => '/g5_updatable'
   resources :posts
 
   resource :home, only: [:index, :show]

data/spec/dummy/db/migrate/20150603224032_create_g5_updatable_clients_and_locations.g5_updatable.rb

@@ -0,0 +1,25 @@
+# This migration comes from g5_updatable (originally 20140709222005)
+class CreateG5UpdatableClientsAndLocations < ActiveRecord::Migration
+  def change
+    create_table :g5_updatable_clients do |t|
+      t.string :uid
+      t.string :urn
+      t.json :properties
+
+      t.timestamps
+    end
+    add_index :g5_updatable_clients, :uid
+    add_index :g5_updatable_clients, :urn
+
+    create_table :g5_updatable_locations do |t|
+      t.string :uid
+      t.string :urn
+      t.string :client_uid
+      t.json :properties
+
+      t.timestamps
+    end
+    add_index :g5_updatable_locations, :uid
+    add_index :g5_updatable_locations, :urn
+  end
+end

data/spec/dummy/db/migrate/20150603224033_create_integration_setting.g5_updatable.rb

@@ -0,0 +1,19 @@
+# This migration comes from g5_updatable (originally 20141030211945)
+class CreateIntegrationSetting < ActiveRecord::Migration
+  def change
+    create_table :g5_updatable_integration_settings do |t|
+      t.string :uid
+      t.string :urn
+      t.string :location_uid
+      t.string :vendor_action
+      t.integer :job_frequency_in_minutes
+      t.json :properties
+      t.timestamps
+    end
+
+    add_index :g5_updatable_integration_settings, :urn
+    add_index :g5_updatable_integration_settings, :uid
+    add_index :g5_updatable_integration_settings, :vendor_action
+    add_index :g5_updatable_integration_settings, [:location_uid, :vendor_action], name: :g5_u_is_loc_action
+  end
+end

data/spec/dummy/db/migrate/20150603224034_remove_integration_setting.g5_updatable.rb

@@ -0,0 +1,6 @@
+# This migration comes from g5_updatable (originally 20141122211945)
+class RemoveIntegrationSetting < ActiveRecord::Migration
+  def change
+    drop_table :g5_updatable_integration_settings
+  end
+end

data/spec/dummy/db/migrate/20150603224035_add_name_to_clients_and_locations.g5_updatable.rb

@@ -0,0 +1,10 @@
+# This migration comes from g5_updatable (originally 20141211211945)
+class AddNameToClientsAndLocations < ActiveRecord::Migration
+  def change
+    add_column :g5_updatable_clients, :name, :string
+    add_index :g5_updatable_clients, :name
+
+    add_column :g5_updatable_locations, :name, :string
+    add_index :g5_updatable_locations, :name
+  end
+end

data/spec/dummy/db/migrate/20150603224036_update_names.g5_updatable.rb

@@ -0,0 +1,11 @@
+# This migration comes from g5_updatable (originally 20141211711945)
+class UpdateNames < ActiveRecord::Migration
+  def change
+    G5Updatable::Client.all.each do |client|
+      client.update_attributes(name: client.properties['name'])
+    end
+    G5Updatable::Location.all.each do |location|
+      location.update_attributes(name: location.properties['name'])
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150509061150) do
+ActiveRecord::Schema.define(version: 20150603224036) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -56,6 +56,33 @@ ActiveRecord::Schema.define(version: 20150509061150) do
 
   add_index "g5_authenticatable_users_roles", ["user_id", "role_id"], name: "index_g5_authenticatable_users_roles_on_user_id_and_role_id", using: :btree
 
+  create_table "g5_updatable_clients", force: :cascade do |t|
+    t.string   "uid"
+    t.string   "urn"
+    t.json     "properties"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "name"
+  end
+
+  add_index "g5_updatable_clients", ["name"], name: "index_g5_updatable_clients_on_name", using: :btree
+  add_index "g5_updatable_clients", ["uid"], name: "index_g5_updatable_clients_on_uid", using: :btree
+  add_index "g5_updatable_clients", ["urn"], name: "index_g5_updatable_clients_on_urn", using: :btree
+
+  create_table "g5_updatable_locations", force: :cascade do |t|
+    t.string   "uid"
+    t.string   "urn"
+    t.string   "client_uid"
+    t.json     "properties"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "name"
+  end
+
+  add_index "g5_updatable_locations", ["name"], name: "index_g5_updatable_locations_on_name", using: :btree
+  add_index "g5_updatable_locations", ["uid"], name: "index_g5_updatable_locations_on_uid", using: :btree
+  add_index "g5_updatable_locations", ["urn"], name: "index_g5_updatable_locations_on_urn", using: :btree
+
   create_table "posts", force: :cascade do |t|
     t.integer  "author_id"
     t.string   "content"

data/spec/models/g5_authenticatable/user_spec.rb

@@ -477,4 +477,5 @@ describe G5Authenticatable::User do
       end
     end
   end
+  
 end

data/spec/policies/client_policy_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe G5Updatable::ClientPolicy do
+  subject(:policy) { described_class }
+
+  let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+  let(:user2) { FactoryGirl.create(:g5_authenticatable_user) }
+
+  before do
+    user.roles = []
+    user.save!
+    user2.add_role(:viewer, client_1)
+  end
+
+  let!(:client_1) { FactoryGirl.create(:g5_updatable_client) }
+  let!(:client_2) { FactoryGirl.create(:g5_updatable_client) }
+  let!(:client_3) { FactoryGirl.create(:g5_updatable_client) }
+
+  subject { G5Updatable::ClientPolicy::Scope.new(user, G5Updatable::Client).resolve }
+
+  context 'with global role' do
+    before { user.add_role :admin }
+    it 'returns all clients' do
+      expect(subject.length).to eq(3)
+      expect(subject).to include(client_1)
+      expect(subject).to include(client_2)
+      expect(subject).to include(client_3)
+    end
+  end
+
+  context 'with client role' do
+    before { user.add_role(:admin, client_1) }
+    it 'returns a single client' do
+      expect(subject.length).to eq(1)
+      expect(subject).to include(client_1)
+    end
+  end
+
+  context 'with many client roles'  do
+    before do
+      user.add_role(:admin, client_1)
+      user.add_role(:admin, client_2)
+      user.add_role(:admin, client_3)
+    end
+    it 'returns all assigned clients' do
+      expect(subject.length).to eq(3)
+      expect(subject).to include(client_1)
+      expect(subject).to include(client_2)
+      expect(subject).to include(client_3)
+    end
+  end
+
+  context 'with no role' do
+    it 'returns no clients' do
+      expect(subject.length).to eq(0)
+    end
+  end
+
+end

data/spec/requests/default_role_authorization_spec.rb

@@ -19,14 +19,17 @@ describe 'Default role-based authorization API' do
       end
 
       it 'includes all posts' do
-        expect(json).to contain_exactly(
-          hash_including('id' => post.id,
-                         'author_id' => post.author.id,
-                         'content' => post.content),
-          hash_including('id' => other_post.id,
-                         'author_id' => other_post.author.id,
-                         'content' => other_post.content)
-        )
+        expected = {
+          'posts'=> [
+            hash_including('id' => post.id,
+                           'author_id' => post.author.id,
+                           'content' => post.content),
+            hash_including('id' => other_post.id,
+                           'author_id' => other_post.author.id,
+                           'content' => other_post.content)
+          ]
+        }
+        expect(json).to include(expected)
       end
     end
 

data/spec/spec_helper.rb

@@ -12,6 +12,8 @@ require 'rspec/rails'
 require 'capybara/rspec'
 require 'webmock/rspec'
 require 'g5_authenticatable/rspec'
+require 'g5_updatable/rspec'
+require 'g5_updatable/factories'
 
 Rails.backtrace_cleaner.remove_silencers!
 
@@ -45,6 +47,13 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
   config.infer_spec_type_from_file_location!
 
   config.after(:suite) { WebMock.disable! }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: g5_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - maeve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_g5_authenticatable
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: g5_updatable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 description: |-
   An engine that provides a basic User model,
                             authentication logic, and remote credential
@@ -111,6 +125,7 @@ files:
 - app/models/g5_authenticatable/role.rb
 - app/models/g5_authenticatable/user.rb
 - app/policies/g5_authenticatable/base_policy.rb
+- app/policies/g5_updatable/client_policy.rb
 - app/views/g5_authenticatable/error/auth_error.html.erb
 - app/views/layouts/g5_authenticatable/application.html.erb
 - config/initializers/devise.rb
@@ -192,6 +207,11 @@ files:
 - spec/dummy/db/migrate/20150428182339_add_g5_authenticatable_users_contact_info.rb
 - spec/dummy/db/migrate/20150429212919_create_g5_authenticatable_roles.rb
 - spec/dummy/db/migrate/20150509061150_create_posts.rb
+- spec/dummy/db/migrate/20150603224032_create_g5_updatable_clients_and_locations.g5_updatable.rb
+- spec/dummy/db/migrate/20150603224033_create_integration_setting.g5_updatable.rb
+- spec/dummy/db/migrate/20150603224034_remove_integration_setting.g5_updatable.rb
+- spec/dummy/db/migrate/20150603224035_add_name_to_clients_and_locations.g5_updatable.rb
+- spec/dummy/db/migrate/20150603224036_update_names.g5_updatable.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
@@ -213,6 +233,7 @@ files:
 - spec/models/g5_authenticatable/user_spec.rb
 - spec/models/post_spec.rb
 - spec/policies/application_policy_spec.rb
+- spec/policies/client_policy_spec.rb
 - spec/policies/post_policy_spec.rb
 - spec/requests/default_role_authorization_spec.rb
 - spec/requests/grape_api_spec.rb
@@ -306,6 +327,11 @@ test_files:
 - spec/dummy/db/migrate/20150428182339_add_g5_authenticatable_users_contact_info.rb
 - spec/dummy/db/migrate/20150429212919_create_g5_authenticatable_roles.rb
 - spec/dummy/db/migrate/20150509061150_create_posts.rb
+- spec/dummy/db/migrate/20150603224032_create_g5_updatable_clients_and_locations.g5_updatable.rb
+- spec/dummy/db/migrate/20150603224033_create_integration_setting.g5_updatable.rb
+- spec/dummy/db/migrate/20150603224034_remove_integration_setting.g5_updatable.rb
+- spec/dummy/db/migrate/20150603224035_add_name_to_clients_and_locations.g5_updatable.rb
+- spec/dummy/db/migrate/20150603224036_update_names.g5_updatable.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
@@ -327,6 +353,7 @@ test_files:
 - spec/models/g5_authenticatable/user_spec.rb
 - spec/models/post_spec.rb
 - spec/policies/application_policy_spec.rb
+- spec/policies/client_policy_spec.rb
 - spec/policies/post_policy_spec.rb
 - spec/requests/default_role_authorization_spec.rb
 - spec/requests/grape_api_spec.rb