validates_subset 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ac3e5de7a80d20cdddb2d41527f9228a767cc5f
-  data.tar.gz: 7fbf538b71f54145550823de261b4ac6fb356b7e
+  metadata.gz: 5b8541c955ec99c6f3927a09fe5b529ec4731283
+  data.tar.gz: f345e04b8700cc02bab8f7275566994cabf72fec
 SHA512:
-  metadata.gz: 4f8b260d9e133cd883f4bede331137c57aa51a68ea7883a026e5c6c5306cc2c822584b6c2d4870cb02f0027f1d6fba8d739025e6ba3592a8effc62751ebf5ccb
-  data.tar.gz: aec647c12952a02a976d09fd4c84c4c2b6629b66a40db0dd45eea4d74cd23fa6b616b59c8005680ebfb7ce5949893cc5777623a6310739b05f969b4511e753aa
+  metadata.gz: 4c9780c06be8db238014e199d8dd1ed70c87cca86e88eaf1fd512ec8cea7c2cc1111c30dc61b53f8d74436a563c8be1fb5eeef1ee6c4c39dd5bfe46305f322ac
+  data.tar.gz: b9c6e67b0cd46f8a49d82ecb06f1c119baf54e8ad852d9ba159dd85dbbcdee27498d87e192b96ef0193a33823b7e390920b100f80eb6263a510735be4895ce3f

data/.gitignore

@@ -1 +1,2 @@
 .ruby-*
+*.gem

data/.travis.yml

@@ -1,3 +1,6 @@
 language: ruby
-rvm: 2.2.1
+rvm:
+  - 1.9.3
+  - '2.0'
+  - 2.2.1
 script: bundle exec rspec spec

data/Gemfile

@@ -1,9 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'activemodel'
-
-group :test do
-  gem 'rspec'
-  gem 'pry'
-  gem 'guard-rspec'
-end
+gemspec

data/Gemfile.lock

@@ -1,57 +1,27 @@
+PATH
+  remote: .
+  specs:
+    validates_subset (1.0.3)
+      activemodel (>= 3.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activesupport (4.2.1)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     builder (3.2.2)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    coderay (1.1.0)
     diff-lcs (1.2.5)
-    ffi (1.9.8)
-    formatador (0.2.5)
-    guard (2.12.5)
-      formatador (>= 0.2.4)
-      listen (~> 2.7)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.5.2)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    hitimes (1.2.2)
     i18n (0.7.0)
     json (1.8.3)
-    listen (2.10.0)
-      celluloid (~> 0.16.0)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
-    method_source (0.8.2)
     minitest (5.7.0)
-    nenv (0.2.0)
-    notiffany (0.0.6)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rb-fsevent (0.9.5)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
+    rake (10.4.2)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
@@ -65,12 +35,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    shellany (0.0.1)
-    slop (3.6.0)
-    thor (0.19.1)
     thread_safe (0.3.5)
-    timers (4.0.1)
-      hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -78,7 +43,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel
-  guard-rspec
-  pry
-  rspec
+  bundler (~> 1.3)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  validates_subset!

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2015 Jake Yesbeck
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+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.

data/lib/arguments.rb

@@ -38,7 +38,7 @@ module ValidatesSubset
     # @subset
     #   return: <Hash>
     def subset
-      { :subset => @superset }
+      { subset: @superset }
     end
   end
 end

data/lib/validates_subset.rb

@@ -1,4 +1,9 @@
 require 'active_model'
+require 'active_support/i18n'
+
+I18n.load_path << File.dirname(__FILE__) + '/../locale/en.yml'
+I18n.load_path << File.dirname(__FILE__) + '/../locale/pl.yml'
+I18n.load_path << File.dirname(__FILE__) + '/../locale/sv.yml'
 
 require_relative './arguments'
 
@@ -14,7 +19,7 @@ module ActiveModel
         options[:superset] = options.delete(:subset)
 
         merged_options = {
-          :message => "is expected to be a subset of #{ options[:superset] } and is not."
+          message: :subset
         }.merge(options)
 
         super(merged_options)
@@ -50,7 +55,15 @@ module ActiveModel
 
         raise error unless error.nil?
 
-        record.errors.add(attribute, options[:message])
+        value = record.send(attribute)
+
+        invalid_value = if value.is_a?(Array)
+          value - options[:superset]
+        else
+          value
+        end
+
+        record.errors.add(attribute, :subset, { subset: options[:superset], invalid_value: invalid_value }.merge(message: options[:message]))
       end
 
       # Helper method to return the base expected error:

data/locale/en.yml

@@ -0,0 +1,4 @@
+en:
+  errors:
+    messages:
+      subset: is expected to be a subset of %{subset} and is not.

data/locale/pl.yml

@@ -0,0 +1,4 @@
+pl:
+  errors:
+    messages:
+      subset: musi być podzbiorem %{subset}.

data/locale/sv.yml

@@ -0,0 +1,4 @@
+sv:
+  errors:
+    messages:
+      subset: "förväntas vara en delmängd av %{subset}."

data/spec/integration/modifiers/allow_blank_spec.rb

@@ -21,7 +21,7 @@ describe 'allow blank' do
     end
 
     context 'value is not a valid subset' do
-      let(:value) { %i[a b c] }
+      let(:value) { [:a, :b, :c] }
 
       specify do
         expect(subject).to_not be_valid

data/spec/integration/modifiers/allow_nil_spec.rb

@@ -21,7 +21,7 @@ describe 'allow nil' do
     end
 
     context 'value is not a valid subset' do
-      let(:value) { %i[a b c] }
+      let(:value) { [:a, :b, :c] }
 
       specify do
         expect(subject).to_not be_valid

data/spec/integration/modifiers/if_spec.rb

@@ -22,7 +22,7 @@ describe 'if condition' do
     end
 
     context 'value is not a valid subset' do
-      let(:value) { %i[a b c] }
+      let(:value) { [:a, :b, :c] }
 
       specify do
         expect(subject).to_not be_valid

data/spec/integration/modifiers/message_spec.rb

@@ -20,7 +20,7 @@ describe 'custom messaging' do
   end
 
   context 'value is not a valid subset' do
-    let(:value) { %i[a b c] }
+    let(:value) { [:a, :b, :c] }
 
     specify do
       expect(subject).to_not be_valid

data/spec/integration/modifiers/multiple_spec.rb

@@ -21,7 +21,7 @@ describe 'multiple validations' do
     end
 
     context 'value is not a valid subset' do
-      let(:value) { %i[a b c] }
+      let(:value) { [:a, :b, :c] }
 
       specify do
         expect(subject).to_not be_valid

data/spec/integration/modifiers/unless_spec.rb

@@ -22,7 +22,7 @@ describe 'unless condition' do
     end
 
     context 'value is not a valid subset' do
-      let(:value) { %i[a b c] }
+      let(:value) { [:a, :b, :c] }
 
       specify do
         expect(subject).to be_valid
@@ -58,7 +58,7 @@ describe 'unless condition' do
     end
 
     context 'value is not a valid subset' do
-      let(:value) { %i[a b c] }
+      let(:value) { [:a, :b, :c] }
 
       specify do
         expect(subject).to_not be_valid

data/validates_subset.gemspec

@@ -1,6 +1,6 @@
 lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
-require_relative './version'
+require './version'
 
 Gem::Specification.new do |s|
   s.name          = 'validates_subset'

data/version.rb

@@ -1,3 +1,6 @@
 module ValidatesSubset
-  VERSION = '1.0.2'.freeze
+  MAJOR = 1
+  MINOR = 1
+  TINY = 0
+  VERSION = [MAJOR, MINOR, TINY].join('.').freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_subset
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Jake Yesbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -78,9 +78,13 @@ files:
 - Gemfile
 - Gemfile.lock
 - Guardfile
+- LICENSE.txt
 - README.md
 - lib/arguments.rb
 - lib/validates_subset.rb
+- locale/en.yml
+- locale/pl.yml
+- locale/sv.yml
 - spec/integration/modifiers/allow_blank_spec.rb
 - spec/integration/modifiers/allow_nil_spec.rb
 - spec/integration/modifiers/if_spec.rb