multi_client 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee973e7a43f9052c0584bd35622074e9454978e0
-  data.tar.gz: dbd4564e532229f97fe85972aed59cfbb8e01b29
+  metadata.gz: 3e18e3181ca39656c1dec3e8c0aa13b11c3de851
+  data.tar.gz: 092f67ee29528eb30dc0751134a5f4cf16802fca
 SHA512:
-  metadata.gz: 2e6387041fa8d3823bb1aea9ee3a1d0e4ca1f1bfd720bbee7dc56e16e2c248367ecbd5d2e23f7844d3b76880eda87f59ac0a9221133bbe7b4ec4bc0e4a9c1dd8
-  data.tar.gz: 4986730268411211e589f8605b51360fe78e86a88853ec0fc252b9da286941c0911950def3a00bff6df17ae93782ebe8a02b81de46e95206b039ef0bac4b34db
+  metadata.gz: 1dfa2f9539cfb8ac70bbc56b094580a34427d505c289fcefa876819ce7fa36da0d353f966d841577f750f3d86629c9c1368ed45bf4284606eb7854a41d938c95
+  data.tar.gz: fd64e7e683086961627b5ba7e26cfce6c4745fe7ebce16ef401d442a7180ebc3aee0da59cc4dede0eda4f722cafbdfea8c2638e7b859f49ff035d8a38ff4ced5

data/README.rdoc

@@ -56,6 +56,14 @@ Add migrations and migrate
     Post.all
   end
 
+= How do I setup my application so that a client is looked up automatically?
+
+  # app/controllers/application_controller.rb
+  class ApplicationController < ActionController::Base
+    include MultiClient::ControllerWithClient
+    helper_method :current_client
+  end
+
 = Gotchas
 
 == include MultiClient::ModelWithClient::ActiveSupport::Concern after calls to any class methods.

data/app/models/multi_client/client.rb

@@ -32,6 +32,10 @@ module MultiClient
       self.current_id = where(identifier: identifier).first.try(:id)
     end
 
+    def self.set_current_by_subdomain(subdomain)
+      self.current_id = where(subdomain: subdomain).first.try(:id)
+    end
+
     def self.unset_current
       self.current_id = nil
     end

data/app/services/multi_client/create_client_service.rb

@@ -18,6 +18,7 @@ module MultiClient
       say "Input is valid"
       ActiveRecord::Base.transaction do
         response.client = create_client
+        return response unless response.client.persisted?
         Client.with_client(response.client) do
           # response.client_setting = create_client_setting
           response.roles, response.permissions = create_default_roles_and_permissions if create_roles_and_permissions == true

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

@@ -8,6 +8,10 @@ module MultiClient
       def generate_intializer
         copy_file 'initializer.rb', 'config/initializers/multi_client.rb'
       end
+
+      def generate_client_model
+        copy_file 'client.rb', 'app/models/client.rb'
+      end
     end
   end
 end

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

@@ -0,0 +1,2 @@
+class Client < MultiClient::Client
+end

data/lib/multi_client/spec_helpers/feature.rb

@@ -0,0 +1,21 @@
+module MultiClient
+  module SpecHelpers
+    module Feature
+      def with_client(client, &block)
+        MultiClient::Client.with_client(client) { block.call }
+      end
+
+      def use_subdomain(subdomain)
+        Capybara.current_session.driver.reset!
+        Capybara.default_host = Capybara.default_host.sub(/(.*?\/\/)(.*?)(\..*)/, "\\1#{subdomain}\\3")      
+      end
+
+      def with_subdomain(subdomain, &block)
+        original_host = Capybara.default_host
+        use_subdomain(subdomain)
+        yield
+        Capybara.default_host = original_host
+      end
+    end
+  end
+end

data/lib/multi_client/version.rb

@@ -1,3 +1,3 @@
 module MultiClient
-  VERSION = '3.1.0'.freeze
+  VERSION = '3.1.1'.freeze
 end

data/lib/tasks/multi_client_tasks.rake

@@ -1,13 +1,13 @@
 namespace :multi_client do
   namespace :create do
-    desc "Explaining what the task does"
+    desc "Creates the master Tenant"
     task create_master: :environment do
       if MultiClient::Client.exists?(subdomain: 'master')
         puts "Master tenant already exists"
         next
       end
       if MultiClient::Client.enabled.create!(subdomain: 'master', identifier: MultiClient::Configuration.master_client_identifier)
-        puts "Created master tenant"
+        puts "Created master tenant (#{MultiClient::Configuration.master_client_identifier})"
       end
       puts "Done"
     end

data/spec/factories/multi_client/client_factories.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :multi_client_client, class: MultiClient::Client do
-    sequence(:identifier)
-    sequence(:subdomain)
+    sequence(:identifier) { |i| "client.identifier.#{i}"}
+    sequence(:subdomain)  { |i| "client#{i}"}
     enabled true
 
     trait(:master) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_client
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -151,6 +151,7 @@ files:
 - config/routes.rb
 - db/migrate/001_create_multi_client_clients.rb
 - lib/generators/multi_client/install/install_generator.rb
+- lib/generators/multi_client/install/templates/client.rb
 - lib/generators/multi_client/install/templates/initializer.rb
 - lib/multi_client.rb
 - lib/multi_client/configuration.rb
@@ -158,7 +159,7 @@ files:
 - lib/multi_client/master_subdomain.rb
 - lib/multi_client/no_subdomain.rb
 - lib/multi_client/non_master_subdomain.rb
-- lib/multi_client/spec_helper.rb
+- lib/multi_client/spec_helpers/feature.rb
 - lib/multi_client/subdomain.rb
 - lib/multi_client/version.rb
 - lib/tasks/multi_client_tasks.rake

data/lib/multi_client/spec_helper.rb

@@ -1,9 +0,0 @@
-module MultiClient
-  module SpecHelper
-    def use_client(client)
-      MultiClient::Client.current_id = client.id
-      Capybara.current_session.driver.reset!
-      Capybara.default_host = Capybara.default_host.sub(/(.*?\/\/)(.*?)(\..*)/, "\\1#{client.subdomain}\\3")      
-    end
-  end
-end