strongbolt 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 085945fde7504a693c9d0bd3a6a98b04da72911f
-  data.tar.gz: cde8841b764409146e570aab407bd352e626c373
+  metadata.gz: cae9f523b7f4e7e3e8a20d8e1dce761dff86ed09
+  data.tar.gz: 5541d8ac7cbf7f88f264c0b516cdbd11a4d297a0
 SHA512:
-  metadata.gz: f57f6215dfaf0cd3b095d02fbc5c88073d52514de38767903a451e93c8fc3afd43b2fcee1bdbbcc77f54451683e73dd5a0d517b88122888974e0ef5a919415bd
-  data.tar.gz: 96236affc3e1b2eed63fe6a9e4ce4cbc1a4a323fd8cc408bca2c46ed08c093e1c861aeef96f8427dd0a1914527989c5a31307d34aa8530ce13b2249e7b137f86
+  metadata.gz: 89eecd3ddf5d3c503e154c6405121530d163d40e742bdf3a30fd6a368526377052bfc9223666e70ab03238130e39755ff177cace84790e4a8c5da8343abdc526
+  data.tar.gz: 57ad08612046396dc58ed27161ee3525afe978cad2cf800f228e94f28aa14e96923da2525f292a871994c3171da65f057c36c42b5bae8cd2efba4027c38365b1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    strongbolt (0.3.8)
+    strongbolt (0.3.9)
       awesome_nested_set (~> 3.0.0)
       grant (~> 3.0)
       simple_form (~> 3.0)
@@ -40,6 +40,7 @@ GEM
       activerecord (>= 4.0.0, < 5)
     builder (3.2.2)
     concurrent-ruby (1.0.2)
+    database_cleaner (1.5.3)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     fabrication (2.15.2)
@@ -119,6 +120,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (> 1.7.0)
+  database_cleaner
   fabrication
   fuubar
   rails (~> 4.1.0)

data/lib/generators/strongbolt/fix_unique_group_members_generator.rb

@@ -3,7 +3,8 @@ require "strongbolt/generators/migration"
 module Strongbolt
   module Generators
     #
-    # Creates a migration to fix a has many through with users tenants problem
+    # Creates a migration to add an unique index to user_groups_users,
+    # so that a user can only exist once in a group.
     #
     class FixUniqueGroupMembersGenerator < Rails::Generators::Base
       include Strongbolt::Generators::Migration

data/lib/strongbolt/user_abilities.rb

@@ -121,10 +121,10 @@ module Strongbolt
               @results_cache["#{k}#{attr_k}-#{user_id}"] = true
               @results_cache["#{k}any-#{user_id}"] = true
             else
-            # On the other hand, it doesn't make sense to pre-populate the valid
-            # IDs for the models with a lot of instances when we probably are never
-            # going to need to know this. Instead, adding 'owned' is a hint to actually look
-            # up later if we own a particular geography.
+              # On the other hand, it doesn't make sense to pre-populate the valid
+              # IDs for the models with a lot of instances when we probably are never
+              # going to need to know this. Instead, adding 'owned' is a hint to actually look
+              # up later if we own a particular geography.
               @results_cache["#{k}#{attr_k}-owned"] = true
               @results_cache["#{k}any-owned"] = true
             end
@@ -216,6 +216,8 @@ module Strongbolt
       #
       # Checks if the instance given fulfills tenant management rules
       #
+      # returns true even if instance has no relationship to any tenant
+      #
       def has_access_to_tenants? instance, tenants = nil
         # If no tenants list given, we take all
         tenants ||= Strongbolt.tenants
@@ -224,7 +226,8 @@ module Strongbolt
 
         # Go over each tenants and check if we access to at least one of the tenant
         # models linked to it
-        tenants.inject(true) do |result, tenant|
+        found_any_tenant_relationship = false
+        has_access_to_any_tenant = tenants.inject(false) do |result, tenant|
           begin
             if instance.class == tenant
               tenant_ids = [instance.id]
@@ -245,8 +248,11 @@ module Strongbolt
           rescue ActiveModel::MissingAttributeError
             tenant_ids = []
           end
-          result && (tenant_ids.size == 0 || (@tenants_cache[tenant.name] & tenant_ids).present?)
+          found_any_tenant_relationship = true unless tenant_ids.empty?
+          has_access_to_current_tenant = (tenant_ids.size > 0 && (@tenants_cache[tenant.name] & tenant_ids).present?)
+          result || has_access_to_current_tenant
         end
+        has_access_to_any_tenant || !found_any_tenant_relationship
       end
 
       #

data/lib/strongbolt/version.rb

@@ -1,3 +1,3 @@
 module Strongbolt
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

data/spec/spec_helper.rb

@@ -36,6 +36,7 @@ require 'shoulda/matchers'
 
 require 'rspec/rails'
 require 'fabrication'
+require 'database_cleaner'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
@@ -74,6 +75,14 @@ RSpec.configure do |config|
   config.before(:suite) do
     TestsMigrations.new.migrate :up
     User.send :include, Strongbolt::UserAbilities
+    DatabaseCleaner.clean_with :truncation
+    DatabaseCleaner.strategy = :transaction
+  end
+
+  config.around(:each) do |spec|
+    DatabaseCleaner.start
+    spec.run
+    DatabaseCleaner.clean
   end
 
   config.after(:suite) do

data/spec/strongbolt/user_abilities_multiple_tenants_spec.rb

@@ -0,0 +1,93 @@
+require "spec_helper"
+
+describe Strongbolt::UserAbilities do
+
+  before(:all) do
+    define_model "TenantA" do
+      self.table_name = "tenant_a"
+
+      has_many :model_with_tenant
+    end
+    define_model "TenantB" do
+      self.table_name = "tenant_b"
+
+      has_many :model_with_tenant
+    end
+
+    define_model "ModelWithTenant" do
+      self.table_name = "model_with_tenants"
+
+      belongs_to :tenant_a
+      belongs_to :tenant_b
+    end
+
+    Strongbolt::Configuration.add_tenant TenantA
+    Strongbolt::Configuration.add_tenant TenantB
+  end
+  after(:all) do
+    undefine_model TenantA
+    undefine_model TenantB
+    Strongbolt::Configuration.tenants = []
+  end
+
+
+  #
+  # Creates some fixtures for the tests here
+  #
+  def create_fixtures
+    @user1 = User.create!
+    @user2 = User.create!
+    @user3 = User.create!
+
+    @tenant_a = TenantA.create!
+    @tenant_b = TenantB.create!
+    @user1.add_tenant @tenant_a
+    @user1.add_tenant @tenant_b
+    @user2.add_tenant @tenant_a
+    @user3.add_tenant @tenant_b
+
+    @tenanted_model1 = ModelWithTenant.create! tenant_a: @tenant_a, tenant_b: @tenant_b
+    @tenanted_model2 = ModelWithTenant.create! tenant_a: @tenant_a
+    @tenanted_model3 = ModelWithTenant.create! tenant_b: @tenant_b
+
+    @group = Strongbolt::UserGroup.create! name: "Normal"
+    @group.users << @user1
+    @group.users << @user2
+    @group.users << @user3
+
+    @role = @group.roles.create! name: "Normal"
+    @role.capabilities.create! model: "User", action: "update", require_ownership: true
+    @role.capabilities.create! model: "ModelWithTenant", action: "find", require_tenant_access: true
+  end
+
+
+
+  #
+  # Has access to tenants?
+  #
+  describe "has_access_to_tenants?" do
+    before { create_fixtures }
+
+    it "should be true when model is tenant" do
+      expect(@user1.send :has_access_to_tenants?, @tenant_a).to eq true
+      expect(@user1.send :has_access_to_tenants?, @tenant_b).to eq true
+      expect(@user2.send :has_access_to_tenants?, @tenant_a).to eq true
+      expect(@user2.send :has_access_to_tenants?, @tenant_b).to eq false
+      expect(@user3.send :has_access_to_tenants?, @tenant_a).to eq false
+      expect(@user3.send :has_access_to_tenants?, @tenant_b).to eq true
+    end
+
+    it "should be true when model is first child" do
+      expect(@user1.send :has_access_to_tenants?, @tenanted_model1).to eq true
+      expect(@user1.send :has_access_to_tenants?, @tenanted_model2).to eq true
+      expect(@user1.send :has_access_to_tenants?, @tenanted_model3).to eq true
+      expect(@user2.send :has_access_to_tenants?, @tenanted_model1).to eq true
+      expect(@user2.send :has_access_to_tenants?, @tenanted_model2).to eq true
+      expect(@user2.send :has_access_to_tenants?, @tenanted_model3).to eq false
+      expect(@user3.send :has_access_to_tenants?, @tenanted_model1).to eq true
+      expect(@user3.send :has_access_to_tenants?, @tenanted_model2).to eq false
+      expect(@user3.send :has_access_to_tenants?, @tenanted_model3).to eq true
+    end
+  end
+
+end

data/spec/support/db_setup.rb

@@ -55,6 +55,26 @@ class TestsMigrations < ActiveRecord::Migration
       t.integer :child_id
     end
 
+    create_table :tenant_a, :force => true do |t|
+      t.string :name
+
+      t.timestamps
+    end
+
+    create_table :tenant_b, :force => true do |t|
+      t.string :name
+
+      t.timestamps
+    end
+
+    create_table :model_with_tenants, :force => true do |t|
+      t.string :name
+      t.integer :tenant_a_id
+      t.integer :tenant_b_id
+
+      t.timestamps
+    end
+
     create_table :strongbolt_capabilities, :force => true do |t|
       t.string   :name
       t.string   :description

data/strongbolt.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'fuubar'
   spec.add_development_dependency 'rspec-rails', '~> 3.1.0'
   spec.add_development_dependency 'fabrication'
+  spec.add_development_dependency 'database_cleaner'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strongbolt
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Thomas Césaré-Herriau
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
@@ -165,6 +165,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  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: Use model-level authorization with a very granular roles and permissions
   definition.
 email:
@@ -311,6 +325,7 @@ files:
 - spec/strongbolt/helpers_spec.rb
 - spec/strongbolt/role_spec.rb
 - spec/strongbolt/tenantable_spec.rb
+- spec/strongbolt/user_abilities_multiple_tenants_spec.rb
 - spec/strongbolt/user_abilities_spec.rb
 - spec/strongbolt/user_group_spec.rb
 - spec/strongbolt/users_tenant_spec.rb
@@ -415,6 +430,7 @@ test_files:
 - spec/strongbolt/helpers_spec.rb
 - spec/strongbolt/role_spec.rb
 - spec/strongbolt/tenantable_spec.rb
+- spec/strongbolt/user_abilities_multiple_tenants_spec.rb
 - spec/strongbolt/user_abilities_spec.rb
 - spec/strongbolt/user_group_spec.rb
 - spec/strongbolt/users_tenant_spec.rb