storey 0.4.0 → 0.4.1

data/README.md

@@ -6,7 +6,7 @@ Heavily inspired by the Apartment gem, Storey simplifies the implementation of m
 
 # Configuration
 
-Typically set in an initializer: config/initializer/storey.rb
+Typically set in an initializer: `config/initializer/storey.rb`
 
     # Defines the tables that should stay available to all (ie in the public schema)
     # Note that there's currently no way to exclude tables that aren't linked to models

data/lib/storey/dumper.rb

@@ -1,25 +1,27 @@
-class Storey::Dumper
+module Storey
+    class Dumper
 
-  delegate :dump, to: :dumper
+    delegate :dump, to: :dumper
 
-  def self.dump(*args)
-    self.new(*args).dump
-  end
+    def self.dump(*args)
+      self.new(*args).dump
+    end
 
-  def initialize(options={})
-    @options = options
-  end
+    def initialize(options={})
+      @options = options
+    end
 
-  def dumper
-    dumper_class.new(@options)
-  end
+    def dumper
+      dumper_class.new(@options)
+    end
 
-  def dumper_class
-    schema_format = Rails.configuration.active_record.schema_format || :ruby
-    klass = case schema_format
-            when :sql; Storey::SqlDumper
-            when :ruby; Storey::RubyDumper
-            end
-  end
+    def dumper_class
+      schema_format = Rails.configuration.active_record.schema_format || :ruby
+      klass = case schema_format
+              when :sql; SqlDumper
+              when :ruby; RubyDumper
+              end
+    end
 
+  end
 end

data/lib/storey/duplicator.rb

@@ -1,99 +1,131 @@
-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'
-    self.structure_only = options[:structure_only] || false
-
-    self.source_schema = Storey.suffixify from_schema
-    self.target_schema = Storey.suffixify to_schema
-    self.file_prefix = "#{Time.now.to_i}_#{rand(100000)}"
-    self.source_file   = File.join self.source_dump_path, "#{self.file_prefix}_#{self.source_schema}.sql"
-    self.target_file   = File.join self.target_dump_path, "#{self.file_prefix}_#{self.target_schema}.sql"
-  end
-
-  def perform!
-    dump_schema
-    replace_occurances
-    load_schema
-  end
+module Storey
+  class 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={})
+      unless from_schema
+        fail SchemaNotFound, "cannot duplicate from nil schema"
+      end
 
-  private
+      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'
+      self.structure_only = options[:structure_only] || false
+
+      self.source_schema = suffixify(from_schema)
+      self.target_schema = suffixify(to_schema)
+      self.file_prefix = "#{Time.now.to_i}_#{rand(100000)}"
+      self.source_file = File.join(
+        self.source_dump_path,
+        "#{self.file_prefix}_#{self.source_schema}.sql"
+      )
+      self.target_file = File.join(
+        self.target_dump_path,
+        "#{self.file_prefix}_#{self.target_schema}.sql"
+      )
+    end
 
-  def dump_schema(options={})
-    ENV['PGPASSWORD'] = Storey.database_config[:password]
-    prepare_schema_dump_directories
+    def perform!
+      dump_schema
+      replace_occurances
+      load_schema
+    end
 
-    options[:host]     ||= Storey.database_config[:host] unless Storey.database_config[:host].blank?
-    options[:username] ||= Storey.database_config[:username]
-    options[:file]     ||= self.source_file
-    options[:schema]   ||= self.source_schema
+    private
 
-    switches = options.map { |k, v| "--#{k}=#{v}" }
-    switches << '--schema-only' if self.structure_only
-    switches = switches.join(" ")
+    def dump_schema(options={})
+      ENV['PGPASSWORD'] = Storey.database_config[:password]
+      prepare_schema_dump_directories
 
-    `pg_dump #{switches} #{Storey.database_config[:database]}`
-  end
+      unless Storey.database_config[:host].blank?
+        options[:host] ||= Storey.database_config[:host]
+      end
+      options[:username] ||= Storey.database_config[:username]
+      options[:file]     ||= self.source_file
+      options[:schema]   ||= self.source_schema
 
-  def prepare_schema_dump_directories
-    [self.source_dump_path, self.target_dump_path].each { |d| FileUtils.mkdir_p(d) }
-  end
+      switches = options.map { |k, v| "--#{k}=#{v}" }
+      switches << '--schema-only' if self.structure_only
+      switches = switches.join(" ")
 
-  def load_schema(options={})
-    options[:file] ||= self.target_file
-    switches = Storey.command_line_switches(options)
+      success = system("pg_dump #{switches} #{Storey.database_config[:database]}")
+      unless success
+        raise StoreyError, "There seems to have been a problem dumping `#{self.source_schema}` to make a copy of it into `#{self.target_schema}`"
+      end
+    end
 
-    if duplicating_from_default?
-      # Since we are copying the source schema and we're after structure only,
-      # the dump_schema ended up creating a SQL file without the "CREATE SCHEMA" command
-      # thus we have to create it manually
-      ::Storey.create_plain_schema self.target_schema
+    def prepare_schema_dump_directories
+      [self.source_dump_path, self.target_dump_path].each do |d|
+        FileUtils.mkdir_p(d)
+      end
     end
 
-    `psql #{switches}`
+    def load_schema(options={})
+      options[:file] ||= self.target_file
+      switches = Storey.command_line_switches(options)
 
-    copy_source_schema_migrations
+      if duplicating_from_default?
+        # Since we are copying the source schema and we're after structure only,
+        # the dump_schema ended up creating a SQL file without the "CREATE SCHEMA" command
+        # thus we have to create it manually
+        ::Storey.create_plain_schema self.target_schema
+      end
 
-    ENV['PGPASSWORD'] = nil
-  end
+      `psql #{switches}`
 
-  def copy_source_schema_migrations
-    ::Storey.switch self.target_schema do
-      source_schema_migrations.each do |version|
-        unless target_schema_migrations.include?(version)
-          ActiveRecord::Base.connection.execute "INSERT INTO schema_migrations (version) VALUES ('#{version}');"
+      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|
+          unless target_schema_migrations.include?(version)
+            command = "INSERT INTO schema_migrations (version) VALUES ('#{version}');"
+            ActiveRecord::Base.connection.execute command
+          end
         end
       end
     end
-  end
 
-  def source_schema_migrations
-    ::Storey.switch(self.source_schema) do
-      ActiveRecord::Migrator.get_all_versions
+    def source_schema_migrations
+      ::Storey.switch(self.source_schema) do
+        ActiveRecord::Migrator.get_all_versions
+      end
     end
-  end
 
-  def target_schema_migrations
-    ::Storey.switch(self.target_schema) do
-      ActiveRecord::Migrator.get_all_versions
+    def target_schema_migrations
+      ::Storey.switch(self.target_schema) do
+        ActiveRecord::Migrator.get_all_versions
+      end
     end
-  end
 
-  def replace_occurances
-    File.open(self.source_file, 'r') do |file|
-      file.each_line do |line|
-        new_line = line.gsub(/#{self.source_schema}/, self.target_schema)
-        File.open(self.target_file, 'a') {|tf| tf.puts new_line}
+    def replace_occurances
+      File.open(self.source_file, 'r') do |file|
+        file.each_line do |line|
+          new_line = line.gsub(/#{self.source_schema}/, self.target_schema)
+          File.open(self.target_file, 'a') {|tf| tf.puts new_line}
+        end
       end
     end
-  end
 
-  def duplicating_from_default?
-    ::Storey.matches_default_search_path?(self.source_schema) && self.structure_only
+    def duplicating_from_default?
+      ::Storey.matches_default_search_path?(self.source_schema) && self.structure_only
+    end
+
+    def suffixify(schema_name)
+      Suffixifier.suffixify schema_name
+    end
+
   end
 end

data/lib/storey/hstore.rb

@@ -1,8 +1,32 @@
-class Storey::Hstore
-  def self.install
-    fail 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.' unless Storey.persistent_schemas.include?('hstore')
+module Storey
+  class Hstore
+
+    def self.install
+      self.new.install
+    end
+
+    def install
+      ensure_hstore_is_persistent
+      Storey.create 'hstore', force: true
+      ActiveRecord::Base.connection.execute "CREATE EXTENSION IF NOT EXISTS hstore SCHEMA #{suffixify('hstore')}"
+    rescue ActiveRecord::StatementInvalid => e
+      if e.message =~ /could not open extension control file/
+        fail StoreyError, "Oops! Looks like the Hstore extension is not installed. Please install it for your OS first."
+      end
+      fail e
+    end
+
+    private
+
+    def ensure_hstore_is_persistent
+      unless Storey.persistent_schemas.include?('hstore')
+        fail 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.'
+      end
+    end
+
+    def suffixify(schema_name)
+      Suffixifier.suffixify(schema_name)
+    end
 
-    Storey.create 'hstore', force: true
-    ActiveRecord::Base.connection.execute "CREATE EXTENSION IF NOT EXISTS hstore SCHEMA #{Storey.suffixify('hstore')}"
   end
 end

data/lib/storey/migrator.rb

@@ -1,44 +1,48 @@
-module Storey::Migrator
-  extend self
+module Storey
+  module Migrator
 
-  def migrate_all
-    self.migrate 'public'
-    Storey::Dumper.dump
-    Storey.schemas(public: false).each do |schema|
-      self.migrate schema
+    extend self
+
+    def migrate_all
+      self.migrate 'public'
+      Dumper.dump
+      Storey.schemas(public: false).each do |schema|
+        self.migrate schema
+      end
     end
-  end
 
-  def migrate(schema)
-    Storey.switch schema do
-      ActiveRecord::Migrator.migrate ActiveRecord::Migrator.migrations_path
+    def migrate(schema)
+      Storey.switch schema do
+        ActiveRecord::Migrator.migrate ActiveRecord::Migrator.migrations_path
+      end
     end
-  end
 
-  def run(direction, schema, version)
-    Storey.switch schema do
-      ActiveRecord::Migrator.run(
-        direction,
-        ActiveRecord::Migrator.migrations_path,
-        version
-      )
+    def run(direction, schema, version)
+      Storey.switch schema do
+        ActiveRecord::Migrator.run(
+          direction,
+          ActiveRecord::Migrator.migrations_path,
+          version
+        )
+      end
     end
-  end
 
-  def rollback_all(step=1)
-    Storey.schemas.each do |schema_name|
-      self.rollback(schema_name, step)
+    def rollback_all(step=1)
+      Storey.schemas.each do |schema_name|
+        self.rollback(schema_name, step)
+      end
+      Dumper.dump
     end
-    Storey::Dumper.dump
-  end
 
-  def rollback(schema, step=1)
-    Storey.switch schema do
-      puts "= Rolling back `#{schema}` #{step} steps"
-      ActiveRecord::Migrator.rollback(
-        ActiveRecord::Migrator.migrations_path,
-        step
-      )
+    def rollback(schema, step=1)
+      Storey.switch schema do
+        puts "= Rolling back `#{schema}` #{step} steps"
+        ActiveRecord::Migrator.rollback(
+          ActiveRecord::Migrator.migrations_path,
+          step
+        )
+      end
     end
+
   end
 end

data/lib/storey/native_schema_matcher.rb

@@ -0,0 +1,19 @@
+module Storey
+  class NativeSchemaMatcher
+    NATIVE_SCHEMAS = ['"$user"', 'public']
+
+    def self.matches?(*args)
+      self.new(*args).matches?
+    end
+
+    def initialize(schema_name)
+      @schema_name = schema_name
+    end
+
+    def matches?
+      NATIVE_SCHEMAS.include?(@schema_name) ||
+        (NATIVE_SCHEMAS - @schema_name.split(',')).empty?
+    end
+
+  end
+end

data/lib/storey/ruby_dumper.rb

@@ -1,21 +1,23 @@
 require 'active_record/schema_dumper'
 
-class Storey::RubyDumper
+module Storey
+    class RubyDumper
 
-  def self.dump(*args)
-    self.new(*args).dump
-  end
+    def self.dump(*args)
+      self.new(*args).dump
+    end
 
-  def initialize(options={})
-    default_file_path = File.join(Rails.root, 'db', 'schema.rb')
-    @file = options[:file] || default_file_path
-  end
+    def initialize(options={})
+      default_file_path = File.join(Rails.root, 'db', 'schema.rb')
+      @file = options[:file] || default_file_path
+    end
 
-  def dump
-    File.open(@file, "w:utf-8") do |file|
-      ActiveRecord::Base.establish_connection(Rails.env)
-      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+    def dump
+      File.open(@file, "w:utf-8") do |file|
+        ActiveRecord::Base.establish_connection(Rails.env)
+        ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+      end
     end
-  end
 
+  end
 end

data/lib/storey/sql_dumper.rb

@@ -1,23 +1,25 @@
-class Storey::SqlDumper
+module Storey
+    class SqlDumper
 
-  def self.dump(*args)
-    self.new(*args).dump
-  end
+    def self.dump(*args)
+      self.new(*args).dump
+    end
 
-  def initialize(options={})
-    @file = options[:file] || File.join(Rails.root, "db", "structure.sql")
-  end
+    def initialize(options={})
+      @file = options[:file] || File.join(Rails.root, "db", "structure.sql")
+    end
 
-  def dump
-    abcs = ActiveRecord::Base.configurations
-    set_psql_env(abcs[Rails.env])
-    search_path = abcs[Rails.env]['schema_search_path']
-    unless search_path.blank?
-      search_path = search_path.split(",").map{|search_path_part| "--schema=#{Shellwords.escape(search_path_part.strip)}" }.join(" ")
+    def dump
+      abcs = ActiveRecord::Base.configurations
+      set_psql_env(abcs[Rails.env])
+      search_path = abcs[Rails.env]['schema_search_path']
+      unless search_path.blank?
+        search_path = search_path.split(",").map{|search_path_part| "--schema=#{Shellwords.escape(search_path_part.strip)}" }.join(" ")
+      end
+      `pg_dump -i -s -x -O -f #{Shellwords.escape(@file)} #{search_path} #{Shellwords.escape(abcs[Rails.env]['database'])}`
+      raise 'Error dumping database' if $?.exitstatus == 1
+      File.open(@file, "a") { |f| f << "SET search_path TO #{ActiveRecord::Base.connection.schema_search_path};\n\n" }
     end
-    `pg_dump -i -s -x -O -f #{Shellwords.escape(@file)} #{search_path} #{Shellwords.escape(abcs[Rails.env]['database'])}`
-    raise 'Error dumping database' if $?.exitstatus == 1
-    File.open(@file, "a") { |f| f << "SET search_path TO #{ActiveRecord::Base.connection.schema_search_path};\n\n" }
-  end
 
+  end
 end

data/lib/storey/suffixifier.rb

@@ -0,0 +1,37 @@
+module Storey
+  class Suffixifier
+
+    def self.suffixify(*args)
+      self.new(*args).suffixify
+    end
+
+    def initialize(schema_name)
+      @schema_name = schema_name
+    end
+
+    def suffixify
+      schema_names.map do |schema_name|
+        if schema_name =~ /\w+#{suffix}/ || native_schema?(schema_name)
+          schema_name
+        else
+          "#{schema_name}#{suffix}"
+        end
+      end.join(',')
+    end
+
+    private
+
+    def schema_names
+      @schema_names ||= @schema_name.split(',')
+    end
+
+    def suffix
+      Storey.suffix
+    end
+
+    def native_schema?(schema_name)
+      NativeSchemaMatcher.matches?(schema_name)
+    end
+
+  end
+end

data/lib/storey/unsuffixifier.rb

@@ -0,0 +1,33 @@
+module Storey
+  class Unsuffixifier
+
+    def self.unsuffixify(*args)
+      self.new(*args).unsuffixify
+    end
+
+    def initialize(schema_name)
+      @schema_name = schema_name
+    end
+
+    def unsuffixify
+      schema_names.map do |schema_name|
+        if schema_name =~ /(["\$\w]+)#{suffix}/
+          $1
+        else
+          schema_name
+        end
+      end.join(',')
+    end
+
+    private
+
+    def suffix
+      Storey.suffix
+    end
+
+    def schema_names
+      @schema_name.split(',')
+    end
+
+  end
+end

data/lib/storey/version.rb

@@ -1,3 +1,3 @@
 module Storey
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/storey.rb

@@ -9,6 +9,9 @@ require 'storey/hstore'
 require 'storey/dumper'
 require 'storey/ruby_dumper'
 require 'storey/sql_dumper'
+require 'storey/native_schema_matcher'
+require 'storey/suffixifier'
+require 'storey/unsuffixifier'
 
 module Storey
   RESERVED_SCHEMAS = %w(hstore)
@@ -87,7 +90,7 @@ module Storey
   end
 
   def create_plain_schema(schema_name)
-    name = self.suffixify schema_name
+    name = suffixify schema_name
     command = %{"CREATE SCHEMA #{name}"}
     switches = self.command_line_switches(command: command)
     `psql #{switches}`
@@ -143,8 +146,7 @@ module Storey
       path = self.schema_search_path_for(name)
 
       unless self.schema_exists?(name)
-        fail(Storey::SchemaNotFound,
-             %{The schema "#{path}" cannot be found.})
+        fail(Storey::SchemaNotFound, %{The schema "#{path}" cannot be found.})
       end
 
       ActiveRecord::Base.connection.schema_search_path = path
@@ -159,7 +161,7 @@ module Storey
   end
 
   def schema_exists?(name)
-    schema_name = self.suffixify(name)
+    schema_name = suffixify(name)
 
     schemas_in_db = self.schemas(suffix: self.suffix.present?)
     schemas_in_db << %("$user")
@@ -196,34 +198,6 @@ module Storey
     duplicator.perform!
   end
 
-  def suffixify(schema_name)
-    if Storey.suffix &&
-      !schema_name.include?(Storey.suffix) &&
-      !matches_default_search_path?(schema_name)
-
-      "#{schema_name}#{Storey.suffix}"
-    else
-      schema_name
-    end
-  end
-
-  def unsuffixify(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
-
   def matches_default_search_path?(schema_name)
     paths = self.default_search_path.split(',')
     paths.each do |path|
@@ -251,4 +225,19 @@ module Storey
       end
     end
   end
+
+  private
+
+  def matches_native_schemas?(schema_name)
+    NativeSchemaMatcher.matches?(schema_name)
+  end
+
+  def suffixify(schema_name)
+    Suffixifier.suffixify(schema_name)
+  end
+
+  def unsuffixify(schema_name)
+    Unsuffixifier.unsuffixify schema_name
+  end
+
 end

data/spec/spec_helper.rb

@@ -13,12 +13,14 @@ require 'pry'
 
 RSpec.configure do |config|
   config.before(:suite) do
+    Storey.reload_config!
+
     # 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'
+      if tables.size != 1 || tables[0] != 'schema_migrations'
         DatabaseCleaner.clean_with :truncation
       end
     end

data/spec/storey/duplicator_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Storey::Duplicator do
+
+  describe '#perform!' do
+    context "when the dump is a failure" do
+      it 'should raise an error' do
+        duplicator = described_class.new('non-existent-will-fail-dump', 'new')
+        expect {
+          duplicator.perform!
+        }.to raise_error(
+          Storey::StoreyError,
+          "There seems to have been a problem dumping `non-existent-will-fail-dump` to make a copy of it into `new`"
+        )
+      end
+    end
+  end
+
+end

data/spec/storey/native_schema_matcher_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Storey::NativeSchemaMatcher do
+
+  describe '#matches?' do
+    context 'when the schema is "$user"' do
+      it 'should be true' do
+        m = described_class.new('"$user"')
+        m.matches?.should be_true
+      end
+    end
+
+    context 'when the schema is public' do
+      it 'should be true' do
+        m = described_class.new('public')
+        m.matches?.should be_true
+      end
+    end
+
+    context 'when given comma separated string of schemas all matching' do
+      it 'should be true' do
+        m = described_class.new('"$user",public')
+        m.matches?.should be_true
+      end
+    end
+
+    context 'when the schema is neither "$user" or public' do
+      it 'should be false' do
+        m = described_class.new('something')
+        m.matches?.should be_false
+      end
+    end
+  end
+
+end

data/spec/storey/schema_search_path_for_spec.rb

@@ -3,8 +3,6 @@ require 'spec_helper'
 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'

data/spec/storey/suffixifier_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Storey::Suffixifier do
+
+  describe '#suffixify' do
+    subject do
+      described_class.new(schema_name).suffixify
+    end
+
+    context 'suffixes have been turned on' do
+      before { Storey.suffix = '_suff' }
+
+      context 'when the schema given has not already been suffixified' do
+        let(:schema_name) { 'boom' }
+        it { should == 'boom_suff' }
+      end
+
+      context 'when the schema given has already been suffixified' do
+        let(:schema_name) { 'boom_suff' }
+        it { should == 'boom_suff' }
+      end
+
+      context 'when given comma separated schemas' do
+        let(:schema_name) { '"$user",public,foo,bar,baz' }
+
+        it 'should return a comma separted schema string with the non-native schemas suffixified' do
+          subject.should == '"$user",public,foo_suff,bar_suff,baz_suff'
+        end
+      end
+    end
+
+    context 'suffixes are not on' do
+      before { Storey.suffix = nil }
+      let(:schema_name) { 'boom' }
+      it { should == 'boom' }
+    end
+  end
+
+end

data/spec/storey/unsuffixifier_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Storey::Unsuffixifier do
+
+  describe '#unsuffixify' do
+    subject { described_class.new(schema_name).unsuffixify }
+
+    context 'when the suffix is set' do
+      before { Storey.suffix = '_buff' }
+
+      context 'when the schema name does not have a suffix' do
+        let(:schema_name) { 'big' }
+        it { should == 'big' }
+      end
+
+      context 'when the schema name has a suffix' do
+        let(:schema_name) { 'big_buff' }
+        it { should == 'big' }
+      end
+
+      context 'when the schema name is comma separated schemas' do
+        let(:schema_name) { '"$user",public,froo_buff,la_buff' }
+        it {should == '"$user",public,froo,la'}
+      end
+    end
+
+    context 'when the suffix is not set' do
+      let(:schema_name) { '"$user",public,froo_buff' }
+      it { should == '"$user",public,froo_buff' }
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storey
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -110,9 +110,12 @@ files:
 - lib/storey/exceptions.rb
 - lib/storey/hstore.rb
 - lib/storey/migrator.rb
+- lib/storey/native_schema_matcher.rb
 - lib/storey/railtie.rb
 - lib/storey/ruby_dumper.rb
 - lib/storey/sql_dumper.rb
+- lib/storey/suffixifier.rb
+- lib/storey/unsuffixifier.rb
 - lib/storey/version.rb
 - lib/tasks/storey.rake
 - rvmrc.sample
@@ -166,8 +169,10 @@ files:
 - spec/storey/drop_spec.rb
 - spec/storey/dumper_spec.rb
 - spec/storey/duplicate_spec.rb
+- spec/storey/duplicator_spec.rb
 - spec/storey/excluded_models_spec.rb
 - spec/storey/hstore_spec.rb
+- spec/storey/native_schema_matcher_spec.rb
 - spec/storey/persistent_schemas_spec.rb
 - spec/storey/ruby_dumper_spec.rb
 - spec/storey/schema_exists_spec.rb
@@ -175,8 +180,9 @@ files:
 - spec/storey/schema_spec.rb
 - spec/storey/schemas_spec.rb
 - spec/storey/sql_dumper_spec.rb
-- spec/storey/suffixify_spec.rb
+- spec/storey/suffixifier_spec.rb
 - spec/storey/switch_spec.rb
+- spec/storey/unsuffixifier_spec.rb
 - spec/tasks/storey_rake_spec.rb
 - storey.gemspec
 homepage: https://github.com/ramontayag/storey
@@ -193,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2618005081690436209
+      hash: 1554154607789373813
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,73 +208,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2618005081690436209
+      hash: 1554154607789373813
 requirements: []
 rubyforge_project: storey
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Manage multiple PostgreSQL schemas in your multi-tenant app.
-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/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/default_schema.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/ruby_dumper_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
-- spec/storey/sql_dumper_spec.rb
-- spec/storey/suffixify_spec.rb
-- spec/storey/switch_spec.rb
-- spec/tasks/storey_rake_spec.rb
+test_files: []

data/spec/storey/suffixify_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe Storey, '.suffixify' do
-  context 'given a schema that is not the default schema' do
-    it 'should not add a suffix' do
-      Storey.suffix = '_doo'
-      Storey.suffixify('public').should == 'public'
-      Storey.suffixify(%{"$user",public}).should == %{"$user",public}
-    end
-  end
-end