schema_plus 0.1.0.pre3 → 0.1.0.pre4

data/README.rdoc

@@ -6,9 +6,7 @@ SchemaPlus is an ActiveRecord extension that provides enhanced capabilities for
 
 For added rails DRYness see also the gems
 {+schema_associations+}[http://rubygems.org/gems/schema_associations] and
-{+schema_validations+}[http://rubygems.org/gems/schema_associations]
-<b>IMPORTANT PRERELEASE NOTE: <i>schema_validations is not yet separate
-gems, it's currently bundled in here.  It's not documented yet though.</i></b>
+{+schema_validations+}[http://rubygems.org/gems/schema_validations]
 
 == Compatibility
 
@@ -127,26 +125,39 @@ ActiveRecord works with views the same as with ordinary tables.  That is, for th
   * Greg Barnett (https://github.com/greg-barnett)
   * Ronen Barzel (https://github.com/ronen)
 
-* SchemaPlus was created in 2011 by Michal Lomnicki and Ronen Barzel
+* SchemaPlus was created in 2011 by Michał Łomnicki and Ronen Barzel
 
 
 
 == Testing
 
-SchemaPlus is tested using rspec.  To run the tests, after you've forked & cloned: Make sure you have Postgresql and MySQL running.  Create database user "schema_plus" with permissions for database "schema_plus_unittest".  Then:
+SchemaPlus is tested using rspec and rvm, with some hackery to test against
+multiple versions of rails and ruby and db adapters.  To run the tests,
+after you've forked & cloned: Make sure you have Postgresql and MySQL
+running.  Create database user "schema_plus" with permissions for database
+"schema_plus_unittest".  Then:
 
   $ cd schema_plus
   $ bundle install
   $ rake postgresql:build_databases
   $ rake mysql:build_databases
+  $ ./runspecs --install  # do this once to install gem dependencies for all versions (slow)
+  $ ./runspecs # as many times as you like
+
+You can also pick a specific version of rails and ruby to use, such as:
+  $ rvm use 1.9.2
+  $ export SCHEMA_ASSOCIATIONS_RAILS_VERSION=3.1
+  $ bundle update --local rails mysql2  # different versions of rails require different mysql2's
+  $ rake spec
+
+And you can run the specs for a specific adapter:
   $ rake postgresql:spec # to run postgresql tests only
   $ rake mysql:spec # to run mysql tests only
   $ rake mysql2:spec # to run mysql2 tests only
   $ rake sqlite3:spec # to run sqlite3 tests only
-  $ rake spec # run all tests
 
 If you're running ruby 1.9.2, code coverage results will be in coverage/index.html -- it should be at 100% coverage.
 
 == License
 
-This plugin is released under the MIT license.
+This gem is released under the MIT license.

data/lib/schema_plus/active_record/base.rb

@@ -7,32 +7,18 @@ module SchemaPlus
     module Base
       def self.included(base) #:nodoc:
         base.extend(ClassMethods)
-        base.extend(SchemaPlus::ActiveRecord::Validations)
       end
 
       module ClassMethods #:nodoc:
         def self.extended(base) #:nodoc:
           class << base
             alias_method_chain :columns, :schema_plus
-            alias_method_chain :abstract_class?, :schema_plus
             alias_method_chain :reset_column_information, :schema_plus
           end
         end
 
         public
 
-        # Per-model override of Config options.  Use via, e.g.
-        #     class MyModel < ActiveRecord::Base
-        #         schema_plus :associations => { :auto_create => false }
-        #     end
-        def schema_plus(opts)
-          @schema_plus_config = SchemaPlus.config.merge(opts)
-        end
-
-        def abstract_class_with_schema_plus? #:nodoc:
-          abstract_class_without_schema_plus? || !(name =~ /^Abstract/).nil?
-        end
-
         def columns_with_schema_plus #:nodoc:
           unless @schema_plus_extended_columns
             @schema_plus_extended_columns = true
@@ -69,11 +55,6 @@ module SchemaPlus
           connection.reverse_foreign_keys(table_name, "#{name} Reverse Foreign Keys")
         end
 
-        private
-
-        def schema_plus_config # :nodoc:
-          @schema_plus_config ||= SchemaPlus.config.dup
-        end
       end
     end
   end

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

@@ -35,6 +35,11 @@ module SchemaPlus
             adapter_module = SchemaPlus::ActiveRecord::ConnectionAdapters.const_get(adapter)
             self.class.send(:include, adapter_module) unless self.class.include?(adapter_module)
             self.post_initialize if self.respond_to? :post_initialize
+            # rails 3.1 defines a separate Mysql2IndexDefinition which is
+            # compatible with the monkey patches; but the definition only
+            # appears once the adapter is loaded.  so wait til now to check
+            # if that constant exists, then include the patches
+            ::ActiveRecord::ConnectionAdapters::Mysql2IndexDefinition.send(:include, SchemaPlus::ActiveRecord::ConnectionAdapters::IndexDefinition) if defined? ::ActiveRecord::ConnectionAdapters::Mysql2IndexDefinition
           end
         end
 

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

@@ -118,6 +118,7 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
     protected
     def column_index(name, options) #:nodoc:
       options = {} if options == true
+      options = {:unique => true} if options == :unique
       name = [name] + Array.wrap(options.delete(:with)).compact
       self.index(name, options)
     end

data/lib/schema_plus/railtie.rb

@@ -1,11 +1,10 @@
 module SchemaPlus 
   class Railtie < Rails::Railtie #:nodoc:
-    config.before_initialize do
-      SchemaPlus.insert_connection_adapters
-    end
 
-    initializer 'schema_plus.insert', :after => :load_config_initializers do
-      SchemaPlus.insert
+    initializer 'schema_plus.insert', :after => "active_record.initialize_database" do
+      ActiveSupport.on_load(:active_record) do
+        SchemaPlus.insert
+      end
     end
 
   end

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "0.1.0.pre3"
+  VERSION = "0.1.0.pre4"
 end

data/lib/schema_plus.rb

@@ -16,8 +16,6 @@ require 'schema_plus/railtie' if defined?(Rails)
 module SchemaPlus
   module ActiveRecord
 
-    autoload :Validations, 'schema_plus/active_record/validations'
-
     module ConnectionAdapters
       autoload :MysqlAdapter, 'schema_plus/active_record/connection_adapters/mysql_adapter'
       autoload :PostgresqlAdapter, 'schema_plus/active_record/connection_adapters/postgresql_adapter'
@@ -33,7 +31,7 @@ module SchemaPlus
   #    end
   #
   # The options are grouped into subsets based on area of functionality.
-  # See Config::ForeignKeys, Config::Validations
+  # See Config::ForeignKeys
   #
   class Config < Valuable
 
@@ -80,56 +78,6 @@ module SchemaPlus
     end
     has_value :foreign_keys, :klass => ForeignKeys, :default => ForeignKeys.new
 
-    # This set of configuration options control SchemaPlus's automatic
-    # validations behavior.  Set them in
-    # +config/initializers/schema_plus.rb+ using:
-    #
-    #    SchemaPlus.setup do |config|
-    #       config.validations.auto_create = ...
-    #    end
-    #
-    class Validations < Valuable
-      ##
-      # :attr_accessor: auto_create
-      #
-      # Whether to automatically create validations based on database constraints.
-      # Boolean, default is +true+.
-      has_value :auto_create, :klass => :boolean, :default => true
-
-      ##
-      # :attr_accessor: only
-      #
-      # List of field names to include in automatic validation.
-      # Value is a single name, and array of names, or +nil+.  Default is +nil+.
-      has_value :only, :default => nil
-
-      ##
-      # :attr_accessor: except
-      #
-      # List of field names to exclude from automatic validation.
-      # Value is a single name, an array of names, or +nil+.  Default is <tt>[:created_at, :updated_at, :created_on, :updated_on]</tt>.
-      has_value :except, :default => [:created_at, :updated_at, :created_on, :updated_on]
-      
-      ##
-      # :attr_accessor: only_type
-      #
-      # List of validation types to exclude from automatic validation.
-      # Value is a single type, and array of types, or +nil+.  Default is +nil+.
-      # A type is specified as, e.g., +:validates_presence_of+ or simply +:presence+.
-      has_value :except_type, :default => nil
-
-      ##
-      # :attr_accessor: only_type
-      #
-      # List of validation types to include in automatic validation.
-      # Value is a single type, and array of types, or +nil+.  Default is +nil+.
-      # A type is specified as, e.g., +:validates_presence_of+ or simply +:presence+.
-      has_value :only_type, :default => nil
-
-    end
-    has_value :validations, :klass => Validations, :default => Validations.new
-
-
     def dup #:nodoc:
       self.class.new(Hash[attributes.collect{ |key, val| [key, Valuable === val ?  val.class.new(val.attributes) : val] }])
     end
@@ -171,8 +119,6 @@ module SchemaPlus
     ::ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, SchemaPlus::ActiveRecord::ConnectionAdapters::AbstractAdapter)
     ::ActiveRecord::ConnectionAdapters::Column.send(:include, SchemaPlus::ActiveRecord::ConnectionAdapters::Column)
     ::ActiveRecord::ConnectionAdapters::IndexDefinition.send(:include, SchemaPlus::ActiveRecord::ConnectionAdapters::IndexDefinition)
-    # (mysql2 v0.2.7 uses its own IndexDefinition, which is compatible with the monkey patches; so if that constant exists, include the patches
-    ::ActiveRecord::ConnectionAdapters::Mysql2IndexDefinition.send(:include, SchemaPlus::ActiveRecord::ConnectionAdapters::IndexDefinition) if defined? ::ActiveRecord::ConnectionAdapters::Mysql2IndexDefinition
     ::ActiveRecord::ConnectionAdapters::SchemaStatements.send(:include, SchemaPlus::ActiveRecord::ConnectionAdapters::SchemaStatements)
     ::ActiveRecord::ConnectionAdapters::TableDefinition.send(:include, SchemaPlus::ActiveRecord::ConnectionAdapters::TableDefinition)
   end

data/runspecs

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+
+RUBY_VERSIONS = %W[1.8.7 1.9.2]
+RAILS_VERSIONS = %W[3.0 3.1]
+
+options = {}
+OptionParser.new do |opts|
+    opts.banner = "Usage: #{$0} [options]"
+
+    opts.on("--install", "Install gem dependencies") do |v|
+        options[:install] = v
+    end
+end.parse!
+
+cmds = if options [:install]
+           ['bundle update']
+       else
+           ['bundle update --local rails mysql2 | egrep "rails|mysql2"', 'rake spec']
+       end
+
+n = 1
+total = RUBY_VERSIONS.size * RAILS_VERSIONS.size
+RUBY_VERSIONS.each do |ruby|
+    RAILS_VERSIONS.each do |rails|
+        puts "\n\n*** ruby version #{ruby} - rails version #{rails}  [#{n} of #{total}]\n\n"
+        n += 1
+        allcmds = []
+        allcmds << "rvm use #{ruby}"
+        allcmds << "export SCHEMA_PLUS_RAILS_VERSION=#{rails}"
+        allcmds += cmds
+        allcmds << 'exit'
+        system %Q{echo '#{allcmds.join(' \n ')}' | bash -i} or abort "aborting #{$0}"
+    end
+end

data/schema_plus.gemspec

@@ -23,12 +23,21 @@ Gem::Specification.new do |s|
   s.add_dependency("rails")
   s.add_dependency("valuable")
       
+  case ENV['SCHEMA_PLUS_RAILS_VERSION']
+  when '3.0'
+      s.add_development_dependency("rails", "~> 3.0")
+      s.add_development_dependency("mysql2", "~> 0.2.6")
+  when '3.1'
+      s.add_development_dependency("rails", ">= 3.1.0.rc1")
+      s.add_development_dependency("mysql2")
+  else
+      s.add_development_dependency("mysql2")
+  end
+
   s.add_development_dependency("rake", "~> 0.8.7")
-  s.add_development_dependency("rails", ">= 3.1.0.rc1")
   s.add_development_dependency("rspec")
   s.add_development_dependency("pg")
   s.add_development_dependency("mysql")
-  s.add_development_dependency("mysql2")
   s.add_development_dependency("sqlite3")
   s.add_development_dependency("simplecov")
   s.add_development_dependency("simplecov-gem-adapter")

data/spec/column_spec.rb

@@ -0,0 +1,99 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'models/user'
+
+describe "Column" do
+  let(:migration) { ::ActiveRecord::Migration }
+
+  context "regarding indexes" do
+
+    context "if not unique" do
+
+      before (:each) do 
+        create_table(User, :login => { :index => true})
+        @login = User.columns.find{|column| column.name == "login"}
+      end
+
+      it "should report not unique" do
+        @login.should_not be_unique
+      end
+
+      it "should report nil unique scope" do
+        create_table(User, :login => { :index => true})
+        @login.unique_scope.should be_nil
+      end
+    end
+
+    context "if unique single column" do
+      before (:each) do 
+        create_table(User, :login => { :index => :unique})
+        @login = User.columns.find{|column| column.name == "login"}
+      end
+
+      it "should report unique" do
+        @login.should be_unique
+      end
+
+      it "should report an empty unique scope" do
+        @login.unique_scope.should == []
+      end
+    end
+
+    context "if unique multicolumn" do
+
+      before (:each) do 
+        create_table(User, :first => {}, :middle => {}, :last => { :index => {:with => [:first, :middle], :unique => true}})
+        @first = User.columns.find{|column| column.name == "first"}
+        @middle = User.columns.find{|column| column.name == "middle"}
+        @last = User.columns.find{|column| column.name == "last"}
+      end
+
+      it "should report unique for each" do
+        @first.should be_unique
+        @middle.should be_unique
+        @last.should be_unique
+      end
+
+      it "should report unique scope for each" do
+        @first.unique_scope.should =~ %W[middle last]
+        @middle.unique_scope.should =~ %W[first last]
+        @last.unique_scope.should =~ %W[first middle]
+      end
+    end
+
+  end
+
+  context "regarding when it requires a value" do
+
+    it "not required if the column can be null" do
+      create_table(User, :login => { :null => true})
+      User.columns.find{|column| column.name == "login"}.required_on.should be_nil
+    end
+
+    it "must have a value on :save if there's no default" do
+      create_table(User, :login => { :null => false })
+      User.columns.find{|column| column.name == "login"}.required_on.should == :save
+    end
+
+    it "must have a value on :updae if there's default" do
+      create_table(User, :login => { :null => false, :default => "foo" })
+      User.columns.find{|column| column.name == "login"}.required_on.should == :update
+    end
+
+  end
+
+
+  protected
+
+  def create_table(model, columns_with_options)
+    migration.suppress_messages do
+      migration.create_table model.table_name, :force => true do |t|
+        columns_with_options.each_pair do |column, options|
+          t.send :string, column, options
+        end
+      end
+      model.reset_column_information
+    end
+  end
+
+end

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'
   }
 

data/spec/migration_spec.rb

@@ -46,6 +46,15 @@ describe ActiveRecord::Migration do
       @model.should have_index.on(:state)
     end
 
+    it "should create a unique index if specified on column" do
+      create_table(@model, :state => { :index => {:unique => true} }) 
+      @model.should have_unique_index.on(:state)
+    end
+    it "should create a unique index if specified on column using shorthand" do
+      create_table(@model, :state => { :index => :unique }) 
+      @model.should have_unique_index.on(:state)
+    end
+
     it "should create an index if specified explicitly" do
       create_table_opts(@model, {}, {:state => {}}, {:state => {}}) 
       @model.should have_index.on(:state)
@@ -250,6 +259,12 @@ describe ActiveRecord::Migration do
         end
       end
 
+      it "should create a unique index if specified by shorthand" do
+        add_column(:post_id, :integer, :index => :unique) do
+          @model.should have_unique_index.on(:post_id)
+        end
+      end
+
       it "should allow custom name for index" do
         index_name = 'comments_post_id_unique_index'
         add_column(:post_id, :integer, :index => { :unique => true, :name => index_name }) do

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: schema_plus
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 0.1.0.pre3
+  prerelease: true
+  segments: 
+  - 0
+  - 1
+  - 0
+  - pre4
+  version: 0.1.0.pre4
 platform: ruby
 authors: 
 - Ronen Barzel
@@ -11,17 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-17 00:00:00 -07:00
+date: 2011-07-25 00:00:00 +02: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
@@ -29,43 +35,49 @@ 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: rake
+  name: mysql2
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.7
+        segments: 
+        - 0
+        version: "0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.0.rc1
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -73,10 +85,11 @@ dependencies:
   name: pg
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -84,68 +97,50 @@ dependencies:
   name: mysql
   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: mysql2
+  name: sqlite3
   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: sqlite3
+  name: simplecov
   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
+  name: simplecov-gem-adapter
   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
@@ -177,12 +172,11 @@ files:
 - lib/schema_plus/active_record/migration.rb
 - lib/schema_plus/active_record/schema.rb
 - lib/schema_plus/active_record/schema_dumper.rb
-- lib/schema_plus/active_record/validations.rb
 - lib/schema_plus/railtie.rb
 - lib/schema_plus/version.rb
+- runspecs
 - schema_plus.gemspec
-- schema_plus.gemspec.rails3.0
-- schema_plus.gemspec.rails3.1
+- spec/column_spec.rb
 - spec/connections/mysql/connection.rb
 - spec/connections/mysql2/connection.rb
 - spec/connections/postgresql/connection.rb
@@ -207,7 +201,6 @@ files:
 - spec/support/matchers/have_index.rb
 - spec/support/matchers/reference.rb
 - spec/support/reference.rb
-- spec/validations_spec.rb
 - spec/views_spec.rb
 has_rdoc: true
 homepage: https://github.com/ronen/schema_plus
@@ -219,48 +212,27 @@ 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: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: schema_plus
-rubygems_version: 1.6.2
+rubygems_version: 1.3.6
 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: 
-- 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/extensions/active_model.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/validations_spec.rb
-- spec/views_spec.rb
+test_files: []
+

data/lib/schema_plus/active_record/validations.rb

@@ -1,139 +0,0 @@
-module SchemaPlus
-  module ActiveRecord
-      module Validations
-
-        def inherited(klass) #:nodoc:
-          if self == ::ActiveRecord::Base
-            klass.instance_eval do
-
-              # create a callback to load the validations before validation
-              # happens.  the callback deletes itself after use (just to
-              # eliminate the callback overhead).
-              before_validation :load_schema_validations
-              private
-              define_method :load_schema_validations do
-                self.class.send :load_schema_validations
-                self.class.skip_callback :validation, :before, :load_schema_validations
-              end
-            end
-          end
-          super
-        end
-
-        # Adds schema-based validations to model.
-        # Attributes as well as associations are validated.
-        # For instance if there is column
-        #
-        #     <code>email NOT NULL</code>
-        #
-        # defined at database-level it will be translated to
-        #
-        #     <code>validates_presence_of :email</code>
-        #
-        # If there is an association named <tt>user</tt>
-        # based on <tt>user_id NOT NULL</tt> it will be translated to
-        #
-        #     <code>validates_presence_of :user</code>
-        #
-        #  Note it uses the name of association (user) not the column name (user_id).
-        #  Only <tt>belongs_to</tt> associations are validated.
-        #
-        #  This accepts following options:
-        #  * :only - auto-validate only given attributes
-        #  * :except - auto-validate all but given attributes
-        #
-        def schema_plus(*) #:nodoc:
-          super
-          load_schema_validations
-        end
-
-        private
-
-        def load_schema_validations #:nodoc:
-          # Don't bother if: it's already been loaded; the class is abstract; not a base class; or the table doesn't exist
-          return unless create_schema_validations?
-          
-          load_column_validations
-          load_association_validations
-          @schema_validations_loaded = true
-        end
-
-        def load_column_validations #:nodoc:
-          content_columns.each do |column|
-            name = column.name.to_sym
-
-            # Data-type validation
-            if column.type == :integer
-              validate_logged :validates_numericality_of, name, :allow_nil => true, :only_integer => true
-            elsif column.number?
-              validate_logged :validates_numericality_of, name, :allow_nil => true
-            elsif column.text? && column.limit
-              validate_logged :validates_length_of, name, :allow_nil => true, :maximum => column.limit
-            end
-
-            # NOT NULL constraints
-            if column.required_on
-              if column.type == :boolean
-                validate_logged :validates_inclusion_of, name, :in => [true, false], :message => :blank
-              else
-                validate_logged :validates_presence_of, name
-              end
-            end
-
-            # UNIQUE constraints
-            add_uniqueness_validation(column) if column.unique?
-          end
-        end
-
-        def load_association_validations #:nodoc:
-          reflect_on_all_associations(:belongs_to).each do |association|
-            # :primary_key_name was deprecated (noisily) in rails 3.1
-            foreign_key_method = (association.respond_to? :foreign_key) ?  :foreign_key : :primary_key_name
-            column = columns_hash[association.send(foreign_key_method).to_s]
-            next unless column
-
-            # NOT NULL constraints
-            validate_logged :validates_presence_of, association.name if column.required_on
-
-            # UNIQUE constraints
-            add_uniqueness_validation(column) if column.unique?
-          end
-        end
-
-        def add_uniqueness_validation(column) #:nodoc:
-          scope = column.unique_scope.map(&:to_sym)
-          condition = :"#{column.name}_changed?"
-          name = column.name.to_sym
-          validate_logged :validates_uniqueness_of, name, :scope => scope, :allow_nil => true, :if => condition
-        end
-
-        def create_schema_validations? #:nodoc:
-          schema_plus_config.validations.auto_create? && !(@schema_validations_loaded || abstract_class? || name.blank? || !table_exists?)
-        end
-
-        def validate_logged(method, arg, opts={}) #:nodoc:
-          if _filter_validation(method, arg) 
-            msg = "SchemaPlus validations: #{self.name}.#{method} #{arg.inspect}"
-            msg += ", #{opts.inspect[1...-1]}" if opts.any?
-            logger.info msg
-            send method, arg, opts
-          end
-        end
-
-        def _filter_validation(macro, name) #:nodoc:
-          config = schema_plus_config.validations
-          types = [macro]
-          if match = macro.to_s.match(/^validates_(.*)_of$/) 
-            types << match[1].to_sym
-          end
-          return false if config.only        and not Array.wrap(config.only).include?(name)
-          return false if config.except      and     Array.wrap(config.except).include?(name)
-          return false if config.only_type   and not (Array.wrap(config.only_type) & types).any?
-          return false if config.except_type and     (Array.wrap(config.except_type) & types).any?
-          return true
-        end
-
-      end
-
-    end
-  end

data/schema_plus.gemspec.rails3.0

@@ -1,36 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "schema_plus/version"
-
-Gem::Specification.new do |s|
-  s.name        = "schema_plus"
-  s.version     = SchemaPlus::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Ronen Barzel", "Michał Łomnicki"]
-  s.email       = ["ronen@barzel.org", "michal.lomnicki@gmail.com"]
-  s.homepage    = "https://github.com/ronen/schema_plus"
-  s.summary     = "Enhances ActiveRecord schema mechanism, including more DRY index creation and support for foreign key constraints and views."
-  s.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."
-
-  s.rubyforge_project = "schema_plus"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  s.add_dependency("rails")
-  s.add_dependency("valuable")
-      
-  s.add_development_dependency("rake", "~> 0.8.7")
-  s.add_development_dependency("rails", "~> 3.0")
-  s.add_development_dependency("rspec")
-  s.add_development_dependency("pg")
-  s.add_development_dependency("mysql")
-  s.add_development_dependency("mysql2", "0.2.6")
-  s.add_development_dependency("sqlite3")
-  s.add_development_dependency("simplecov")
-  s.add_development_dependency("simplecov-gem-adapter")
-  s.add_development_dependency("ruby-debug19") if RUBY_VERSION >= "1.9.2"
-end
-

data/schema_plus.gemspec.rails3.1

@@ -1,36 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "schema_plus/version"
-
-Gem::Specification.new do |s|
-  s.name        = "schema_plus"
-  s.version     = SchemaPlus::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Ronen Barzel", "Michał Łomnicki"]
-  s.email       = ["ronen@barzel.org", "michal.lomnicki@gmail.com"]
-  s.homepage    = "https://github.com/ronen/schema_plus"
-  s.summary     = "Provides ActiveRecord support for foreign keys, database defined validations and associations."
-  s.description = "SchemaPlus is an ActiveRecord extension that provides support for defining foreign keys and indexes in database migrations and schemas, as well as for defining model validations and associations based on the database."
-
-  s.rubyforge_project = "schema_plus"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  s.add_dependency("rails")
-  s.add_dependency("valuable")
-      
-  s.add_development_dependency("rake", "~> 0.8.7")
-  s.add_development_dependency("rails", ">= 3.1.0.rc1")
-  s.add_development_dependency("rspec")
-  s.add_development_dependency("pg")
-  s.add_development_dependency("mysql")
-  s.add_development_dependency("mysql2")
-  s.add_development_dependency("sqlite3")
-  s.add_development_dependency("simplecov")
-  s.add_development_dependency("simplecov-gem-adapter")
-  s.add_development_dependency("ruby-debug19") if RUBY_VERSION >= "1.9.2"
-end
-

data/spec/validations_spec.rb

@@ -1,292 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Validations" do
-
-  before(:all) do
-    define_schema
-  end
-
-  after(:each) do
-    remove_all_models
-  end
-
-  context "auto-created" do
-    before(:each) do
-      with_auto_validations do
-        class Article < ActiveRecord::Base ; end
-
-        class Review < ActiveRecord::Base
-          belongs_to :article
-          belongs_to :news_article, :class_name => 'Article', :foreign_key => :article_id
-          schema_plus :validations => { :except => :content }
-        end
-      end
-    end
-
-    it "should be valid with valid attributes" do
-      Article.new(valid_attributes).should be_valid
-    end
-
-    it "should validate content presence" do
-      post = Article.new.should have(1).error_on(:content)
-    end
-
-    it "should check title length" do
-      Article.new(:title => 'a' * 100).should have(1).error_on(:title)
-    end
-
-    it "should validate state numericality" do
-      Article.new(:state => 'unknown').should have(1).error_on(:state)
-    end
-
-    it "should validate if state is integer" do
-      Article.new(:state => 1.23).should have(1).error_on(:state)
-    end
-
-    it "should validate average_mark numericality" do
-      Article.new(:average_mark => "high").should have(1).error_on(:average_mark)
-    end
-
-    it "should validate boolean fields" do
-      Article.new(:active => nil).should have(1).error_on(:active)
-    end
-
-    it "should validate title uniqueness" do
-      article1 = Article.create(valid_attributes)
-      article2 = Article.new(:title => valid_attributes[:title])
-      article2.should have(1).error_on(:title)
-      article1.destroy
-    end
-
-    it "should validate state uniqueness in scope of 'active' value" do
-      article1 = Article.create(valid_attributes)
-      article2 = Article.new(valid_attributes.merge(:title => 'SchemaPlus 2.0 released'))
-      article2.should_not be_valid
-      article2.toggle(:active)
-      article2.should be_valid
-      article1.destroy
-    end
-
-    it "should validate presence of belongs_to association" do
-      review = Review.new
-      review.should have(1).error_on(:article)
-    end
-
-    it "should validate uniqueness of belongs_to association" do
-      article = Article.create(valid_attributes)
-      article.should be_valid
-      review1 = Review.create(:article => article, :author => 'michal')
-      review1.should be_valid
-      review2 = Review.new(:article => article, :author => 'michal')
-      review2.should have_at_least(1).error_on(:article_id)
-    end
-
-    it "should validate associations with unmatched column and name" do
-      Review.new.should have(1).error_on(:news_article)
-    end
-
-    def valid_attributes
-      {
-        :title => 'SchemaPlus released!',
-        :content => "Database matters. Get full use of it but don't write unecessary code. Get SchemaPlus!",
-        :state => 3,
-        :average_mark => 9.78,
-        :active => true
-      }
-    end
-
-  end
-
-  context "auto-created but changed" do
-    before(:each) do
-      with_auto_validations do
-        class Article < ActiveRecord::Base ; end
-        class Review < ActiveRecord::Base
-          belongs_to :article
-          belongs_to :news_article, :class_name => 'Article', :foreign_key => :article_id
-        end
-      end
-      too_big_content = 'a' * 1000
-      @review = Review.new(:content => too_big_content)
-    end
-
-    it "would normally have an error" do
-      @review.should have(1).error_on(:content)
-      @review.should have(1).error_on(:author)
-    end
-
-    it "shouldn't validate fields passed to :except option" do
-      Review.schema_plus :validations => { :except => :content }
-      @review.should have(:no).errors_on(:content)
-      @review.should have(1).error_on(:author)
-    end
-
-    it "shouldn't validate types passed to :except_type option using full validation" do
-      Review.schema_plus :validations => { :except_type => :validates_length_of }
-      @review.should have(:no).errors_on(:content)
-      @review.should have(1).error_on(:author)
-    end
-
-    it "shouldn't validate types passed to :except_type option using shorthand" do
-      Review.schema_plus :validations => { :except_type => :length }
-      @review.should have(:no).errors_on(:content)
-      @review.should have(1).error_on(:author)
-    end
-
-    it "should only validate type passed to :only_type option" do
-      Review.schema_plus :validations => { :only_type => :length }
-      @review.should have(1).error_on(:content)
-      @review.should have(:no).errors_on(:author)
-    end
-
-
-    it "shouldn't create validations if locally disabled" do
-      Review.schema_plus :validations => { :auto_create => false }
-      @review.should have(:no).errors_on(:content)
-      @review.should have(:no).error_on(:author)
-    end
-  end
-
-  context "auto-created disabled" do
-    around(:each) do |example|
-      with_auto_validations(false, &example)
-    end
-
-    before(:each) do
-      class Article < ActiveRecord::Base ; end
-
-      class Review < ActiveRecord::Base
-        belongs_to :article
-        belongs_to :news_article, :class_name => 'Article', :foreign_key => :article_id
-      end
-      too_big_content = 'a' * 1000
-      @review = Review.new(:content => too_big_content)
-    end
-
-    it "should not create validation" do
-      @review.should have(:no).errors_on(:content)
-    end
-
-    it "should create validation if locally enabled" do
-      Review.schema_plus :validations => { :auto_create => true }
-      @review.should have(1).error_on(:content)
-    end
-
-  end
-
-  context "manually invoked" do
-    before(:each) do
-      class Article < ActiveRecord::Base ; end
-      Article.schema_plus :validations => { :only => [:title, :state] }
-
-      class Review < ActiveRecord::Base
-        belongs_to :dummy_association
-        schema_plus :validations => { :except => :content }
-      end
-    end
-
-    it "should validate fields passed to :only option" do
-      too_big_title = 'a' * 100
-      wrong_state = 'unknown'
-      article = Article.new(:title => too_big_title, :state => wrong_state)
-      article.should have(1).error_on(:title)
-      article.should have(1).error_on(:state)
-    end
-
-    it "shouldn't validate skipped fields" do
-      article = Article.new
-      article.should have(:no).errors_on(:content)
-      article.should have(:no).errors_on(:average_mark)
-    end
-
-    it "shouldn't validate association on unexisting column" do
-      Review.new.should have(:no).errors_on(:dummy_association)
-    end
-
-    it "shouldn't validate fields passed to :except option" do
-      Review.new.should have(:no).errors_on(:content)
-    end
-
-    it "should validate all fields but passed to :except option" do
-      Review.new.should have(1).error_on(:author)
-    end
-
-  end
-
-  context "manually invoked" do
-    before(:each) do
-      class Review < ActiveRecord::Base
-        belongs_to :article
-      end
-      @columns = Review.content_columns.dup
-      Review.schema_plus :validations => { :only => [:title] }
-    end
-
-    it "shouldn't validate associations not included in :only option" do
-      Review.new.should have(:no).errors_on(:article)
-    end
-
-    it "shouldn't change content columns of the model" do
-      @columns.should == Review.content_columns
-    end
-
-  end
-
-  context "when used with STI" do
-    around(:each) { |example| with_auto_validations(&example) }
-
-    it "should set validations on base class" do
-      class Review < ActiveRecord::Base ; end
-      class PremiumReview < Review ; end
-      PremiumReview.new
-      Review.new.should have(1).error_on(:author)
-    end
-
-    it "shouldn't create doubled validations" do
-      class Review < ActiveRecord::Base ; end
-      Review.new
-      class PremiumReview < Review ; end
-      PremiumReview.new.should have(1).error_on(:author)
-    end
-
-  end
-
-  protected
-  def with_auto_validations(value = true)
-    old_value = SchemaPlus.config.validations.auto_create
-    begin
-      SchemaPlus.config.validations.auto_create = value
-      yield
-    ensure
-      SchemaPlus.config.validations.auto_create = old_value
-    end
-  end
-
-  def define_schema
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Schema.define do
-        connection.tables.each do |table| drop_table table end
-
-        create_table :articles, :force => true do |t|
-          t.string :title, :limit => 50
-          t.text  :content, :null => false
-          t.integer :state
-          t.float   :average_mark, :null => false
-          t.boolean :active, :null => false
-        end
-        add_index :articles, :title, :unique => true
-        add_index :articles, [:state, :active], :unique => true
-
-        create_table :reviews, :force => true do |t|
-          t.integer :article_id, :null => false
-          t.string :author, :null => false
-          t.string :content, :limit => 200
-          t.string :type
-        end
-        add_index :reviews, :article_id, :unique => true
-
-      end
-    end
-  end
-
-end