storey 0.1.0 → 0.2.0

data/README.md

@@ -17,6 +17,9 @@ Typically set in an initializer: config/initializer/storey.rb
     # Used for obscuring the schema name - which is important when performing schema duplication.
     # Storey.suffix = "_suffix"
 
+    # Defines schemas that should always stay in the search path, apart from the one you switched to.
+    # Storey.persistent_schemas = %w(hstore)
+
 # Methods
 
 ## schemas

data/lib/storey.rb

@@ -10,12 +10,13 @@ module Storey
 
   autoload :Duplicator, 'storey/duplicator'
 
-  mattr_accessor :suffix, :default_search_path
+  mattr_accessor :suffix, :default_search_path, :persistent_schemas
   mattr_reader :excluded_models
 
   def init
     @@default_search_path = schema
     self.excluded_models ||= []
+    self.persistent_schemas ||= []
     process_excluded_models
   end
 
@@ -89,19 +90,28 @@ module Storey
       result
     else
       reset and return if name.blank?
-      name = suffixify name
-      ActiveRecord::Base.connection.schema_search_path = name
+      path = self.schema_search_path_for(name)
+      ActiveRecord::Base.connection.schema_search_path = path
     end
   rescue ActiveRecord::StatementInvalid => e
     if e.to_s =~ /invalid value for parameter "search_path"/
-      fail Storey::SchemaNotFound, %{The schema "#{name}" cannot be found.}
+      fail Storey::SchemaNotFound, %{The schema "#{path}" cannot be found.}
     else
       raise e
     end
   end
 
+  def schema_search_path_for(schema_name)
+    path = [suffixify(schema_name)]
+    self.persistent_schemas.each do |schema|
+      path << suffixify(schema)
+    end
+    path.uniq.join(',')
+  end
+
   def reload_config!
     self.excluded_models = []
+    self.persistent_schemas = []
     self.suffix = nil
   end
 
@@ -123,7 +133,20 @@ module Storey
   end
 
   def unsuffixify(name)
-    Storey.suffix && name =~ /(\w+)#{Storey.suffix}/ ? $1 : name
+    search_path = name
+    if Storey.suffix
+      paths = []
+      name.split(',').each do |schema|
+        result = if schema =~ /(\w+)#{Storey.suffix}/
+                   $1
+                 else
+                   schema
+                 end
+        paths << result
+      end
+      search_path = paths.join(',')
+    end
+    search_path
   end
 
   protected
@@ -133,7 +156,8 @@ module Storey
   end
 
   def reset
-    ActiveRecord::Base.connection.schema_search_path = self.default_search_path
+    path = self.schema_search_path_for(self.default_search_path)
+    ActiveRecord::Base.connection.schema_search_path = path
   end
 
   # Loads the Rails schema.rb into the current schema

data/lib/storey/version.rb

@@ -1,3 +1,3 @@
 module Storey
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/dummy/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.

data/spec/spec_helper.rb

@@ -9,9 +9,21 @@ require 'database_cleaner'
 # Include rake so we can instantiate the @rake variable and call rake tasks
 require 'rake'
 
-require 'ruby-debug'
+require 'pry'
 
 RSpec.configure do |config|
+  config.before(:suite) do
+    # Clean the public schema
+    Storey.switch do
+      tables = ActiveRecord::Base.connection.tables
+      # Don't invoke DatabaseCleaner if there are no tables,
+      # since that library chokes and tries to drop tables without names
+      if tables.size != 1 or tables[0] != 'schema_migrations'
+        DatabaseCleaner.clean_with :truncation
+      end
+    end
+  end
+
   config.before(:each) do
     # We don't want configuration to leak into other tests
     Storey.reload_config!

data/spec/storey/persistent_schemas_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Storey do
+end

data/spec/storey/switch_spec.rb

@@ -99,4 +99,62 @@ describe Storey, "#switch" do
       end
     end
   end
+
+  context 'when persitent schemas are set' do
+
+    context 'when suffixes are not set' do
+      before do
+        Storey.create 'foobar'
+        persistent_schemas = %w(handle bar foo)
+        persistent_schemas.each do |schema|
+          Storey.create schema
+        end
+        Storey.persistent_schemas = persistent_schemas
+      end
+
+      it 'should switch to the schema with the persitent schemas still in the search path' do
+        Storey.switch 'foobar'
+        Storey.schema.should == %{foobar,handle,bar,foo}
+
+        Storey.switch
+        Storey.schema.should == %{"$user",public,handle,bar,foo}
+      end
+    end
+
+    context 'when suffixes are set' do
+      before do
+        Storey.suffix = '_boomboom'
+        Storey.create 'foobar'
+        persistent_schemas = %w(handle bar foo)
+        persistent_schemas.each do |schema|
+          Storey.create schema
+        end
+        Storey.persistent_schemas = persistent_schemas
+      end
+
+      it 'should switch to the schema with the persitent schemas still in the search path' do
+        Storey.switch 'foobar'
+        Storey.schema.should == %{foobar,handle,bar,foo}
+
+        Storey.switch
+        Storey.schema.should == %{"$user",public,handle,bar,foo}
+      end
+    end
+
+    context 'when switching to one of the persistent schemas' do
+      before do
+        persistent_schemas = %w(handle bar foo)
+        persistent_schemas.each do |schema|
+          Storey.create schema
+        end
+        Storey.persistent_schemas = persistent_schemas
+      end
+
+      it 'should not have duplicate schemas in the search path' do
+        Storey.switch 'bar'
+        Storey.schema.should == %{bar,handle,foo}
+      end
+    end
+
+  end
 end

data/storey.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency "pg", "~> 0.12.2"
   s.add_development_dependency "database_cleaner"
-  s.add_development_dependency "ruby-debug"
+  s.add_development_dependency "pry"
   s.add_runtime_dependency "rails", "~> 3.2.2"
 end

metadata

@@ -1,107 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: storey
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Ramon Tayag
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-17 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &82245390 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: pg
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *82245390
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: &82244830 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 12
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.12.2
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: database_cleaner
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *82244830
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: &82244090 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *82244090
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &82243450 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *82243450
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &82242810 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 2
-        - 2
+      - !ruby/object:Gem::Version
         version: 3.2.2
   type: :runtime
-  version_requirements: *id005
-description: Storey aims to simplify the implementation of managing a multi-tenant application.
-email: 
+  prerelease: false
+  version_requirements: *82242810
+description: Storey aims to simplify the implementation of managing a multi-tenant
+  application.
+email:
 - ramon@tayag.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -162,44 +134,34 @@ files:
 - spec/storey/drop_spec.rb
 - spec/storey/duplicate_spec.rb
 - spec/storey/excluded_models_spec.rb
+- spec/storey/persistent_schemas_spec.rb
 - spec/storey/schema_spec.rb
 - spec/storey/schemas_spec.rb
 - spec/storey/switch_spec.rb
 - spec/tasks/storey_rake_spec.rb
 - storey.gemspec
-has_rdoc: true
 homepage: https://github.com/ramontayag/storey
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: storey
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Manage multiple PostgreSQL schemas in your multi-tenant app.
 test_files: []
-