schema_validations 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a393a0d55876bd8f8e7564c4697d49e39192a253
-  data.tar.gz: da40a15493d7ee658427ad9b8fa84d55b18cf1c5
+  metadata.gz: 6ea33d2335e1af126b8d168661412173f65bd12c
+  data.tar.gz: 91b7ba79752b866df0c1184356f5aa9f43ec311f
 SHA512:
-  metadata.gz: 46e9332822a7060a8815c85607a5879299b69626ceffa5cf5702d28272557f62341ae0e6af197841bbf398e985c8726d0eac7d5a7645adeaf75658d7d28e5644
-  data.tar.gz: ff590cab2b092c7cc5cdfb75bfe0a5acfc5235a6e8ef787a807550cc1b1fb2072d804447bedbe67df08cd2c2005ba316e18278fa0e8d8adc7a2dbc83fbc9c974
+  metadata.gz: f5d11da519e0fab53b9d494e0e51b203b7a593c22c35e1d68f92a2c442185dd703ea96461566bbb7723b285fe4194db2863f5de3a5d4f2550dbdf3c5831d480b
+  data.tar.gz: 27d023e4d31824c6f85444cdefc34d15002da1efd1f252960c5cb961a1f04abd5cf870d556e9e087baa0361bc993a947eb35fcd18090a6168161e6c23171142f

data/.gitignore

@@ -22,6 +22,7 @@ pkg
 .rvmrc
 *.log
 tmp/
+Gemfile.local
 Gemfile.lock
 gemfiles/*.lock
 gemfiles/**/*.lock

data/.travis.yml

@@ -5,10 +5,14 @@
 ---
 sudo: false
 rvm:
-- 1.9.3
 - 2.1.5
 gemfile:
-- gemfiles/rails-3.2/Gemfile.sqlite3
-- gemfiles/rails-4.1/Gemfile.sqlite3
-- gemfiles/rails-4.2/Gemfile.sqlite3
+- gemfiles/activerecord-4.2.1/Gemfile.mysql2
+- gemfiles/activerecord-4.2.1/Gemfile.postgresql
+- gemfiles/activerecord-4.2.1/Gemfile.sqlite3
+env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
+addons:
+  postgresql: '9.4'
+before_script: bundle exec rake create_databases
+after_script: bundle exec rake drop_databases
 script: bundle exec rake travis

data/README.md

@@ -45,17 +45,24 @@ hood.
 
 ## Compatibility
 
-SchemaValidations is tested on all combinations of:
+As of version 1.2.0, SchemaValidations supports and is tested on:
 
-*   rails 3.2, 4.1, and 4.2
-*   MRI ruby 1.9.3 and 2.1.5)'s
-config.
+<!-- SCHEMA_DEV: MATRIX - begin -->
+<!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
+* ruby **2.1.5** with activerecord **4.2.1**, using **mysql2**, **postgresql** or **sqlite3**
+
+<!-- SCHEMA_DEV: MATRIX - end -->
+
+Earlier versions of SchemaValidations supported:
+
+*   rails 3.2, 4.1, and 4.2.0
+*   MRI ruby 1.9.3 and 2.1.5
 
 ## Installation
 
 Simply add schema_validations to your Gemfile.
 
-    gem "schema_validations"            
+    gem "schema_validations"
 
 ### What if I want something special?
 
@@ -105,15 +112,6 @@ Data types:
 | :float             | :validates ... :numericality => true                      |
 | :integer           | :validates ... :numericality => { :only_integer => true } |
 
-## Dependency
-
-SchemaValidations uses the [schema_plus](http://rubygems.org/gems/schema_plus)
-gem for its schema queries.  That gem will by default auto-create foreign key
-constraints that you probably want -- but if you don't want them, you can
-disable them using [schema_plus](http://rubygems.org/gems/schema_plus
-
-
-
 ## How do I know what it did?
 If you're curious (or dubious) about what validations SchemaValidations
 defines, you can check the log file.  For every assocation that
@@ -133,6 +131,10 @@ use case.
 
 ## Release Notes
 
+### 1.2.0
+
+* No longer pull in schema_plus's auto-foreign key behavior. Limited to AR >= 4.2.1
+
 ### 1.1.0
 
 * Works with Rails 4.2.
@@ -147,7 +149,7 @@ use case.
 * No longer support Rails < 3.2 or Ruby < 1.9.3
 
 ### 0.2.2
-    
+
 * Rails 2.3 compatibility (check for Rails::Railties symbol).  thanks to https://github.com/thehappycoder
 
 ### 0.2.0
@@ -165,14 +167,30 @@ use case.
 
 ## Testing
 
-SchemaValidations is tested against the matrix of combinations.  To run the full combo of
-tests, after you've forked & cloned: 
+Are you interested in contributing to schema_validations?  Thanks!  Please follow
+the standard protocol: fork, feature branch, develop, push, and issue pull request.
+
+Some things to know about to help you develop and test:
+
+<!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_DEV - begin -->
+<!-- These lines are auto-inserted from a schema_dev template -->
+* **schema_dev**:  SchemaValidations uses [schema_dev](https://github.com/SchemaPlus/schema_dev) to
+  facilitate running rspec tests on the matrix of ruby, activerecord, and database
+  versions that the gem supports, both locally and on
+  [travis-ci](http://travis-ci.org/SchemaPlus/schema_validations)
+
+  To to run rspec locally on the full matrix, do:
+
+        $ schema_dev bundle install
+        $ schema_dev rspec
+
+  You can also run on just one configuration at a time;  For info, see `schema_dev --help` or the [schema_dev](https://github.com/SchemaPlus/schema_dev) README.
+
+  The matrix of configurations is specified in `schema_dev.yml` in
+  the project root.
 
-    $ cd schema_validations
-    $ schema_dev bundle install
-    $ schema_dev rspec
 
-For more info, see [schema_dev](https://github.com/SchemaPlus/schema_dev)
+<!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_DEV - end -->
 
 Code coverage results will be in coverage/index.html -- it should be at 100% coverage.
 

data/gemfiles/Gemfile.base

@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
 gemspec :path => File.expand_path('..', __FILE__)
 
-platform :ruby do
-    gem "byebug" if RUBY_VERSION > "2"
-end
+File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local

data/gemfiles/{rails-3.2 → activerecord-4.2.1}/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "rails", "~> 3.2.0"
+gem "activerecord", "4.2.1"

data/gemfiles/{rails-3.2/Gemfile.sqlite3 → activerecord-4.2.1/Gemfile.mysql2}

@@ -2,9 +2,9 @@ require "pathname"
 eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
 
 platform :ruby do
-  gem "sqlite3"
+  gem "mysql2"
 end
 
 platform :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
-end
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/{rails-4.1/Gemfile.sqlite3 → activerecord-4.2.1/Gemfile.postgresql}

@@ -2,9 +2,9 @@ require "pathname"
 eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
 
 platform :ruby do
-  gem "sqlite3"
+  gem "pg"
 end
 
 platform :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
-end
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/lib/schema_validations/active_record/validations.rb

@@ -100,8 +100,7 @@ module SchemaValidations
                      when respond_to?(:defined_enums) && defined_enums.has_key?(column.name) then :enum
                      when column.type == :integer then :integer
                      when column.number? then :numeric
-                     when column.respond_to?(:text?) && column.text? then :text
-                     when [:string, :text].include?(column.type) then :text
+                     when column.text? then :text
                      when column.type == :boolean then :boolean
                      end
 
@@ -155,7 +154,7 @@ module SchemaValidations
       end
 
       def validate_logged(method, arg, opts={}) #:nodoc:
-        if _filter_validation(method, arg) 
+        if _filter_validation(method, arg)
           msg = "[schema_validations] #{self.name}.#{method} #{arg.inspect}"
           msg += ", #{opts.inspect[1...-1]}" if opts.any?
           logger.info msg
@@ -166,7 +165,7 @@ module SchemaValidations
       def _filter_validation(macro, name) #:nodoc:
         config = schema_validations_config
         types = [macro]
-        if match = macro.to_s.match(/^validates_(.*)_of$/) 
+        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)

data/lib/schema_validations/version.rb

@@ -1,3 +1,3 @@
 module SchemaValidations
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/schema_validations.rb

@@ -1,6 +1,6 @@
 require 'valuable'
 
-require 'schema_plus'
+require 'schema_plus_columns'
 require 'schema_validations/version'
 require 'schema_validations/active_record/validations'
 require 'schema_validations/railtie' if defined?(Rails::Railtie)

data/schema_dev.yml

@@ -1,8 +1,8 @@
 ruby:
-  - 1.9.3
   - 2.1.5
-rails:
-  - 3.2
-  - 4.1
-  - 4.2
-db: sqlite3
+activerecord:
+  - 4.2.1
+db:
+  - mysql2
+  - postgresql
+  - sqlite3

data/schema_validations.gemspec

@@ -20,9 +20,11 @@ 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("schema_plus")
+  s.add_dependency("schema_plus_columns")
+  s.add_dependency("activerecord", "~> 4.2", ">= 4.2.1")
+  s.add_dependency("valuable")
       
-  s.add_development_dependency("schema_dev", "~> 1.2")
+  s.add_development_dependency("schema_dev", "~> 3.5")
   s.add_development_dependency("rake")
   s.add_development_dependency("rdoc")
   s.add_development_dependency("rspec")

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ require 'schema_dev/rspec'
 require 'database_cleaner'
 DatabaseCleaner.strategy = :truncation
 
-SchemaDev::Rspec.setup_db
+SchemaDev::Rspec.setup
 
 RSpec.configure do |config|
   config.before(:each) do

data/spec/validations_spec.rb

@@ -34,9 +34,11 @@ describe "Validations" do
     end
 
     it "should create validations for introspection with validators_on" do
-      expect(Article.validators_on(:content).map{|v| v.class.name.demodulize}.uniq).to match_array(%W[
-        PresenceValidator
-      ])
+      expected = case
+                 when SchemaDev::Rspec::Helpers.mysql? then %W[PresenceValidator LengthValidator]
+                 else %W[PresenceValidator]
+                 end
+      expect(Article.validators_on(:content).map{|v| v.class.name.demodulize}.uniq).to match_array(expected)
     end
 
     it "should be valid with valid attributes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_validations
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,10 +9,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: schema_plus
+  name: schema_plus_columns
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.1
+- !ruby/object:Gem::Dependency
+  name: valuable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -31,14 +65,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -141,12 +175,10 @@ files:
 - README.md
 - Rakefile
 - gemfiles/Gemfile.base
-- gemfiles/rails-3.2/Gemfile.base
-- gemfiles/rails-3.2/Gemfile.sqlite3
-- gemfiles/rails-4.1/Gemfile.base
-- gemfiles/rails-4.1/Gemfile.sqlite3
-- gemfiles/rails-4.2/Gemfile.base
-- gemfiles/rails-4.2/Gemfile.sqlite3
+- gemfiles/activerecord-4.2.1/Gemfile.base
+- gemfiles/activerecord-4.2.1/Gemfile.mysql2
+- gemfiles/activerecord-4.2.1/Gemfile.postgresql
+- gemfiles/activerecord-4.2.1/Gemfile.sqlite3
 - init.rb
 - lib/schema_validations.rb
 - lib/schema_validations/active_record/validations.rb

data/gemfiles/rails-4.1/Gemfile.base

@@ -1,3 +0,0 @@
-eval File.read File.expand_path('../../Gemfile.base', __FILE__)
-
-gem "rails", "~> 4.1.0"

data/gemfiles/rails-4.2/Gemfile.base

@@ -1,3 +0,0 @@
-eval File.read File.expand_path('../../Gemfile.base', __FILE__)
-
-gem "rails", "~> 4.2.0"