active_interaction 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57e566015dd952d744123dd2471da57d7b9ba9ea
-  data.tar.gz: 17d15bb89957162cbc25479595d1bb43cec54ef5
+  metadata.gz: 9ebbd60d2d495d3011785f7fb78478f6b6b4a2d9
+  data.tar.gz: e52b7f93aff786d4a8be65e36121ecc5b30eaf3b
 SHA512:
-  metadata.gz: 1a93ea6f2cd2a63854ee2a4418994c9a41dc46c63d83208f4281da9e3d8f786cf23b0891d28b2a0909ffabdeaf47e0caec5957d7762127447ec97caa59867679
-  data.tar.gz: e6386cde98bec96a9da6564b74809a824539b400535dd7608fb446741d353d1181a6d2b3b9c39deb706e19f8cef8747a10c8e7479df5f9e32d1942591e7b8418
+  metadata.gz: b9b58d141cca46ad7b9b0dba1373c9e0cb159cc04d9831b0660df7d1941347d94b1e63b8f9f063d0425240173757f4fff00453650299d46f52059b5d49ccb1f9
+  data.tar.gz: 14bee4cebb9847f4eb759016e9846e7171d6a7647b78516c4389686dbb1e6ed7f8e94438a63d1a83c028f446c86d4289f57ededca0af5afaabc0887ff742d60f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # [Master][]
 
+# [1.1.7][] (2014-04-30)
+
+- Fix a bug that leaked validators among all child classes.
+
 # [1.1.6][] (2014-04-29)
 
 - Fix a bug that caused nested hash error messages to be misleading.
@@ -182,7 +186,8 @@
 
 - Initial release.
 
-  [Master]: https://github.com/orgsync/active_interaction/compare/v1.1.6...master
+  [master]: https://github.com/orgsync/active_interaction/compare/v1.1.7...master
+  [1.1.7]: https://github.com/orgsync/active_interaction/compare/v1.1.6...v1.1.7
   [1.1.6]: https://github.com/orgsync/active_interaction/compare/v1.1.5...v1.1.6
   [1.1.5]: https://github.com/orgsync/active_interaction/compare/v1.1.4...v1.1.5
   [1.1.4]: https://github.com/orgsync/active_interaction/compare/v1.1.3...v1.1.4

data/lib/active_interaction.rb

@@ -32,7 +32,7 @@ require 'active_interaction/filters/time_filter'
 require 'active_interaction/base'
 
 I18n.load_path << File.expand_path(
-  File.join(%w(active_interaction locale en.yml)), File.dirname(__FILE__))
+  File.join(%w[active_interaction locale en.yml]), File.dirname(__FILE__))
 
 # Manage application specific business logic.
 #
@@ -41,5 +41,5 @@ I18n.load_path << File.expand_path(
 #
 # @since 1.0.0
 #
-# @version 1.1.6
+# @version 1.1.7
 module ActiveInteraction end

data/lib/active_interaction/base.rb

@@ -135,6 +135,8 @@ module ActiveInteraction
       # @param klass [Class]
       def inherited(klass)
         klass.instance_variable_set(:@_interaction_filters, filters.dup)
+
+        super
       end
 
       # @param filter [Filter]

data/lib/active_interaction/modules/validation.rb

@@ -5,37 +5,39 @@ module ActiveInteraction
   #
   # @private
   module Validation
-    # @param filters [Hash{Symbol => Filter}]
-    # @param inputs [Hash{Symbol => Object}]
-    def self.validate(filters, inputs)
-      filters.each_with_object([]) do |(name, filter), errors|
-        begin
-          filter.cast(inputs[name])
-        rescue InvalidNestedValueError,
-               InvalidValueError,
-               MissingValueError => e
-          errors << error_args(filter, e)
+    class << self
+      # @param filters [Hash{Symbol => Filter}]
+      # @param inputs [Hash{Symbol => Object}]
+      def validate(filters, inputs)
+        filters.each_with_object([]) do |(name, filter), errors|
+          begin
+            filter.cast(inputs[name])
+          rescue InvalidNestedValueError,
+                 InvalidValueError,
+                 MissingValueError => e
+            errors << error_args(filter, e)
+          end
         end
       end
-    end
 
-    private
+      private
 
-    def self.error_args(filter, error)
-      case error
-      when InvalidNestedValueError
-        [filter.name, :invalid_nested, nil,
-         name: e.filter_name.inspect, value: e.input_value.inspect]
-      when InvalidValueError
-        [filter.name, :invalid_type, nil, type: type(filter)]
-      when MissingValueError
-        [filter.name, :missing]
+      def error_args(filter, error)
+        case error
+        when InvalidNestedValueError
+          [filter.name, :invalid_nested, nil,
+           name: e.filter_name.inspect, value: e.input_value.inspect]
+        when InvalidValueError
+          [filter.name, :invalid_type, nil, type: type(filter)]
+        when MissingValueError
+          [filter.name, :missing]
+        end
       end
-    end
 
-    # @param filter [Filter]
-    def self.type(filter)
-      I18n.translate("#{Base.i18n_scope}.types.#{filter.class.slug}")
+      # @param filter [Filter]
+      def type(filter)
+        I18n.translate("#{Base.i18n_scope}.types.#{filter.class.slug}")
+      end
     end
   end
 end

data/lib/active_interaction/version.rb

@@ -5,5 +5,5 @@ module ActiveInteraction
   # The version number.
   #
   # @return [Gem::Version]
-  VERSION = Gem::Version.new('1.1.6')
+  VERSION = Gem::Version.new('1.1.7')
 end

data/spec/active_interaction/base_spec.rb

@@ -171,7 +171,7 @@ describe ActiveInteraction::Base do
         end
       end
 
-      %w(thing1 thing2).each do |thing|
+      %w[thing1 thing2].each do |thing|
         it "adds an attr_reader for #{thing}" do
           expect(interaction).to respond_to thing
         end
@@ -229,7 +229,7 @@ describe ActiveInteraction::Base do
           end
 
           it 'has errors' do
-            expect(outcome.errors.messages[:thing]).to eql %w(error error)
+            expect(outcome.errors.messages[:thing]).to eql %w[error error]
           end
 
           it 'has symbolic errors' do
@@ -327,20 +327,50 @@ describe ActiveInteraction::Base do
   end
 
   context 'inheritance' do
-    let(:described_class) { InteractionWithFilter }
+    context 'filters' do
+      let(:described_class) { InteractionWithFilter }
 
-    def filters(klass)
-      klass.filters.keys
-    end
+      def filters(klass)
+        klass.filters.keys
+      end
 
-    it 'includes the filters from the superclass' do
-      expect(filters(Class.new(described_class))).to include :thing
+      it 'includes the filters from the superclass' do
+        expect(filters(Class.new(described_class))).to include :thing
+      end
+
+      it 'does not mutate the filters on the superclass' do
+        Class.new(described_class) { float :other_thing }
+
+        expect(filters(described_class)).to_not include :other_thing
+      end
     end
 
-    it 'does not mutate the filters on the superclass' do
-      Class.new(described_class) { float :other_thing }
+    context 'validators' do
+      it 'does not pollute validators' do
+        a = Class.new(ActiveInteraction::Base) do
+          string :a
+          validates_presence_of :a
+        end
 
-      expect(filters(described_class)).to_not include :other_thing
+        b = Class.new(ActiveInteraction::Base) do
+          string :b
+          validates_presence_of :b
+        end
+
+        expect(a.validators).to_not eql b.validators
+      end
+
+      it 'gives duped validators to subclasses' do
+        a = Class.new(ActiveInteraction::Base) do
+          string :a
+          validates_presence_of :a
+        end
+
+        b = Class.new(a)
+
+        expect(a.validators).to eql b.validators
+        expect(a.validators).to_not equal b.validators
+      end
     end
   end
 

data/spec/active_interaction/i18n_spec.rb

@@ -11,7 +11,7 @@ end
 describe I18nInteraction do
   include_context 'interactions'
 
-  TYPES = %w(
+  TYPES = %w[
     array
     boolean
     date
@@ -23,7 +23,7 @@ describe I18nInteraction do
     model
     string
     time
-  )
+  ]
 
   shared_examples 'translation' do
     context 'types' do

data/spec/support/interactions.rb

@@ -24,9 +24,9 @@ shared_examples_for 'an interaction' do |type, generator, filter_options = {}|
       public_send(type, :required, filter_options)
       public_send(type, :optional, filter_options.merge(default: nil))
       public_send(type, :default,
-                  filter_options.merge(default: generator.call))
+        filter_options.merge(default: generator.call))
       public_send(type, :defaults_1, :defaults_2,
-                  filter_options.merge(default: generator.call))
+        filter_options.merge(default: generator.call))
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel