company_scope 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67f97ee18ea2db521a006698af04ac418b25f655
-  data.tar.gz: 7aadddea2aba3eb1f1401489b8641875f804bcab
+  metadata.gz: 4828ee3b27fc705144a5ea007d19da75cf2532e9
+  data.tar.gz: 19bfe7b31a86d5b17e57345be24c170ce2b2af23
 SHA512:
-  metadata.gz: efef00d3736d4fda3be69119dd086f4610c023c5f421ed0fc532cc7f675e7047405d8e6f3e333ec285959f897c6fda35515772d5ce70ea8a910cbe75408d8411
-  data.tar.gz: 95167ad9bd1ae66d7beb473eb44e8daa91eab2c4ec3985ff8c451d639c29b506e13e9f2d08c14a58a59b0819d512b630e3574dc88f9783bb2c0f5a23c8a21a65
+  metadata.gz: 07afdd531247d5a265d8782f342b75448012529656306b0f173d8d35aa0beb8ef0d39b5afc552f28e2f94eaacbbc340611786003e04f0e627aa35872e63b6ab8
+  data.tar.gz: c7209d0567261ffb7b07232d8b78e153f6bd12ac946c64ef137bc4490e3cf1ff4c22431015e54348e8027c6b61d01afc4818ecbf1acef9d9870800fa92f9a248

data/lib/company_scope/railtie.rb

@@ -7,22 +7,23 @@ module CompanyScope
     initializer :after_initialize do |app|
       #
       CompanyScope.configure do |config|
+        config.enabled = app.config.company_scope[:configured] || false
         config.company_model = app.config.company_scope[:company_model] || :company
         config.company_name_matcher = app.config.company_scope[:company_name_matcher] || :subdomain_matcher
       end
       #
-      company_config = CompanyScope.config.company_model
-      company_name_matcher = CompanyScope.config.company_name_matcher
-      #
-      # - add MultiCompany Rack middleware to detect the company_name from the subdomain
-      #app.config.middleware.insert_after Rack::Sendfile, Custom::MultiCompany, company_config, company_name_matcher
-      app.config.middleware.insert_before Rack::Runtime, Custom::MultiCompany, company_config, company_name_matcher
-      # - the base module injects the default scope into company dependant models
-      #
-      ActiveRecord::Base.send(:include, CompanyScope::Base)
-      #
-      # - the company_entity module injects class methods for acting as the company!
-      ActiveRecord::Base.send(:include, CompanyScope::Guardian)
+      company_scope_configured = CompanyScope.config.enabled
+      # - this is set in the template initializer - if not by default it is disabled!
+      if company_scope_configured
+        company_config = CompanyScope.config.company_model
+        company_name_matcher = CompanyScope.config.company_name_matcher
+        # - add MultiCompany Rack middleware to detect the company_name from the subdomain
+        app.config.middleware.insert_before Rack::Runtime, Custom::MultiCompany, company_config, company_name_matcher
+        # - the base module injects the default scope into company dependant models
+        ActiveRecord::Base.send(:include, CompanyScope::Base)
+        # - the company_entity module injects class methods for acting as the company!
+        ActiveRecord::Base.send(:include, CompanyScope::Guardian)
+      end
       #
       if defined?(ActionController::Base)
         # - the control module has some error handling for the application controller

data/lib/company_scope/version.rb

@@ -1,3 +1,3 @@
 module CompanyScope
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/company_scope.rb

@@ -12,6 +12,7 @@ require File.dirname(__FILE__) + '/company_scope/railtie' if defined? ::Rails::R
 #
 module CompanyScope
   class Config
+    attr_accessor :enabled
     attr_accessor :company_model
     attr_accessor :company_name_matcher
   end

data/lib/generators/company_scope/install_generator.rb

@@ -0,0 +1,26 @@
+require 'rails/generators'
+module CompanyScope
+  class InstallGenerator < Rails::Generators::Base
+    desc "CompanyScope installs the relevant database migrations"
+    source_root File.expand_path("../templates", __FILE__)
+    
+    class_option :company_class_name, :type => :string, :default => 'company', :desc => "Name of Company Model"
+    class_option :user_class_name, :type => :string, :default => 'user', :desc => "Name of User Model"
+    class_option :enable_uuid, :type => boolean, :default => false, :desc => "Enable UUID if the extension is used"
+
+    def self.source_root
+      File.expand_path("../templates", __FILE__)
+    end
+
+    def modify_application_rb
+    end
+
+    def create_migrations
+      Dir["#{self.class.source_root}/migrations/*.rb"].sort.each do |filepath|
+        name = File.basename(filepath)
+        template "migrations/#{name}", "db/migrate/#{name}"
+        sleep 1
+      end
+    end
+  end
+end

data/lib/generators/company_scope/templates/company_scope.rb.erb

@@ -0,0 +1,3 @@
+CompanyScope.setup do |config|
+  
+end

data/log/test.log

@@ -358,3 +358,43 @@ 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 0ms (Views: 0.2ms)
+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: 1.0ms)
+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 0ms (Views: 0.2ms)
+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 0ms (Views: 0.2ms)
+Processing by DummyApplicationController#index as HTML
+Completed 200 OK in 1ms (Views: 0.3ms)
+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 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 200 OK in 0ms (Views: 0.1ms)
+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.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Steve Forkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,6 +206,8 @@ files:
 - lib/company_scope/railtie.rb
 - lib/company_scope/version.rb
 - lib/custom/multi_company.rb
+- lib/generators/company_scope/install_generator.rb
+- lib/generators/company_scope/templates/company_scope.rb.erb
 - lib/subdomain_matcher.rb
 - log/test.log
 homepage: http://github.com/netflakes/company_scope