active_interaction 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1139d1df0d150418f22b231b09423c894ba98c41
-  data.tar.gz: c53767591c098f28c46ffa8ae77fb31ac714e310
+  metadata.gz: 0449466d5aadcc60fb21146f2f69cad47097698a
+  data.tar.gz: d88a740e6c885e713a2829b7a26902e9712a57c8
 SHA512:
-  metadata.gz: 5524134f37f76b6252d1ee82a2fe9d879aae1debec5d46679b66eb608e42bd49668c59532c5e2fda8f64999b5582649fb090c78e0c9c7048df2d05cd7e729474
-  data.tar.gz: 591d0b74feed33a7a7d39ebe67f61adea4c7f5721541d9c570ef39c8dd06b53f4cfd74ee8bac8dc8a78508c447d942a7e0cacbb80813392640ddce8d79f9b512
+  metadata.gz: 3563d4d5944e8316c3a75c9450c52a411a626436b9acc87380b92890cd393f1cd743f1b6cd2b3a7159a5e963aac06c2bc21dcdb494616337c4d2fb654cfa0ac5
+  data.tar.gz: 58cb5f5101acce859c491c3eb3a5d8c0117d46f31c966007f3d86a34244c87ac8810493204161dcdee1d840d5954730d88b06c6173e10cdf9366f41542feec66

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # [Master][]
 
+# [0.9.1][] (2013-12-17)
+
+- Fix I18n deprecation warning.
+- Raise `ArgumentError` when running an interaction with non-hash inputs.
+- For compatibility with `ActiveRecord::Errors`, support indifferent access of
+  `ActiveInteraction::Errors`.
+- Fix losing filters when using inheritance.
+
 # [0.9.0][] (2013-12-02)
 
 - Add experimental composition implementation
@@ -84,7 +92,8 @@
 
 - Initial release.
 
-  [master]: https://github.com/orgsync/active_interaction/compare/v0.9.0...master
+  [master]: https://github.com/orgsync/active_interaction/compare/v0.9.1...master
+  [0.9.1]: https://github.com/orgsync/active_interaction/compare/v0.9.0...0.9.1
   [0.9.0]: https://github.com/orgsync/active_interaction/compare/v0.9.0...0.9.0
   [0.8.0]: https://github.com/orgsync/active_interaction/compare/v0.7.0...v0.8.0
   [0.7.0]: https://github.com/orgsync/active_interaction/compare/v0.6.1...v0.7.0

data/README.md

@@ -25,7 +25,7 @@ This project uses [semantic versioning][].
 Add it to your Gemfile:
 
 ```ruby
-gem 'active_interaction', '~> 0.9.0'
+gem 'active_interaction', '~> 0.9.1'
 ```
 
 And then execute:
@@ -43,8 +43,8 @@ $ gem install active_interaction
 ## What do I get?
 
 ActiveInteraction::Base lets you create interaction models. These
-models ensure that certain options are provided and that those
-options are in the format you want them in. If the options are valid
+models ensure that certain inputs are provided and that those
+inputs are in the format you want them in. If the inputs are valid
 it will call `execute`, store the return value of that method in
 `result`, and return an instance of your ActiveInteraction::Base
 subclass. Let's look at a simple example:
@@ -61,7 +61,7 @@ class UserSignup < ActiveInteraction::Base
   # ActiveRecord validations
   validates :email, format: EMAIL_REGEX
 
-  # The execute method is called only if the options validate. It
+  # The execute method is called only if the inputs validate. It
   # does your business action. The return value will be stored in
   # `result`.
   def execute

data/lib/active_interaction.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'active_model'
 
 require 'active_interaction/version'

data/lib/active_interaction/base.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'active_support/core_ext/hash/indifferent_access'
 
 module ActiveInteraction
@@ -33,26 +35,29 @@ module ActiveInteraction
 
     validate :input_errors, :runtime_errors
 
-    # @param options [Hash{Symbol => Object}] Attribute values to set.
+    # @param inputs [Hash{Symbol => Object}] Attribute values to set.
     #
     # @private
-    def initialize(options = {})
+    def initialize(inputs = {})
+      fail ArgumentError, 'inputs must be a hash' unless inputs.is_a?(Hash)
+
       @_interaction_errors = Errors.new(self)
       @_interaction_result = nil
       @_interaction_runtime_errors = nil
 
-      options = options.symbolize_keys
-      options.each do |key, value|
+      inputs.each do |key, value|
         if key.to_s.start_with?('_interaction_')
-          raise InvalidValueError, key.inspect
+          fail InvalidValueError, key.inspect
         end
 
         instance_variable_set("@#{key}", value)
       end
 
+      inputs = inputs.symbolize_keys
       self.class.filters.each do |filter|
         begin
-          send("#{filter.name}=", filter.clean(options[filter.name]))
+          send("#{filter.name}=", filter.clean(inputs[filter.name]))
+        # rubocop: disable HandleExceptions
         rescue InvalidValueError, MissingValueError
           # Validators (#input_errors) will add errors if appropriate.
         end
@@ -66,9 +71,8 @@ module ActiveInteraction
     #
     # @since 0.6.0
     def inputs
-      self.class.filters.reduce({}) do |h, filter|
+      self.class.filters.each_with_object({}) do |filter, h|
         h[filter.name] = send(filter.name)
-        h
       end
     end
 
@@ -81,7 +85,7 @@ module ActiveInteraction
     #
     # @abstract
     def execute
-      raise NotImplementedError
+      fail NotImplementedError
     end
 
     # Returns the output from {#execute} if there are no validation errors or
@@ -123,6 +127,7 @@ module ActiveInteraction
           result = transaction do
             begin
               interaction.execute
+            # rubocop:disable HandleExceptions
             rescue Interrupt
               # Inner interaction failed. #compose handles merging errors.
             end
@@ -141,11 +146,11 @@ module ActiveInteraction
     # @private
     def self.method_missing(*args, &block)
       super do |klass, names, options|
-        raise InvalidFilterError, 'missing attribute name' if names.empty?
+        fail InvalidFilterError, 'missing attribute name' if names.empty?
 
         names.each do |attribute|
           if attribute.to_s.start_with?('_interaction_')
-            raise InvalidFilterError, attribute.inspect
+            fail InvalidFilterError, attribute.inspect
           end
 
           filter = klass.new(attribute, options, &block)
@@ -173,8 +178,8 @@ module ActiveInteraction
       end
     end
 
-    def compose(interaction, options = {})
-      outcome = interaction.run(options)
+    def compose(interaction, inputs = {})
+      outcome = interaction.run(inputs)
       return outcome.result if outcome.valid?
 
       # This can't use Errors#merge! because the errors have to be added to
@@ -183,7 +188,14 @@ module ActiveInteraction
         errors.add(:base, message) unless errors.added?(:base, message)
       end
 
-      raise Interrupt
+      fail Interrupt
+    end
+
+    def self.inherited(subclass)
+      instance_var = :@_interaction_filters
+
+      subclass.instance_variable_set(
+        instance_var, instance_variable_get(instance_var))
     end
   end
 end

data/lib/active_interaction/errors.rb

@@ -1,3 +1,6 @@
+# coding: utf-8
+
+# rubocop:disable Documentation
 module ActiveInteraction
   # Top-level error class. All other errors subclass this.
   Error = Class.new(StandardError)
@@ -66,13 +69,13 @@ module ActiveInteraction
 
     # @private
     def initialize(*args)
-      @symbolic = {}
+      @symbolic = {}.with_indifferent_access
       super
     end
 
     # @private
     def initialize_dup(other)
-      @symbolic = other.symbolic.dup
+      @symbolic = other.symbolic.with_indifferent_access
       super
     end
 
@@ -89,17 +92,11 @@ module ActiveInteraction
     # @return [Errors]
     def merge!(other)
       other.symbolic.each do |attribute, symbols|
-        symbols.each do |symbol|
-          add_sym(attribute, symbol)
-        end
+        symbols.each { |s| add_sym(attribute, s) }
       end
 
       other.messages.each do |attribute, messages|
-        messages.each do |message|
-          unless added?(attribute, message)
-            add(attribute, message)
-          end
-        end
+        messages.each { |m| add(attribute, m) unless added?(attribute, m) }
       end
 
       self

data/lib/active_interaction/filter.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'active_support/inflector'
 
 module ActiveInteraction
@@ -76,17 +78,15 @@ module ActiveInteraction
       # @see .factory
       def slug
         match = CLASS_REGEXP.match(name)
-        raise InvalidClassError, name unless match
+        fail InvalidClassError, name unless match
         match.captures.first.underscore.to_sym
       end
 
       # @private
       def inherited(klass)
-        begin
-          CLASSES[klass.slug] = klass
-        rescue InvalidClassError
-          # Ignore classes with invalid slugs.
-        end
+        CLASSES[klass.slug] = klass
+      rescue InvalidClassError
+        CLASSES[klass.name.to_sym] = klass
       end
     end
 
@@ -159,7 +159,7 @@ module ActiveInteraction
     # @raise [InvalidDefaultError] if the default value is invalid
     # @raise [NoDefaultError] if there is no default value
     def default
-      raise NoDefaultError, name unless has_default?
+      fail NoDefaultError, name unless has_default?
 
       cast(options[:default])
     rescue InvalidValueError, MissingValueError
@@ -193,18 +193,18 @@ module ActiveInteraction
     #
     # @return [Boolean]
     def has_default?
-      options.has_key?(:default)
+      options.key?(:default)
     end
 
     # @private
     def cast(value)
       case value
       when NilClass
-        raise MissingValueError, name unless has_default?
+        fail MissingValueError, name unless has_default?
 
         nil
       else
-        raise InvalidValueError, "#{name}: #{value.inspect}"
+        fail InvalidValueError, "#{name}: #{value.inspect}"
       end
     end
   end

data/lib/active_interaction/filters.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   # A collection of {Filter}s.
   #

data/lib/active_interaction/filters/abstract_date_time_filter.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   # @private
   class AbstractDateTimeFilter < Filter
@@ -27,11 +29,11 @@ module ActiveInteraction
     end
 
     def has_format?
-      options.has_key?(:format)
+      options.key?(:format)
     end
 
     def klass
-      raise NotImplementedError
+      fail NotImplementedError
     end
   end
 end

data/lib/active_interaction/filters/abstract_numeric_filter.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   # @private
   class AbstractNumericFilter < Filter
@@ -19,7 +21,7 @@ module ActiveInteraction
     private
 
     def klass
-      raise NotImplementedError
+      fail NotImplementedError
     end
   end
 end

data/lib/active_interaction/filters/array_filter.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to
@@ -45,13 +47,13 @@ module ActiveInteraction
         filter = klass.new(name, options, &block)
 
         if filters.any?
-          raise InvalidFilterError, 'multiple filters in array block'
+          fail InvalidFilterError, 'multiple filters in array block'
         end
         unless names.empty?
-          raise InvalidFilterError, 'attribute names in array block'
+          fail InvalidFilterError, 'attribute names in array block'
         end
         if filter.has_default?
-          raise InvalidDefaultError, 'default values in array block'
+          fail InvalidDefaultError, 'default values in array block'
         end
 
         filters.add(filter)

data/lib/active_interaction/filters/boolean_filter.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to

data/lib/active_interaction/filters/date_filter.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to

data/lib/active_interaction/filters/date_time_filter.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to

data/lib/active_interaction/filters/file_filter.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to

data/lib/active_interaction/filters/float_filter.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to

data/lib/active_interaction/filters/hash_filter.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to
@@ -31,10 +33,9 @@ module ActiveInteraction
       case value
       when Hash
         value = value.symbolize_keys
-        filters.reduce(strip? ? {} : value) do |h, f|
-          k = f.name
-          h[k] = f.clean(value[k])
-          h
+        filters.each_with_object(strip? ? {} : value) do |filter, h|
+          k = filter.name
+          h[k] = filter.clean(value[k])
         end
       else
         super
@@ -43,7 +44,7 @@ module ActiveInteraction
 
     def default
       if options[:default].is_a?(Hash) && !options[:default].empty?
-        raise InvalidDefaultError, "#{name}: #{options[:default].inspect}"
+        fail InvalidDefaultError, "#{name}: #{options[:default].inspect}"
       end
 
       super
@@ -51,7 +52,7 @@ module ActiveInteraction
 
     def method_missing(*args, &block)
       super(*args) do |klass, names, options|
-        raise InvalidFilterError, 'missing attribute name' if names.empty?
+        fail InvalidFilterError, 'missing attribute name' if names.empty?
 
         names.each do |name|
           filters.add(klass.new(name, options, &block))

data/lib/active_interaction/filters/integer_filter.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to

data/lib/active_interaction/filters/model_filter.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to

data/lib/active_interaction/filters/string_filter.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to

data/lib/active_interaction/filters/symbol_filter.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to