active_interaction 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec03f8a492e5db88366e50b9a918ff40a4e008b3
-  data.tar.gz: 356b91990bfac14981a6d36dffcaafb4e3dd2d33
+  metadata.gz: d65a75d08fc8be7355ec025ebaed8b08873819c0
+  data.tar.gz: 3d75fd27e50013507a73176b40ba466e949b937f
 SHA512:
-  metadata.gz: a68094094d6dbf8a395a3f709ffd993944512c6edc921ce36f99b4383792de041954cc2d73271a0748102782f89c4e457bb63288ee56eb34e42ff6cb38fbcbd5
-  data.tar.gz: d682f33e94ea7bd25f4f9cf89e2fe3924bc501e608c6d32f469da42d92782f88aca01b43605c69adb5de62e36b2cafe3857307ff927a2306dbbb25ef334c4f93
+  metadata.gz: d807465b1015098c9c77c33c4429cd685fdf2eb268c83388ecd8b57110f12d1716309f1100c42fd2fda9b4bbefc9c612545c74905e6a17117fed45710ad5925c
+  data.tar.gz: 10c78c1906541dc8b89060c16bc957a44a9cd9519988e0633382c9609d4b101fa82ce9420df5fbf8b83a6f7ae9db4f76549c7075f5656d41a9423a52becd89db

data/CHANGELOG.md

@@ -1,5 +1,14 @@
+# [2.0.1][] (2015-05-27)
+
+## Fixed
+
+- [#286][]: Change `file` filter to check for `rewind` instead of `eof?`.
+- [#289][]: Actually removed `model` filter, which was deprecated in v1.6.0.
+
 # [2.0.0][] (2015-05-06)
 
+For help upgrading to version 2, please read [the announcement post][].
+
 ## Changed
 
 - [#250][]: Replaced symbolic errors with Rails 5-style detailed errors.
@@ -414,6 +423,7 @@
 
 - Initial release.
 
+  [2.0.1]: https://github.com/orgsync/active_interaction/compare/v2.0.0...v2.0.1
   [2.0.0]: https://github.com/orgsync/active_interaction/compare/v1.6.0...v2.0.0
   [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
@@ -544,3 +554,7 @@
   [#264]: https://github.com/orgsync/active_interaction/issues/264
   [#265]: https://github.com/orgsync/active_interaction/issues/265
   [#269]: https://github.com/orgsync/active_interaction/issues/269
+  [#286]: https://github.com/orgsync/active_interaction/issues/286
+  [#289]: https://github.com/orgsync/active_interaction/issues/289
+
+  [the announcement post]: http://devblog.orgsync.com/2015/05/06/announcing-active-interaction-2/

data/CONTRIBUTING.md

@@ -10,10 +10,4 @@
 
 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.
 
-# Vagrant
-
-If you like to use [Vagrant][] we've provided a [Vagrantfile][] for your convenience.
-
 [fork]: https://github.com/orgsync/active_interaction/fork
-[Vagrant]: http://www.vagrantup.com
-[Vagrantfile]: Vagrantfile

data/LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 to 2015 Aaron Lasseigne and Taylor Fausak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -14,11 +14,11 @@
 </p>
 
 <p align="center">
-  <a href="https://rubygems.org/gems/active_interaction"><img alt="" src="https://img.shields.io/gem/v/active_interaction.svg?label=version&amp;style=flat-square"></a>
-  <a href="https://travis-ci.org/orgsync/active_interaction"><img alt="" src="https://img.shields.io/travis/orgsync/active_interaction/master.svg?label=build&amp;style=flat-square"></a>
-  <a href="https://coveralls.io/r/orgsync/active_interaction"><img alt="" src="https://img.shields.io/coveralls/orgsync/active_interaction/master.svg?label=coverage&amp;style=flat-square"></a>
-  <a href="https://codeclimate.com/github/orgsync/active_interaction"><img alt="" src="https://img.shields.io/codeclimate/github/orgsync/active_interaction.svg?label=climate&amp;style=flat-square"></a>
-  <a href="https://gemnasium.com/orgsync/active_interaction"><img alt="" src="https://img.shields.io/gemnasium/orgsync/active_interaction.svg?label=dependencies&amp;style=flat-square"></a>
+  <a href="https://rubygems.org/gems/active_interaction"><img alt="Version" src="https://img.shields.io/gem/v/active_interaction.svg?label=version&amp;style=flat-square"></a>
+  <a href="https://travis-ci.org/orgsync/active_interaction"><img alt="Build" src="https://img.shields.io/travis/orgsync/active_interaction/master.svg?label=build&amp;style=flat-square"></a>
+  <a href="https://coveralls.io/r/orgsync/active_interaction"><img alt="Coverage" src="https://img.shields.io/coveralls/orgsync/active_interaction/master.svg?label=coverage&amp;style=flat-square"></a>
+  <a href="https://codeclimate.com/github/orgsync/active_interaction"><img alt="Climate" src="https://img.shields.io/codeclimate/github/orgsync/active_interaction.svg?label=climate&amp;style=flat-square"></a>
+  <a href="https://gemnasium.com/orgsync/active_interaction"><img alt="Dependencies" src="https://img.shields.io/gemnasium/orgsync/active_interaction.svg?label=dependencies&amp;style=flat-square"></a>
 </p>
 
 <hr>
@@ -85,7 +85,8 @@ $ gem install active_interaction --version '~> 2.0'
 ```
 
 This project uses [Semantic Versioning][]. Check out [the change log][] for a
-detailed list of changes.
+detailed list of changes. For help upgrading to version 2, please read [the
+announcement post][].
 
 ActiveInteraction works with all supported versions of Ruby (2.0 through 2.2)
 and ActiveModel (3.2 through 4.2).
@@ -1079,9 +1080,12 @@ end
 
 ### Forms
 
-The outcome returned by `.run` can be used in forms as though it were an ActiveModel object. You can also create a form object by calling `.new` on the interaction.
+The outcome returned by `.run` can be used in forms as though it were an
+ActiveModel object. You can also create a form object by calling `.new` on the
+interaction.
 
-Given an application with an `Account` model we'll create a new `Account` using the `CreateAccount` interaction.
+Given an application with an `Account` model we'll create a new `Account` using
+the `CreateAccount` interaction.
 
 ```rb
 # GET /accounts/new
@@ -1102,9 +1106,10 @@ def create
 end
 ```
 
-The form used to create a new `Account` has slightly more information on the `form_for` call than you might expect.
+The form used to create a new `Account` has slightly more information on the
+`form_for` call than you might expect.
 
-```rb
+```erb
 <%= form_for @account, as: :account, url: accounts_path do |f| %>
   <%= f.text_field :first_name %>
   <%= f.text_field :last_name %>
@@ -1112,11 +1117,13 @@ The form used to create a new `Account` has slightly more information on the `fo
 <% end %>
 ```
 
-This is necessary because we want the form to act like it is creating a new `Account`. Defining `to_model` on the `CreateAccount` interaction tells the form to treat our interaction like an `Account`.
+This is necessary because we want the form to act like it is creating a new
+`Account`. Defining `to_model` on the `CreateAccount` interaction tells the
+form to treat our interaction like an `Account`.
 
 ```rb
 class CreateAccount < ActiveInteraction::Base
-  ...
+  # ...
 
   def to_model
     Account.new
@@ -1124,16 +1131,35 @@ class CreateAccount < ActiveInteraction::Base
 end
 ```
 
-Now our `form_for` call knows how to generate the correct URL and param name (i.e. `params[:account]`).
+Now our `form_for` call knows how to generate the correct URL and param name
+(i.e. `params[:account]`).
 
-```rb
+```erb
 # app/views/accounts/new.html.erb
 <%= form_for @account do |f| %>
-  ...
+  <%# ... %>
 <% end %>
 ```
 
-ActiveInteraction also supports [formtastic][] and [simple_form][]. The filters used to define the inputs on your interaction will relay type information to these gems. As a result, form fields will automatically use the appropriate input type.
+If you have an interaction that updates an `Account`, you can define `to_model`
+to return the object you're updating.
+
+```rb
+class UpdateAccount < ActiveInteraction::Base
+  # ...
+
+  object :account
+
+  def to_model
+    account
+  end
+end
+```
+
+ActiveInteraction also supports [formtastic][] and [simple_form][]. The filters
+used to define the inputs on your interaction will relay type information to
+these gems. As a result, form fields will automatically use the appropriate
+input type.
 
 ### Predicates
 
@@ -1227,6 +1253,7 @@ Logo design by [Tyler Lee][].
 [the full documentation]: http://rubydoc.info/github/orgsync/active_interaction
 [semantic versioning]: http://semver.org/spec/v2.0.0.html
 [the change log]: CHANGELOG.md
+[the announcement post]: http://devblog.orgsync.com/2015/05/06/announcing-active-interaction-2/
 [active_model-errors_details]: https://github.com/cowbell/active_model-errors_details
 [aaron lasseigne]: https://github.com/AaronLasseigne
 [taylor fausak]: https://github.com/tfausak
@@ -1235,7 +1262,7 @@ Logo design by [Tyler Lee][].
 [mutations]: https://github.com/cypriss/mutations
 [our contribution guidelines]: CONTRIBUTING.md
 [complete list of contributors]: https://github.com/orgsync/active_interaction/graphs/contributors
-[the mit license]: LICENSE.txt
+[the mit license]: LICENSE.md
 [formtastic]: https://rubygems.org/gems/formtastic
 [simple_form]: https://rubygems.org/gems/simple_form
 [tyler lee]: https://github.com/tylerlee

data/lib/active_interaction.rb

@@ -9,19 +9,8 @@ require 'active_model'
 #
 # @since 1.0.0
 #
-# @version 2.0.0
+# @version 2.0.1
 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'

data/lib/active_interaction/base.rb

@@ -99,11 +99,6 @@ module ActiveInteraction
         end
       end
 
-      def model(*)
-        super
-      end
-      ActiveInteraction.deprecate self, :model, 'use `object` instead'
-
       private
 
       # @param klass [Class]

data/lib/active_interaction/filters/array_filter.rb

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

data/lib/active_interaction/filters/file_filter.rb

@@ -4,8 +4,9 @@ module ActiveInteraction
   class Base
     # @!method self.file(*attributes, options = {})
     #   Creates accessors for the attributes and ensures that values passed to
-    #   the attributes respond to the `eof?` method. This is useful when passing
-    #   in Rails params that include a file upload or another generic IO object.
+    #   the attributes respond to the `rewind` method. This is useful when
+    #   passing in Rails params that include a file upload or another generic
+    #   IO object.
     #
     #   @!macro filter_method_params
     #
@@ -24,7 +25,7 @@ module ActiveInteraction
     private
 
     def methods
-      [:eof?]
+      [:rewind]
     end
   end
 end

data/lib/active_interaction/filters/hash_filter.rb

@@ -49,11 +49,6 @@ module ActiveInteraction
       end
     end
 
-    def model(*)
-      super
-    end
-    ActiveInteraction.deprecate self, :model, 'use `object` instead'
-
     private
 
     def clean_value(h, name, filter, value)

data/lib/active_interaction/version.rb

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

data/spec/active_interaction/base_spec.rb

@@ -2,15 +2,15 @@
 
 require 'spec_helper'
 
-InteractionWithFilter = Class.new(TestInteraction) do
+class InteractionWithFilter < TestInteraction
   float :thing
 end
 
-InteractionWithDateFilter = Class.new(TestInteraction) do
+class InteractionWithDateFilter < TestInteraction
   date :thing
 end
 
-AddInteraction = Class.new(TestInteraction) do
+class AddInteraction < TestInteraction
   float :x, :y
 
   def execute
@@ -18,7 +18,7 @@ AddInteraction = Class.new(TestInteraction) do
   end
 end
 
-InterruptInteraction = Class.new(TestInteraction) do
+class InterruptInteraction < TestInteraction
   object :x, :y,
     class: Object,
     default: nil

data/spec/active_interaction/concerns/active_recordable_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-InteractionWithFloatFilter = Class.new(TestInteraction) do
+class InteractionWithFloatFilter < TestInteraction
   float :thing
 end
 

data/spec/active_interaction/filters/file_filter_spec.rb

@@ -25,8 +25,8 @@ describe ActiveInteraction::FileFilter, :filter do
       end
     end
 
-    context 'with an object that responds to #eof?' do
-      let(:value) { double(eof?: true) }
+    context 'with an object that responds to #rewind' do
+      let(:value) { double(rewind: nil) }
 
       it 'returns the object' do
         expect(result).to eq value

data/spec/active_interaction/i18n_spec.rb

@@ -12,7 +12,7 @@ describe ActiveInteraction do
   end
 end
 
-I18nInteraction = Class.new(TestInteraction) do
+class I18nInteraction < TestInteraction
   hash :a do
     hash :x
   end

data/spec/active_interaction/integration/array_interaction_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-ArrayInteraction = Class.new(TestInteraction) do
+class ArrayInteraction < TestInteraction
   array :a do
     array
   end

data/spec/active_interaction/integration/file_interaction_spec.rb

@@ -1,7 +1,20 @@
 # coding: utf-8
 
 require 'spec_helper'
+require 'action_dispatch'
 
-describe 'FileInteraction' do
+class FileInteraction < TestInteraction
+  file :a
+end
+
+describe FileInteraction do
+  include_context 'interactions'
   it_behaves_like 'an interaction', :file, -> { File.open(__FILE__) }
+
+  it 'works with an uploaded file' do
+    file = File.open(__FILE__)
+    uploaded_file = ActionDispatch::Http::UploadedFile.new(tempfile: file)
+    inputs[:a] = uploaded_file
+    expect(outcome).to be_valid
+  end
 end

data/spec/active_interaction/integration/hash_interaction_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-HashInteraction = Class.new(TestInteraction) do
+class HashInteraction < TestInteraction
   hash :a do
     hash :x
   end

data/spec/active_interaction/integration/interface_interaction_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'json'
 require 'yaml'
 
-InterfaceInteraction = Class.new(TestInteraction) do
+class InterfaceInteraction < TestInteraction
   interface :anything
 end
 

data/spec/active_interaction/integration/object_interaction_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-ObjectInteraction = Class.new(TestInteraction) do
+class ObjectInteraction < TestInteraction
   object :object
 end
 

data/spec/active_interaction/integration/time_interaction_spec.rb

@@ -25,7 +25,7 @@ TimeWithZone = Class.new do
   end
 end
 
-TimeInteraction = Class.new(TestInteraction) do
+class TimeInteraction < TestInteraction
   time :a
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -31,6 +31,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +189,7 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - CONTRIBUTING.md
-- LICENSE.txt
+- LICENSE.md
 - README.md
 - lib/active_interaction.rb
 - lib/active_interaction/backports.rb

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2013 Aaron Lasseigne
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.