valle 0.1.0 → 0.2.0

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
 branches:
   only:
     - master

data/CHANGELOG.md

@@ -1,7 +1,11 @@
+## 0.2.0 / 2013-11-16
+
+* added attributes option [Anton Kalyaev]
+
 ## 0.1.0 / 2013-11-08
 
 * fixed Stack too deep error [Anton Kalyaev]
-* fixed enabled option [Anton Kalyaev]
+* enabled option now works [Anton Kalyaev]
 * fixed db:migrate error [Anton Kalyaev]
 * dot not override AR#valid? method [Anton Kalyaev]
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Anton Kalyaev
+Copyright (c) 2012 - 2013 Anton Kalyaev
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -17,6 +17,11 @@ Example:
     PG::Error: ERROR:  value "2147483648" is out of range for type integer
     : SELECT  "users".* FROM "users"  WHERE "users"."id" = $1 LIMIT 1
 
+### Supported Rails
+
+- 3.x
+- 4.x
+
 ### Supported ActiveRecord field types
 
 - `:primary_key`
@@ -55,6 +60,20 @@ Also, you should be able to turn it off temporary by setting `enabled` option to
       config.enabled = false
     end
 
+### Disabling gem for some attributes
+
+There are cases where you need to skip validation for a particular
+attribute (see [#4](https://github.com/kaize/valle/issues/4)). For
+example, CarrierWave stores his images temporarily in attributes, so calling
+`save` on them will fail because of LengthValidator (255 chars maximum).
+You can disable this gem for such fields using `attributes` option.
+
+    Valle.configure do |config|
+      config.attributes = {
+        'User' => %w(id name) # Model => Array of attributes to validate
+      }
+    end
+
 ## Alternatives
 
 There is a similar gem, called [validates_lengths_from_database](http://github.com/rubiety/validates_lengths_from_database). It solves only one part -

data/features/configuration.feature

@@ -77,3 +77,30 @@ Feature:
       """
     When I successfully run `bundle exec rake test --trace`
     Then the output should contain "2 tests, 3 assertions, 0 failures, 0 errors"
+
+  Scenario: Using attributes option should allow us to skip some attributes
+    When I write to "config/initializers/valle.rb" with:
+      """
+      Valle.configure do |config|
+        config.attributes = {
+          'User' => %w(id)
+        }
+      end
+      """
+    And I write to "test/unit/user_test.rb" with:
+      """
+      require 'test_helper'
+
+      class UserTest < ActiveSupport::TestCase
+        test "should raise ActiveRecord::StatementInvalid error when name is too long" do
+          user = FactoryGirl.create(:user)
+          user.name = 'a' * 256
+
+          # SQLLite3 do not throw an ActiveRecord::StatementInvalid error
+          # so just check that record gets saved
+          assert user.save
+        end
+      end
+      """
+    When I successfully run `bundle exec rake test --trace`
+    Then the output should contain "1 tests, 1 assertions, 0 failures, 0 errors"

data/lib/valle.rb

@@ -43,8 +43,23 @@ module Valle
       options[:models].nil? ||
         options[:models].is_a?(Array) && options[:models].include?(model_name)
     end
+
+    ##
+    # Can we process this attribute
+    #
+    # If the user wants to skip some attributes, we need to check
+    # whether we should add validators to column or not.
+    #
+    # @param [String] model_name model name
+    # @param [String] attribute attribute name
+    # @see Valle::Configuration
+    #
+    def can_process_column?(model_name, attribute)
+      !options[:attributes].has_key?(model_name) ||
+        options[:attributes][model_name].is_a?(Array) && options[:attributes][model_name].include?(attribute)
+    end
   end
 end
 
-## if not using Railtie, call `Valle::Hooks.init` directly
+# if not using Railtie, call `Valle::Hooks.init` directly
 require 'valle/railtie' if defined? Rails

data/lib/valle/configuration.rb

@@ -1,5 +1,5 @@
-# TODO [AK 09/12/12] maybe we should use ActiveSupport::Configurable ?
 require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/hash_with_indifferent_access'
 
 module Valle
   module Configuration
@@ -8,7 +8,8 @@ module Valle
 
     self.options = {
       enabled: true, # gem is enabled by default
-      models: nil # nil means to select all the AR models
+      models: nil, # selects all AR models by default
+      attributes: ActiveSupport::HashWithIndifferentAccess.new, # adds validators to all attributes by default
     }
 
     def configure
@@ -22,5 +23,9 @@ module Valle
     def models=(collection)
       self.options[:models] = collection
     end
+
+    def attributes=(mapping)
+      self.options[:attributes] = mapping
+    end
   end
 end

data/lib/valle/manager.rb

@@ -11,10 +11,13 @@ module Valle
       def add_validators(klass)
         columns = klass.columns
         columns.each do |original_column|
+          next unless Valle.can_process_column?(klass.model_name.to_s, original_column.name)
+
           column = AbstractAdapter::ColumnWrapper.wrap(original_column)
           ValidationSetter.add_validator(column, klass)
         end
       end
+
     end
   end
 end

data/lib/valle/version.rb

@@ -1,3 +1,3 @@
 module Valle
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/valle.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Valle automatically sets minimum and maximum values for the fields of your ActiveRecord model(s), so you shouldn't worry, that string length or ID value will exceed the permissible limit.}
   gem.summary       = %q{Built-in limit validations for your ActiveRecord model.}
   gem.homepage      = "http://github.com/kaize/valle"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valle
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -80,7 +80,8 @@ files:
 - test/test_helper.rb
 - valle.gemspec
 homepage: http://github.com/kaize/valle
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -93,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1785766048281463164
+      hash: 1784568943326759879
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -102,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1785766048281463164
+      hash: 1784568943326759879
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24