company_scope 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76e4908c7c91d390e44c66f6c18891493831d1b3
-  data.tar.gz: bac3b43ef130a3f422b56e6129ec7227dd484f7d
+  metadata.gz: 20a3400d84425d8ce823542bc038abb96dc43995
+  data.tar.gz: 45ce497b1fb10c375f22f58f42349199899720ef
 SHA512:
-  metadata.gz: c28bc166bcdddc387ffb508f0accb04d0151f9bcac62b84d5a700e505f60a9ed6519acfd73cd135bd6ccd415b9538de466dbb09d395feaea75260910add0d51d
-  data.tar.gz: 497ad6e99a12acee86b0858caab13273478142b7e3a260aef664ff4d7f3bc821e1e4b6a75b2ecf435551e888639c274029c8c9faae4ec539de0bcc206be0b0bb
+  metadata.gz: 2c50413c3b5aa0106acaf68ff4e55694866b459e9c7f020f37c8e3c490666d76344980c5794e6646d13eacddbe330367a20e56b6122eb1f5cc9f4371777309f9
+  data.tar.gz: 107dd39ae499575d1d6253929f00a0932e78b1e68931b99374868527f15ae5878365c5928f07d85bc7c4fc3b2f3ac5a7f83b6545253231b8f225f0a5898953ef

data/README.md

@@ -29,8 +29,33 @@ Or install it yourself as:
 
 ## Usage
 
-NB: This gem is currently under development and has not been published officially!
-(use at your own risk..)
+Getting started
+===============
+There are two steps in adding multi-tenancy/company to your app with company_scope:
+
+1. setting the current tenant and
+2. scoping your models.
+
+Setting the current tenant
+--------------------------
+There are three ways to set the current tenant:
+
+1. by using the subdomain to lookup the current tenant,
+2. by setting  the current tenant in the controller, and
+3. by setting the current tenant for a block.
+
+### Use the subdomain to lookup the current tenant ###
+
+```ruby
+class ApplicationController < ActionController::Base
+  set_current_tenant_by_subdomain(:account, :subdomain)
+end
+```
+
+
+
+
+
 
 ## Development
 

data/lib/company_scope/base.rb

@@ -9,28 +9,33 @@ module CompanyScope
     #
     module CompanyScopeClassMethods
       #
-      def acts_as_company
+      def acts_as_company(tenant = :company)
 
-        belongs_to  :company
+        belongs_to tenant.to_s.underscore.to_sym
 
-        validates_presence_of :company_id
+        validates_presence_of "#{tenant.to_s}_id".to_sym #:company_id
 
-        default_scope { where("#{self.table_name}.company_id = ?", Company.current_id) }
+        #default_scope { where("#{self.table_name}.company_id = ?", Company.current_id) }
+        default_scope { where("#{self.table_name}.#{tenant.to_s.underscore}_id = ?",
+          Module.const_get("#{tenant.to_s.classify}").current_id) }
 
         # - on creation we make sure the company_id is set!
         before_validation(on: :create) do |obj|
-          obj.company_id = Company.current_id
+          obj.send(eval(":#{tenant.to_s.underscore}_id="), Module.const_get("#{tenant.to_s.classify}").current_id)
         end
 
         before_save do |obj|
           # catch each time someone attempts to violate the company relationship!
-          raise ::CompanyScope::Control::CompanyAccessViolationError unless obj.company_id == Company.current_id
+          raise ::CompanyScope::Control::CompanyAccessViolationError unless
+            obj.attributes["#{tenant.to_s.underscore}_id"] == Module.const_get("#{tenant.to_s.classify}").current_id
           true
         end
 
         before_destroy do |obj|
           # force company to be correct for current_user
-          raise ::CompanyScope::Control::CompanyAccessViolationError unless obj.company_id == Company.current_id
+          #raise ::CompanyScope::Control::CompanyAccessViolationError unless obj.company_id == Company.current_id
+          raise ::CompanyScope::Control::CompanyAccessViolationError unless
+            obj.attributes["#{tenant.to_s.underscore}_id"] == Module.const_get("#{tenant.to_s.classify}").current_id
           true
         end
       end

data/lib/company_scope/filter.rb

@@ -10,24 +10,31 @@ module CompanyScope
     end
 
     module FilterMethods
-      
+
       def current_company
         request.env["COMPANY_ID"] # a default that is best overridden in the application controller..
       end
-        
+
       def filter_by_current_company_scope
-        Company.current_id = current_company.id
+        scope_class.current_id = current_company.id
         yield
       ensure
-        Company.current_id = nil
+        scope_class.current_id = nil
       end
     end
 
     module FilterClassMethods
+      #
+      def set_scoping_class(scope_model = :company)
+        self.class_eval do
+          cattr_accessor :scope_class
+        end
+        self.scope_class = scope_model.to_s.camelcase.constantize
+      end
       #
       def company_setup
         helper_method :current_company
-      end        
+      end
       #
       def acts_as_company_filter
         around_filter :filter_by_current_company_scope

data/lib/company_scope/version.rb

@@ -1,3 +1,3 @@
 module CompanyScope
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: company_scope
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Steve Forkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler