storey 0.3.4 → 0.3.5

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in storey.gemspec
 gemspec
+
+gem 'pry'

data/lib/storey/dumper.rb

@@ -1,39 +1,25 @@
 class Storey::Dumper
-  def self.dump(options={})
-    case Rails.configuration.active_record.schema_format
-    when :sql  ; self.dump_structure_sql(options)
-    when :ruby ; self.dump_schema_rb(options)
-    end
-  end
 
-  def self.dump_schema_rb(options={})
-    require 'active_record/schema_dumper'
-    filename = options[:file] || "#{Rails.root}/db/schema.rb"
-    File.open(filename, "w:utf-8") do |file|
-      ActiveRecord::Base.establish_connection(Rails.env)
-      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
-    end
+  delegate :dump, to: :dumper
+
+  def self.dump(*args)
+    self.new(*args).dump
   end
 
-  def self.dump_structure_sql(options={})
-    abcs = ActiveRecord::Base.configurations
-    filename = options[:file] || File.join(Rails.root, "db", "structure.sql")
-    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(filename)} #{search_path} #{Shellwords.escape(abcs[Rails.env]['database'])}`
-    raise 'Error dumping database' if $?.exitstatus == 1
-    File.open(filename, "a") { |f| f << "SET search_path TO #{ActiveRecord::Base.connection.schema_search_path};\n\n" }
+  def initialize(options={})
+    @options = options
   end
 
-  private
+  def dumper
+    dumper_class.new(@options)
+  end
 
-  def self.set_psql_env(config)
-    ENV['PGHOST']     = config['host']          if config['host']
-    ENV['PGPORT']     = config['port'].to_s     if config['port']
-    ENV['PGPASSWORD'] = config['password'].to_s if config['password']
-    ENV['PGUSER']     = config['username'].to_s if config['username']
+  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
+
 end

data/lib/storey/migrator.rb

@@ -25,6 +25,13 @@ module Storey::Migrator
     end
   end
 
+  def rollback_all(step=1)
+    Storey.schemas.each do |schema_name|
+      puts "rolling back #{schema_name}"
+      self.rollback(schema_name, step)
+    end
+  end
+
   def rollback(schema, step=1)
     Storey.switch schema do
       ActiveRecord::Migrator.rollback(

data/lib/storey/ruby_dumper.rb

@@ -0,0 +1,21 @@
+require 'active_record/schema_dumper'
+
+class Storey::RubyDumper
+
+  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 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

data/lib/storey/sql_dumper.rb

@@ -0,0 +1,23 @@
+class Storey::SqlDumper
+
+  def self.dump(*args)
+    self.new(*args).dump
+  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(" ")
+    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

data/lib/storey/version.rb

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

data/lib/storey.rb

@@ -7,6 +7,8 @@ require 'storey/migrator'
 require 'storey/duplicator'
 require 'storey/hstore'
 require 'storey/dumper'
+require 'storey/ruby_dumper'
+require 'storey/sql_dumper'
 
 module Storey
   RESERVED_SCHEMAS = %w(hstore)
@@ -45,14 +47,27 @@ module Storey
   end
 
   def create(name, options={}, &block)
-    fail ArgumentError, "Must pass in a valid schema name" if name.blank?
-    fail ArgumentError, "'#{name}' is a reserved schema name" if RESERVED_SCHEMAS.include?(name) && !options[:force]
-    fail Storey::SchemaExists, %{The schema "#{name}" already exists.} if self.schemas.include?(name)
+    if name.blank?
+      fail ArgumentError, "Must pass in a valid schema name"
+    end
+
+    if RESERVED_SCHEMAS.include?(name) && !options[:force]
+      fail ArgumentError, "'#{name}' is a reserved schema name"
+    end
+
+    if self.schemas.include?(name)
+      fail(Storey::SchemaExists,
+           %{The schema "#{name}" already exists.})
+    end
 
-    options[:load_database_structure] = true if options[:load_database_structure].nil?
+    if options[:load_database_structure].nil?
+      options[:load_database_structure] = true
+    end
 
     if options[:load_database_structure]
-      duplicator = Storey::Duplicator.new 'public', name, structure_only: true
+      duplicator = Storey::Duplicator.new('public',
+                                          name,
+                                          structure_only: true)
       duplicator.perform!
       name = suffixify name
       switch name do
@@ -64,13 +79,17 @@ module Storey
   end
 
   def create_plain_schema(schema_name)
-    switches = self.command_line_switches(:command => %{"CREATE SCHEMA #{self.suffixify schema_name}"})
+    name = self.suffixify schema_name
+    command = %{"CREATE SCHEMA #{name}"}
+    switches = self.command_line_switches(command: command)
     `psql #{switches}`
   end
 
   def command_line_switches(options={})
     switches = {}
-    switches[:host] = self.database_config[:host] if self.database_config.has_key?(:host)
+    if self.database_config.has_key?(:host)
+      switches[:host] = self.database_config[:host]
+    end
     switches[:dbname] = self.database_config[:database]
     switches[:username] = self.database_config[:username]
     switches = switches.merge(options)
@@ -97,9 +116,11 @@ module Storey
 
   def drop(name)
     name = suffixify name
-    ActiveRecord::Base.connection.execute("DROP SCHEMA #{name} CASCADE")
+    command = "DROP SCHEMA #{name} CASCADE"
+    ActiveRecord::Base.connection.execute(command)
   rescue ActiveRecord::StatementInvalid => e
-    raise Storey::SchemaNotFound, %{The schema "#{name}" cannot be found.}
+    raise(Storey::SchemaNotFound,
+          %{The schema "#{name}" cannot be found. Error: #{e}})
   end
 
   def switch(name=nil, &block)
@@ -110,11 +131,12 @@ module Storey
       switch original_schema
       result
     else
-      reset and return if name.blank?
+      reset and return if name.blank? || name == 'public'
       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
@@ -136,18 +158,15 @@ module Storey
     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) unless schema_names.include?(schema)
+      unless schema_names.include?(schema)
+        path << suffixify(schema)
+      end
     end
     path.uniq.join(',')
   end
@@ -159,11 +178,13 @@ module Storey
   end
 
   def database_config
-    Rails.configuration.database_configuration[Rails.env].with_indifferent_access
+    Rails.configuration.
+      database_configuration[Rails.env].
+      with_indifferent_access
   end
 
   def duplicate!(from_schema, to_schema, options={})
-    duplicator = Duplicator.new from_schema, to_schema, options
+    duplicator = Duplicator.new(from_schema, to_schema, options)
     duplicator.perform!
   end
 

data/lib/tasks/storey.rake

@@ -15,11 +15,7 @@ namespace :storey do
   desc "Rolls the schema back to the previous version (specify steps w/ STEP=n) across all schemas."
   task :rollback => 'db:rollback' do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-
-    Storey.schemas.each do |db|
-      puts("Rolling back #{db} database")
-      Storey::Migrator.rollback db, step
-    end
+    Storey::Migrator.rollback_all(step)
   end
 
   namespace :migrate do

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/migrator_spec.rb

@@ -67,6 +67,17 @@ describe Storey::Migrator do
       end
     end
 
+    describe '.rollback_all' do
+      it 'should rollback all schemas exactly :steps times' do
+        steps = 2
+        ['public', 'first_schema'].each do |schema|
+          described_class.should_receive(:rollback).
+            with(schema, steps).once
+        end
+        described_class.rollback_all(steps)
+      end
+    end
+
     describe "#rollback" do
       it "should rollback the db" do
         @steps = 2

data/spec/storey/drop_spec.rb

@@ -23,9 +23,8 @@ describe Storey, "#drop" do
 
   context "when the schema does not exist" do
     it "should raise an error" do
-      expect {
-        Storey.drop "foobar"
-      }.to raise_error(Storey::SchemaNotFound, %{The schema "foobar" cannot be found.})
+      expect { Storey.drop "foobar" }.
+        to raise_error(Storey::SchemaNotFound)
     end
   end
 end

data/spec/storey/dumper_spec.rb

@@ -1,53 +1,105 @@
 require 'spec_helper'
 
 describe Storey::Dumper do
-  describe '.dump' do
-    context 'when the schema_format is :ruby' do
-      before do
-        Rails.configuration.active_record.schema_format = :ruby
-      end
 
-      it 'should create a db/schema.rb file' do
-        schema_rb_path = File.join Rails.root, 'db', 'schema.rb'
-        FileUtils.rm schema_rb_path if File.exists?(schema_rb_path)
-        described_class.dump
-        File.should exist(schema_rb_path)
-        FileUtils.rm schema_rb_path if File.exists?(schema_rb_path)
-      end
+  describe '#dump' do
+    it 'should dump the schema using the correct dumper' do
+      special_dumper = double
+      args = {}
+      dumper = described_class.new(args)
+      dumper.stub(:dumper).and_return(special_dumper)
+      special_dumper.should_receive(:dump).once
+      dumper.dump
+    end
+  end
 
-      context 'given a file is specified' do
-        it 'should create the schema dump file in the specified location' do
-          schema_rb_path = File.join Rails.root, 'db', 'schema2.rb'
-          FileUtils.rm schema_rb_path if File.exists?(schema_rb_path)
-          described_class.dump file: schema_rb_path
-          File.should exist(schema_rb_path)
-          FileUtils.rm schema_rb_path if File.exists?(schema_rb_path)
-        end
-      end
+  describe '#dumper' do
+    it 'should be an instance of the dumper_class with the options passed through' do
+      options = {:a => 'b'}
+      dumper = described_class.new(options)
+      dumper.dumper_class.should_receive(:new).with(options).and_return('dumper')
+      dumper.dumper.should == 'dumper'
     end
+  end
 
-    context 'when the schema_format is :sql' do
-      before do
-        Rails.configuration.active_record.schema_format = :sql
+  describe '#dumper_class' do
+    context 'when the schema_format is nil' do
+      it 'should be RubyDumper' do
+        Rails.configuration.active_record.schema_format = nil
+        described_class.new.dumper_class.should == Storey::RubyDumper
       end
+    end
 
-      it 'should create a db/structure.sql file' do
-        structure_path = File.join Rails.root, 'db', 'structure.sql'
-        FileUtils.rm structure_path if File.exists?(structure_path)
-        described_class.dump
-        File.should exist(structure_path)
-        FileUtils.rm structure_path
+    context 'when the schema_format is :ruby' do
+      it 'should be RubyDumper' do
+        Rails.configuration.active_record.schema_format = :ruby
+        described_class.new.dumper_class.should == Storey::RubyDumper
       end
+    end
 
-      context 'when the file is specified' do
-        it 'should create dump into the given file' do
-          structure_path = File.join Rails.root, 'db', 'structure2.sql'
-          FileUtils.rm structure_path if File.exists?(structure_path)
-          described_class.dump file: structure_path
-          File.should exist(structure_path)
-          FileUtils.rm structure_path
-        end
+    context 'when the schema_format is :sql' do
+      it 'should be RubyDumper' do
+        Rails.configuration.active_record.schema_format = :sql
+        described_class.new.dumper_class.should == Storey::SqlDumper
       end
     end
   end
+
+  # describe '.dump' do
+  #   context 'when schema_format is not set' do
+  #     it 'should default to dumping ruby format' do
+  #       Rails.configuration.active_record.schema_format = nil
+  #       described_class.should_receive(:dump_schema_rb).once
+  #       described_class.dump
+  #     end
+  #   end
+
+  #   context 'when the schema_format is :ruby' do
+  #     before do
+  #       Rails.configuration.active_record.schema_format = :ruby
+  #     end
+
+  #     it 'should create a db/schema.rb file' do
+  #       schema_rb_path = File.join Rails.root, 'db', 'schema.rb'
+  #       FileUtils.rm schema_rb_path if File.exists?(schema_rb_path)
+  #       described_class.dump
+  #       File.should exist(schema_rb_path)
+  #       FileUtils.rm schema_rb_path if File.exists?(schema_rb_path)
+  #     end
+
+  #     context 'given a file is specified' do
+  #       it 'should create the schema dump file in the specified location' do
+  #         schema_rb_path = File.join Rails.root, 'db', 'schema2.rb'
+  #         FileUtils.rm schema_rb_path if File.exists?(schema_rb_path)
+  #         described_class.dump file: schema_rb_path
+  #         File.should exist(schema_rb_path)
+  #         FileUtils.rm schema_rb_path if File.exists?(schema_rb_path)
+  #       end
+  #     end
+  #   end
+
+  #   context 'when the schema_format is :sql' do
+  #     before do
+  #       Rails.configuration.active_record.schema_format = :sql
+  #     end
+
+  #     it 'should create a db/structure.sql file' do
+  #       structure_path = File.join Rails.root, 'db', 'structure.sql'
+  #       FileUtils.rm structure_path if File.exists?(structure_path)
+  #       described_class.dump
+  #       File.should exist(structure_path)
+  #       FileUtils.rm structure_path
+  #     end
+
+  #     context 'when the file is specified' do
+  #       it 'should create dump into the given file' do
+  #         structure_path = File.join Rails.root, 'db', 'structure2.sql'
+  #         FileUtils.rm structure_path if File.exists?(structure_path)
+  #         described_class.dump file: structure_path
+  #         File.should exist(structure_path)
+  #         FileUtils.rm structure_path
+  #       end
+  #     end
+  #   end
+  # end
 end

data/spec/storey/ruby_dumper_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Storey::RubyDumper do
+
+  describe '.dump' do
+    it 'should create a db/schema.rb file' do
+      schema_rb_path = File.join(Rails.root, 'db', 'schema.rb')
+      FileUtils.rm(schema_rb_path) if File.exists?(schema_rb_path)
+      dumper = described_class.new
+      dumper.dump
+      File.should exist(schema_rb_path)
+      FileUtils.rm(schema_rb_path) if File.exists?(schema_rb_path)
+    end
+
+    context 'given a file is specified' do
+      it 'should create the schema dump file in the specified location' do
+        schema_rb_path = File.join(Rails.root, 'db', 'schema2.rb')
+        FileUtils.rm(schema_rb_path) if File.exists?(schema_rb_path)
+        dumper = described_class.new(file: schema_rb_path)
+        dumper.dump
+        File.should exist(schema_rb_path)
+        FileUtils.rm(schema_rb_path) if File.exists?(schema_rb_path)
+      end
+    end
+  end
+
+end

data/spec/storey/sql_dumper_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Storey::SqlDumper do
+
+  describe '#dump' do
+    it 'should create a db/structure.sql file' do
+      structure_path = File.join(Rails.root, 'db', 'structure.sql')
+      FileUtils.rm(structure_path) if File.exists?(structure_path)
+      described_class.new.dump
+      File.should exist(structure_path)
+      FileUtils.rm(structure_path)
+    end
+
+    context 'when the file is specified' do
+      it 'should create dump into the given file' do
+        structure_path = File.join(Rails.root, 'db', 'structure2.sql')
+        FileUtils.rm(structure_path) if File.exists?(structure_path)
+        dumper = described_class.new(file: structure_path)
+        dumper.dump
+        File.should exist(structure_path)
+        FileUtils.rm structure_path
+      end
+    end
+  end
+
+end

data/spec/storey/switch_spec.rb

@@ -159,4 +159,16 @@ describe Storey, "#switch" do
     end
 
   end
+
+  context 'when switching to the default/public schema' do
+    it 'should reset' do
+      Storey.create 'another'
+      Storey.switch 'another'
+      Storey.switch('public') do
+        Storey.schema.should == Storey.default_search_path
+      end
+      Storey.switch 'public'
+      Storey.schema.should == Storey.default_search_path
+    end
+  end
 end

data/spec/tasks/storey_rake_spec.rb

@@ -83,22 +83,15 @@ describe Storey, "rake tasks" do
   end
 
   describe "storey:rollback" do
-    before do
-      @step = 2
-    end
-
     it "should rollback dbs" do
-      Storey::Migrator.should_receive(:rollback).exactly(@number_of_dbs+1).times
+      Storey::Migrator.should_receive(:rollback_all).once
       @rake['storey:rollback'].invoke
     end
 
     it "should rollback dbs STEP amt" do
-      Storey::Migrator.should_receive(:rollback).with(
-        anything,
-        @step
-      ).exactly(@number_of_dbs+1).times
-
-      ENV['STEP'] = @step.to_s
+      step = 2
+      Storey::Migrator.should_receive(:rollback_all).with(step).once
+      ENV['STEP'] = step.to_s
       @rake['storey:rollback'].invoke
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storey
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -111,6 +111,8 @@ files:
 - lib/storey/hstore.rb
 - lib/storey/migrator.rb
 - lib/storey/railtie.rb
+- lib/storey/ruby_dumper.rb
+- lib/storey/sql_dumper.rb
 - lib/storey/version.rb
 - lib/tasks/storey.rake
 - rvmrc.sample
@@ -147,7 +149,6 @@ files:
 - 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
@@ -167,10 +168,12 @@ files:
 - 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
@@ -189,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1937923977582358929
+      hash: -1594116376623390099
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1937923977582358929
+      hash: -1594116376623390099
 requirements: []
 rubyforge_project: storey
 rubygems_version: 1.8.24
@@ -239,7 +242,6 @@ test_files:
 - 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
@@ -259,10 +261,12 @@ test_files:
 - 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