active_interaction 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05a744023cf02eb1f2ea70d41ca68b807779e13a
-  data.tar.gz: 455646aa8861af2545cd805f4eafe0856a9ff8f5
+  metadata.gz: c3902ef15c3ae5f01fc8488e949ebeadea266a24
+  data.tar.gz: 1465a2163042d03ca351af7fd735b9cfa7404aa1
 SHA512:
-  metadata.gz: 64c694eb64b7550b224b12d271463ef508e8d23fa6edbb295f97374a9693010d2cfbd0be22c6a98c66aa0dd1b1e4ff58893e524b93024be8dee39ee6ab841a4a
-  data.tar.gz: d657ef014a9e0bf547f83402e0d8becc33d1fad871bbfb26d8680fcf37a0d5ad9cad5fe263d7b43105f584caad4b98a349050dc41115bb3de70231cf42788676
+  metadata.gz: 4991f73428cf14bf5793fc5ad76ad8aa298da83ec030135d15770a459f42396f961f5eb9042dcf46531c63dd87255c697a5fb6d3e497164d2272e8d58de9d6ef
+  data.tar.gz: 0095a818c2d81597499af06a6967097ffdf2953089cf91c2a4ef1de196a57b95e7d3de812c7c722faa66139faeca19c83093d2043fa64c0ce828853e3f902dd3

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [1.6.0][] (2015-05-06)
+
+## Added
+
+- Added `object` as an alias for `model`.
+- Added symbol support to `add`.
+- Added `details` as an alternative to `symbolic`.
+
+## Changed
+
+- Deprecated `model` in favor of `object`.
+- Deprecated `add_sym` in favor of `add`.
+- Deprecated `transaction`.
+- Deprecated `symbolic` in favor of `details`.
+
 # [1.5.1][] (2015-04-28)
 
 ## Fixed
@@ -381,6 +396,7 @@
 
 - Initial release.
 
+  [1.6.0]: https://github.com/orgsync/active_interaction/compare/v1.5.1...v1.6.0
   [1.5.1]: https://github.com/orgsync/active_interaction/compare/v1.5.0...v1.5.1
   [1.5.0]: https://github.com/orgsync/active_interaction/compare/v1.4.1...v1.5.0
   [1.4.1]: https://github.com/orgsync/active_interaction/compare/v1.4.0...v1.4.1

data/README.md

@@ -75,13 +75,13 @@ Read more on [the project page][] or check out [the full documentation][].
 Add it to your Gemfile:
 
 ``` rb
-gem 'active_interaction', '~> 1.5'
+gem 'active_interaction', '~> 1.6'
 ```
 
 Or install it manually:
 
 ``` sh
-$ gem install active_interaction --version '~> 1.5'
+$ gem install active_interaction --version '~> 1.6'
 ```
 
 This project uses [Semantic Versioning][]. Check out [the change log][] for a

data/lib/active_interaction.rb

@@ -2,6 +2,28 @@
 
 require 'active_model'
 
+# Manage application specific business logic.
+#
+# @author Aaron Lasseigne <aaron.lasseigne@gmail.com>
+# @author Taylor Fausak <taylor@fausak.me>
+#
+# @since 1.0.0
+#
+# @version 1.6.0
+module ActiveInteraction
+  DEPRECATOR =
+    if ::ActiveSupport::Deprecation.respond_to?(:new)
+      ::ActiveSupport::Deprecation.new('2', 'ActiveInteraction')
+    end
+  private_constant :DEPRECATOR
+
+  def self.deprecate(klass, method, message = nil)
+    options = { method => message }
+    options.merge!(deprecator: DEPRECATOR) if DEPRECATOR
+    klass.deprecate(options)
+  end
+end
+
 require 'active_interaction/version'
 require 'active_interaction/errors'
 
@@ -43,13 +65,3 @@ require 'active_interaction/backports'
 
 I18n.load_path.unshift(*Dir[File.expand_path(
   File.join(%w[active_interaction locale *.yml]), File.dirname(__FILE__))])
-
-# Manage application specific business logic.
-#
-# @author Aaron Lasseigne <aaron.lasseigne@gmail.com>
-# @author Taylor Fausak <taylor@fausak.me>
-#
-# @since 1.0.0
-#
-# @version 1.5.1
-module ActiveInteraction end

data/lib/active_interaction/backports.rb

@@ -17,16 +17,15 @@ module ActiveInteraction
     # Required for Rails < 3.2.13.
     protected :initialize_dup
   end
-end
 
-# @private
-class Hash
-  # Required for Rails < 4.0.0.
-  def transform_keys
-    result = {}
-    each_key do |key|
-      result[yield(key)] = self[key]
+  class HashFilter # rubocop:disable Style/Documentation
+    # Required for Rails < 4.0.0.
+    def self.transform_keys(hash, &block)
+      return hash.transform_keys(&block) if hash.respond_to?(:transform_keys)
+
+      result = {}
+      hash.each_key { |key| result[block.call(key)] = hash[key] }
+      result
     end
-    result
-  end unless method_defined?(:transform_keys)
+  end
 end

data/lib/active_interaction/base.rb

@@ -121,6 +121,11 @@ module ActiveInteraction
         end
       end
 
+      def model(*)
+        super
+      end
+      ActiveInteraction.deprecate self, :model, 'use `object` instead'
+
       private
 
       # @param klass [Class]
@@ -249,7 +254,7 @@ module ActiveInteraction
     def type_check
       run_callbacks(:type_check) do
         Validation.validate(self.class.filters, inputs).each do |error|
-          errors.add_sym(*error)
+          errors.add(*error)
         end
       end
     end

data/lib/active_interaction/concerns/transactable.rb

@@ -41,7 +41,8 @@ module ActiveInteraction
     module ClassMethods # rubocop:disable Style/Documentation
       # @param klass [Class]
       def inherited(klass)
-        klass.transaction(transaction?, transaction_options.dup)
+        klass.transaction_without_deprecation(
+          transaction?, transaction_options.dup)
 
         super
       end
@@ -56,6 +57,7 @@ module ActiveInteraction
 
         nil
       end
+      ActiveInteraction.deprecate self, :transaction
 
       # @return [Boolean]
       def transaction?

data/lib/active_interaction/errors.rb

@@ -96,13 +96,28 @@ module ActiveInteraction
     #
     # @return [Hash{Symbol => Array<Symbol>}]
     attr_reader :symbolic
+    ActiveInteraction.deprecate self, :symbolic, 'use `details` instead'
+
+    def details
+      h = Hash.new([]).with_indifferent_access
+      @symbolic.each { |k, vs| vs.each { |v| h[k] += [{ error: v }] } }
+      h
+    end
+
+    alias_method :add_without_details, :add
+    def add_with_details(attribute, message = :invalid, options = {})
+      message = message.call if message.respond_to?(:call)
+      @symbolic[attribute] += [message] if message.is_a?(Symbol)
+      add_without_details(attribute, message, options)
+    end
+    alias_method :add, :add_with_details
 
     # Adds a symbolic error message to an attribute.
     #
     # @example
     #   errors.add_sym(:attribute)
-    #   errors.symbolic
-    #   # => {:attribute=>[:invalid]}
+    #   errors.details
+    #   # => {:attribute=>[{:error=>:invalid}]}
     #   errors.messages
     #   # => {:attribute=>["is invalid"]}
     #
@@ -115,10 +130,11 @@ module ActiveInteraction
     #
     # @see ActiveModel::Errors#add
     def add_sym(attribute, symbol = :invalid, message = nil, options = {})
-      add(attribute, message || symbol, options)
+      add_without_details(attribute, message || symbol, options)
 
-      symbolic[attribute] += [symbol]
+      @symbolic[attribute] += [symbol]
     end
+    ActiveInteraction.deprecate self, :add_sym, 'use `add` instead'
 
     # @see ActiveModel::Errors#initialize
     #
@@ -133,7 +149,8 @@ module ActiveInteraction
     #
     # @private
     def initialize_dup(other)
-      @symbolic = other.symbolic.with_indifferent_access
+      @symbolic = Hash.new([]).with_indifferent_access
+      other.details.each { |k, vs| vs.each { |v| @symbolic[k] += [v[:error]] } }
 
       super
     end
@@ -142,7 +159,7 @@ module ActiveInteraction
     #
     # @private
     def clear
-      symbolic.clear
+      @symbolic.clear
 
       super
     end
@@ -154,7 +171,7 @@ module ActiveInteraction
     # @return [Errors]
     def merge!(other)
       merge_messages!(other)
-      merge_symbolic!(other) if other.respond_to?(:symbolic)
+      merge_details!(other) if other.respond_to?(:details)
       self
     end
 
@@ -168,12 +185,13 @@ module ActiveInteraction
       end
     end
 
-    def merge_symbolic!(other)
-      other.symbolic.each do |attribute, symbols|
-        symbols.each do |symbol|
-          next if symbolic[attribute].include?(symbol)
+    def merge_details!(other)
+      other.details.each do |attribute, hashes|
+        hashes.each do |hash|
+          error = hash[:error]
+          next if @symbolic[attribute].include?(error)
 
-          symbolic[attribute] += [symbol]
+          @symbolic[attribute] += [error]
         end
       end
     end

data/lib/active_interaction/filters/array_filter.rb

@@ -54,6 +54,11 @@ module ActiveInteraction
       end
     end
 
+    def model(*)
+      super
+    end
+    ActiveInteraction.deprecate self, :model, 'use `object` instead'
+
     private
 
     # @return [Array<Class>]

data/lib/active_interaction/filters/hash_filter.rb

@@ -52,6 +52,11 @@ module ActiveInteraction
       end
     end
 
+    def model(*)
+      super
+    end
+    ActiveInteraction.deprecate self, :model, 'use `object` instead'
+
     private
 
     def clean_value(h, name, filter, value)
@@ -76,7 +81,7 @@ module ActiveInteraction
     end
 
     def stringify_the_symbol_keys(hash)
-      hash.transform_keys { |key| key.is_a?(Symbol) ? key.to_s : key }
+      self.class.transform_keys(hash) { |k| k.is_a?(Symbol) ? k.to_s : k }
     end
   end
 end

data/lib/active_interaction/filters/model_filter.rb

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

data/lib/active_interaction/locale/en.yml

@@ -18,6 +18,7 @@ en:
       integer: integer
       interface: interface
       model: model
+      object: object
       string: string
       symbol: symbol
       time: time

data/lib/active_interaction/modules/validation.rb

@@ -25,10 +25,10 @@ module ActiveInteraction
       def error_args(filter, error)
         case error
         when InvalidNestedValueError
-          [filter.name, :invalid_nested, nil,
+          [filter.name, :invalid_nested,
            name: error.filter_name.inspect, value: error.input_value.inspect]
         when InvalidValueError
-          [filter.name, :invalid_type, nil, type: type(filter)]
+          [filter.name, :invalid_type, type: type(filter)]
         when MissingValueError
           [filter.name, :missing]
         end

data/lib/active_interaction/version.rb

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

data/spec/active_interaction/errors_spec.rb

@@ -40,30 +40,30 @@ describe ActiveInteraction::Errors do
 
     context 'calling #add' do
       before do
-        allow(errors).to receive(:add)
+        allow(errors).to receive(:add_without_details)
       end
 
       it 'with the default' do
         errors.add_sym(:attribute)
-        expect(errors).to have_received(:add).once
+        expect(errors).to have_received(:add_without_details).once
           .with(:attribute, :invalid, {})
       end
 
       it 'with a symbol' do
         errors.add_sym(:attribute, :symbol)
-        expect(errors).to have_received(:add).once
+        expect(errors).to have_received(:add_without_details).once
           .with(:attribute, :symbol, {})
       end
 
       it 'with a symbol and message' do
         errors.add_sym(:attribute, :symbol, 'message')
-        expect(errors).to have_received(:add).once
+        expect(errors).to have_received(:add_without_details).once
           .with(:attribute, 'message', {})
       end
 
       it 'with a symbol, message and options' do
         errors.add_sym(:attribute, :symbol, 'message', key: :value)
-        expect(errors).to have_received(:add).once
+        expect(errors).to have_received(:add_without_details).once
           .with(:attribute, 'message', key: :value)
       end
     end

data/spec/active_interaction/modules/validation_spec.rb

@@ -42,7 +42,7 @@ describe ActiveInteraction::Validation do
           type = I18n.translate(
             "#{ActiveInteraction::Base.i18n_scope}.types.#{filter.class.slug}")
 
-          expect(result).to eql [[filter.name, :invalid_type, nil, type: type]]
+          expect(result).to eql [[filter.name, :invalid_type, type: type]]
         end
       end
 
@@ -65,7 +65,6 @@ describe ActiveInteraction::Validation do
           expect(result).to eql [[
             filter.name,
             :invalid_nested,
-            nil,
             { name: name.inspect, value: value.inspect }
           ]]
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel