multi_client 2.2.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a6e1687c81abaeab7384d68ba3a9bc6ac3c5913
-  data.tar.gz: ce98f18cbda27d89d807825807adcf79c10f34fe
+  metadata.gz: d9fe6bf2d773b9549c7b637e9905ec592c059e68
+  data.tar.gz: 68e12f5338a2a36fe5a2d23fb94d67ebd794a02b
 SHA512:
-  metadata.gz: 4d7d2adf77960c0aa426598734720488a2b2bb76c66c31f1f8f5e227e6bcc834d6411e8011359216c7796f7c74200fb5d0464ae3b18a4c9b34ca59d39ce3ee94
-  data.tar.gz: 234ee38c3ab4fff5081d8fda76a6e771a21e5cfee0e57e0c367a41406ca6805c54e307358cec24f32161b17c588419efe6a9210f2cb6bc859a03d080c0643ce6
+  metadata.gz: 70599b057fdddb47846ec157b43b5225d9c52860822597e3d2c7beb8f6aeeb90c0a3d02deba2a33298a0304135c6ce8b31db1df362c70c4c2000e64016ee8726
+  data.tar.gz: a421e291f1837fccb98e8df58e19dbe0cedf3f0b493d2cdb5a29fedf4522069d8434f7f6ea9e95e4607a98dd9f7390a2c7ec17ee9f9d5d36389af983d0143ea0

data/README.rdoc

@@ -20,6 +20,24 @@ Add migrations and migrate
 
     > rake multi_client:install:migrations && rake db:migrate
 
+= How do I scope routing to clients?
+
+  # config/routes.rb
+  constraints MultiClient::Subdomain do
+    resources :posts
+  end
+
+  => acme.example.com/posts
+
+= How do I scope routing to non-clients?
+
+  # config/routes.rb
+  constraints MultiClient::NoSubdomain do
+    resources :posts
+  end
+
+  => www.example.com/posts
+
 = How do I set the current client?
 
   # console

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

@@ -5,7 +5,7 @@ module MultiClient
     included do
       around_action :set_current_client
 
-      helper_method :current_client
+      helper_method :current_client if respond_to?(:current_client)
     end
 
     private

data/app/helpers/multi_client_helper.rb

@@ -1,5 +1,6 @@
 module MultiClientHelper
   def render_client_navigation
+    return unless MultiClient::Client.master?
     clients = MultiClient::Client.all
     render 'multi_client/client_navigation', clients: clients
   end

data/app/models/multi_client/client.rb

@@ -9,7 +9,7 @@ module MultiClient
     scope :enabled, -> { where(enabled: true) }
 
     def self.master
-      where(identifier: Configuration.master_tenant_identifier).first
+      where(identifier: Configuration.master_client_identifier).first
     end
 
     def self.current_id=(id)
@@ -36,26 +36,26 @@ module MultiClient
       self.current_id = nil
     end
 
-    def self.with_tenant(tenant, &block)
+    def self.with_client(client, &block)
       original_id = current_id
       begin
-        self.current_id = tenant.id
-        Rails.logger.info "Temporarily set tenant id to #{tenant.id}"
+        self.current_id = client.id
+        Rails.logger.info "Temporarily set client id to #{client.id}"
         block.call
       rescue
         raise
       ensure
-        Rails.logger.info "Restored tenant id to #{original_id}"
+        Rails.logger.info "Restored client id to #{original_id}"
         self.current_id = original_id
       end
     end
 
     def self.master?
-      !!(current && current.identifier == Configuration.master_tenant_identifier)
+      !!(current && current.identifier == Configuration.master_client_identifier)
     end
 
     def self.set_current_to_master
-      set_current_by_identifier(Configuration.master_tenant_identifier)
+      set_current_by_identifier(Configuration.master_client_identifier)
     end
 
   end

data/app/services/multi_client/create_client_service.rb

@@ -0,0 +1,158 @@
+module MultiClient
+  class CreateClientService < Itsf::Services::V2::Service::Base
+    class Response < Itsf::Services::V2::Response::Base
+      # attr_accessor :client, :client_setting, :users, :licensed_products, :roles, :permissions
+      attr_accessor :client, :users, :roles, :permissions
+    end
+
+    # attr_accessor :subdomain, :identifier, :enabled, :brand_primary_color, :logo, :user_emails, :product_ids, :create_roles_and_permissions, :request_host
+    attr_accessor :subdomain, :identifier, :enabled, :user_emails, :create_roles_and_permissions, :request_host
+
+    # validates :subdomain, :identifier, :enabled, :brand_primary_color, :logo, :user_emails, :create_roles_and_permissions, :request_host, presence: true
+    validates :subdomain, :identifier, :enabled, :user_emails, :create_roles_and_permissions, :request_host, presence: true
+  
+    def do_work
+      say "Running on environment #{Rails.env}"
+      say "Validating input"
+      return response unless valid?
+      say "Input is valid"
+      ActiveRecord::Base.transaction do
+        response.client = create_client
+        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
+          response.users = create_users
+          # response.licensed_products = create_licensed_products
+          raise ActiveRecord::Rollback if errors.any?
+          request_user_password_resets(response.users.map(&:email))
+        end
+      end
+      say "Done"
+      respond
+    end
+
+    private
+
+    def create_client
+      say "Creating client", indent: 1
+      client = Client.new(client_attributes)
+      if client.save
+        say "Created #{client.class} #{client}", indent: 2
+      else
+        add_error_and_say :client, "Error creating #{client.class} #{client}. Errors: #{client.errors.full_messages.to_sentence}", indent: 2
+      end
+      say "Done", indent: 1
+      return client
+    end
+
+    # def create_client_setting
+    #   say "Creating client setting", indent: 1
+    #   client_setting = ClientSetting.new(client_setting_attributes)
+    #   if client_setting.save
+    #     say "Created #{client_setting.class} #{client_setting}", indent: 2
+    #   else
+    #     add_error_and_say :client_setting, "Error creating #{client_setting.class} #{client_setting}. Errors: #{client_setting.errors.full_messages.to_sentence}", indent: 2
+    #   end
+    #   say "Done", indent: 1
+    #   return client_setting
+    # end
+
+    def create_default_roles_and_permissions
+      say "Creating roles", indent: 1
+      result = Ecm::Rbac::ImportDefaultPermissionsService.call(filename: Rails.root.join("config", "rbac.yml"))
+      if result.success?
+        say "Created roles", indent: 2
+      else
+        add_error_and_say :create_roles_and_permissions, "Error creating roles. Errors: #{result.errors.full_messages.to_sentence}", indent: 2
+      end
+      say "Done", indent: 1
+      return result.roles, result.permissions
+    end
+
+    def create_users
+      say "Creating #{splitted_user_emails.size} users", indent: 1
+      users = splitted_user_emails.collect do |user_email|
+        create_user(user_email)
+      end
+      say "Done", indent: 1
+      return users
+    end
+
+    def create_user(email)
+      say "Creating user", indent: 1
+      random_password = SecureRandom.hex
+      user = Ecm::UserArea::User.new(email: email, password: random_password, password_confirmation: random_password, active: true, confirmed: true, approved: true, roles: user_roles)
+      if user.save
+        say "Created #{user.class} #{user}", indent: 2
+      else
+        add_error_and_say :user_emails, "Error creating #{user.class} #{user}. Errors: #{user.errors.full_messages.to_sentence}", indent: 2
+      end
+      say "Done", indent: 1
+      return user
+    end
+
+    # def create_licensed_products
+    #   say "Creating #{product_ids.size} licensed products", indent: 1
+    #   licensed_products = product_ids.collect do |product_id|
+    #     create_licensed_product(product_id)
+    #   end
+    #   say "Done", indent: 1
+    #   return licensed_products
+    # end
+
+    # def create_licensed_product(product_id)
+    #   say "Creating licensed product", indent: 1
+    #   licensed_product = Chi::Licensing::LicensedProduct.new(licensee: response.client)
+    #   licensed_product.product = load_product(product_id)
+    #   if licensed_product.save
+    #     say "Created #{licensed_product.class} #{licensed_product}", indent: 2
+    #   else
+    #     add_error_and_say :product_ids, "Error creating #{licensed_product.class} #{licensed_product}. Errors: #{licensed_product.errors.full_messages.to_sentence}", indent: 2
+    #   end
+    #   say "Done", indent: 1
+    #   return licensed_product
+    # end
+
+    def client_attributes
+      { subdomain: subdomain, identifier: identifier, enabled: enabled }
+    end
+
+    def client_setting_attributes
+      { brand_primary_color: brand_primary_color, logo: logo }
+    end
+
+    def splitted_user_emails
+      user_emails.split(/[^\w+@\.\+\-\_]/)
+    end
+
+    def request_user_password_resets(emails)
+      host = request_host.gsub(Client.master.subdomain, subdomain)
+      emails.map do |email|
+        Ecm::UserArea::UserPasswordResetRequest.call(email: email, host: host)
+      end
+    end
+
+    # def load_product(product_id)
+    #   Chi::Licensing::Product.where(id: product_id).first
+    # end
+
+    def create_roles_and_permissions
+      if Rails.version < '5'
+        ActiveRecord::Type::Boolean.new.type_cast_from_user(@create_roles_and_permissions)
+      else
+        ActiveRecord::Type::Boolean.new.cast(@create_roles_and_permissions)
+      end
+    end
+
+    def user_roles
+      [
+        Ecm::Rbac::Role.where(identifier: 'rt_imager/admin').first,
+        Ecm::Rbac::Role.where(identifier: 'rt_imager/web').first,
+      ].compact
+    end
+
+    # def product_ids
+    #   @product_ids ||= []
+    # end
+  end
+end

data/config/locales/de.yml

@@ -1,3 +1,16 @@
 de:
   classes:
-    multi_client/client: Mandant
+    multi_client/client: 'Mandant'
+    multi_client/create_client_service: 'Dienst zum einrichten von Mandanten'
+  activerecord:
+    attributes:
+      multi_client/client:
+        identifier: 'Bezeichner'
+        subdomain: 'Subdomain'
+        enabled: 'Aktiv'
+        created_at: 'Erstellt am'
+        updated_at: 'Aktualisiert am'
+    models:
+      multi_client/client:
+        one: 'Mandant'
+        other: 'Mandanten'

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

@@ -61,10 +61,10 @@ MultiClient.configure do |config|
   # 
   config.no_subdomain_prefixes = ->(request) { ['www', '', nil] }
 
-  # The master tenant is a special tenant. You can ask Tenant.master? to
-  # check, if the actual tenant is the master tenant.
+  # The master client is a special client. You can ask MultiClient::Client.master? to
+  # check, if the actual client is the master client.
   # 
-  # Default: config.master_tenant_identifier = '000'
+  # Default: config.master_client_identifier = '000'
   # 
-  config.master_tenant_identifier = '000'
+  config.master_client_identifier = '000'
 end

data/lib/multi_client/configuration.rb

@@ -24,7 +24,7 @@ module MultiClient
 
     mattr_accessor(:force_client_scope_for_unscoped_callers) { [] }
 
-    mattr_accessor(:master_tenant_identifier) { '000' }
+    mattr_accessor(:master_client_identifier) { '000' }
 
     def self.namespaced_model_name
       "MultiClient::#{model_name}"

data/lib/multi_client/spec_helper.rb

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

data/lib/multi_client/version.rb

@@ -1,3 +1,3 @@
 module MultiClient
-  VERSION = '2.2.1'.freeze
+  VERSION = '3.0.0'.freeze
 end

data/lib/multi_client.rb

@@ -3,4 +3,8 @@ require 'multi_client/configuration'
 
 module MultiClient
   extend Configuration
+
+  def self.table_name_prefix
+    'multi_client_'
+  end
 end

data/lib/tasks/multi_client_tasks.rake

@@ -1,4 +1,15 @@
-# desc "Explaining what the task does"
-# task :multi_client do
-#   # Task goes here
-# end
+namespace :multi_client do
+  namespace :create do
+    desc "Explaining what the task does"
+    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"
+      end
+      puts "Done"
+    end
+  end
+end

data/spec/factories/multi_client/client_factories.rb

@@ -0,0 +1,12 @@
+FactoryGirl.define do
+  factory :multi_client_client, class: MultiClient::Client do
+    sequence(:identifier)
+    sequence(:subdomain)
+    enabled true
+
+    trait(:master) do
+      identifier MultiClient::Configuration.master_client_identifier
+      subdomain 'master'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_client
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -141,6 +141,7 @@ files:
 - app/helpers/multi_client_helper.rb
 - app/models/concerns/multi_client/model_with_client.rb
 - app/models/multi_client/client.rb
+- app/services/multi_client/create_client_service.rb
 - app/views/layouts/multi_client/application.html.erb
 - app/views/multi_client/_client_navigation.haml
 - app/views/multi_client/_current_client.html.erb
@@ -159,6 +160,7 @@ files:
 - lib/multi_client/subdomain.rb
 - lib/multi_client/version.rb
 - lib/tasks/multi_client_tasks.rake
+- spec/factories/multi_client/client_factories.rb
 homepage: https://github.com/robotex82/multi_client
 licenses:
 - MIT