active_interaction 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b77e2393588e6b32887a4a38847e14b8f347191
-  data.tar.gz: ef3b09ab34ef2b7937a457f5cab2648f0cb7e8cc
+  metadata.gz: 8da6c6009b0e73aeec0afbc524e94c27dde01260
+  data.tar.gz: c34f2110a50219b87ba1e22cda387f0f429db7d2
 SHA512:
-  metadata.gz: 5af88c5f9d4b7da0b6e6adc2039d393e0b2fdbac83268b28a8015dce6cf926ec59465201e298e90ce6f4a8f6cd77d5d3641bd787eaaaf0cd2e314646237f66c3
-  data.tar.gz: ebdfcf778480fa4874e04551d07cb2495df8845238d1b79868c0905c77e309f5c9130892c888c241786cf6d7d78b3b914d5bdf374ef513fb78b1e3c8dcd2fdba
+  metadata.gz: 274c345305f246fc6ae9078846d317cbb7e19b4781d18e73f20ade3336ca77f34008e7e8ca65985a5b3573a0742d8c79a25e9c1ffcc707d947ee5316e965fcec
+  data.tar.gz: ff0bf22dfb87c3774a3a9397943dfa02959355b7773dd87d1d188ac7ac1df47a6014888fcba67ef1286200f6df93f98e96c008c3acf0234d0c87f83780e0464e

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # [Master][]
 
+# [1.2.2][] (2014-05-07)
+
+- Fix a bug that raised `NameError`s when there were invalid nested hash
+  errors.
+- Add missing translation for symbol filters.
+
 # [1.2.1][] (2014-05-02)
 
 - Fix a bug that marked model inputs as invalid even if they returned true for
@@ -199,7 +205,8 @@
 
 - Initial release.
 
-  [master]: https://github.com/orgsync/active_interaction/compare/v1.2.1...master
+  [master]: https://github.com/orgsync/active_interaction/compare/v1.2.2...master
+  [1.2.2]: https://github.com/orgsync/active_interaction/compare/v1.2.1...v1.2.2
   [1.2.1]: https://github.com/orgsync/active_interaction/compare/v1.2.0...v1.2.1
   [1.2.0]: https://github.com/orgsync/active_interaction/compare/v1.1.7...v1.2.0
   [1.1.7]: https://github.com/orgsync/active_interaction/compare/v1.1.6...v1.1.7

data/lib/active_interaction.rb

@@ -39,8 +39,9 @@ require 'active_interaction/base'
 
 require 'active_interaction/backports'
 
-I18n.load_path << File.expand_path(
-  File.join(%w[active_interaction locale en.yml]), File.dirname(__FILE__))
+I18n.load_path += Dir[File.expand_path(
+  File.join(%w[active_interaction locale *.yml]), File.dirname(__FILE__))]
+I18n.default_locale = :en
 
 # Manage application specific business logic.
 #
@@ -49,5 +50,5 @@ I18n.load_path << File.expand_path(
 #
 # @since 1.0.0
 #
-# @version 1.2.1
+# @version 1.2.2
 module ActiveInteraction end

data/lib/active_interaction/filter.rb

@@ -12,10 +12,6 @@ module ActiveInteraction
 
   # Describes an input filter for an interaction.
   class Filter
-    # @return [Regexp]
-    CLASS_REGEXP = /\AActiveInteraction::([A-Z]\w*)Filter\z/
-    private_constant :CLASS_REGEXP
-
     # @return [Hash{Symbol => Class}]
     CLASSES = {}
     private_constant :CLASSES
@@ -32,6 +28,9 @@ module ActiveInteraction
     undef_method :hash
 
     class << self
+      # @return [Symbol]
+      attr_reader :slug
+
       # Get the filter associated with a symbol.
       #
       # @example
@@ -52,35 +51,14 @@ module ActiveInteraction
         CLASSES.fetch(slug) { fail MissingFilterError, slug.inspect }
       end
 
-      # Convert the class name into a short symbol.
-      #
-      # @example
-      #   ActiveInteraction::BooleanFilter.slug
-      #   # => :boolean
-      # @example
-      #   ActiveInteraction::Filter.slug
-      #   # => ActiveInteraction::InvalidClassError: ActiveInteraction::Filter
-      #
-      # @return [Symbol]
-      #
-      # @raise [InvalidClassError] If the filter doesn't have a valid slug.
-      #
-      # @see .factory
-      def slug
-        return @slug if defined?(@slug)
-
-        match = name[CLASS_REGEXP, 1]
-        fail InvalidClassError, name unless match
-        @slug = match.underscore.to_sym
-      end
+      private
 
+      # @param slug [Symbol]
       # @param klass [Class]
       #
-      # @private
-      def inherited(klass)
-        CLASSES[klass.slug] = klass
-      rescue InvalidClassError
-        CLASSES[klass.name.to_sym] = klass
+      # @return [Class]
+      def register(slug)
+        CLASSES[@slug = slug] = self
       end
     end
 

data/lib/active_interaction/filters/array_filter.rb

@@ -25,6 +25,8 @@ module ActiveInteraction
   class ArrayFilter < Filter
     include Missable
 
+    register :array
+
     def cast(value)
       case value
       when Array

data/lib/active_interaction/filters/boolean_filter.rb

@@ -16,6 +16,8 @@ module ActiveInteraction
 
   # @private
   class BooleanFilter < Filter
+    register :boolean
+
     def cast(value)
       case value
       when FalseClass, '0', /\Afalse\z/i

data/lib/active_interaction/filters/date_filter.rb

@@ -19,5 +19,6 @@ module ActiveInteraction
 
   # @private
   class DateFilter < AbstractDateTimeFilter
+    register :date
   end
 end

data/lib/active_interaction/filters/date_time_filter.rb

@@ -19,6 +19,8 @@ module ActiveInteraction
 
   # @private
   class DateTimeFilter < AbstractDateTimeFilter
+    register :date_time
+
     def database_column_type
       :datetime
     end

data/lib/active_interaction/filters/decimal_filter.rb

@@ -17,6 +17,8 @@ module ActiveInteraction
 
   # @private
   class DecimalFilter < AbstractNumericFilter
+    register :decimal
+
     def cast(value)
       case value
       when Numeric

data/lib/active_interaction/filters/file_filter.rb

@@ -16,6 +16,8 @@ module ActiveInteraction
 
   # @private
   class FileFilter < Filter
+    register :file
+
     def cast(value)
       value = extract_file(value)
 

data/lib/active_interaction/filters/float_filter.rb

@@ -15,5 +15,6 @@ module ActiveInteraction
 
   # @private
   class FloatFilter < AbstractNumericFilter
+    register :float
   end
 end

data/lib/active_interaction/filters/hash_filter.rb

@@ -27,6 +27,8 @@ module ActiveInteraction
   class HashFilter < Filter
     include Missable
 
+    register :hash
+
     def cast(value)
       case value
       when Hash

data/lib/active_interaction/filters/integer_filter.rb

@@ -15,5 +15,6 @@ module ActiveInteraction
 
   # @private
   class IntegerFilter < AbstractNumericFilter
+    register :integer
   end
 end

data/lib/active_interaction/filters/model_filter.rb

@@ -18,6 +18,8 @@ module ActiveInteraction
 
   # @private
   class ModelFilter < Filter
+    register :model
+
     def cast(value, reconstantize = true)
       @klass ||= klass
 

data/lib/active_interaction/filters/string_filter.rb

@@ -18,6 +18,8 @@ module ActiveInteraction
 
   # @private
   class StringFilter < Filter
+    register :string
+
     def cast(value)
       case value
       when String

data/lib/active_interaction/filters/symbol_filter.rb

@@ -14,6 +14,8 @@ module ActiveInteraction
 
   # @private
   class SymbolFilter < Filter
+    register :symbol
+
     def cast(value)
       case value
       when Symbol

data/lib/active_interaction/filters/time_filter.rb

@@ -21,6 +21,8 @@ module ActiveInteraction
 
   # @private
   class TimeFilter < AbstractDateTimeFilter
+    register :time
+
     alias_method :_klass, :klass
     private :_klass
 

data/lib/active_interaction/locale/en.yml

@@ -18,4 +18,5 @@ en:
       integer: integer
       model: model
       string: string
+      symbol: symbol
       time: time

data/lib/active_interaction/modules/validation.rb

@@ -26,7 +26,7 @@ module ActiveInteraction
         case error
         when InvalidNestedValueError
           [filter.name, :invalid_nested, nil,
-           name: e.filter_name.inspect, value: e.input_value.inspect]
+           name: error.filter_name.inspect, value: error.input_value.inspect]
         when InvalidValueError
           [filter.name, :invalid_type, nil, type: type(filter)]
         when MissingValueError

data/lib/active_interaction/version.rb

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

data/spec/active_interaction/filter_spec.rb

@@ -2,11 +2,6 @@
 
 require 'spec_helper'
 
-module ActiveInteraction
-  class ATestFilter < ActiveInteraction::Filter; end
-end
-class ATestFilter < ActiveInteraction::Filter; end
-
 describe ActiveInteraction::Filter, :filter do
   include_context 'filters'
 
@@ -16,33 +11,30 @@ describe ActiveInteraction::Filter, :filter do
     end
   end
 
-  context ActiveInteraction::ATestFilter do
-    it_behaves_like 'a filter'
-
-    let(:described_class) { ActiveInteraction::ATestFilter }
+  context 'with an unregistered subclass' do
+    let(:described_class) { Class.new(ActiveInteraction::Filter) }
 
     describe '.slug' do
-      it 'returns a slug representing the class' do
-        expect(described_class.slug).to eql :a_test
+      it 'is nil' do
+        expect(described_class.slug).to be_nil
       end
     end
   end
 
-  context ATestFilter do
-    let(:described_class) { ATestFilter }
+  context 'with a registered subclass' do
+    it_behaves_like 'a filter'
 
-    describe '.factory' do
-      it 'returns a Filter' do
-        expect(described_class.factory(described_class.name.to_sym))
-          .to eql described_class
+    let(:described_class) do
+      s = slug
+      Class.new(ActiveInteraction::Filter) do
+        register s
       end
     end
+    let(:slug) { SecureRandom.hex.to_sym }
 
     describe '.slug' do
-      it 'raises an error' do
-        expect do
-          described_class.slug
-        end.to raise_error ActiveInteraction::InvalidClassError
+      it 'returns the registered slug' do
+        expect(described_class.slug).to eql slug
       end
     end
   end

data/spec/active_interaction/i18n_spec.rb

@@ -11,19 +11,9 @@ end
 describe I18nInteraction do
   include_context 'interactions'
 
-  TYPES = %w[
-    array
-    boolean
-    date
-    date_time
-    file
-    float
-    hash
-    integer
-    model
-    string
-    time
-  ]
+  TYPES = ActiveInteraction::Filter
+    .const_get(:CLASSES)
+    .map { |slug, _| slug.to_s }
 
   shared_examples 'translation' do
     context 'types' do

data/spec/active_interaction/modules/validation_spec.rb

@@ -49,10 +49,27 @@ describe ActiveInteraction::Validation do
       context 'MissingValueError' do
         let(:exception) { ActiveInteraction::MissingValueError }
 
-        it 'returns an :msising error' do
+        it 'returns a :missing error' do
           expect(result).to eql [[filter.name, :missing]]
         end
       end
+
+      context 'InvalidNestedValueError' do
+        let(:exception) do
+          ActiveInteraction::InvalidNestedValueError.new(name, value)
+        end
+        let(:name) { SecureRandom.hex.to_sym }
+        let(:value) { double }
+
+        it 'returns an :invalid_nested error' do
+          expect(result).to eql [[
+            filter.name,
+            :invalid_nested,
+            nil,
+            { name: name.inspect, value: value.inspect }
+          ]]
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel