strongbolt 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baf025ec21753dc7118e68781d9bb7b2daa018ce
-  data.tar.gz: d2d254b7e26d55c1c8f5ec0ce76dd4a02dada6d5
+  metadata.gz: c67e76eb347b2f56147ce3ea4edb40c0abbec16c
+  data.tar.gz: fe67b27504d1db3bcd74cd861aee53b979dcbc84
 SHA512:
-  metadata.gz: 9704256eb913654a8051046032810c01d731c42fdb4e216adabd9004d0cb2342dac42974ea281a4b414fe3d4f285885560a02640868b344b212a9fff481d070e
-  data.tar.gz: 715958487be1fe8ecd319d1a1a35979cff78c2a5a933dd4f42832d02c9177240f50ad369f42f200d08bdc382e2129682dd2f4b7ae827967779ceaf23cee01d2b
+  metadata.gz: b456dbe25f2c8fa8a2492cff18a864b1e21f76b3b38fe9427da888d06c17e6cbab82778863d37f5e68cb878e2f3e7599abf1f8f9d3c3e15538ec4cdaeebc3cdd
+  data.tar.gz: f077745183044f7feb443bda2dc0d4e438b7597ad7034ed7f089a6eb088d835bf1de72c293bec8c255867a52360b6df96c630e35a4a220d18594e2845ad551b5

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.3
+ruby-2.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    strongbolt (0.3.6)
+    strongbolt (0.3.7)
       awesome_nested_set (~> 3.0.0)
       grant (~> 3.0)
       simple_form (~> 3.0)
@@ -9,27 +9,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
+    actionmailer (4.1.15)
+      actionpack (= 4.1.15)
+      actionview (= 4.1.15)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.6)
-      actionview (= 4.1.6)
-      activesupport (= 4.1.6)
+    actionpack (4.1.15)
+      actionview (= 4.1.15)
+      activesupport (= 4.1.15)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.6)
-      activesupport (= 4.1.6)
+    actionview (4.1.15)
+      activesupport (= 4.1.15)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.6)
-      activesupport (= 4.1.6)
+    activemodel (4.1.15)
+      activesupport (= 4.1.15)
       builder (~> 3.1)
-    activerecord (4.1.6)
-      activemodel (= 4.1.6)
-      activesupport (= 4.1.6)
+    activerecord (4.1.15)
+      activemodel (= 4.1.15)
+      activesupport (= 4.1.15)
       arel (~> 5.0.0)
-    activesupport (4.1.6)
+    activesupport (4.1.15)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -39,51 +39,52 @@ GEM
     awesome_nested_set (3.0.3)
       activerecord (>= 4.0.0, < 5)
     builder (3.2.2)
+    concurrent-ruby (1.0.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    fabrication (2.11.3)
+    fabrication (2.15.2)
     fuubar (2.0.0)
       rspec (~> 3.0)
       ruby-progressbar (~> 1.4)
     grant (3.0.0)
       activerecord (>= 4.0.0)
-    hike (1.2.3)
-    i18n (0.6.11)
-    json (1.8.1)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
-    minitest (5.4.2)
-    multi_json (1.10.1)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    i18n (0.7.0)
+    json (1.8.3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0221)
+    minitest (5.8.4)
+    rack (1.5.5)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.6)
-      actionmailer (= 4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
-      activemodel (= 4.1.6)
-      activerecord (= 4.1.6)
-      activesupport (= 4.1.6)
+    rails (4.1.15)
+      actionmailer (= 4.1.15)
+      actionpack (= 4.1.15)
+      actionview (= 4.1.15)
+      activemodel (= 4.1.15)
+      activerecord (= 4.1.15)
+      activesupport (= 4.1.15)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.6)
+      railties (= 4.1.15)
       sprockets-rails (~> 2.0)
-    railties (4.1.6)
-      actionpack (= 4.1.6)
-      activesupport (= 4.1.6)
+    railties (4.1.15)
+      actionpack (= 4.1.15)
+      activesupport (= 4.1.15)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (11.1.2)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
       rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.5)
+    rspec-core (3.1.7)
       rspec-support (~> 3.1.0)
     rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.2)
+    rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-rails (3.1.0)
       actionpack (>= 3.0)
@@ -93,26 +94,23 @@ GEM
       rspec-expectations (~> 3.1.0)
       rspec-mocks (~> 3.1.0)
       rspec-support (~> 3.1.0)
-    rspec-support (3.1.1)
-    ruby-progressbar (1.6.0)
+    rspec-support (3.1.2)
+    ruby-progressbar (1.8.1)
     shoulda-matchers (2.7.0)
       activesupport (>= 3.0.0)
     simple_form (3.2.1)
       actionpack (> 4, < 5.1)
       activemodel (> 4, < 5.1)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
+    sprockets (3.6.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.9)
+    sqlite3 (1.3.11)
     thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -126,9 +124,9 @@ DEPENDENCIES
   rails (~> 4.1.0)
   rake
   rspec-rails (~> 3.1.0)
-  shoulda-matchers
-  sqlite3 (= 1.3.9)
+  shoulda-matchers (~> 2.7.0)
+  sqlite3
   strongbolt!
 
 BUNDLED WITH
-   1.11.2
+   1.12.3

data/README.md

@@ -2,6 +2,8 @@
 
 RBAC framework for model-level authorization gem with very granular control on permissions, using Capabilities, Roles and UserGroups.
 
+Checkout our [minimal example app](https://github.com/AnalyticsMediaGroup/strongbolt_example) to try it out without the need to set it up yourself.
+
 Only works with Rails 4.
 
 ## Installation
@@ -30,6 +32,8 @@ If you plan on using the built-in view to manage user groups, roles and permissi
 
 You will need to have jQuery or a similar library with Ajax to make it work
 
+There is a minimal example app using Strongbolt made available [here](https://github.com/AnalyticsMediaGroup/strongbolt_example). If you experience any issues setting Strongbolt up or configuring it, this example app is already setup for you and might be able to resolve some issues.
+
 ## Usage
 
 ### Configuration

data/app/controllers/strongbolt/security_controller.rb

@@ -1,8 +1,8 @@
 module Strongbolt
   class SecurityController < ::StrongboltController
-    self.model_for_authorization = "Role"
+    self.model_for_authorization = "Strongbolt::Role"
 
     def index
     end
   end
-end
+end

data/app/controllers/strongbolt/user_groups_users_controller.rb

@@ -1,12 +1,12 @@
 module Strongbolt
   class UserGroupsUsersController < ::StrongboltController
 
-    self.model_for_authorization = "UserGroup"
+    self.model_for_authorization = "Strongbolt::UserGroup"
 
     def create
       @user_group = UserGroup.find(params[:user_group_id])
       @user = Strongbolt.user_class_constant.find(params[:id])
-      
+
       @user_group.users << @user unless @user_group.users.include?(@user)
 
       redirect_to request.referrer || user_group_path(@user_group)
@@ -15,7 +15,7 @@ module Strongbolt
     def destroy
       @user_group = UserGroup.find(params[:user_group_id])
       @user = Strongbolt.user_class_constant.find(params[:id])
-      
+
       @user_group.users.delete @user
 
       redirect_to request.referrer || user_group_path(@user_group)
@@ -32,4 +32,4 @@ module Strongbolt
     end
 
   end
-end
+end

data/app/views/strongbolt/roles/_capabilities.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for(Capability.new, url: role_capabilities_path(@role), as: :capability) do |f| %>
+<%= simple_form_for(Strongbolt::Capability.new, url: role_capabilities_path(@role), as: :capability) do |f| %>
   <table class="table table-striped table-condensed" id="role-capabilities" data-url="<%= role_capabilities_path(@role) %>">
 
     <thead>
@@ -12,7 +12,7 @@
 
     <tbody>
       <% @keys.each do |key| %>
-          
+
         <tr>
           <td><%= key[:model] %></td>
           <td>
@@ -32,7 +32,7 @@
 
       <tfoot>
         <tr>
-          <td><%= f.input_field :model, collection: Capability.models, include_blank: false %></td>
+          <td><%= f.input_field :model, collection: Strongbolt::Capability.models, include_blank: false %></td>
           <td><%= f.input_field :require_ownership, as: :select, include_blank: false %></td>
           <td><%= f.input_field :require_tenant_access, as: :select, include_blank: false %></td>
           <td colspan="4">
@@ -44,4 +44,4 @@
 
   </table>
 
-<% end %>
+<% end %>

data/app/views/strongbolt/roles/_capability.html.erb

@@ -2,8 +2,8 @@
       data-model="<%= key[:model] %>"
       data-require-ownership=<%= key[:require_ownership] %>
       data-require-tenant-access=<%= key[:require_tenant_access] %>>
-  
-  <% Capability::Actions.each do |action| %>
+
+  <% Strongbolt::Capability::Actions.each do |action| %>
     <% if inherited_capability[action.to_sym] %>
       <button type="button" disabled class="btn btn-xs btn-success" title="Inherited">
         <%= action.capitalize %>
@@ -18,4 +18,4 @@
     <% end %>
   <% end %>
 
-</div>
+</div>

data/app/views/strongbolt/roles/_form.html.erb

@@ -4,7 +4,7 @@
   method: params[:action].to_sym == :new ? :post : :put) do |f| %>
 
   <%= f.input :name %>
-  <%= f.input :parent_id, collection: Role.where.not(id: @role.id).order('parent_id IS NOT NULL', :parent_id, :name) %>
+  <%= f.input :parent_id, collection: Strongbolt::Role.where.not(id: @role.id).order('parent_id IS NOT NULL', :parent_id, :name) %>
   <%= f.input :description %>
 
   <%= f.button :submit, class: 'btn-primary', value: 'Save' %>

data/lib/generators/strongbolt/install_generator.rb

@@ -26,4 +26,4 @@ module Strongbolt
 
     end
   end
-end
+end

data/lib/strongbolt/bolted.rb

@@ -73,7 +73,7 @@ module Strongbolt
       end
 
     end
-    
+
     module InstanceMethods
       #
       # Asks permission to performa an operation on the current instance
@@ -91,7 +91,7 @@ module Strongbolt
         send self.class.owner_attribute
       end
     end
-    
+
     def self.included(receiver)
       receiver.extend         ClassMethods
       receiver.send :include, InstanceMethods
@@ -115,11 +115,11 @@ module Strongbolt
           unless granted
             Strongbolt.access_denied user, instance, action, $request.try(:fullpath)
           end
-          
+
           granted
         end # End Grant
 
       end
     end
   end
-end
+end

data/lib/strongbolt/capabilities_role.rb

@@ -5,11 +5,11 @@ module Strongbolt
     belongs_to :role,
       :class_name => "Strongbolt::Role",
       :inverse_of => :capabilities_roles
-    
+
     belongs_to :capability,
       :class_name => "Strongbolt::Capability",
       :inverse_of => :capabilities_roles
 
     validates_presence_of :role, :capability
   end
-end
+end

data/lib/strongbolt/capability.rb

@@ -12,7 +12,7 @@ module Strongbolt
       :class_name => "Strongbolt::CapabilitiesRole",
       :dependent => :restrict_with_exception,
       :inverse_of => :capability
-    
+
     has_many :roles, :through => :capabilities_roles
 
     has_many :users, through: :roles
@@ -57,7 +57,7 @@ module Strongbolt
           ! (table.last[:model] == capability.model &&
             table.last[:require_ownership] == capability.require_ownership &&
             table.last[:require_tenant_access] == capability.require_tenant_access)
-          
+
           table << {
             model: capability.model,
             require_ownership: capability.require_ownership,
@@ -87,7 +87,7 @@ module Strongbolt
           require_ownership: capability.require_ownership,
           require_tenant_access: capability.require_tenant_access
         }
-        
+
         hash[key] ||= {
           find: false,
           create: false,
@@ -161,5 +161,3 @@ module Strongbolt
     end
   end
 end
-
-Capability = Strongbolt::Capability unless defined? Capability

data/lib/strongbolt/configuration.rb

@@ -108,4 +108,4 @@ module Strongbolt
 
   end
 
-end
+end

data/lib/strongbolt/engine.rb

@@ -11,7 +11,7 @@ module Strongbolt
         app.config.assets.paths << root.join('app', 'assets', sub).to_s
       end
     end
-    
+
     initializer "strongbolt.helpers" do
       ActionView::Base.send :include, Strongbolt::Helpers
     end

data/lib/strongbolt/role.rb

@@ -10,7 +10,7 @@ module Strongbolt
       :dependent => :restrict_with_exception,
       :inverse_of => :role
     has_many :user_groups, :through => :roles_user_groups
-    
+
     has_many :users, through: :user_groups
 
     has_many :capabilities_roles,
@@ -31,7 +31,7 @@ module Strongbolt
       Strongbolt::Capability.joins(:roles)
         .where("strongbolt_roles.lft < :lft AND strongbolt_roles.rgt > :rgt", lft: lft, rgt: rgt)
         .distinct
-      end
+    end
 
     private
 
@@ -42,5 +42,3 @@ module Strongbolt
     end
   end
 end
-
-Role = Strongbolt::Role unless defined? Role

data/lib/strongbolt/roles_user_group.rb

@@ -5,11 +5,11 @@ module Strongbolt
     belongs_to :user_group,
       :class_name => "Strongbolt::UserGroup",
       :inverse_of => :roles_user_groups
-    
+
     belongs_to :role,
       :class_name => "Strongbolt::Role",
       :inverse_of => :roles_user_groups
 
     validates_presence_of :user_group, :role
   end
-end
+end

data/lib/strongbolt/tenantable.rb

@@ -91,30 +91,30 @@ module Strongbolt
           else
             raise DirectAssociationNotConfigured, "Class #{klass.name} is 1 degree from #{self.name} but the association isn't configured, you should implement it before using tenant method"
           end
-        
+
         # The coming class has a relationship to the tenant
         else
           # If already created, we don't need to go further
           return singular_association_name if klass.new.respond_to?(singular_association_name)
           return plural_association_name if klass.new.respond_to?(plural_association_name)
-          
+
           # Inverse association
           inverse = inverse_of(association)
-          
+
           # If no inverse, we cannot go further
           if inverse.nil?
             raise InverseAssociationNotConfigured, "Assocation #{association.name} on #{association.klass.name} could not be configured correctly as no inverse has been found"
           elsif inverse.options.has_key? :polymorphic
             return nil
           end
-            
+
 
           # Common options
           options = {
             through: inverse.name,
             autosave: false
           }
-          
+
           # If the target is linked through some sort of has_many
           if link == plural_association_name || inverse.collection?
             # Has many
@@ -123,7 +123,7 @@ module Strongbolt
             # Setup the scope with_name_of_plural_associations
             # Current tenant table name
             klass.has_many assoc, options
-            
+
             Strongbolt.logger.debug "#{klass.name} has_many #{plural_association_name} through: #{options[:through]}\n\n"
 
           # Otherwise, it's linked through a has one
@@ -133,7 +133,7 @@ module Strongbolt
             # Setup the association
             # Setup the scope with_name_of_plural_associations
             klass.has_one assoc, options
-            
+
             Strongbolt.logger.debug "#{klass.name} has_one #{singular_association_name} through: #{options[:through]}\n\n"
           end
         end
@@ -177,7 +177,7 @@ module Strongbolt
       #
       #
       def create_users_tenant_subclass
-        unless Strongbolt.const_defined?("Users#{self.name}")
+        unless Strongbolt.const_defined?(users_tenants_subclass_name)
           users_tenant_subclass = Class.new(Strongbolt::UsersTenant)
           users_tenant_subclass.class_eval <<-RUBY
             # Ensures permissions on UsersTenant are applied here
@@ -194,7 +194,7 @@ module Strongbolt
 
             validates :#{singular_association_name}, :presence => true
           RUBY
-          Strongbolt.const_set "Users#{self.name}", users_tenant_subclass
+          Strongbolt.const_set users_tenants_subclass_name, users_tenant_subclass
         end
       end #/create_users_tenant_subclass
 
@@ -208,7 +208,7 @@ module Strongbolt
           # Setup the association
           # The first one should never be there before
           user_class.has_many :"users_#{plural_association_name}",
-            :class_name => "Strongbolt::Users#{self.name}",
+            :class_name => "Strongbolt::#{users_tenants_subclass_name}",
             :inverse_of => :user,
             :dependent => :delete_all,
             :foreign_key => :user_id
@@ -241,6 +241,18 @@ module Strongbolt
         end
       end #/setup_association_on_user
 
+      #
+      # returns the name of the subclass of Strongbolt::UsersTenant, containing
+      # the associations between users and the tenant model this is running in.
+      #
+      def users_tenants_subclass_name
+        # If the name is something like Strongbolt::UserGroup, we have to remove the double colons.
+        # This results to 'StrongboltUserGroup'.
+        # The module name is left in the name, so that we won't have any collisions
+        # with the same class names in different modules.
+        "Users#{self.name.gsub('::', '')}"
+      end #/users_tenants_subclass_name
+
       #
       # Returns the inverse of specified association, using what's given
       # as inverse_of or trying to guess it
@@ -292,13 +304,13 @@ module Strongbolt
       end
 
     end
-    
+
     module InstanceMethods
     end
-    
+
     def self.included(receiver)
       receiver.extend         ClassMethods
       receiver.send :include, InstanceMethods
     end
   end
-end
+end

data/lib/strongbolt/user_abilities.rb

@@ -1,9 +1,9 @@
 module Strongbolt
   module UserAbilities
     module ClassMethods
-      
+
     end
-    
+
     module InstanceMethods
       #----------------------------------------------------------#
       #                                                          #
@@ -33,16 +33,16 @@ module Strongbolt
       #
       def can? action, instance, attrs = :any, all_instance = false
         without_grant do
-      
+
           # Get the actual instance if we were given AR
           instance = instance.try(:first) if instance.is_a?(ActiveRecord::Relation)
           return false if instance.nil?
-          
+
           # We require this to be an *existing* user, that the action and attribute be symbols
           # and that the instance is a class or a String
-          raise ArgumentError, "Action must be a symbol and instance must be Class, String, Symbol or AR" unless self.id.present? && action.is_a?(Symbol) && 
+          raise ArgumentError, "Action must be a symbol and instance must be Class, String, Symbol or AR" unless self.id.present? && action.is_a?(Symbol) &&
              (instance.is_a?(ActiveRecord::Base) || instance.is_a?(Class) || instance.is_a?(String)) && attrs.is_a?(Symbol)
-        
+
           # Pre-populate all the capabilities into a results cache for quick lookup. Permissions for all "non-owned" objects are
           # immediately available; additional lookups are required for owned objects (e.g. User, CheckoutBag, etc.).
           # The results cache key is formatted as "action model attribute" (attribute can be any, all or an actual attribute)
@@ -61,11 +61,11 @@ module Strongbolt
                         # if we don't need it, so just defer until we determine there's an actual need
             model_name = instance
           end
-          
+
           # Look up the various possible valid entries in the cache that would allow us to see this
           return capability_in_cache?(action, instance, model_name, attrs, all_instance)
 
-        end #end w/o grant   
+        end #end w/o grant
       end
 
       #
@@ -93,14 +93,14 @@ module Strongbolt
       #
       def populate_capabilities_cache
         beginning = Time.now
-        
+
         @results_cache ||= {}
         @model_ancestor_cache ||= {}
 
         # User can find itself by default
         @results_cache["findUserany-any"] = true
         @results_cache["findUserany-#{id}"] = true
-        
+
         #
         # Store every capability fetched
         #
@@ -108,7 +108,7 @@ module Strongbolt
 
           k = "#{capability.action}#{capability.model}"
           attr_k = capability.attr || 'all'
-          
+
           @results_cache["#{k}#{attr_k}-any"] = true
           @results_cache["#{k}any-any"] = true
 
@@ -137,7 +137,7 @@ module Strongbolt
         end # End each capability
 
         Strongbolt.logger.info "Populated capabilities in #{(Time.now - beginning)*1000}ms"
-      
+
         @results_cache
       end # End Populate capabilities Cache
 
@@ -150,10 +150,10 @@ module Strongbolt
       #  Checks if the user can perform 'action' on 'instance'   #
       #                                                          #
       #----------------------------------------------------------#
-      
+
       def capability_in_cache?(action, instance, model_name, attrs = :any, all_instance = false)
         action_model = "#{action}#{model_name}"
-        
+
         Strongbolt.logger.warn "User has no results cache" if @results_cache.empty?
         Strongbolt.logger.debug { "Authorizing user to perform #{action} on #{instance.inspect}" }
 
@@ -162,13 +162,13 @@ module Strongbolt
           # First, check if we have a hash/cache hit for User being able to do this action to every instance of the model/class
           return true if @results_cache["#{action_model}all-all"]  #Access to all attributes on ENTIRE class?
           return true if @results_cache["#{action_model}#{attrs}-all"]  #Access to this specific attribute on ENTIRE class?
-          
+
           # If we're checking on a specific instance of the class, not the general model,
           # append the id to the key
           id = instance.try(:id)
           return true if @results_cache["#{action_model}all-#{id}"] # Access to all this instance's attributes?
           return true if @results_cache["#{action_model}#{attrs}-#{id}"] #Access to this instance's attribute?
-          
+
           # Checking ownership and tenant access
           # Block access for non tenanted instance
           valid_tenants = has_access_to_tenants?(instance)
@@ -209,14 +209,14 @@ module Strongbolt
           return true if @results_cache["#{action_model}#{attrs}-any"] && ! all_instance  #Access to this specific attribute on at least once instance?
         end
         #logger.info "Cache miss for checking access to #{key}"
-        
+
         return false
       end
 
       #
       # Checks if the instance given fulfills tenant management rules
       #
-      def has_access_to_tenants? instance, tenants = nil        
+      def has_access_to_tenants? instance, tenants = nil
         # If no tenants list given, we take all
         tenants ||= Strongbolt.tenants
         # Populate the cache if needed
@@ -256,7 +256,7 @@ module Strongbolt
         return if @tenants_cache.present?
 
         Strongbolt.logger.debug "Populating tenants cache for user #{self.id}"
-        
+
         @tenants_cache = {}
         # Go over each tenants
         Strongbolt.tenants.each do |tenant|
@@ -267,7 +267,7 @@ module Strongbolt
 
 
     end # End InstanceMethods
-    
+
     def self.included(receiver)
       receiver.extend         ClassMethods
       receiver.send :include, InstanceMethods
@@ -279,7 +279,7 @@ module Strongbolt
           :inverse_of => :user,
           :foreign_key => :user_id
         has_many :user_groups, :through => :user_groups_users
-        
+
         has_many :roles, through: :user_groups
       end
 
@@ -289,4 +289,4 @@ module Strongbolt
       end
     end
   end
-end
+end

data/lib/strongbolt/user_group.rb

@@ -6,7 +6,7 @@ module Strongbolt
       :dependent => :restrict_with_exception,
       :inverse_of => :user_group
     has_many :users, :through => :user_groups_users
-    
+
     has_many :roles_user_groups,
       :class_name => "Strongbolt::RolesUserGroup",
       :dependent => :delete_all,
@@ -20,5 +20,3 @@ module Strongbolt
 
   end
 end
-
-UserGroup = Strongbolt::UserGroup unless defined? UserGroup

data/lib/strongbolt/user_groups_user.rb

@@ -5,7 +5,7 @@ module Strongbolt
     belongs_to :user_group,
       :class_name => "Strongbolt::UserGroup",
       :inverse_of => :user_groups_users
-    
+
     belongs_to :user,
       :class_name => Configuration.user_class,
       :foreign_key => :user_id,
@@ -13,4 +13,4 @@ module Strongbolt
 
     validates_presence_of :user_group, :user
   end
-end
+end

data/lib/strongbolt/users_tenant.rb

@@ -8,5 +8,3 @@ module Strongbolt
     validates :user, presence: true
   end
 end
-
-UsersTenant = Strongbolt::UsersTenant unless defined? UsersTenant

data/lib/strongbolt/version.rb

@@ -1,3 +1,3 @@
 module Strongbolt
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/lib/tasks/strongbolt_tasks.rake

@@ -7,23 +7,23 @@ namespace :strongbolt do
       #
       # Creates capabilities for all models/actions
       #
-      Capability.models.each do |model|
-        Capability::Actions.each do |action|
-          Capability.where(model: model, action: action,
+      Strongbolt::Capability.models.each do |model|
+        Strongbolt::Capability::Actions.each do |action|
+          Strongbolt::Capability.where(model: model, action: action,
             require_tenant_access: false).first_or_create
         end
       end
 
       # The role
-      role = Role.create! name: "FULL ACCESS (TEMPORARY)"
-      role.capabilities = Capability.all
+      role = Strongbolt::Role.create! name: "FULL ACCESS (TEMPORARY)"
+      role.capabilities = Strongbolt::Capability.all
 
       # The user group
-      ug = UserGroup.create! name: "FULL ACCESS USERS (TEMPORARY)"
+      ug = Strongbolt::UserGroup.create! name: "FULL ACCESS USERS (TEMPORARY)"
       ug.roles << role
 
       # Assign to all users
       User.all.each { |user| user.user_groups << ug }
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -86,4 +86,4 @@ RSpec.configure do |config|
   end
   puts File.expand_path("../..", __FILE__)
 
-end
+end

data/spec/strongbolt/configuration_spec.rb

@@ -1,13 +1,13 @@
 require "spec_helper"
 
 describe Strongbolt::Configuration do
-  
+
 
   #
   # User class
   #
   describe "user class" do
-    
+
     it "should default to User" do
       expect(Strongbolt::Configuration.user_class).to eq "User"
     end
@@ -29,7 +29,7 @@ describe Strongbolt::Configuration do
   # Setting up tenants
   #
   describe 'tenants=' do
-    
+
     before do
       define_model "Model" do
         self.table_name = "models"
@@ -59,11 +59,11 @@ describe Strongbolt::Configuration do
       Strongbolt::Configuration.models = "OtherModel", "Model"
     end
     after do
-      Capability.models = nil
+      Strongbolt::Capability.models = nil
     end
 
     it "should set Capability::Models" do
-      expect(Capability.models).to eq ["Model", "OtherModel", "Strongbolt::Capability", "Strongbolt::Role", "Strongbolt::UserGroup", "Strongbolt::UsersTenant"]
+      expect(Strongbolt::Capability.models).to eq ["Model", "OtherModel", "Strongbolt::Capability", "Strongbolt::Role", "Strongbolt::UserGroup", "Strongbolt::UsersTenant"]
     end
 
     context "when adding other models" do
@@ -72,7 +72,7 @@ describe Strongbolt::Configuration do
       end
 
       it "should merge with current models" do
-        expect(Capability.models).to eq ["LastModel", "Model", "OtherModel", "Strongbolt::Capability", "Strongbolt::Role", "Strongbolt::UserGroup", "Strongbolt::UsersTenant"]
+        expect(Strongbolt::Capability.models).to eq ["LastModel", "Model", "OtherModel", "Strongbolt::Capability", "Strongbolt::Role", "Strongbolt::UserGroup", "Strongbolt::UsersTenant"]
       end
     end
 
@@ -82,7 +82,7 @@ describe Strongbolt::Configuration do
       end
 
       it "should merge with current models" do
-        expect(Capability.models).to eq ["BottomModel", "Model", "OtherModel", "Strongbolt::Capability", "Strongbolt::Role", "Strongbolt::UserGroup", "Strongbolt::UsersTenant"]
+        expect(Strongbolt::Capability.models).to eq ["BottomModel", "Model", "OtherModel", "Strongbolt::Capability", "Strongbolt::Role", "Strongbolt::UserGroup", "Strongbolt::UsersTenant"]
       end
     end
   end #/models=
@@ -93,7 +93,7 @@ describe Strongbolt::Configuration do
   # Setting default permissions
   #
   describe "default_capabilities=" do
-    
+
     before do
       Strongbolt::Configuration.default_capabilities = [
         {:model => "User", :actions => :all},
@@ -110,10 +110,10 @@ describe Strongbolt::Configuration do
 
     it "should return Capability" do
       Strongbolt::Configuration.default_capabilities.each do |c|
-        expect(c).to be_a Capability
+        expect(c).to be_a Strongbolt::Capability
       end
     end
 
   end
 
-end
+end

data/strongbolt.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rails", "~> 4.1.0"
   spec.add_development_dependency "bundler", "> 1.7.0"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency 'sqlite3', '1.3.9'
-  spec.add_development_dependency 'shoulda-matchers'
+  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'shoulda-matchers', '~> 2.7.0'
   spec.add_development_dependency 'fuubar'
   spec.add_development_dependency 'rspec-rails', '~> 3.1.0'
   spec.add_development_dependency 'fabrication'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strongbolt
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Thomas Césaré-Herriau
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
@@ -99,30 +99,30 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement