tenanfy 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85c62500154d550d5ff86498c72037952ee55c1b
-  data.tar.gz: e9c3fdb92396c975c91619cf97862642c181b398
+  metadata.gz: 7a3eacc926211c4d312033d4ae884ffa6b96415f
+  data.tar.gz: dba26693200afd9ec2d8cb34e3ebdf5a448fc1c3
 SHA512:
-  metadata.gz: 09005a519c83867edb1ee3671457d5fe8eb95424a505dedbfed2e84df0dc3d87a8deac4e0ae9885a8a97e26f3ab7b53161a64d716f3af3d2a699c0aa7da35fdf
-  data.tar.gz: 88970e4a96def998b592181a27a2119fa69d1a08edd08dcb243934a3f76db208ff58acf45d17fbcc727edc891ee456f266fcc8415ee95245531376c392f6ea4b
+  metadata.gz: b418e038172548bccd95bd59545521e6d9cc421f06525667d7f9753552719edc93aebd05aa4968d37fca92c77b68270922726c2d0e08c9b1ea93274f9ee63863
+  data.tar.gz: 525ffcc1d9d67cfb2db83848d689144a0d75883ac400dd8a726e45eebcada42d1ca07be88af6f7b46977317e4c3b6ee6ab15e0a85667831b297da2b7dd9e0068

data/app/models/tenanfy/tenant.rb

@@ -1,8 +1,9 @@
 module Tenanfy
   class Tenant < ActiveRecord::Base
-    validates       :name, :theme, presence: true
-    validates       :theme, format: { with: /[a-z0-9_]+/ }
-    serialize       :configs, Hash
+    validates :name, :themes, presence: true
+    validate  :validate_themes
+    serialize :configs, Hash
+    serialize :themes, Array
 
     has_many :urls, inverse_of: :tenant
 
@@ -16,25 +17,35 @@ module Tenanfy
     end
 
     def schema_name
-      "tenant_#{self.id}"
+      "tenant_#{id}"
     end
 
     def switch_to_tenant
-      ::Apartment::Tenant.switch(self.schema_name)
+      ::Apartment::Tenant.switch(schema_name)
     end
 
-    def theme_path
-      "app/views/#{self.theme}"
+    def theme_paths
+      themes.map do |theme|
+        "app/views/#{theme}"
+      end
     end
 
     private
 
+    def validate_themes
+      themes.each do |theme|
+        if theme !~ /[a-z0-9_]+/
+          errors.add(:themes, "#{theme} is not in the correct format.")
+        end
+      end
+    end
+
     def build_schema
-      ::Apartment::Tenant.create(self.schema_name)
+      ::Apartment::Tenant.create(schema_name)
     end
 
     def drop_schema
-      ::Apartment::Tenant.drop(self.schema_name)
+      ::Apartment::Tenant.drop(schema_name)
     end
 
   end

data/db/migrate/20130128025640_create_tenanfy_tenants.rb

@@ -2,7 +2,7 @@ class CreateTenanfyTenants < ActiveRecord::Migration
   def change
     create_table :tenanfy_tenants do |t|
       t.string :name  , null: false
-      t.string :theme , null: false
+      t.string :themes, null: false
       t.string :description
       t.string :keywords
       t.text   :configs

data/lib/tenanfy/controller.rb

@@ -4,7 +4,10 @@ module Tenanfy
 
     included do
       around_filter :setup_tenant_thread
-      helper_method :current_tenant, :current_tenant_theme, :current_tenant_name
+      helper_method :current_tenant, :current_tenant_themes, :current_tenant_name
+      helper_method :current_tenant_themes
+      helper_method :current_tenant_theme
+      helper_method :current_tenant_name
     end
 
     private
@@ -19,16 +22,17 @@ module Tenanfy
     def setup_tenant_thread
       RequestStore.store[:tenant] = current_tenant
       on_tenant_change
-      prepend_tenant_theme
+      prepend_tenant_themes
       yield
     ensure
       after_tenant_change
       RequestStore.store[:tenant] = nil
     end
 
-    # Adds the tenant theme in the controller view path
-    def prepend_tenant_theme
-      prepend_view_path current_tenant.theme_path if current_tenant && current_tenant.theme_path
+    # Adds the tenant themes in the controller view path
+    def prepend_tenant_themes
+      return unless current_tenant && current_tenant.theme_paths
+      prepend_view_path current_tenant.theme_paths
     end
 
     # Returns the current tenant for this request
@@ -36,9 +40,13 @@ module Tenanfy
       @current_tenant ||= Tenant.find_by_domain(request.host)
     end
 
-    # Returns the current tenant theme
     def current_tenant_theme
-      current_tenant ? current_tenant.theme : ""
+      current_tenant_themes.first.to_s
+    end
+
+    # Returns the current tenant themes
+    def current_tenant_themes
+      current_tenant ? current_tenant.themes : []
     end
 
     # Returns the current tenant name
@@ -48,6 +56,5 @@ module Tenanfy
 
     def on_tenant_change; end
     def after_tenant_change; end
-
   end
 end

data/lib/tenanfy/helpers.rb

@@ -23,7 +23,11 @@ module Tenanfy
     #
     def append_tenant_theme_to_assets(*assets)
       assets.map! do |asset|
-        should_add_tenant_theme_to_asset?(asset) && current_tenant ? "#{current_tenant.theme}/#{asset}" : asset
+        if should_add_tenant_theme_to_asset?(asset) && current_tenant
+          "#{current_tenant.themes.first}/#{asset}"
+        else
+          asset
+        end
       end
       assets
     end

data/lib/tenanfy/version.rb

@@ -1,3 +1,3 @@
 module Tenanfy
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenanfy
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Tiago Scolari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails