multi_client 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb959e3e7261ece07ebd98c3c50024e9aeeebf00
-  data.tar.gz: 12f046e79761540fa66f8ac99f6cd23c78e08b56
+  metadata.gz: 870e44c8e39778573342067fc5f7e1a0b3259418
+  data.tar.gz: 8f9bcbd1516b65c100eed8497e92ba5fac0eb8bf
 SHA512:
-  metadata.gz: ffd03a80b02d73e9354aea0581d0192685217591380e5d1f602f9e5aae486f2fb45c20f07d59542f04354c9c51d637d5de5a39db273a7f4afcf905c60ce08a27
-  data.tar.gz: 575e6f74d0533afdfe35dababf3b6a998bd5506909f3572f1367458897e34d12081c0089280b5aee5ac5216666563c1dbb68d8dbd1f0e0997f3e80f00afa1ea4
+  metadata.gz: 64f12b209c88af029f201321dbc3165a83ea226ae0d5d132e6f4df7588872eca35a61dc4450c05c4428a056bd9b20d0cdaa61dfcff800a1977426835edcf4dd8
+  data.tar.gz: 0154ef2e3637469500cf8119578e5a0dba4ecce8f0e4df3adb7bf1da4af4bc06714ab31a7b703778ffa5a780d4c79bfc036773a5be98241af29cd570168ee452

data/Rakefile

@@ -14,9 +14,13 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
+
 load 'rails/tasks/statistics.rake'
 
+
+
 Bundler::GemHelper.install_tasks
+

data/app/controllers/concerns/multi_client/controller_with_client.rb

@@ -19,7 +19,7 @@ module MultiClient
     end
 
     def set_current_client
-      redirect_to(root_url(subdomain: 'www')) && return unless current_client = client_class.enabled.find_by_subdomain(request.subdomains.first)
+      redirect_to root_url(subdomain: 'www') and return unless current_client = client_class.enabled.find_by_subdomain(request.subdomains.first)
       client_class.current_id = current_client.id
       begin
         yield
@@ -28,4 +28,4 @@ module MultiClient
       end
     end
   end
-end
+end

data/app/exceptions/unscoped_forbidden_error.rb

@@ -1,2 +1,2 @@
 class UnscopedForbiddenError < StandardError
-end
+end

data/app/helpers/multi_client_helper.rb

@@ -3,4 +3,4 @@ module MultiClientHelper
     clients = MultiClient::Client.all
     render 'multi_client/client_navigation', clients: clients
   end
-end
+end

data/app/models/concerns/multi_client/model_with_client.rb

@@ -5,31 +5,38 @@ module MultiClient
     included do
       klass = Class.new(self) do
         default_scope { unscoped }
-
+        
         def unscoped
           super
         end
       end
-      const_set 'Unscoped', klass
+      self.const_set 'Unscoped', klass
 
       belongs_to MultiClient::Configuration.method_name.to_sym, class_name: MultiClient::Configuration.model_name
 
-      scope "for_current_#{MultiClient::Configuration.method_name}".to_sym, -> { where(MultiClient::Configuration.foreign_key.to_sym => MultiClient::Configuration.model_name.constantize.current_id) }
+      scope "for_current_#{MultiClient::Configuration.method_name}".to_sym, lambda { where(MultiClient::Configuration.foreign_key.to_sym => MultiClient::Configuration.model_name.constantize.current_id) }
       default_scope { send("for_current_#{MultiClient::Configuration.method_name}".to_sym) }
 
       validates MultiClient::Configuration.foreign_key.to_sym, presence: true
 
-      ::MultiClient::Client.has_many name.demodulize.underscore.pluralize.to_sym, class_name: "::#{name}", foreign_key: MultiClient::Configuration.foreign_key.to_sym
+      ::MultiClient::Client.has_many self.name.demodulize.underscore.pluralize.to_sym, class_name: "::#{self.name}", foreign_key: MultiClient::Configuration.foreign_key.to_sym
+
     end
 
     class_methods do
       def unscoped
-        return super if name.demodulize == 'Unscoped'
-        caller = caller_locations(1, 1)[0].label
-        return where(MultiClient::Configuration.foreign_key.to_sym => MultiClient::Configuration.model_name.constantize.current_id) if MultiClient::Configuration.force_client_scope_for_unscoped_callers.include?(caller)
-        return super if MultiClient::Configuration.allowed_unscoped_callers.include?(caller)
-        raise UnscopedForbiddenError, "Calling unscoped from #{caller} is not allowed to prevent client data leakage"
+        return super if self.name.demodulize == 'Unscoped'
+        return where(MultiClient::Configuration.foreign_key.to_sym => MultiClient::Configuration.model_name.constantize.current_id) if caller_locations(1,1)[0].label == 'aggregate_column'
+
+        # Experimental
+        # return where(MultiClient::Configuration.foreign_key.to_sym => MultiClient::Configuration.model_name.constantize.current_id) if  ['aggregate_column', 'bottom_item', 'scope_for_slug_generator'].include?(caller_locations(1,1)[0].label)
+
+        if ['_create_record', 'scope', 'validate_each', 'eval_scope', '_update_record', 'aggregate_column', 'bottom_item', 'scope_for_slug_generator'].include?(caller_locations(1,1)[0].label)
+          super
+        else
+          raise UnscopedForbiddenError, "Calling unscoped from #{caller_locations(1,1)[0].label} is not allowed to prevent client data leakage" 
+        end
       end
     end
   end
-end
+end

data/lib/generators/multi_client/install/install_generator.rb

@@ -1,13 +1,13 @@
 module MultiClient
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      desc 'Generates the initializer'
+      desc "Generates the initializer"
 
       source_root File.expand_path('../templates', __FILE__)
 
       def generate_intializer
-        copy_file 'multi_client.rb', 'config/initializers/multi_client.rb'
+        copy_file "multi_client.rb", "config/initializers/multi_client.rb"
       end
     end
   end
-end
+end

data/lib/generators/multi_client/install/templates/multi_client.rb

@@ -13,44 +13,4 @@ MultiClient.configure do |config|
   #
   # default: config.method_name = 'client'
   config.method_name = 'client'
-
-  # Calling unscoped is blocked to prevent data leakage. You can define
-  # exceptions here.
-  # 
-  # default: config.allowed_unscoped_callers = %w(
-  #   _create_record 
-  #   _update_record 
-  #   aggregate_column 
-  #   bottom_item 
-  #   eval_scope
-  #   relation_for_destroy 
-  #   reload 
-  #   scope
-  #   scope_for_slug_generator 
-  #   update_counters
-  #   update_positions 
-  #   validate_each
-  # )
-  #
-  config.allowed_unscoped_callers = %w(
-    _create_record 
-    _update_record 
-    aggregate_column 
-    bottom_item 
-    eval_scope
-    relation_for_destroy 
-    reload 
-    scope
-    scope_for_slug_generator 
-    update_counters
-    update_positions 
-    validate_each
-  )
-
-  # Calling unscoped is blocked to prevent data leakage. You can override the behaviour of unscoped
-  # here. If the caller is in this list, it wont get the unscoped scope, but a client scoped relation.
-  #
-  # default: config.force_client_scope_for_unscoped_callers = ['aggregate_column']
-  #
-  config.force_client_scope_for_unscoped_callers = ['aggregate_column']
 end

data/lib/multi_client/configuration.rb

@@ -16,10 +16,6 @@ module MultiClient
       'client'
     end
 
-    mattr_accessor(:allowed_unscoped_callers) { [] }
-
-    mattr_accessor(:force_client_scope_for_unscoped_callers) { [] }
-
     def self.namespaced_model_name
       "MultiClient::#{model_name}"
     end

data/lib/multi_client/no_subdomain.rb

@@ -9,4 +9,4 @@ module MultiClient
       end
     end
   end
-end
+end

data/lib/multi_client/subdomain.rb

@@ -9,4 +9,4 @@ module MultiClient
       end
     end
   end
-end
+end

data/lib/multi_client/version.rb

@@ -1,3 +1,3 @@
 module MultiClient
-  VERSION = '0.1.1'.freeze
+  VERSION = "1.0.0"
 end

data/lib/multi_client.rb

@@ -1,5 +1,5 @@
-require 'multi_client/engine'
-require 'multi_client/configuration'
+require "multi_client/engine"
+require "multi_client/configuration"
 
 module MultiClient
   extend Configuration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails