active_interaction 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e72499bf1bdf3c8e52009aec73e0fa72c811055c
-  data.tar.gz: 1cf3dc7c588dfdc26b9342f657039ed854c0e510
+  metadata.gz: a9002b84bec6ce71116bd2f797632fd473e47de9
+  data.tar.gz: 13ec78e97adc867930f6c1c392f73e68fdc7cc15
 SHA512:
-  metadata.gz: 853da48292d4d04cc8854c6a5992347ad48935806802d7a2dd22a8c35e345039f1c8751a2fc52b155a5848329db8b58d89aa338af1211b238f5c6a4772fb58a2
-  data.tar.gz: 9095f7b640d805897acf24f7a9439ae78cbb7af08a41d101070a7712786f878d4287a096420a90e52c05fecf0c56b0f766e58fada470e649d3273d2b64c2ba2a
+  metadata.gz: cd8360a22da901c3e60fa56d58bfb7318645ef42ebb17c7b4c32e7893e45eb37d49a33383f1f3bef3c9bf8c062be298cc3a1fba9056194994d4410fc7a49eab3
+  data.tar.gz: 87e22933a0e425d6af9e58d82d0248fd9db17012544a923ce423e260d04b174d55a369caea3998a422a2018d73d429039ef8c8817ab9e602963a2997ee3264c7

data/CONTRIBUTING.md

@@ -8,6 +8,6 @@
 
 # Code Style
 
-Running the tests using `rake` (with no args) or within `guard` will also check for style issues in the code. Ideally all submissions would pass these checks. If the code style is causing issues (particularly the method or class size) we can work with you to correct it. Don't let it stop you from contributing.
+Running the tests using `rake` (with no args) will also check for style issues in the code. Ideally all submissions would pass these checks. If the code style is causing issues (particularly the method or class size) we can work with you to correct it. Don't let it stop you from contributing.
 
 [fork]: https://github.com/orgsync/active_interaction/fork

data/lib/active_interaction.rb

@@ -50,5 +50,10 @@ require 'active_interaction/base'
 
 require 'active_interaction/backports'
 
-I18n.load_path.unshift(*Dir[File.expand_path(
-  File.join(%w[active_interaction locale *.yml]), File.dirname(__FILE__))])
+I18n.load_path.unshift(
+  *Dir.glob(
+    File.expand_path(
+      File.join(%w[active_interaction locale *.yml]), File.dirname(__FILE__)
+    )
+  )
+)

data/lib/active_interaction/concerns/runnable.rb

@@ -74,8 +74,8 @@ module ActiveInteraction
     def run
       return unless valid?
 
-      result_or_errors = catch(:interrupt) do
-        run_callbacks(:execute) { execute }
+      result_or_errors = run_callbacks(:execute) do
+        catch(:interrupt) { execute }
       end
 
       self.result =

data/lib/active_interaction/locale/pt-BR.yml

@@ -0,0 +1,23 @@
+pt-BR:
+  active_interaction:
+    errors:
+      messages:
+        invalid: é inválido
+        invalid_nested: possui um valor aninhado inválido (%{name} => %{value})
+        invalid_type: não é um(a) %{type} válido(a)
+        missing: é obrigatório
+    types:
+      array: array
+      boolean: boolean
+      date: date
+      date_time: date time
+      decimal: decimal
+      file: file
+      float: float
+      hash: hash
+      integer: integer
+      interface: interface
+      object: object
+      string: string
+      symbol: symbol
+      time: time

data/lib/active_interaction/version.rb

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

data/spec/active_interaction/concerns/runnable_spec.rb

@@ -51,10 +51,7 @@ describe ActiveInteraction::Runnable do
             it type do
               has_run = false
 
-              klass.set_callback name, type, lambda { |_, &block|
-                has_run = true
-                block.call unless block.nil?
-              }
+              klass.set_callback name, type, -> { has_run = true }
 
               klass.run
               expect(has_run).to be_truthy
@@ -65,6 +62,49 @@ describe ActiveInteraction::Runnable do
 
       include_examples 'set_callback examples', :validate
       include_examples 'set_callback examples', :execute
+
+      context 'execute with composed interaction' do
+        class InnerInteraction
+          include ActiveInteraction::Runnable
+
+          def execute
+            errors.add(:base)
+          end
+        end
+
+        class OuterInteraction
+          include ActiveInteraction::Runnable
+
+          def execute
+            compose(InnerInteraction)
+          end
+        end
+
+        context 'around' do
+          it 'is yielded errors from composed interactions' do
+            block_result = nil
+            OuterInteraction.set_callback :execute, :around do |_, block|
+              block_result = block.call
+            end
+
+            OuterInteraction.run
+            expect(block_result).to be_an(ActiveInteraction::Errors)
+            expect(block_result).to include(:base)
+          end
+        end
+
+        context 'after' do
+          it 'is yielded errors from composed interactions' do
+            has_run = false
+            OuterInteraction.set_callback :execute, :after do
+              has_run = true
+            end
+
+            OuterInteraction.run
+            expect(has_run).to be_truthy
+          end
+        end
+      end
     end
   end
 

data/spec/active_interaction/errors_spec.rb

@@ -113,6 +113,13 @@ describe ActiveInteraction::Errors do
       it 'does not raise an error' do
         expect { errors.merge!(other) }.to_not raise_error
       end
+
+      it 'merges messages' do
+        message = SecureRandom.hex
+        other.add(:base, message)
+        errors.merge!(other)
+        expect(errors.messages[:base]).to include message
+      end
     end
   end
 end

data/spec/active_interaction/i18n_spec.rb

@@ -4,10 +4,9 @@ require 'spec_helper'
 
 describe ActiveInteraction do
   context 'I18n.load_path' do
-    it 'contains localization file paths at the beginning' do
-      expect(
-        I18n.load_path.first
-      ).to match %r{active_interaction/locale/en.yml\z}
+    it 'contains localization file paths' do
+      expect(I18n.load_path)
+        .to include a_string_ending_with('active_interaction/locale/en.yml')
     end
   end
 end
@@ -25,7 +24,14 @@ describe I18nInteraction do
     .const_get(:CLASSES)
     .map { |slug, _| slug.to_s }
 
-  shared_examples 'translation' do
+  shared_examples 'translation' do |locale|
+    before do
+      @locale = I18n.locale
+      I18n.locale = locale
+    end
+
+    after { I18n.locale = @locale }
+
     context 'types' do
       TYPES.each do |type|
         it "has a translation for #{type}" do
@@ -61,18 +67,28 @@ describe I18nInteraction do
   end
 
   context 'english' do
-    include_examples 'translation'
+    include_examples 'translation', :en
+  end
 
-    before do
-      @locale = I18n.locale
-      I18n.locale = :en
-    end
+  context 'brazilian portuguese' do
+    include_examples 'translation', :'pt-BR'
+  end
 
-    after { I18n.locale = @locale }
+  context 'french' do
+    include_examples 'translation', :fr
   end
 
   context 'hsilgne' do
-    include_examples 'translation'
+    before do
+      # This must appear before including the translation examples so that the
+      # locale is available before it is assigned.
+      locale = :hsilgne
+      unless I18n.locale_available?(locale)
+        I18n.config.available_locales = I18n.config.available_locales + [locale]
+      end
+    end
+
+    include_examples 'translation', :hsilgne
 
     before do
       I18n.backend.store_translations('hsilgne',
@@ -86,11 +102,6 @@ describe I18nInteraction do
           },
           types: TYPES.each_with_object({}) { |e, a| a[e] = e.reverse }
         })
-
-      @locale = I18n.locale
-      I18n.locale = 'hsilgne'
     end
-
-    after { I18n.locale = @locale }
   end
 end

data/spec/active_interaction/modules/validation_spec.rb

@@ -47,7 +47,8 @@ describe ActiveInteraction::Validation do
 
         it 'returns an :invalid_type error' do
           type = I18n.translate(
-            "#{ActiveInteraction::Base.i18n_scope}.types.#{filter.class.slug}")
+            "#{ActiveInteraction::Base.i18n_scope}.types.#{filter.class.slug}"
+          )
 
           expect(result).to eql [[filter.name, :invalid_type, type: type]]
         end

data/spec/spec_helper.rb

@@ -1,12 +1,14 @@
 # coding: utf-8
 
-require 'coveralls'
-Coveralls.wear!
+# Disable code coverage for JRuby because it always reports 0% coverage.
+if RUBY_ENGINE != 'jruby'
+  require 'coveralls'
+  Coveralls.wear!
+end
 
 require 'i18n'
 if I18n.config.respond_to?(:enforce_available_locales)
   I18n.config.enforce_available_locales = true
-  I18n.config.available_locales = %w[en hsilgne]
 end
 
 require 'active_interaction'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -87,34 +87,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.6'
-- !ruby/object:Gem::Dependency
-  name: guard-rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -163,14 +135,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +202,7 @@ files:
 - lib/active_interaction/grouped_input.rb
 - lib/active_interaction/locale/en.yml
 - lib/active_interaction/locale/fr.yml
+- lib/active_interaction/locale/pt-BR.yml
 - lib/active_interaction/modules/input_processor.rb
 - lib/active_interaction/modules/validation.rb
 - lib/active_interaction/version.rb
@@ -300,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.0
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Manage application specific business logic.