schema_plus 0.1.0 → 0.1.1

data/README.rdoc

@@ -11,9 +11,11 @@ For added rails DRYness see also the gems
 == Compatibility
 
 SchemaPlus supports all combinations of:
-* rails 3.0 or 3.1
+* rails 2.3, 3.0, or 3.1
 * MRI ruby 1.8.7 or 1.9.2
-* PostgreSQL, MySQL (using mysql or mysql2 gem), or Sqlite3
+* PostgreSQL, MySQL (using mysql or mysql2 gem), or SQLite3 (using sqlite3 3.7.7 which has foreign key support)
+
+Support for rails 2.3 will likely be dropped starting in version 0.2.x.
 
 == Installation
 

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

@@ -95,6 +95,16 @@ module SchemaPlus
           false
         end
 
+        # This is define in rails 3.x, but not in rails2.x
+        unless defined? ::ActiveRecord::ConnectionAdapters::SchemaStatements::index_name_exists?
+          # File activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb, line 403
+          def index_name_exists?(table_name, index_name, default)
+            return default unless respond_to?(:indexes)
+            index_name = index_name.to_s
+            indexes(table_name).detect { |i| i.name == index_name }
+          end
+        end
+
       end
     end
   end

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

@@ -19,8 +19,8 @@ module SchemaPlus
         end
 
         def initialize_with_schema_plus(*args) #:nodoc:
-          # same args as add_index(table_name, column_names, options={})
-          if args.length == 2 or (args.length == 3 && Hash === args.last)
+          # same args as add_index(table_name, column_names, options)
+          if args.length == 3 and Hash === args.last
             table_name, column_names, options = args + [{}]
             initialize_without_schema_plus(table_name, options[:name], options[:unique], column_names, options[:lengths])
             @conditions = options[:conditions]

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/runspecs

@@ -3,7 +3,7 @@
 require 'optparse'
 
 RUBY_VERSIONS = %W[1.8.7 1.9.2]
-RAILS_VERSIONS = %W[3.0 3.1]
+RAILS_VERSIONS = %W[2.3 3.0 3.1]
 
 options = {}
 OptionParser.new do |opts|

data/schema_plus.gemspec

@@ -24,6 +24,9 @@ Gem::Specification.new do |s|
   s.add_dependency("valuable")
       
   case ENV['SCHEMA_PLUS_RAILS_VERSION']
+  when '2.3'
+      s.add_development_dependency("rails", "~> 2.3")
+      s.add_development_dependency("mysql2", "~> 0.2.6")
   when '3.0'
       s.add_development_dependency("rails", "~> 3.0")
       s.add_development_dependency("mysql2", "~> 0.2.6")

data/spec/connections/mysql/connection.rb

@@ -9,7 +9,7 @@ ActiveRecord::Base.configurations = {
     :database => 'schema_plus_unittest',
     :username => 'schema_plus',
     :encoding => 'utf8',
-    #:socket => '/tmp/mysql.sock',
+    :socket => '/tmp/mysql.sock',
     :min_messages => 'warning'
   }
 

data/spec/connections/mysql2/connection.rb

@@ -9,7 +9,7 @@ ActiveRecord::Base.configurations = {
     :database => 'schema_plus_unittest',
     :username => 'schema_plus',
     :encoding => 'utf8',
-    #:socket => '/tmp/mysql.sock',
+    :socket => '/tmp/mysql.sock',
     :min_messages => 'warning'
   }
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: schema_plus
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ronen Barzel
@@ -15,18 +11,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 +02:00
+date: 2011-07-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -34,112 +29,123 @@ dependencies:
   name: valuable
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mysql2
+  name: rails
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: "2.3"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: mysql2
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
+        version: 0.2.6
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 0.8.7
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: pg
+  name: rspec
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: mysql
+  name: pg
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: mysql
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: sqlite3
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: simplecov-gem-adapter
+  name: simplecov
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: simplecov-gem-adapter
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id012
 description: "SchemaPlus is an ActiveRecord extension that provides enhanced capabilities for schema definition and querying, including: enhanced and more DRY index capabilities, support and automation for foreign key constraints, and support for views."
 email: 
 - ronen@barzel.org
@@ -194,7 +200,6 @@ files:
 - spec/schema_dumper_spec.rb
 - spec/schema_spec.rb
 - spec/spec_helper.rb
-- spec/support/extensions/active_model.rb
 - spec/support/helpers.rb
 - spec/support/matchers/automatic_foreign_key_matchers.rb
 - spec/support/matchers/have_index.rb
@@ -211,25 +216,47 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: schema_plus
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Enhances ActiveRecord schema mechanism, including more DRY index creation and support for foreign key constraints and views.
-test_files: []
-
+test_files: 
+- spec/column_spec.rb
+- spec/connections/mysql/connection.rb
+- spec/connections/mysql2/connection.rb
+- spec/connections/postgresql/connection.rb
+- spec/connections/sqlite3/connection.rb
+- spec/foreign_key_definition_spec.rb
+- spec/foreign_key_spec.rb
+- spec/index_definition_spec.rb
+- spec/index_spec.rb
+- spec/migration_spec.rb
+- spec/models/comment.rb
+- spec/models/post.rb
+- spec/models/user.rb
+- spec/references_spec.rb
+- spec/schema/auto_schema.rb
+- spec/schema/core_schema.rb
+- spec/schema_dumper_spec.rb
+- spec/schema_spec.rb
+- spec/spec_helper.rb
+- spec/support/helpers.rb
+- spec/support/matchers/automatic_foreign_key_matchers.rb
+- spec/support/matchers/have_index.rb
+- spec/support/matchers/reference.rb
+- spec/support/reference.rb
+- spec/views_spec.rb

data/spec/support/extensions/active_model.rb

@@ -1,13 +0,0 @@
-# ported from rspec-rails
-# There is no reason to install whole gem as we
-# need only that tiny helper
-module ::ActiveModel::Validations
-
-  def error_on(attribute)
-    self.valid?
-    [self.errors[attribute]].flatten.compact
-  end
-
-  alias :errors_on :error_on
-
-end