sequel-rails 0.6.1 → 0.7.0

data/lib/sequel_rails/storage/jdbc.rb

@@ -35,7 +35,8 @@ module SequelRails
             db.execute("CREATE DATABASE IF NOT EXISTS `#{db_name}` DEFAULT CHARACTER SET #{charset} DEFAULT COLLATE #{collation}")
           end
         elsif _is_postgres?
-          system("createdb #{db_name}")
+          adapter = ::SequelRails::Storage::Postgres.new(config)
+          adapter._create
         end
       end
 
@@ -48,14 +49,33 @@ module SequelRails
             db.execute("DROP DATABASE IF EXISTS `#{db_name}`")
           end
         elsif _is_postgres?
-          system("dropdb #{db_name}")
+          adapter = ::SequelRails::Storage::Postgres.new(config)
+          adapter._drop
+        end
+      end
+
+      def _dump(filename)
+        if _is_postgres?
+          adapter = ::SequelRails::Storage::Postgres.new(config)
+          adapter._dump(filename)
+        else
+          raise NotImplementedError
+        end
+      end
+
+      def _load(filename)
+        if _is_postgres?
+          adapter = ::SequelRails::Storage::Postgres.new(config)
+          adapter._load(filename)
+        else
+          raise NotImplementedError
         end
       end
 
       private
 
       def collation
-        @collation ||= config['collation'] || ENV['COLLATION'] || 'utf8_unicode_ci'
+        @collation ||= super || "utf8_unicode_ci"
       end
 
       def in_memory?

data/lib/sequel_rails/storage/mysql.rb

@@ -1,49 +1,50 @@
-require 'shellwords'
-
 module SequelRails
   module Storage
     class Mysql < Abstract
+
       def _create
-        execute("CREATE DATABASE IF NOT EXISTS `#{database}` DEFAULT CHARACTER SET #{charset} DEFAULT COLLATE #{collation}")
+        execute "CREATE DATABASE IF NOT EXISTS `#{database}` DEFAULT CHARACTER SET #{charset} DEFAULT COLLATE #{collation}"
       end
 
       def _drop
-        execute("DROP DATABASE IF EXISTS `#{database}`")
+        execute "DROP DATABASE IF EXISTS `#{database}`"
       end
 
       def _dump(filename)
-        commands = %w(mysqldump --no-data)
-        commands << "--user=#{Shellwords.escape(username)}" unless username.blank?
-        commands << "--password=#{Shellwords.escape(password)}" unless password.blank?
-        commands << "--host=#{host}" unless host.blank?
-        commands << "--result-file" << filename
+        commands = ["mysqldump"]
+        add_connection_settings commands
+        add_flag commands, "--no-data"
+        add_option commands, "--result-file", filename
         commands << database
-        system(*commands)
+        safe_exec commands
       end
 
       def _load(filename)
-        commands = %w(mysql)
-        commands << "--user=#{Shellwords.escape(username)}" unless username.blank?
-        commands << "--password=#{Shellwords.escape(password)}" unless password.blank?
-        commands << "--host=#{host}" unless host.blank?
-        commands << '--execute' << %{SET FOREIGN_KEY_CHECKS = 0; SOURCE #{filename}; SET FOREIGN_KEY_CHECKS = 1}
-        commands << '--database' << database
-        system(*commands)
+        commands = ["mysql"]
+        add_connection_settings commands
+        add_option commands, "--database", database
+        add_option commands, "--execute", %{SET FOREIGN_KEY_CHECKS = 0; SOURCE #{filename}; SET FOREIGN_KEY_CHECKS = 1}
+        safe_exec commands
+      end
+
+      def collation
+        @collation ||= super || "utf8_unicode_ci"
       end
 
       private
 
-      def execute(statement)
-        commands = ["mysql"]
-        commands << "--user=#{Shellwords.escape(username)}" unless username.blank?
-        commands << "--password=#{Shellwords.escape(password)}" unless password.blank?
-        commands << "--host=#{host}" unless host.blank?
-        commands << "-e" << statement
-        system(*commands)
+      def add_connection_settings(commands)
+        add_option commands, "--user", username
+        add_option commands, "--password", password
+        add_option commands, "--host", host
+        add_option commands, "--port", port.to_s
       end
 
-      def collation
-        @collation ||= config['collation'] || ENV['COLLATION'] || 'utf8_unicode_ci'
+      def execute(statement)
+        commands = ["mysql"]
+        add_connection_settings commands
+        add_option commands, "--execute", statement
+        safe_exec commands
       end
 
     end

data/lib/sequel_rails/storage/postgres.rb

@@ -1,55 +1,55 @@
 module SequelRails
   module Storage
     class Postgres < Abstract
+
       def _create
-        ENV["PGPASSWORD"] = password unless password.blank?
-        commands = ["createdb", "--encoding", charset]
-        commands << "--username" << username unless username.blank?
-        commands << "--owner" << owner unless owner.blank?
-        commands << "--port" << port.to_s unless port.blank?
-        commands << "--host" << host unless host.blank?
-        commands << database
-        res = system(*commands)
-        ENV["PGPASSWORD"] = nil unless password.blank?
-        res
+        with_pgpassword do
+          commands = ["createdb"]
+          add_connection_settings commands
+          add_option commands, "--maintenance-db", maintenance_db
+          add_option commands, "--encoding", encoding
+          add_option commands, "--locale", locale
+          add_option commands, "--lc-collate", collation
+          add_option commands, "--lc-ctype", ctype
+          add_option commands, "--template", template
+          add_option commands, "--tablespace", tablespace
+          add_option commands, "--owner", owner
+          commands << database
+          safe_exec commands
+        end
       end
 
       def _drop
-        ENV["PGPASSWORD"] = password unless password.blank?
-        commands = ["dropdb"]
-        commands << "-U" << username unless username.blank?
-        commands << "--port" << port.to_s unless port.blank?
-        commands << "--host" << host unless host.blank?
-        commands << database
-        res = system(*commands)
-        ENV["PGPASSWORD"] = nil unless password.blank?
-        res
+        with_pgpassword do
+          commands = ["dropdb"]
+          add_connection_settings commands
+          commands << database
+          safe_exec commands
+        end
       end
 
       def _dump(filename)
-        ENV["PGPASSWORD"] = password unless password.blank?
-        commands = %w(pg_dump -i -s -x -O)
-        commands << "-f" << filename
-        commands << "-U" << username unless username.blank?
-        commands << "--port" << port.to_s unless port.blank?
-        commands << "--host" << host unless host.blank?
-        commands << database
-        res = system(*commands)
-        ENV["PGPASSWORD"] = nil unless password.blank?
-        res
+        with_pgpassword do
+          commands = ["pg_dump"]
+          add_connection_settings commands
+          add_flag commands, "-i"
+          add_flag commands, "-s"
+          add_flag commands, "-x"
+          add_flag commands, "-O"
+          add_option commands, "--file", filename
+          commands << database
+          safe_exec commands
+        end
       end
 
       def _load(filename)
-        ENV["PGPASSWORD"] = password unless password.blank?
-        commands = %w(psql)
-        commands << "-f" << filename
-        commands << "-U" << username unless username.blank?
-        commands << "--port" << port.to_s unless port.blank?
-        commands << "--host" << host unless host.blank?
-        commands << database
-        res = system(*commands)
-        ENV["PGPASSWORD"] = nil unless password.blank?
-        res
+        with_pgpassword do
+          commands = ["psql"]
+          add_connection_settings commands
+          add_option commands, "--file", filename
+          commands << database
+          safe_exec commands
+        end
       end
 
       def close_connections
@@ -68,6 +68,46 @@ module SequelRails
           # are closed
         end
       end
+
+      def encoding
+        @encoding ||= config["encoding"] || charset
+      end
+
+      def locale
+        @locale ||= config["locale"] || ""
+      end
+
+      def template
+        @template ||= config["template"] || ""
+      end
+
+      def ctype
+        @ctype ||= config["ctype"] || ""
+      end
+
+      def tablespace
+        @tablespace ||= config["tablespace"] || ""
+      end
+
+      def maintenance_db
+        @maintenance_db ||= config["maintenance_db"] || ""
+      end
+
+      private
+
+      def with_pgpassword
+        ENV["PGPASSWORD"] = password unless password.blank?
+        yield
+      ensure
+        ENV["PGPASSWORD"] = nil unless password.blank?
+      end
+
+      def add_connection_settings(commands)
+        add_option commands, "--username", username
+        add_option commands, "--host", host
+        add_option commands, "--port", port.to_s
+      end
+
     end
   end
 end

data/lib/sequel_rails/storage/sqlite.rb

@@ -13,12 +13,16 @@ module SequelRails
 
       def _dump(filename)
         return if in_memory?
-        system "sqlite3 \"#{path.to_s}\" .schema > \"#{filename}\""
+        escaped_path = SequelRails::Shellwords.shellescape(path.to_s)
+        escaped_filename = SequelRails::Shellwords.shellescape(filename)
+        exec "sqlite3 #{escaped_path} .schema > #{escaped_filename}"
       end
 
       def _load(filename)
         return if in_memory?
-        system "sqlite3 \"#{path.to_s}\" < \"#{filename}\""
+        escaped_path = SequelRails::Shellwords.shellescape(path.to_s)
+        escaped_filename = SequelRails::Shellwords.shellescape(filename)
+        exec "sqlite3 #{escaped_path} < #{escaped_filename}"
       end
 
       private

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/sequel-rails.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Brasten Sager (brasten)", "Jonathan TRON"]
   s.email       = ["brasten@gmail.com", "jonathan.tron@metrilio.com"]
-  s.homepage    = "https://github.com/TalentBox/sequel-rails"
+  s.homepage    = "http://talentbox.github.io/sequel-rails/"
   s.description = "Integrate Sequel with Rails 3"
   s.summary     = "Use Sequel with Rails 3"
   s.files         = `git ls-files`.split("\n")
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.extra_rdoc_files = ["LICENSE", "README.md"]
   s.rdoc_options = ["--charset=UTF-8"]
+  s.license = "MIT"
 
   s.add_runtime_dependency "sequel", [">= 3.28", "< 5.0"]
   s.add_runtime_dependency "railties", ">= 3.2.0"

data/spec/lib/sequel_rails/configuration_spec.rb

@@ -1,9 +1,89 @@
 require "spec_helper"
 
-describe SequelRails::Configuration do
+describe SequelRails do
 
   describe ".setup" do
+    let(:environment) { "development" }
+    let(:configuration) { SequelRails::Configuration.new }
+
+    it "delegates to current configuration" do
+      SequelRails.configuration = configuration
+      configuration.should_receive(:connect).with(environment)
+      SequelRails.setup environment
+    end
+  end
+
+end
+
+describe SequelRails::Configuration do
+
+  describe "#schema_dump" do
+    before{ Rails.stub(:env).and_return environment }
+    subject{ described_class.new }
 
+    context "in test environment" do
+      let(:environment) { "test" }
+      it "defaults to false" do
+        subject.schema_dump.should be_false
+      end
+      it "can be assigned" do
+        subject.schema_dump = true
+        subject.schema_dump.should be_true
+      end
+      it "can be set from merging another hash" do
+        subject.merge!(:schema_dump => true)
+        subject.schema_dump.should be_true
+      end
+    end
+
+    context "in production environment" do
+      let(:environment) { "production" }
+      it "defaults to false" do
+        subject.schema_dump.should be_false
+      end
+      it "can be assigned" do
+        subject.schema_dump = true
+        subject.schema_dump.should be_true
+      end
+      it "can be set from merging another hash" do
+        subject.merge!(:schema_dump => true)
+        subject.schema_dump.should be_true
+      end
+    end
+
+    context "in other environments" do
+      let(:environment) { "development" }
+      it "defaults to true" do
+        subject.schema_dump.should be_true
+      end
+      it "can be assigned" do
+        subject.schema_dump = false
+        subject.schema_dump.should be_false
+      end
+      it "can be set from merging another hash" do
+        subject.merge!(:schema_dump => false)
+        subject.schema_dump.should be_false
+      end
+    end
+  end
+
+  describe "#load_database_tasks" do
+    subject{ described_class.new }
+
+    it "defaults to true" do
+      subject.load_database_tasks.should be_true
+    end
+    it "can be assigned" do
+      subject.load_database_tasks = false
+      subject.load_database_tasks.should be_false
+    end
+    it "can be set from merging another hash" do
+      subject.merge!(:load_database_tasks => false)
+      subject.load_database_tasks.should be_false
+    end
+  end
+
+  describe "#connect" do
     let(:environments) do
       {
         "development" => {
@@ -38,21 +118,20 @@ describe SequelRails::Configuration do
     end
     let(:is_jruby) { false }
 
-    before do
-      SequelRails.configuration = described_class.new
-      SequelRails.configuration.raw = environments
-      SequelRails.configuration.instance_variable_set('@environments', nil)
-      SequelRails.stub(:jruby?).and_return is_jruby
+    subject do
+      config = described_class.new
+      config.raw = environments
+      config
     end
 
-    subject { SequelRails.setup(environment) }
+    before { SequelRails.stub(:jruby?).and_return is_jruby }
 
     shared_examples "max_connections" do
       context "with max_connections config option" do
         let(:max_connections) { 31337 }
         before do
           environments[environment]["max_connections"] = 7
-          SequelRails.configuration.max_connections = max_connections
+          subject.max_connections = max_connections
         end
 
         it "overrides the option from the configuration" do
@@ -63,7 +142,7 @@ describe SequelRails::Configuration do
               hash_or_url.should include("max_connections=#{max_connections}")
             end
           end
-          subject
+          subject.connect environment
         end
       end
     end
@@ -75,7 +154,7 @@ describe SequelRails::Configuration do
           let(:search_path) { ['secret', 'private', 'public'] }
           before do
             environments[environment]["search_path"] = "private, public"
-            SequelRails.configuration.search_path = search_path
+            subject.search_path = search_path
           end
 
           it "overrides the option from the configuration" do
@@ -86,7 +165,7 @@ describe SequelRails::Configuration do
                 hash_or_url.should include("search_path=secret,private,public")
               end
             end
-            subject
+            subject.connect environment
           end
         end
       end
@@ -102,7 +181,7 @@ describe SequelRails::Configuration do
           ::Sequel.should_receive(:connect) do |hash|
             hash['adapter'].should == 'postgres'
           end
-          subject
+          subject.connect environment
         end
 
       end
@@ -120,7 +199,7 @@ describe SequelRails::Configuration do
             hash['adapter'].should == 'jdbc:postgresql'
             hash['host'].should    == '127.0.0.1'
           end
-          subject
+          subject.connect environment
         end
 
         context "when url is already given" do
@@ -132,7 +211,7 @@ describe SequelRails::Configuration do
               url.should == "jdbc:adapter_name://HOST/DB?user=U&password=P&ssl=true&sslfactory=sslFactoryOption"
               hash['adapter'].should == 'jdbc:adapter_name'
             end
-            subject
+            subject.connect environment
           end
 
         end
@@ -151,7 +230,7 @@ describe SequelRails::Configuration do
           ::Sequel.should_receive(:connect) do |hash|
             hash['adapter'].should == 'mysql'
           end
-          subject
+          subject.connect environment
         end
       end
 
@@ -167,7 +246,7 @@ describe SequelRails::Configuration do
             hash['adapter'].should  == 'jdbc:mysql'
             hash['database'].should == 'sequel_rails_test_storage_remote'
           end
-          subject
+          subject.connect environment
         end
 
         context "when url is already given" do
@@ -179,77 +258,23 @@ describe SequelRails::Configuration do
               url.should == "jdbc:adapter_name://HOST/DB?user=U&password=P&ssl=true&sslfactory=sslFactoryOption"
               hash['adapter'].should == 'jdbc:adapter_name'
             end
-            subject
+            subject.connect environment
           end
 
         end
       end
     end
-  end
-
-  describe "#schema_dump" do
-    before{ Rails.stub(:env).and_return environment }
-    subject{ described_class.new }
-
-    context "in test environment" do
-      let(:environment) { "test" }
-      it "defaults to false" do
-        subject.schema_dump.should be_false
-      end
-      it "can be assigned" do
-        subject.schema_dump = true
-        subject.schema_dump.should be_true
-      end
-      it "can be set from merging another hash" do
-        subject.merge!(:schema_dump => true)
-        subject.schema_dump.should be_true
-      end
-    end
-
-    context "in production environment" do
-      let(:environment) { "production" }
-      it "defaults to false" do
-        subject.schema_dump.should be_false
-      end
-      it "can be assigned" do
-        subject.schema_dump = true
-        subject.schema_dump.should be_true
-      end
-      it "can be set from merging another hash" do
-        subject.merge!(:schema_dump => true)
-        subject.schema_dump.should be_true
-      end
-    end
 
-    context "in other environments" do
+    describe "after connect hook" do
+      let(:hook) { double }
       let(:environment) { "development" }
-      it "defaults to true" do
-        subject.schema_dump.should be_true
-      end
-      it "can be assigned" do
-        subject.schema_dump = false
-        subject.schema_dump.should be_false
-      end
-      it "can be set from merging another hash" do
-        subject.merge!(:schema_dump => false)
-        subject.schema_dump.should be_false
-      end
-    end
-  end
+      before { SequelRails.unstub :jruby? }
 
-  describe "#load_database_tasks" do
-    subject{ described_class.new }
-
-    it "defaults to true" do
-      subject.load_database_tasks.should be_true
-    end
-    it "can be assigned" do
-      subject.load_database_tasks = false
-      subject.load_database_tasks.should be_false
-    end
-    it "can be set from merging another hash" do
-      subject.merge!(:load_database_tasks => false)
-      subject.load_database_tasks.should be_false
+      it "runs hook if provided" do
+        subject.after_connect = hook
+        hook.should_receive(:call)
+        subject.connect environment
+      end
     end
   end
 end