sequel-rails 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8ea9bc9710a82354d3df888106dc2c6b971eb41
-  data.tar.gz: bb493d857f3236c479356890e1790906ff7ed3ab
+  metadata.gz: 3330d90f962d4bfa80130c3493821dd336026f9f
+  data.tar.gz: 0bf339401f577de82fbabc98a7e0802c445a8937
 SHA512:
-  metadata.gz: a7f6e7394c214be105146096a8f65e7f0eda0b33d7525a67f51b0a2611454a52f8baf352a6868d317e1e2488b4e283d0d2169d2a3fa8dbbf2044bcb6f07cbda4
-  data.tar.gz: cd45198031727fdefee6ca5a4c68a80db03d7c3e7bc3111cb0ddd3169577030bd0815a5c00b2f76085832c250ce051b451899baf86743ad752ebbab3c65566b7
+  metadata.gz: f2223b86642bc6a5ee1fdf190fb50f49a3b7e75f98df818c0d00bc1bf787ab9c7643735cf6789737d0397d7e269e02a9de3d064f30d6b5354a0d3dd9e453016f
+  data.tar.gz: fb92d8c8da9c8850b5ae5c843d9025049065b163e354284c8e78c378a1b27d547b969c82204b79969051e45dc8f9cd415dde02b984f29e716892abc576600197

data/History.md

@@ -1,3 +1,11 @@
+0.6.0 (2013-09-12)
+==================
+
+* Do not try to construct `url` from config if data config already contains one `url` [#35](https://github.com/TalentBox/sequel-rails/issues/41)
+* Add setting to allow disabling database's rake tasks to be loaded [#41](https://github.com/TalentBox/sequel-rails/issues/41)
+* Loosen the Sequel dependencies to `< 5.0` (Joshua Hansen) [#39](https://github.com/TalentBox/sequel-rails/pull/39)
+* Fix regexp to extract root url when using JDBC (Eric Strathmeyer) [#40](https://github.com/TalentBox/sequel-rails/pull/40)
+
 0.5.1 (2013-08-05)
 ==================
 

data/README.md

@@ -68,6 +68,10 @@ You can configure some options with the usual rails mechanism, in
     # These override corresponding settings from the database config.
     config.sequel.max_connections = 16
     config.sequel.search_path = %w(mine public)
+
+    # Configure whether database's rake tasks will be loaded or not
+    # Defaults to true
+    config.sequel.load_database_tasks = false
 ```
 
 Available sequel specific rake tasks
@@ -148,6 +152,7 @@ Improvements has been made by those awesome contributors:
 * Sean Sorrell (rudle)
 * Saulius Grigaliunas (sauliusg)
 * Jacques Crocker (railsjedi)
+* Eric Strathmeyer (strathmeyer)
 
 Credits
 =======

data/lib/sequel_rails/configuration.rb

@@ -23,6 +23,11 @@ module SequelRails
     attr_accessor :logger
     attr_accessor :migration_dir
 
+    def initialize(root, database_yml_hash)
+      super()
+      @root, @raw = root, database_yml_hash
+    end
+
     def environment_for(name)
       environments[name.to_s] || environments[name.to_sym]
     end
@@ -39,17 +44,16 @@ module SequelRails
       super.nil? ? (schema_dump = default_schema_dump) : super
     end
 
+    def load_database_tasks
+      super.nil? ? (load_database_tasks = true) : super
+    end
+
   private
 
     def default_schema_dump
       not %w(test production).include? Rails.env
     end
 
-    def initialize(root, database_yml_hash)
-      super()
-      @root, @raw = root, database_yml_hash
-    end
-
     def normalize_repository_config(hash)
       config = {}
       hash.each do |key, value|
@@ -86,7 +90,7 @@ module SequelRails
       config['search_path'] = search_path if search_path
 
       # some adapters only support an url
-      if config['adapter'] && config['adapter'] =~ /^(jdbc|do):/
+      if config['adapter'] && config['adapter'] =~ /^(jdbc|do):/ && !config.has_key?('url')
         params = {}
         config.each do |k, v|
           next if ['adapter', 'host', 'port', 'database'].include?(k)
@@ -98,7 +102,7 @@ module SequelRails
         end
         params_str = params.map { |k, v| "#{k}=#{v}" }.join('&')
         port = config['port'] ? ":#{config['port']}" : ''
-        config['url'] = case config['adapter']
+        config['url'] ||= case config['adapter']
         when /sqlite/
           "%s:%s" % [config['adapter'], config['database']]
         else

data/lib/sequel_rails/railtie.rb

@@ -36,8 +36,10 @@ module SequelRails
 
     config.sequel = ActiveSupport::OrderedOptions.new
 
-    rake_tasks do
-      load "sequel_rails/railties/database.rake"
+    rake_tasks do |app|
+      if app.config.sequel.load_database_tasks
+        load "sequel_rails/railties/database.rake"
+      end
     end
 
     initializer 'sequel.configuration' do |app|

data/lib/sequel_rails/storage/jdbc.rb

@@ -15,7 +15,7 @@ module SequelRails
       end
 
       def _root_url
-        config['url'].scan(/^jdbc:mysql:\/\/\w*:?\d*/).first
+        config['url'].scan(/^jdbc:mysql:\/\/[\w\.]*:?\d*/).first
       end
 
       def db_name

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/sequel-rails.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["LICENSE", "README.md"]
   s.rdoc_options = ["--charset=UTF-8"]
 
-  s.add_runtime_dependency "sequel", [">= 3.28", "< 4.1.0"]
+  s.add_runtime_dependency "sequel", [">= 3.28", "< 5.0"]
   s.add_runtime_dependency "railties", ">= 3.2.0"
 
   s.add_development_dependency "rake", ">= 0.8.7"

data/spec/lib/sequel_rails/configuration_spec.rb

@@ -2,46 +2,50 @@ require "spec_helper"
 
 describe SequelRails::Configuration do
 
-  let(:environments) do
-    {
-      "development" => {
-        "adapter" => "postgres",
-        "owner" => (ENV["TEST_OWNER"] || ENV["USER"]),
-        "username" => (ENV["TEST_OWNER"] || ENV["USER"]),
-        "database" => "sequel_rails_test_storage_dev",
-        "host" => "127.0.0.1",
-      },
-      "test" => {
-        "adapter" => "postgres",
-        "owner" => (ENV["TEST_OWNER"] || ENV["USER"]),
-        "username" => (ENV["TEST_OWNER"] || ENV["USER"]),
-        "database" => "sequel_rails_test_storage_test",
-        "host" => "127.0.0.1",
-      },
-      "remote" => {
-        "adapter" => "mysql",
-        "host" => "10.0.0.1",
-        "database" => "sequel_rails_test_storage_remote",
-      },
-      "production" => {
-        "host" => "10.0.0.1",
-        "database" => "sequel_rails_test_storage_production",
-      },
-      "bogus" => {},
-    }
-  end
-  let(:is_jruby) { false }
+  describe ".setup" do
 
-  before do
-    SequelRails.configuration.stub(:raw).and_return environments
-    SequelRails.configuration.instance_variable_set('@environments', nil)
-    SequelRails.stub(:jruby?).and_return is_jruby
-  end
+    let(:environments) do
+      {
+        "development" => {
+          "adapter" => "postgres",
+          "owner" => (ENV["TEST_OWNER"] || ENV["USER"]),
+          "username" => (ENV["TEST_OWNER"] || ENV["USER"]),
+          "database" => "sequel_rails_test_storage_dev",
+          "host" => "127.0.0.1",
+        },
+        "test" => {
+          "adapter" => "postgres",
+          "owner" => (ENV["TEST_OWNER"] || ENV["USER"]),
+          "username" => (ENV["TEST_OWNER"] || ENV["USER"]),
+          "database" => "sequel_rails_test_storage_test",
+          "host" => "127.0.0.1",
+        },
+        "remote" => {
+          "adapter" => "mysql",
+          "host" => "10.0.0.1",
+          "database" => "sequel_rails_test_storage_remote",
+        },
+        "production" => {
+          "host" => "10.0.0.1",
+          "database" => "sequel_rails_test_storage_production",
+        },
+        "url_already_constructed" => {
+          "adapter" => "adapter_name",
+          "url" => "jdbc:adapter_name://HOST/DB?user=U&password=P&ssl=true&sslfactory=sslFactoryOption"
+        },
+        "bogus" => {},
+      }
+    end
+    let(:is_jruby) { false }
 
-  subject { SequelRails.setup(environment) }
+    before do
+      SequelRails.configuration.stub(:raw).and_return environments
+      SequelRails.configuration.instance_variable_set('@environments', nil)
+      SequelRails.stub(:jruby?).and_return is_jruby
+    end
+
+    subject { SequelRails.setup(environment) }
 
-  describe ".setup" do
-    
     shared_examples "max_connections" do
       context "with max_connections config option" do
         let(:max_connections) { 31337 }
@@ -64,7 +68,7 @@ describe SequelRails::Configuration do
     end
 
     context "for a postgres connection" do
-      
+
       shared_examples "search_path" do
         context "with search_path config option" do
           let(:search_path) { ['secret', 'private', 'public'] }
@@ -89,7 +93,7 @@ describe SequelRails::Configuration do
       let(:environment) { 'development' }
 
       context "in C-Ruby" do
-        
+
         include_examples "max_connections"
         include_examples "search_path"
 
@@ -99,11 +103,11 @@ describe SequelRails::Configuration do
           end
           subject
         end
-        
+
       end
 
       context "in JRuby" do
-        
+
         include_examples "max_connections"
         include_examples "search_path"
 
@@ -117,11 +121,25 @@ describe SequelRails::Configuration do
           end
           subject
         end
+
+        context "when url is already given" do
+
+          let(:environment) { "url_already_constructed" }
+
+          it "does not change the url" do
+            ::Sequel.should_receive(:connect) do |url, hash|
+              url.should == "jdbc:adapter_name://HOST/DB?user=U&password=P&ssl=true&sslfactory=sslFactoryOption"
+              hash['adapter'].should == 'jdbc:adapter_name'
+            end
+            subject
+          end
+
+        end
       end
     end
 
     context "for a mysql connection" do
-        
+
       let(:environment) { 'remote' }
 
       context "in C-Ruby" do
@@ -137,7 +155,7 @@ describe SequelRails::Configuration do
       end
 
       context "in JRuby" do
-        
+
         include_examples "max_connections"
 
         let(:is_jruby) { true }
@@ -150,7 +168,87 @@ describe SequelRails::Configuration do
           end
           subject
         end
+
+        context "when url is already given" do
+
+          let(:environment) { "url_already_constructed" }
+
+          it "does not change the url" do
+            ::Sequel.should_receive(:connect) do |url, hash|
+              url.should == "jdbc:adapter_name://HOST/DB?user=U&password=P&ssl=true&sslfactory=sslFactoryOption"
+              hash['adapter'].should == 'jdbc:adapter_name'
+            end
+            subject
+          end
+
+        end
+      end
+    end
+  end
+
+  describe "#schema_dump" do
+    before{ Rails.stub(:env).and_return environment }
+    subject { SequelRails::Configuration.new("path/to/app", {}) }
+
+    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 { SequelRails::Configuration.new("path/to/app", {}) }
+
+    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
 end

data/spec/lib/sequel_rails/jdbc_spec.rb

@@ -0,0 +1,41 @@
+require "spec_helper"
+
+describe SequelRails::Storage::Jdbc do
+  let(:adapter)             { 'jdbc:mysql' }
+  let(:auto_reconnect)      { true }
+  let(:connection_handling) { 'queue' }
+  let(:database)            { 'test' }
+  let(:host)                { 'localhost' }
+  let(:password)            { nil }
+  let(:pool)                { 80 }
+  let(:user)                { 'root' }
+  let(:timeout)             { 5000 }
+  let(:config) do
+    {
+      'password' => password,
+      'pool' => pool,
+      'autoReconnect' => auto_reconnect,
+      'adapter' => adapter,
+      'timeout' => timeout,
+      'connection_handling' => connection_handling,
+      'user' => user,
+      'host' => host,
+      'database' => database,
+      'url' => "#{adapter}://#{host}/#{database}?password=#{password}&pool=#{pool}&autoReconnect=#{auto_reconnect}&timeout=#{timeout}&connection_handling=#{connection_handling}&user=#{user}"
+    }
+  end
+  let(:store) { described_class.new(config) }
+
+  describe "#_root_url" do
+    subject { store._root_url }
+    let(:expected) { "jdbc:mysql://#{host}" }
+
+    it { should == expected }
+
+    context "with ip addresses" do
+      let(:host) { '127.0.0.1'}
+
+      it { should == expected }
+    end
+  end
+end

data/spec/lib/sequel_rails/railtie_spec.rb

@@ -45,10 +45,6 @@ describe SequelRails::Railtie do
     end
   end
 
-  it "adds it's own database's rake tasks" do
-    pending "need to find a way to spec it"
-  end
-
   it "stores it's own config in app.config.sequel" do
     app.config.sequel.should be_instance_of SequelRails::Configuration
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -20,7 +20,7 @@ dependencies:
         version: '3.28'
     - - <
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '3.28'
     - - <
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +163,7 @@ files:
 - spec/internal/public/favicon.ico
 - spec/lib/generators/sequel/migration_spec.rb
 - spec/lib/sequel_rails/configuration_spec.rb
+- spec/lib/sequel_rails/jdbc_spec.rb
 - spec/lib/sequel_rails/migrations_spec.rb
 - spec/lib/sequel_rails/railtie_spec.rb
 - spec/lib/sequel_rails/railties/database_rake_spec.rb
@@ -205,6 +206,7 @@ test_files:
 - spec/internal/public/favicon.ico
 - spec/lib/generators/sequel/migration_spec.rb
 - spec/lib/sequel_rails/configuration_spec.rb
+- spec/lib/sequel_rails/jdbc_spec.rb
 - spec/lib/sequel_rails/migrations_spec.rb
 - spec/lib/sequel_rails/railtie_spec.rb
 - spec/lib/sequel_rails/railties/database_rake_spec.rb