storey 0.3.3 → 0.3.4

data/lib/storey/duplicator.rb

@@ -2,6 +2,8 @@ class Storey::Duplicator
   attr_accessor :source_schema, :target_schema, :source_file, :target_file, :structure_only, :file_prefix, :dump_path, :source_dump_path, :target_dump_path
 
   def initialize(from_schema, to_schema, options={})
+    fail Storey::SchemaNotFound, "cannot duplicate from nil schema" unless from_schema
+
     self.dump_path = File.join Rails.root, 'tmp', 'schema_dumps'
     self.source_dump_path = File.join self.dump_path, 'source'
     self.target_dump_path = File.join self.dump_path, 'target'

data/lib/storey/version.rb

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

data/lib/storey.rb

@@ -9,19 +9,24 @@ require 'storey/hstore'
 require 'storey/dumper'
 
 module Storey
-  extend self
   RESERVED_SCHEMAS = %w(hstore)
 
-  mattr_accessor :suffix, :default_search_path, :persistent_schemas
+  mattr_accessor :suffix, :persistent_schemas
+  mattr_writer :default_search_path
   mattr_reader :excluded_models
+  extend self
 
   def init
-    @@default_search_path = schema
+    self.default_search_path = self.schema
     self.excluded_models ||= []
     self.persistent_schemas ||= []
     process_excluded_models
   end
 
+  def default_search_path
+    ([@@default_search_path] + self.persistent_schemas).join(',')
+  end
+
   def excluded_models=(array)
     @@excluded_models = array
     process_excluded_models
@@ -60,8 +65,7 @@ module Storey
 
   def create_plain_schema(schema_name)
     switches = self.command_line_switches(:command => %{"CREATE SCHEMA #{self.suffixify schema_name}"})
-    command = "psql #{switches}"
-    system(command)
+    `psql #{switches}`
   end
 
   def command_line_switches(options={})
@@ -108,23 +112,42 @@ module Storey
     else
       reset and return if name.blank?
       path = self.schema_search_path_for(name)
+
+      unless self.schema_exists?(name)
+        fail Storey::SchemaNotFound, %{The schema "#{path}" cannot be found.}
+      end
+
       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 "#{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"
+    if e.to_s =~ /relation ".*" does not exist at character \d+/
+      warn "See https://github.com/ramontayag/storey/issues/11"
       raise e
     else
       raise e
     end
   end
 
+  def schema_exists?(name)
+    schema_name = self.suffixify(name)
+
+    schemas_in_db = self.schemas(suffix: self.suffix.present?)
+    schemas_in_db << %("$user")
+    schema_names = schema_name.split(',')
+    schemas_not_in_db = schema_names - schemas_in_db
+    schemas_not_in_db.empty?
+    # existence = schema_names.map do |s|
+    #   schemas_in_db.include?(s)
+    # end
+    # return false if existence.include?(false)
+    # true
+  end
+
   def schema_search_path_for(schema_name)
+    schema_names = schema_name.split(',')
     path = [suffixify(schema_name)]
     self.persistent_schemas.each do |schema|
-      path << suffixify(schema)
+      path << suffixify(schema) unless schema_names.include?(schema)
     end
     path.uniq.join(',')
   end
@@ -145,7 +168,6 @@ module Storey
   end
 
   def suffixify(schema_name)
-
     if Storey.suffix &&
       !schema_name.include?(Storey.suffix) &&
       !matches_default_search_path?(schema_name)
@@ -178,8 +200,7 @@ module Storey
     paths.each do |path|
       return true if path == schema_name
     end
-    return true if self.default_search_path == schema_name
-    return false
+    self.default_search_path == schema_name
   end
 
   protected

data/spec/dummy/db/schema.rb

@@ -11,6 +11,16 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 0) do
+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
 
 end

data/spec/storey/default_search_path_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe 'Storey', '#default_search_path' do
+
+  it 'should include the persistent schemas' do
+    Storey.persistent_schemas = %w(hello there)
+    Storey.default_search_path.should == '"$user",public,hello,there'
+  end
+
+end

data/spec/storey/duplicate_spec.rb

@@ -7,6 +7,13 @@ describe Storey, "#duplicate!" do
     FileUtils.rm_rf(tmp_dir)
   end
 
+  context 'when the target schema is nil' do
+    it 'should raise an error' do
+      expect { Storey.duplicate! nil, 'new' }.
+        to raise_error(Storey::SchemaNotFound, "cannot duplicate from nil schema")
+    end
+  end
+
   context "when there's no suffix set" do
     before do
       Storey.create 'ricky' do

data/spec/storey/hstore_spec.rb

@@ -5,17 +5,16 @@ describe Storey::Hstore do
     it 'should install the extension into the hstore schema' do
       Storey.persistent_schemas = %w(hstore)
       described_class.install
-      expect {
-        ActiveRecord::Base.connection.execute "DROP EXTENSION hstore"
-      }.to_not raise_error(ActiveRecord::StatementInvalid)
+      expect { ActiveRecord::Base.connection.execute "DROP EXTENSION hstore" }.
+        to_not raise_error(ActiveRecord::StatementInvalid)
     end
 
     context 'when hstore is not one of the persistent schemas' do
       it 'should fail with an StoreyError' do
         Storey.persistent_schemas = []
-        expect {
-          described_class.install
-        }.to raise_error(Storey::StoreyError, 'You are attempting to install hstore data type, but the hstore schema (where the data type will be installed) is not one of the persistent schemas. Please add hstore to the list of persistent schemas.')
+        message = 'You are attempting to install hstore data type, but the hstore schema (where the data type will be installed) is not one of the persistent schemas. Please add hstore to the list of persistent schemas.'
+        expect { described_class.install }.
+          to raise_error(Storey::StoreyError, message)
       end
     end
   end

data/spec/storey/schema_exists_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Storey, '#schema_exists?' do
+  context 'the schema is the default search path' do
+    it 'should return true' do
+      Storey.schema_exists?('"$user",public').should be_true
+    end
+  end
+
+  context 'when there is no suffix' do
+    context 'when the schema exists' do
+      before do
+        Storey.create 'hoo'
+      end
+
+      it 'should return true' do
+        Storey.schema_exists?('hoo').should be_true
+      end
+    end
+
+    context 'when the schema does not exist' do
+      it 'should return false' do
+        Storey.schema_exists?('boo').should be_false
+      end
+    end
+  end
+
+  context 'when there is a suffix' do
+    context 'when the schema exists' do
+      before do
+        Storey.suffix = '_boo'
+        Storey.create 'croo'
+      end
+
+      it 'should return true' do
+        Storey.schema_exists?('croo').should be_true
+      end
+    end
+
+    context 'when the schema does not exist' do
+      it 'should return false' do
+        Storey.schema_exists?('croo').should be_false
+      end
+    end
+  end
+end

data/spec/storey/schema_search_path_for_spec.rb

@@ -1,10 +1,14 @@
 require 'spec_helper'
 
-describe Storey, '.schema_search_path_for' do
-  context 'given a blank argument' do
-    it 'should return the default path' do
-      Storey.switch
-      Storey.schema.should == Storey.default_search_path
-    end
+describe Storey, '#schema_search_path_for' do
+
+  context 'given a search path that is one of the persistent schemas' do
+    # Storey.create 'bola'
+    # Storey.create 'halla'
+    Storey.persistent_schemas = %w(halla)
+    Storey.schema_search_path_for('bola,halla').should == 'bola,halla'
+    Storey.schema_search_path_for('halla').should == 'halla'
+    Storey.schema_search_path_for('halla,bola').should == 'halla,bola'
   end
+
 end

data/spec/storey/switch_spec.rb

@@ -60,13 +60,15 @@ describe Storey, "#switch" do
       end
 
       it "should raise an error naming the schema with suffix" do
-        expect {Storey.switch "babo"}.to raise_error(Storey::SchemaNotFound, %{The schema "babo_rock" cannot be found.})
+        expect {Storey.switch "babo"}.
+          to raise_error(Storey::SchemaNotFound, %{The schema "babo_rock" cannot be found.})
       end
     end
 
     context "when the suffix is not set" do
       it "should raise an error" do
-        expect {Storey.switch "babo"}.to raise_error(Storey::SchemaNotFound, %{The schema "babo" cannot be found.})
+        expect {Storey.switch "babo"}.
+          to raise_error(Storey::SchemaNotFound, %{The schema "babo" cannot be found.})
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storey
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -160,12 +160,14 @@ files:
 - spec/storey/configuration_spec.rb
 - spec/storey/create_plain_schema_spec.rb
 - spec/storey/create_spec.rb
+- spec/storey/default_search_path_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_exists_spec.rb
 - spec/storey/schema_search_path_for_spec.rb
 - spec/storey/schema_spec.rb
 - spec/storey/schemas_spec.rb
@@ -187,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1992492096624626052
+      hash: -1937923977582358929
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -196,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1992492096624626052
+      hash: -1937923977582358929
 requirements: []
 rubyforge_project: storey
 rubygems_version: 1.8.24
@@ -250,12 +252,14 @@ test_files:
 - spec/storey/configuration_spec.rb
 - spec/storey/create_plain_schema_spec.rb
 - spec/storey/create_spec.rb
+- spec/storey/default_search_path_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_exists_spec.rb
 - spec/storey/schema_search_path_for_spec.rb
 - spec/storey/schema_spec.rb
 - spec/storey/schemas_spec.rb