schema_validations 0.1.1 → 0.1.2

data/README.rdoc

@@ -37,7 +37,7 @@ Simply add schema_validations to your Gemfile.
 
     gem "schema_validations"
 
-== What if I want something special?
+=== What if I want something special?
 
 SchemaValidations is highly customizable. You can configure behavior
 globally via SchemaValidations.setup or per-model via
@@ -50,6 +50,24 @@ SchemaValidations::ActiveRecord::schema_validations, such as:
 
 See SchemaValidations::Config for the available options.
 
+=== This seems cool, but I'm worried about too much automagic
+
+You can globally turn off automatic creation in
+<tt>config/initializers/schema_validations.rb</tt>:
+
+  SchemaValidations.setup do |config|
+    config.auto_create = false
+  end
+
+Then in any model where you want automatic validations, just do
+
+  class Post < ActiveRecord::Base
+    schema_validations
+  end
+
+You can also pass options as per above.
+
+
 == Which validations are covered?
 
 Constraints:
@@ -112,7 +130,7 @@ full combo of tests, after you've forked & cloned:
   $ ./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:
+See <tt>./runspecs --help</tt> for other options.  You can also pick a specific version of rails and ruby to use, such as:
   $ rvm use 1.9.2
   $ export SCHEMA_VALIDATIONS_RAILS_VERSION=3.1
   $ bundle update --local rails

data/lib/schema_validations/active_record/validations.rb

@@ -14,10 +14,28 @@ module SchemaValidations
 
       # Per-model override of Config options.  Use via, e.g.
       #     class MyModel < ActiveRecord::Base
-      #         schema_associations :auto_create => false
+      #         schema_validations :auto_create => false
       #     end
-      def schema_validations(opts)
-        @schema_validations_config = SchemaValidations.config.merge(opts)
+      #
+      # If <tt>:auto_create</tt> is not specified, it is implicitly
+      # specified as true.  This allows the "non-invasive" style of using
+      # SchemaValidations in which you set the global Config to
+      # <tt>auto_create = false</tt>, then in any model that you want auto
+      # validations you simply do:
+      #
+      #     class MyModel < ActiveRecord::Base
+      #         schema_validations
+      #     end
+      #
+      #  Of course other options can be passed, such as
+      #
+      #     class MyModel < ActiveRecord::Base
+      #         schema_validations :except_type => :validates_presence_of
+      #     end
+      #
+      #
+      def schema_validations(opts={})
+        @schema_validations_config = SchemaValidations.config.merge({:auto_create => true}.merge(opts))
       end
 
       def schema_validations_config # :nodoc:

data/lib/schema_validations/version.rb

@@ -1,3 +1,3 @@
 module SchemaValidations
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/runspecs

@@ -1,36 +1,58 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
+require 'ostruct'
+
+PROJECT = File.basename(File.expand_path('..', __FILE__))
 
 RUBY_VERSIONS = %W[1.8.7 1.9.2]
 RAILS_VERSIONS = %W[2.3 3.0 3.1]
 
-options = {}
+o = OpenStruct.new
+o.ruby_versions = RUBY_VERSIONS
+o.rails_versions = RAILS_VERSIONS
+o.run_cmd = "rake spec"
+
 OptionParser.new do |opts|
     opts.banner = "Usage: #{$0} [options]"
 
     opts.on("--install", "Install gem dependencies") do |v|
-        options[:install] = v
+        o.install = v
+    end
+
+    opts.on("--ruby version", String, "Choose which version(s) of ruby to run.  Default is: #{o.ruby_versions.join(' ')}") do |ruby|
+        o.ruby_versions = ruby.split(' ')
+    end
+
+    opts.on("--rails version", String, "Choose which version(s) of rails to run.  Default is: #{o.rails_versions.join(' ')}") do |rails|
+        o.rails_versions = rails.split(' ')
+    end
+
+    opts.on("--quick", "quick run ruby #{RUBY_VERSIONS.last} and rails #{RAILS_VERSIONS.last}") do
+      o.ruby_versions  = [RUBY_VERSIONS.last]
+      o.rails_versions = [RAILS_VERSIONS.last]
     end
+
 end.parse!
 
-cmds = if options [:install]
+cmds = if o.install
            ['bundle update']
        else
-           ['bundle update --local rails | grep rails', 'rake spec']
+           ['bundle update --local rails | grep rails', o.run_cmd]
        end
 
 n = 1
-total = RUBY_VERSIONS.size * RAILS_VERSIONS.size
-RUBY_VERSIONS.each do |ruby|
-    RAILS_VERSIONS.each do |rails|
+total = o.ruby_versions.size * o.rails_versions.size
+o.ruby_versions.each do |ruby|
+    o.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_VALIDATIONS_RAILS_VERSION=#{rails}"
+        allcmds << "export #{PROJECT.upcase}_RAILS_VERSION=#{rails}"
         allcmds += cmds
         allcmds << 'exit'
         system %Q{echo '#{allcmds.join(' \n ')}' | bash -i} or abort "aborting #{$0}"
     end
 end
+

data/spec/connection.rb

@@ -3,11 +3,12 @@ require 'logger'
 ActiveRecord::Base.logger = Logger.new(File.open("sqlite3.log", "w"))
 
 ActiveRecord::Base.configurations = {
-  'schema_plus' => {
+  'schema_validations' => {
     :adapter => 'sqlite3',
-    :database => File.expand_path('schema_plus.sqlite3', File.dirname(__FILE__)),
+    :database => File.expand_path('schema_validations.sqlite3', File.dirname(__FILE__)),
   }
 
 }
 
-ActiveRecord::Base.establish_connection 'schema_plus'
+ActiveRecord::Base.establish_connection 'schema_validations'
+ActiveRecord::Base.connection.execute "PRAGMA synchronous = OFF"

data/spec/validations_spec.rb

@@ -169,11 +169,16 @@ describe "Validations" do
       Review.new(:content => @too_big_title).should have(:no).errors_on(:content)
     end
 
-    it "should create validation if locally enabled" do
+    it "should create validation if locally enabled explicitly" do
       Review.schema_validations :auto_create => true
       Review.new(:content => @too_big_content).should have(1).error_on(:content)
     end
 
+    it "should create validation if locally enabled implicitly" do
+      Review.schema_validations
+      Review.new(:content => @too_big_content).should have(1).error_on(:content)
+    end
+
   end
 
   context "manually invoked" do

metadata

@@ -2,7 +2,7 @@
 name: schema_validations
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ronen Barzel
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-28 00:00:00 -07:00
+date: 2011-08-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,29 +26,29 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.3"
+        version: 0.8.7
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.7
+        version: "0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: sqlite3
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -59,7 +59,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: simplecov
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -70,7 +70,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: simplecov-gem-adapter
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -81,7 +81,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: simplecov-gem-adapter
+  name: ruby-debug19
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -91,17 +91,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id008
 description: SchemaValidations extends ActiveRecord to automatically create validations by inspecting the database schema. This makes your models more DRY as you no longer need to duplicate NOT NULL, unique, numeric and varchar constraints on the model level.
 email: 
 - ronen@barzel.org