active_interaction 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20cc4b1b768b7f7dddca393b9554a664bb23010a
-  data.tar.gz: c746e003137672689025a54a9245330527088366
+  metadata.gz: 17c5f3f9d7839f69402b77687939e96072fb1d90
+  data.tar.gz: 825810914132a17a96ba6aabee8df1f9c86f5dc5
 SHA512:
-  metadata.gz: 678d8066fa76930180a241ab069617a46d083ac2ca558a4cfee8cb4e6a76131e907ed486ddbd898be89d4f513c74a5799169ba556d24240deb9ad005748c7bcd
-  data.tar.gz: ac3d346048c4744d9b2ca25f91b2f719d0b3fcec609671feaf94353e00d4717c147c6e9b47a669cf37d39d327b8c9352e4ac6f9f78cd8d3106235c44e5ede6d2
+  metadata.gz: e53ecbca6b68702b4fec258879193e776d82cc8d38ff55c9e8c0296ec8858a2d934a782f5f6ac89cbe21c07ad1e93315dd8069d51011e7da0afcc22151fd6f2f
+  data.tar.gz: b36c35ef30dad6c6d1c63af024a50c18b4a5ef474158a29a4c6cb7984338ae65e429ad968bffcc427bc608d27cde23b06802c55fb9ab57e38ca4999a051336a2

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # [Master][]
 
+# [1.3.1][] (2014-12-10)
+
+## Fixed
+
+- [#235][]: Fix a bug that prevented custom translations from loading.
+- [#224][]: Fix a bug that incorrectly inferred plural class names for filters
+  inside arrays.
+
 # [1.3.0][] (2014-08-15)
 
 ## Added
@@ -346,7 +354,8 @@
 
 - Initial release.
 
-  [master]: https://github.com/orgsync/active_interaction/compare/v1.3.0...master
+  [master]: https://github.com/orgsync/active_interaction/compare/v1.3.1...master
+  [1.3.1]: https://github.com/orgsync/active_interaction/compare/v1.3.0...v1.3.1
   [1.3.0]: https://github.com/orgsync/active_interaction/compare/v1.2.5...v1.3.0
   [1.2.5]: https://github.com/orgsync/active_interaction/compare/v1.2.4...v1.2.5
   [1.2.4]: https://github.com/orgsync/active_interaction/compare/v1.2.3...v1.2.4
@@ -455,3 +464,5 @@
   [#203]: https://github.com/orgsync/active_interaction/issues/203
   [#206]: https://github.com/orgsync/active_interaction/issues/206
   [#207]: https://github.com/orgsync/active_interaction/issues/207
+  [#224]: https://github.com/orgsync/active_interaction/issues/224
+  [#235]: https://github.com/orgsync/active_interaction/issues/235

data/README.md

@@ -24,19 +24,19 @@ This project uses [semantic versioning][13].
 
 Add it to your Gemfile:
 
-```ruby
+``` ruby
 gem 'active_interaction', '~> 1.3'
 ```
 
 And then execute:
 
-```sh
+``` sh
 $ bundle
 ```
 
 Or install it yourself with:
 
-```sh
+``` sh
 $ gem install active_interaction
 ```
 
@@ -238,7 +238,7 @@ into `config/locales`. So, for example, let's say that (for whatever
 reason) you want to print out everything backwards. Simply add
 translations for ActiveInteraction to your `hsilgne` locale:
 
-```yaml
+```ruby
 # config/locales/hsilgne.yml
 hsilgne:
   active_interaction:
@@ -281,15 +281,15 @@ ActiveInteraction is brought to you by [@AaronLasseigne][14] and
 work done in [Mutations][17].
 
   [0]: https://github.com/orgsync/active_interaction
-  [1]: https://badge.fury.io/rb/active_interaction.svg
+  [1]: https://img.shields.io/gem/v/active_interaction.svg?style=flat
   [2]: http://rubygems.org/gems/active_interaction "Gem Version"
-  [3]: https://travis-ci.org/orgsync/active_interaction.svg?branch=master
+  [3]: https://img.shields.io/travis/orgsync/active_interaction/master.svg?style=flat
   [4]: https://travis-ci.org/orgsync/active_interaction "Build Status"
-  [5]: https://img.shields.io/coveralls/orgsync/active_interaction/master.svg
+  [5]: https://img.shields.io/coveralls/orgsync/active_interaction/master.svg?style=flat
   [6]: https://coveralls.io/r/orgsync/active_interaction?branch=master "Coverage Status"
-  [7]: https://codeclimate.com/github/orgsync/active_interaction/badges/gpa.svg
+  [7]: https://img.shields.io/codeclimate/github/orgsync/active_interaction.svg?style=flat
   [8]: https://codeclimate.com/github/orgsync/active_interaction "Code Climate"
-  [9]: https://gemnasium.com/orgsync/active_interaction.svg
+  [9]: https://img.shields.io/gemnasium/orgsync/active_interaction.svg?style=flat
   [10]: https://gemnasium.com/orgsync/active_interaction "Dependency Status"
   [11]: http://orgsync.github.io/active_interaction/
   [12]: http://rubydoc.info/github/orgsync/active_interaction

data/lib/active_interaction.rb

@@ -40,8 +40,8 @@ require 'active_interaction/base'
 
 require 'active_interaction/backports'
 
-I18n.load_path += Dir[File.expand_path(
-  File.join(%w[active_interaction locale *.yml]), File.dirname(__FILE__))]
+I18n.load_path.unshift(Dir[File.expand_path(
+  File.join(%w[active_interaction locale *.yml]), File.dirname(__FILE__))])
 
 # Manage application specific business logic.
 #
@@ -50,5 +50,5 @@ I18n.load_path += Dir[File.expand_path(
 #
 # @since 1.0.0
 #
-# @version 1.3.0
+# @version 1.3.1
 module ActiveInteraction end

data/lib/active_interaction/concerns/missable.rb

@@ -16,7 +16,7 @@ module ActiveInteraction
     # @yieldparam options [Hash]
     #
     # @return [Missable]
-    def method_missing(slug, *args, &block)
+    def method_missing(slug, *args)
       return super unless (klass = filter(slug))
 
       options = args.last.is_a?(Hash) ? args.pop : {}

data/lib/active_interaction/filter.rb

@@ -54,7 +54,6 @@ module ActiveInteraction
       private
 
       # @param slug [Symbol]
-      # @param klass [Class]
       #
       # @return [Class]
       def register(slug)
@@ -173,7 +172,7 @@ module ActiveInteraction
 
         nil
       else
-        fail InvalidValueError, "#{name}: #{value.inspect}"
+        fail InvalidValueError, "#{name}: #{describe(value)}"
       end
     end
 
@@ -196,6 +195,14 @@ module ActiveInteraction
 
     private
 
+    # @param value [Object]
+    # @return [String]
+    def describe(value)
+      value.inspect
+    rescue NoMethodError
+      "(Object doesn't support #inspect)"
+    end
+
     # @return [Object]
     def raw_default
       value = options.fetch(:default)

data/lib/active_interaction/filters/array_filter.rb

@@ -41,11 +41,11 @@ module ActiveInteraction
 
     def method_missing(*, &block)
       super do |klass, names, options|
-        filter = klass.new(name, options, &block)
+        filter = klass.new(name.to_s.singularize.to_sym, options, &block)
 
         validate(filter, names)
 
-        filters[name] = filter
+        filters[filter.name] = filter
       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.3.0')
+  VERSION = Gem::Version.new('1.3.1')
 end

data/spec/active_interaction/filters/array_filter_spec.rb

@@ -83,6 +83,24 @@ describe ActiveInteraction::ArrayFilter, :filter do
         end
       end
     end
+
+    context 'with a nested model filter' do
+      let(:block) { proc { model } }
+      let(:name) { :objects }
+      let(:value) { [Object.new] }
+
+      it 'does not raise an error' do
+        expect { result }.to_not raise_error
+      end
+
+      it 'has a filter with the right key' do
+        expect(filter.filters).to have_key(:object)
+      end
+
+      it 'has a filter with the right name' do
+        expect(filter.filters[:object].name).to eql(:object)
+      end
+    end
   end
 
   describe '#database_column_type' do

data/spec/active_interaction/filters/interface_filter_spec.rb

@@ -13,6 +13,14 @@ describe ActiveInteraction::InterfaceFilter, :filter do
   describe '#cast' do
     let(:result) { filter.cast(value) }
 
+    context 'with a BasicObject' do
+      let(:value) { BasicObject.new }
+
+      it 'raises an error' do
+        expect { result }.to raise_error ActiveInteraction::InvalidValueError
+      end
+    end
+
     context 'with an Object' do
       let(:value) { Object.new }
 

data/spec/active_interaction/filters/time_filter_spec.rb

@@ -28,7 +28,9 @@ describe ActiveInteraction::TimeFilter, :filter do
         end
 
         it 'raises an error' do
-          expect { filter }.to raise_error(ActiveInteraction::InvalidFilterError)
+          expect do
+            filter
+          end.to raise_error(ActiveInteraction::InvalidFilterError)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -88,75 +88,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.28'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.28'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0.8'
 description: Manage application specific business logic.
 email:
 - aaron.lasseigne@gmail.com
@@ -165,6 +165,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE.txt
+- README.md
+- lib/active_interaction.rb
 - lib/active_interaction/backports.rb
 - lib/active_interaction/base.rb
 - lib/active_interaction/concerns/active_modelable.rb
@@ -193,10 +197,10 @@ files:
 - lib/active_interaction/filters/symbol_filter.rb
 - lib/active_interaction/filters/time_filter.rb
 - lib/active_interaction/grouped_input.rb
+- lib/active_interaction/locale/en.yml
 - lib/active_interaction/modules/input_processor.rb
 - lib/active_interaction/modules/validation.rb
 - lib/active_interaction/version.rb
-- lib/active_interaction.rb
 - spec/active_interaction/base_spec.rb
 - spec/active_interaction/concerns/active_modelable_spec.rb
 - spec/active_interaction/concerns/hashable_spec.rb
@@ -244,10 +248,6 @@ files:
 - spec/support/concerns.rb
 - spec/support/filters.rb
 - spec/support/interactions.rb
-- CHANGELOG.md
-- LICENSE.txt
-- README.md
-- lib/active_interaction/locale/en.yml
 homepage: http://orgsync.github.io/active_interaction/
 licenses:
 - MIT
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Manage application specific business logic.