schema_plus 1.1.1 → 1.1.2

data/.rspec

@@ -0,0 +1,3 @@
+--colour
+--format documentation
+--tty

data/README.md

@@ -277,6 +277,9 @@ of foreign key constraints, you can re-enable it:
 
 ## Release notes:
 
+### 1.1.2
+*   Now works with rails 3.2.13 (fixed railtie initialization)
+
 ### 1.1.1
 
 *   Dependency constraint to rails 3.2.12 max, since schema_plus doesn't

data/lib/schema_plus/active_record/base.rb

@@ -21,7 +21,7 @@ module SchemaPlus
 
         def columns_with_schema_plus #:nodoc:
           columns = columns_without_schema_plus
-          columns.each do |column| column.connection = self end unless @schema_plus_extended_columns
+          columns.each do |column| column.model = self end unless @schema_plus_extended_columns
           columns
         end
 

data/lib/schema_plus/active_record/connection_adapters/column.rb

@@ -8,13 +8,13 @@ module SchemaPlus
       module Column
 
         attr_reader :default_expr
-        attr_writer :connection # connection gets set by SchemaPlus::ActiveRecord::Base::columns_with_schema_plus
+        attr_writer :model # model gets set by SchemaPlus::ActiveRecord::Base::columns_with_schema_plus
 
         # Returns the list of IndexDefinition instances for each index that
         # refers to this column.  Returns an empty list if there are no
         # such indexes.
         def indexes
-          @indexes ||= @connection.indexes.select{|index| index.columns.include? self.name}
+          @indexes ||= @model.indexes.select{|index| index.columns.include? self.name}
         end
 
         # If the column is in a unique index, returns a list of names of other columns in
@@ -53,9 +53,9 @@ module SchemaPlus
         end
 
         # The default as_jon includes all instance variables.  but
-        # @connection can't be dumped (it contains circular references)
+        # @model can't be dumped (it contains circular references)
         def as_json(options=nil)
-          instance_values.except "connection"
+          instance_values.except "model"
         end
       end
     end

data/lib/schema_plus/railtie.rb

@@ -1,7 +1,7 @@
 module SchemaPlus
   class Railtie < Rails::Railtie #:nodoc:
 
-    initializer 'schema_plus.insert', :after => "active_record.initialize_database" do
+    initializer 'schema_plus.insert', :before => "active_record.initialize_database" do
       ActiveSupport.on_load(:active_record) do
         SchemaPlus.insert
       end

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/schema_plus.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("rails", ">= 3.2", "<= 3.2.12")
+  s.add_dependency("rails", ">= 3.2")
   s.add_dependency("valuable")
 
   s.add_development_dependency("rake")

data/spec/named_schemas_spec.rb

@@ -1,7 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "with multiple schemas" do
-  let (:connection) { ActiveRecord::Base.connection }
+  def connection
+    ActiveRecord::Base.connection
+  end
 
   before(:all) do
     newdb = case connection.adapter_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -20,9 +20,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 3.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,9 +28,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: valuable
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +119,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - MIT-LICENSE