storey 0.3.1 → 0.3.3

data/.gitignore

@@ -10,3 +10,4 @@ spec/config/database.yml
 spec/dummy/config/database.yml
 spec/dummy/log/*
 spec/dummy/tmp
+.rvmrc

data/lib/storey/duplicator.rb

@@ -43,12 +43,8 @@ class Storey::Duplicator
   end
 
   def load_schema(options={})
-    options[:host]     ||= Storey.database_config[:host] unless Storey.database_config[:host].blank?
-    options[:dbname]   ||= Storey.database_config[:database]
-    options[:username] ||= Storey.database_config[:username]
     options[:file] ||= self.target_file
-
-    switches = options.map { |k, v| "--#{k}=#{v}" }.join(" ")
+    switches = Storey.command_line_switches(options)
 
     if duplicating_from_default?
       # Since we are copying the source schema and we're after structure only,
@@ -57,19 +53,33 @@ class Storey::Duplicator
       ::Storey.create_plain_schema self.target_schema
     end
 
-    source_schema_migrations = ::Storey.switch(self.source_schema) do
-      ActiveRecord::Migrator.get_all_versions
-    end
-
     `psql #{switches}`
 
+    copy_source_schema_migrations
+
+    ENV['PGPASSWORD'] = nil
+  end
+
+  def copy_source_schema_migrations
     ::Storey.switch self.target_schema do
       source_schema_migrations.each do |version|
-        ActiveRecord::Base.connection.execute "INSERT INTO schema_migrations (version) VALUES ('#{version}');"
+        unless target_schema_migrations.include?(version)
+          ActiveRecord::Base.connection.execute "INSERT INTO schema_migrations (version) VALUES ('#{version}');"
+        end
       end
     end
+  end
 
-    ENV['PGPASSWORD'] = nil
+  def source_schema_migrations
+    ::Storey.switch(self.source_schema) do
+      ActiveRecord::Migrator.get_all_versions
+    end
+  end
+
+  def target_schema_migrations
+    ::Storey.switch(self.target_schema) do
+      ActiveRecord::Migrator.get_all_versions
+    end
   end
 
   def replace_occurances

data/lib/storey/exceptions.rb

@@ -3,4 +3,5 @@ module Storey
   class SchemaExists < StoreyError; end
   class SchemaNotFound < StoreyError; end
   class TableNotFOund < StoreyError; end
+  class WithinTransaction < StoreyError; end
 end

data/lib/storey/version.rb

@@ -1,3 +1,3 @@
 module Storey
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

data/lib/storey.rb

@@ -59,7 +59,18 @@ module Storey
   end
 
   def create_plain_schema(schema_name)
-    ActiveRecord::Base.connection.execute "CREATE SCHEMA #{self.suffixify schema_name}"
+    switches = self.command_line_switches(:command => %{"CREATE SCHEMA #{self.suffixify schema_name}"})
+    command = "psql #{switches}"
+    system(command)
+  end
+
+  def command_line_switches(options={})
+    switches = {}
+    switches[:host] = self.database_config[:host] if self.database_config.has_key?(:host)
+    switches[:dbname] = self.database_config[:database]
+    switches[:username] = self.database_config[:username]
+    switches = switches.merge(options)
+    switches.map {|k, v| "--#{k}=#{v}"}.join(' ')
   end
 
   def schemas(options={})
@@ -102,6 +113,9 @@ module Storey
   rescue ActiveRecord::StatementInvalid => e
     if e.to_s =~ /invalid value for parameter "search_path"/
       fail Storey::SchemaNotFound, %{The schema "#{path}" cannot be found.}
+    elsif e.to_s =~ /relation ".*" does not exist at character \d+/
+      warn "Still unsure why the following error occurs, but see https://github.com/ramontayag/storey/issues/11"
+      raise e
     else
       raise e
     end

data/rvmrc.sample

@@ -0,0 +1 @@
+rvm use ruby-1.9.2-p290

data/spec/dummy/db/schema.rb

@@ -11,16 +11,6 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120115060728) do
-
-  create_table "companies", :force => true do |t|
-    t.string "name"
-    t.string "schema_name"
-  end
-
-  create_table "posts", :force => true do |t|
-    t.string "name"
-    t.text   "body"
-  end
+ActiveRecord::Schema.define(:version => 0) do
 
 end

data/spec/storey/command_line_switches_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Storey, '.command_line_switches' do
+  it 'should build default command line switches for calling the psql command' do
+    described_class.stub(:database_config).and_return(:host => 'hoop',
+                                                      :database => 'db',
+                                                      :username => 'jj')
+    described_class.command_line_switches.
+      should == "--host=hoop --dbname=db --username=jj"
+  end
+
+  context 'given options' do
+    it 'should add the options to the switches, overriding any default' do
+      described_class.stub(:database_config).and_return(:host => 'hoop',
+                                                        :database => 'db',
+                                                        :username => 'jj')
+
+      described_class.command_line_switches(:a => 'boo', :host => 'loop').
+        should == "--host=loop --dbname=db --username=jj --a=boo"
+    end
+  end
+end

data/spec/storey/create_spec.rb

@@ -9,6 +9,15 @@ describe Storey, "#create" do
     end
   end
 
+  context 'when in a database transaction and loading the database structure' do
+    it 'should not blow up and continue to create the schema' do
+      ActiveRecord::Base.transaction do
+        Storey.create 'foobar'
+      end
+      Storey.schemas.should include('foobar')
+    end
+  end
+
   it "should copy the schema_migrations over" do
     Storey.create "foobar"
     public_schema_migrations = Storey.switch { ActiveRecord::Migrator.get_all_versions }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storey
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &82507520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82507520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &82506870 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.12.2
   type: :development
   prerelease: false
-  version_requirements: *82506870
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &82506250 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82506250
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &82505580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82505580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &82504910 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +85,12 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *82504910
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.2
 description: Storey aims to simplify the implementation of managing a multi-tenant
   application.
 email:
@@ -76,7 +101,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
 - Gemfile
 - README.md
 - Rakefile
@@ -89,6 +113,7 @@ files:
 - lib/storey/railtie.rb
 - lib/storey/version.rb
 - lib/tasks/storey.rake
+- rvmrc.sample
 - spec/config/database.yml.sample
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -131,6 +156,7 @@ files:
 - spec/fixtures/.gitkeep
 - spec/migrator_spec.rb
 - spec/spec_helper.rb
+- spec/storey/command_line_switches_spec.rb
 - spec/storey/configuration_spec.rb
 - spec/storey/create_plain_schema_spec.rb
 - spec/storey/create_spec.rb
@@ -159,16 +185,80 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1992492096624626052
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1992492096624626052
 requirements: []
 rubyforge_project: storey
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Manage multiple PostgreSQL schemas in your multi-tenant app.
-test_files: []
+test_files:
+- spec/config/database.yml.sample
+- spec/dummy/Rakefile
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/mailers/.gitkeep
+- spec/dummy/app/models/.gitkeep
+- spec/dummy/app/models/company.rb
+- spec/dummy/app/models/fake.rb
+- spec/dummy/app/models/post.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/config.ru
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml.sample
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/db/migrate/20120115060713_create_companies.rb
+- spec/dummy/db/migrate/20120115060728_create_posts.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/lib/assets/.gitkeep
+- spec/dummy/log/.gitkeep
+- spec/dummy/log/development.log
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/script/rails
+- spec/fixtures/.gitkeep
+- spec/migrator_spec.rb
+- spec/spec_helper.rb
+- spec/storey/command_line_switches_spec.rb
+- spec/storey/configuration_spec.rb
+- spec/storey/create_plain_schema_spec.rb
+- spec/storey/create_spec.rb
+- spec/storey/drop_spec.rb
+- spec/storey/dumper_spec.rb
+- spec/storey/duplicate_spec.rb
+- spec/storey/excluded_models_spec.rb
+- spec/storey/hstore_spec.rb
+- spec/storey/persistent_schemas_spec.rb
+- spec/storey/schema_search_path_for_spec.rb
+- spec/storey/schema_spec.rb
+- spec/storey/schemas_spec.rb
+- spec/storey/suffixify_spec.rb
+- spec/storey/switch_spec.rb
+- spec/tasks/storey_rake_spec.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm use ruby-1.9.2-p290@storey --create