company_scope 0.9 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afc9477877707a43dea45f4700e9bd2901a39709
-  data.tar.gz: d0afae4228b12188111476a736228f03ae26654e
+  metadata.gz: 40d1345b7a3a4eea16b8ce890f7237b5065a7473
+  data.tar.gz: 06711cac801368b1649a8646551e70d61b5ac5a1
 SHA512:
-  metadata.gz: 2437b536e02709af7019f4859aaf8aaa253dcf8338ef7aebf906d4148dfaa523d57c84b59d5c3f14d6d777488bc73100d45970697f685308d69fb30d9e688235
-  data.tar.gz: 53f8a2ff5a11fb53f3aa64626517730bbb96b2b858601d3f506963b2868b05346b2bd8ed46674da7569e0130082e82ba330629e8566314ef1986a57c51cdf1b7
+  metadata.gz: 892cebfa91f98953b29cb85f2a624dc997b2d1d36a0940a3a6053e5bf4380eb20f4e362ac9614ba3c547ca95f72c13dcedb2a83daec96fe12125227a70b3a414
+  data.tar.gz: ab32aa31826ef03cdd942b2b4be03ef2401c2c72af0ca514613154e53f165db79aebf11768ce4db520335b5a6de96348e1f1ad5c17da91d3bceeb8ce8a551e6c

data/lib/company_scope/base.rb

@@ -5,6 +5,11 @@ module CompanyScope
     #
     def self.included(base)
       base.extend(CompanyScopeClassMethods)
+
+      private
+      def set_company_id(tenant, obj)
+        obj.send(eval(":#{tenant.to_s.underscore}_id="), Module.const_get("#{tenant.to_s.classify}").current_id)
+      end
     end
     #
     module CompanyScopeClassMethods
@@ -18,13 +23,12 @@ module CompanyScope
         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.send(eval(":#{tenant.to_s.underscore}_id="), Module.const_get("#{tenant.to_s.classify}").current_id)
-        end
+        # - on intialize & creation we make sure the company_id is set!
+        after_initialize { |obj| set_company_id(tenant, obj) }
+        before_validation(on: :create) { |obj| set_company_id(tenant, obj) }
 
+        # - before we save - catch each time someone attempts to violate the company relationship!
         before_save do |obj|
-          # catch each time someone attempts to violate the company relationship!
           raise ::CompanyScope::Control::CompanyAccessViolationError unless
             obj.attributes["#{tenant.to_s.underscore}_id"] == Module.const_get("#{tenant.to_s.classify}").current_id
           true

data/lib/company_scope/version.rb

@@ -1,3 +1,3 @@
 module CompanyScope
-  VERSION = "0.9"
+  VERSION = "1.0"
 end

data/log/test.log

@@ -558,3 +558,35 @@ Processing by DummyApplicationController#index as HTML
 Completed 200 OK in 0ms (Views: 0.2ms)
 Processing by DummyApplicationController#index as HTML
 Completed 500 Internal Server Error in 0ms
+Processing by DummyApplicationController#index as HTML
+Completed 200 OK in 1ms (Views: 0.4ms)
+Processing by DummyApplicationController#index as HTML
+Completed 200 OK in 0ms (Views: 0.1ms)
+Processing by DummyApplicationController#index as HTML
+Completed 200 OK in 0ms (Views: 0.1ms)
+Processing by DummyApplicationController#index as HTML
+Completed 500 Internal Server Error in 0ms
+Processing by DummyApplicationController#index as HTML
+Completed 200 OK in 1ms (Views: 0.4ms)
+Processing by DummyApplicationController#index as HTML
+Completed 200 OK in 0ms (Views: 0.2ms)
+Processing by DummyApplicationController#index as HTML
+Completed 200 OK in 0ms (Views: 0.1ms)
+Processing by DummyApplicationController#index as HTML
+Completed 500 Internal Server Error in 0ms
+Processing by DummyApplicationController#index as HTML
+Completed 200 OK in 1ms (Views: 0.4ms)
+Processing by DummyApplicationController#index as HTML
+Completed 200 OK in 0ms (Views: 0.1ms)
+Processing by DummyApplicationController#index as HTML
+Completed 200 OK in 0ms (Views: 0.1ms)
+Processing by DummyApplicationController#index as HTML
+Completed 500 Internal Server Error in 0ms
+Processing by DummyApplicationController#index as HTML
+Completed 200 OK in 1ms (Views: 0.4ms)
+Processing by DummyApplicationController#index as HTML
+Completed 200 OK in 1ms (Views: 0.4ms)
+Processing by DummyApplicationController#index as HTML
+Completed 200 OK in 1ms (Views: 0.3ms)
+Processing by DummyApplicationController#index as HTML
+Completed 500 Internal Server Error in 0ms

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: company_scope
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: '1.0'
 platform: ruby
 authors:
 - Steve Forkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler