sequel-rails 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3330d90f962d4bfa80130c3493821dd336026f9f
-  data.tar.gz: 0bf339401f577de82fbabc98a7e0802c445a8937
+  metadata.gz: f72c17bd6336f3beaf4c924f50df1c3c5f465e26
+  data.tar.gz: 68c754a39afbf03af0beada56cd545c38167d59f
 SHA512:
-  metadata.gz: f2223b86642bc6a5ee1fdf190fb50f49a3b7e75f98df818c0d00bc1bf787ab9c7643735cf6789737d0397d7e269e02a9de3d064f30d6b5354a0d3dd9e453016f
-  data.tar.gz: fb92d8c8da9c8850b5ae5c843d9025049065b163e354284c8e78c378a1b27d547b969c82204b79969051e45dc8f9cd415dde02b984f29e716892abc576600197
+  metadata.gz: ba99ffdebabe0e37b4d17c4de59a00bc0fba5475505d7ddd5998570fb45652f1e2f93c4597b356a798c94e1b3a174d50ac6cf7181ae506ae6d56a699b49a1449
+  data.tar.gz: 46740f777f70160dd7d8ffa6158557280c0677dabe0b2eae00dc7631b33b3780da148d759c9f554b0b2d9bfa90fbe56f5f07d2796f6c74a4e946f6f1bef84346

data/History.md

@@ -1,3 +1,8 @@
+0.6.1 (2013-09-16)
+==================
+
+* Use a `SequelRails::Configuration` from the start in `app.config.sequel` [#44](https://github.com/TalentBox/sequel-rails/issues/41)
+
 0.6.0 (2013-09-12)
 ==================
 

data/lib/sequel_rails/configuration.rb

@@ -16,16 +16,22 @@ module SequelRails
   class Configuration < ActiveSupport::OrderedOptions
 
     def self.for(root, database_yml_hash)
-      ::SequelRails.configuration ||= new(root, database_yml_hash)
+      ::SequelRails.configuration ||= begin
+        config = new
+        config.root = root
+        config.raw = database_yml_hash
+        config
+      end
     end
 
-    attr_reader :root, :raw
-    attr_accessor :logger
-    attr_accessor :migration_dir
-
-    def initialize(root, database_yml_hash)
-      super()
-      @root, @raw = root, database_yml_hash
+    def initialize(*)
+      super
+      self.root = Rails.root
+      self.raw = nil
+      self.logger = Rails.logger
+      self.migration_dir = nil
+      self.schema_dump = default_schema_dump
+      self.load_database_tasks = true
     end
 
     def environment_for(name)
@@ -40,14 +46,6 @@ module SequelRails
       end
     end
 
-    def schema_dump
-      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

data/lib/sequel_rails/railtie.rb

@@ -34,7 +34,7 @@ module SequelRails
       "Sequel::NoExistingObject" => :unprocessable_entity
     )
 
-    config.sequel = ActiveSupport::OrderedOptions.new
+    config.sequel = ::SequelRails::Configuration.new
 
     rake_tasks do |app|
       if app.config.sequel.load_database_tasks
@@ -65,9 +65,11 @@ module SequelRails
 
     # Support overwriting crucial steps in subclasses
     def configure_sequel(app)
-      app.config.sequel = ::SequelRails::Configuration.for(
-        ::Rails.root, app.config.database_configuration
-      ).merge!(app.config.sequel)
+      app.config.sequel.merge!(
+        :root => ::Rails.root,
+        :raw => app.config.database_configuration
+      )
+      ::SequelRails.configuration = app.config.sequel
     end
 
     def setup_i18n_support(app)

data/lib/sequel_rails/version.rb

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

data/spec/lib/sequel_rails/configuration_spec.rb

@@ -39,7 +39,8 @@ describe SequelRails::Configuration do
     let(:is_jruby) { false }
 
     before do
-      SequelRails.configuration.stub(:raw).and_return environments
+      SequelRails.configuration = described_class.new
+      SequelRails.configuration.raw = environments
       SequelRails.configuration.instance_variable_set('@environments', nil)
       SequelRails.stub(:jruby?).and_return is_jruby
     end
@@ -188,7 +189,7 @@ describe SequelRails::Configuration do
 
   describe "#schema_dump" do
     before{ Rails.stub(:env).and_return environment }
-    subject { SequelRails::Configuration.new("path/to/app", {}) }
+    subject{ described_class.new }
 
     context "in test environment" do
       let(:environment) { "test" }
@@ -237,7 +238,7 @@ describe SequelRails::Configuration do
   end
 
   describe "#load_database_tasks" do
-    subject { SequelRails::Configuration.new("path/to/app", {}) }
+    subject{ described_class.new }
 
     it "defaults to true" do
       subject.load_database_tasks.should be_true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel