landlady 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzYyYjNlM2JhNDAxMjk2Mjk4YWI4NGE1MGE4MTJlZmU3YTlmNmQzYw==
+    OWMyZjZiZmY1OTY2NmM5ODRmMmM0Njg2ZmNlYmUzYzA4ZGU1NjcwYw==
   data.tar.gz: !binary |-
-    Y2VmNzAzZmJiYTJjMTMzYjEyNjE2ZDJhYmJkYTc5MDNlYWIwZjQ5NA==
+    ZjljNmE3N2JhYWIxYjI4MjZkZjkxYzgyNjgyYWUwZTRhZTNlNWJlYQ==
 SHA512:
   metadata.gz: !binary |-
-    Y2QxNTBkNGM2Y2IwZGM3N2QyMGZmYTNmZDlhNDZiNDY1NGJlNGE5ODMxZTA1
-    ZThiZjU2Yzg3MDg0N2JkNTYyMjQwMzdkYzRhOTljZDQ5YjcxNzYzMzY0MThj
-    MWFkMzlmOTM3MjY1ZGY4ZTI1Mzc5OWYyNGEyZGI1ODEyZjM2ZGY=
+    Mzg5ZDVlYmY2OTlmZmFjMjQ3OTk3MTA2ODI3NmE2ZmVjY2RmM2UzN2NkYzk1
+    ODE3Mjk3NGVlZTNiODg2OWM5MWE5ODA4OGVjNDY5OWE2OTdlODZiMjRiMDE3
+    MDdkMGQ5ZDQxMGM0ZTI0Y2I4OTZjOTY0ZmIzMGM5MzNjOWZjMGQ=
   data.tar.gz: !binary |-
-    ZWExMDIzODVhZWE0MGFhYzQ5YzFjZWI4ZjFiMGI4NWVhNThlNWU2ZTkwNzgy
-    ODUwYzcwOTAzYjQyNjNlMmVmMTU5YmQ1NWUzMWMwMGNmNjUzZGEyMzk3MzEw
-    YmVmM2QzNWQ5YTAwOGNhMmM3M2MyYWFiYjRmZmFkMTBlODIxMGE=
+    MWQ2NzE1NGU5ZGEwOGEyNGI1ZWU1YjRhYzFkMmZiMTVjODJhN2MwMmFlOWFj
+    ZGM4ZDE3ZjUxNGI2NDA1NGZmODkyZGYxOGM4NDBjZGI2NDk1NzI0MTBmMDQ0
+    MzdiMGVlODNlZDU3MDM5NzEyYmRiMTc3NTAxOGZkMGQ5NTE2MWU=

data/README.md

@@ -18,7 +18,7 @@ Or install it yourself as:
 
 Then Install and run the migrations:
 
-    $ rails g my_gem:install
+    $ rails g landlady:install
     $ rake db:migrate
 
 

data/lib/generators/landlady/{install/install_generator.rb → install_generator.rb}

@@ -2,10 +2,11 @@ require 'rails/generators/migration'
 
 module Landlady
   module Generators
-    class InstallGenerator < ::Rails::Generators::Base
+    class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
+
       source_root File.expand_path('../templates', __FILE__)
-      desc "add the migrations"
+      desc "Add the migrations"
 
       def self.next_migration_number(path)
         unless @prev_migration_nr

data/lib/landlady.rb

@@ -26,4 +26,34 @@ module Landlady
     sql = "SELECT nspname FROM pg_namespace WHERE nspname !~ '^pg_.*'"
     ActiveRecord::Base.connection.query(sql).flatten
   end
+
+  class Tenant < ActiveRecord::Base
+
+    has_and_belongs_to_many :admins
+
+    validates :code, :subdomain, :name, :uniqueness => true
+
+    after_create :prepare_tenant
+
+    private
+
+    def prepare_tenant
+      create_schema
+      load_tables
+    end
+
+    def create_schema
+      Landlady.create_schema id unless Landlady.schemas.include? id
+    end
+
+    def load_tables
+      return if Rails.env.test?
+      Landlady.set_search_path id, false
+      load "#{Rails.root}/db/schema.rb"
+      ::Application::SHARED_TABLES.each { |name| connection.execute %{drop table "#{name}"} }
+      Landlady.restore_default_search_path
+    end
+
+  end
+
 end

data/lib/landlady/railtie.rb

@@ -1,14 +1,17 @@
 require "rails/railtie"
 
 module Landlady
-  class Railtie < ::Rails::Railtie
-    
-    initializer "Landlady.handle_subdomains" do |app|
-      Landlady.set_search_path(@tenant.id) if @tenant = Tenant.find_by_subdomain(request.subdomain)
-    end
-    
-    rake_tasks do
-      load "../tasks/tenants.rake"
-    end
-  end
+	class Railtie < Rails::Railtie
+
+		initializer "Landlady.handle_subdomains" do
+			ActiveSupport.on_load(:action_controller) do 
+				Landlady.set_search_path(@tenant.id) if @tenant = Landlady::Tenant.find_by_subdomain(request.subdomain)
+			end
+		end
+
+		rake_tasks do
+			load "tasks/tenants.rake"
+		end
+
+	end
 end

data/lib/landlady/version.rb

@@ -1,3 +1,3 @@
 module Landlady
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: landlady
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kym McInerney
@@ -52,8 +52,8 @@ files:
 - README.md
 - Rakefile
 - landlady.gemspec
-- lib/generators/landlady/install/install_generator.rb
-- lib/generators/landlady/install/templates/create_tenants.rb
+- lib/generators/landlady/install_generator.rb
+- lib/generators/landlady/templates/create_tenants.rb
 - lib/landlady.rb
 - lib/landlady/railtie.rb
 - lib/landlady/version.rb