active_interaction 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWZlM2U4M2ZiMTYwNjRkOTRkNjQwYWM4OWU5OGM2ZWFhY2FjNDBhMA==
+  data.tar.gz: !binary |-
+    YjRjODdkZTczNWM0MWY1ZTQxMWY5NDUxMTcwNDRhYTI2YWNhYTY1MA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YWIxYmE0YzhjYzQwNGY1ZjMxY2M5ZTYyODEwYzA5N2UyYWM1ZjY5ZDIyN2Vk
+    MTM3YzY5YzZkOGQyZjZmZGQzY2VlNDJkNjBhMjQ1YzQyNGRiMmY3NzRhMDc1
+    MTQ0ZWM5Y2VhMGMxZTY1MjU4Nzg3YjQ5MzU2ZmNmMDhmZTdjNzY=
+  data.tar.gz: !binary |-
+    ZDQ3MDUwNDVmMDA3MmIwZDJiZmE4NDYxYTQ5ODIyMjY4ZmYwYTgwMDllYjhi
+    YjZjNWNhODA2NWFhNjA0ZjY0ODliMTBhOWU3YTUzZDc5YTkyNWVmYjI2MDBl
+    ZGI2Y2UxYjhhYjVjYTVmM2RhYjBlOTBiMWZlZDdmMjQwZmRjYWE=

data/CHANGELOG.md

@@ -1,6 +1,15 @@
+# Master
+
+# 0.1.3
+
+- Fix bug that prevented `attr_accessor`s from working.
+- Handle unconfigured timezones.
+- Use RDoc as YARD's Markdown provider instead of kramdown.
+
 # 0.1.2
 
-- `execute` will now have the filtered version of the values passed to `run` or `run!` as was intended.
+- `execute` will now have the filtered version of the values passed
+  to `run` or `run!` as was intended.
 
 # 0.1.1
 

data/README.md

@@ -1,18 +1,19 @@
 # ActiveInteraction
 
-[![Gem Version][]](https://badge.fury.io/rb/active_interaction)
-[![Build Status][]](https://travis-ci.org/orgsync/active_interaction)
-[![Coverage Status][]](https://coveralls.io/r/orgsync/active_interaction)
-[![Code Climate][]](https://codeclimate.com/github/orgsync/active_interaction)
-[![Dependency Status][]](https://gemnasium.com/orgsync/active_interaction)
+[![Gem Version][]][1]
+[![Build Status][]][2]
+[![Coverage Status][]][3]
+[![Code Climate][]][4]
+[![Dependency Status][]][5]
 
-At first it seemed alright. A little business logic in a controller or model
-wasn't going to hurt anything. Then one day you wake up and you're surrounded
-by fat models and unweildy controllers. Curled up and crying in the
-corner, you can't help but wonder how it came to this.
+At first it seemed alright. A little business logic in a controller
+or model wasn't going to hurt anything. Then one day you wake up
+and you're surrounded by fat models and unwieldy controllers. Curled
+up and crying in the corner, you can't help but wonder how it came
+to this.
 
-Take back control. Slim down models and wrangle monstrous controller methods
-with ActiveInteraction.
+Take back control. Slim down models and wrangle monstrous controller
+methods with ActiveInteraction.
 
 ## Installation
 
@@ -20,31 +21,32 @@ This project uses [semantic versioning][].
 
 Add it to your Gemfile:
 
-~~~ rb
-gem 'active_interaction', '~> 0.1.2'
-~~~
+```ruby
+gem 'active_interaction', '~> 0.1.3'
+```
 
 And then execute:
 
-~~~ sh
+```sh
 $ bundle
-~~~
+```
 
-Or install it yourself as:
+Or install it yourself with:
 
-~~~ rb
+```sh
 $ 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 it will call `execute`, store the return
-value of that method in `result`, and return an instance of your ActiveInteraction::Base
+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
+it will call `execute`, store the return value of that method in
+`result`, and return an instance of your ActiveInteraction::Base
 subclass. Let's looks at a simple example:
 
-~~~ rb
+```ruby
 # Define an interaction that signs up a user.
 class UserSignup < ActiveInteraction::Base
   # required
@@ -56,11 +58,14 @@ class UserSignup < ActiveInteraction::Base
   # ActiveRecord validations
   validates :email, format: EMAIL_REGEX
 
-  # The execute method is called only if the options validate. It does your
-  # business action. The return value will be stored in `result`.
+  # The execute method is called only if the options validate. It
+  # does your business action. The return value will be stored in
+  # `result`.
   def execute
     user = User.create!(email: email, name: name)
-    NewsletterSubscriptions.create(email: email, user_id: user.id) if newsletter_subscribe
+    if newsletter_subscribe
+      NewsletterSubscriptions.create(email: email, user_id: user.id)
+    end
     UserMailer.async(:deliver_welcome, user.id)
     user
   end
@@ -81,45 +86,46 @@ def create
     render action: :new
   end
 end
-~~~
+```
 
-You may have noticed that ActiveInteraction::Base quacks like ActiveRecord::Base.
-It can use validations from your Rails application and check option validity with
-`valid?`. Any errors are added to `errors` which works exactly like an ActiveRecord
-model.
+You may have noticed that ActiveInteraction::Base quacks like
+ActiveRecord::Base. It can use validations from your Rails application
+and check option validity with `valid?`. Any errors are added to
+`errors` which works exactly like an ActiveRecord model.
 
 ## How do I call an interaction?
 
-There are two way to call an interaction. Given UserSignup, you can do this:
+There are two way to call an interaction. Given UserSignup, you can
+do this:
 
-~~~ rb
+```ruby
 outcome = UserSignup.run(params)
 if outcome.valid?
   # Do something with outcome.result...
 else
   # Do something with outcome.errors...
 end
-~~~
+```
 
 Or, you can do this:
 
-~~~ rb
+```ruby
 result = UserSignup.run!(params)
 # Either returns the result of execute,
 # or raises ActiveInteraction::InteractionInvalid
-~~~
+```
 
 ## What can I pass to an interaction?
 
 Interactions only accept a Hash for `run` and `run!`.
 
-~~~ rb
+```ruby
 # A user comments on an article
 class CreateComment < ActiveInteraction::Base
   model :article, :user
   string :comment
 
-  validates :comment, length: {maximum: 500}
+  validates :comment, length: { maximum: 500 }
 
   def execute; ...; end
 end
@@ -131,21 +137,21 @@ def somewhere
     user: current_user
   )
 end
-~~~
+```
 
 ## How do I define an interaction?
 
 1. Subclass ActiveInteraction::Base
 
-    ~~~ rb
+    ```ruby
     class YourInteraction < ActiveInteraction::Base
       # ...
     end
-    ~~~
+    ```
 
 2. Define your attributes:
 
-    ~~~ rb
+    ```ruby
     string :name, :state
     integer :age
     boolean :is_special
@@ -159,13 +165,13 @@ end
     end
     date :arrives_on, default: Date.today
     date :departs_on, default: Date.tomorrow
-    ~~~
+    ```
 
 3. Use any additional validations you need:
 
-    ~~~ rb
-    validates :name, length: {maximum: 10}
-    validates :state, inclusion: {in: %w(AL AK AR ... WY)}
+    ```ruby
+    validates :name, length: { maximum: 10 }
+    validates :state, inclusion: { in: %w(AL AK AR ... WY) }
     validate arrives_before_departs
 
     private
@@ -175,28 +181,34 @@ end
         errors.add(:departs_on, 'must come after the arrival time')
       end
     end
-    ~~~
+    ```
 
 4. Define your execute method. It can return whatever you like:
 
-    ~~~ rb
+    ```ruby
     def execute
       record = do_thing(...)
       # ...
       record
     end
-    ~~~
+    ```
 
-A full list of methods can be found [here](http://www.rubydoc.info/github/orgsync/active_interaction/master/ActiveInteraction/Base).
+Check out the [documentation][] for a full list of methods.
 
 ## Credits
 
 This project was inspired by the fantastic work done in [Mutations][].
 
-[build status]: https://travis-ci.org/orgsync/active_interaction.png
-[code climate]: https://codeclimate.com/github/orgsync/active_interaction.png
-[coverage status]: https://coveralls.io/repos/orgsync/active_interaction/badge.png
-[dependency status]: https://gemnasium.com/orgsync/active_interaction.png
-[gem version]: https://badge.fury.io/rb/active_interaction.png
-[mutations]: https://github.com/cypriss/mutations
-[semantic versioning]: http://semver.org
+  [1]: https://badge.fury.io/rb/active_interaction "Gem Version"
+  [2]: https://travis-ci.org/orgsync/active_interaction "Build Status"
+  [3]: https://coveralls.io/r/orgsync/active_interaction "Coverage Status"
+  [4]: https://codeclimate.com/github/orgsync/active_interaction "Code Climate"
+  [5]: https://gemnasium.com/orgsync/active_interaction "Dependency Status"
+  [build status]: https://travis-ci.org/orgsync/active_interaction.png
+  [code climate]: https://codeclimate.com/github/orgsync/active_interaction.png
+  [coverage status]: https://coveralls.io/repos/orgsync/active_interaction/badge.png
+  [dependency status]: https://gemnasium.com/orgsync/active_interaction.png
+  [documentation]: http://rubydoc.info/github/orgsync/active_interaction
+  [gem version]: https://badge.fury.io/rb/active_interaction.png
+  [mutations]: https://github.com/cypriss/mutations
+  [semantic versioning]: http://semver.org

data/lib/active_interaction.rb

@@ -20,4 +20,4 @@ require 'active_interaction/filters/time_filter'
 require 'active_interaction/base'
 
 # @since 0.1.0
-module ActiveInteraction; end
+module ActiveInteraction end

data/lib/active_interaction/base.rb

@@ -1,8 +1,8 @@
 require 'active_support/core_ext/hash/indifferent_access'
 
 module ActiveInteraction
-  # @abstract Subclass and override {#execute} to implement
-  #   a custom ActiveInteraction class.
+  # @abstract Subclass and override {#execute} to implement a custom
+  #   ActiveInteraction class.
   #
   # @example
   #   class ExampleInteraction < ActiveInteraction::Base
@@ -25,7 +25,7 @@ module ActiveInteraction
   #     p outcome.errors
   #   end
   class Base
-    extend  ::ActiveModel::Naming
+    extend ::ActiveModel::Naming
     include ::ActiveModel::Conversion
     include ::ActiveModel::Validations
 
@@ -57,17 +57,18 @@ module ActiveInteraction
       end
 
       options.each do |attribute, value|
-        if respond_to?("#{attribute}=")
-          send("_filter__#{attribute}=", value)
+        method = "_filter__#{attribute}="
+        if respond_to?(method, true)
+          send(method, value)
         else
           instance_variable_set("@#{attribute}", value)
         end
       end
     end
 
-    # Runs the business logic associated with the interactor. The method is only
-    #   run when there are no validation errors. The return value is placed into
-    #   {#result}. This method must be overridden in the subclass.
+    # Runs the business logic associated with the interaction. The method is
+    #   only run when there are no validation errors. The return value is
+    #   placed into {#result}. This method must be overridden in the subclass.
     #
     # @raise [NotImplementedError] if the method is not defined.
     def execute
@@ -81,7 +82,8 @@ module ActiveInteraction
     #
     # @macro run_attributes
     #
-    # @return [ActiveInteraction::Base] An instance of the class `run` is called on.
+    # @return [ActiveInteraction::Base] An instance of the class `run` is
+    #   called on.
     def self.run(options = {})
       me = new(options)
 
@@ -105,55 +107,61 @@ module ActiveInteraction
     end
 
     # @private
-    def self.method_missing(filter_type, *args, &block)
-      klass = Filter.factory(filter_type)
+    def self.method_missing(type, *args, &block)
+      filter = Filter.factory(type)
       options = args.last.is_a?(Hash) ? args.pop : {}
       args.each do |attribute|
-        filter_attr_accessor(klass, attribute, options, &block)
-
-        filter_validator(attribute, filter_type, klass, options, &block)
+        set_up_reader(attribute, filter, options, &block)
+        set_up_writer(attribute, filter, options, &block)
+        set_up_validator(attribute, type, filter, options, &block)
       end
     end
     private_class_method :method_missing
 
     # @private
-    def self.filter_attr_accessor(filter, attribute, options, &block)
-      filter_attr_writer = "_filter__#{attribute}="
-      define_method(filter_attr_writer) do |value|
-        filtered_value =
-          begin
-            filter.prepare(attribute, value, options, &block)
-          rescue InvalidValue, MissingValue
-            value
-          end
-
-        instance_variable_set("@#{attribute}", filtered_value)
-      end
-      private filter_attr_writer
-
-      attr_writer attribute
-
+    def self.set_up_reader(attribute, filter, options, &block)
+      default = nil
       if options.has_key?(:default)
         begin
-          default_value = filter.prepare(attribute, options.delete(:default), options, &block)
+          default = filter.
+            prepare(attribute, options.delete(:default), options, &block)
         rescue InvalidValue
           raise InvalidDefaultValue
         end
       end
 
       define_method(attribute) do
-        instance_variable_name = "@#{attribute}"
-        if instance_variable_defined?(instance_variable_name)
-          instance_variable_get(instance_variable_name)
+        symbol = "@#{attribute}"
+        if instance_variable_defined?(symbol)
+          instance_variable_get(symbol)
         else
-          default_value
+          default
         end
       end
     end
-    private_class_method :filter_attr_accessor
+    private_class_method :set_up_reader
+
+    # @private
+    def self.set_up_writer(attribute, filter, options, &block)
+      attr_writer attribute
+
+      writer = "_filter__#{attribute}="
+
+      define_method(writer) do |value|
+        value =
+          begin
+            filter.prepare(attribute, value, options, &block)
+          rescue InvalidValue, MissingValue
+            value
+          end
+        instance_variable_set("@#{attribute}", value)
+      end
+      private writer
+    end
+    private_class_method :set_up_writer
 
     # @private
-    def self.filter_validator(attribute, type, filter, options, &block)
+    def self.set_up_validator(attribute, type, filter, options, &block)
       validator = "_validate__#{attribute}__#{type}"
 
       validate validator
@@ -165,11 +173,11 @@ module ActiveInteraction
           errors.add(attribute, 'is required')
         rescue InvalidValue
           errors.add(attribute,
-            "is not a valid #{type.to_s.humanize.downcase}")
+                     "is not a valid #{type.to_s.humanize.downcase}")
         end
       end
       private validator
     end
-    private_class_method :filter_validator
+    private_class_method :set_up_validator
   end
 end

data/lib/active_interaction/filter_method.rb

@@ -7,7 +7,7 @@ module ActiveInteraction
       @method_name, @block = method_name, block
 
       @attribute = args.shift if args.first.is_a?(Symbol)
-      @options   = (args.first || {}).dup
+      @options = (args.first || {}).dup
 
       if @options.include?(:default)
         raise ArgumentError, ':default is not supported inside filter blocks'

data/lib/active_interaction/filters/array_filter.rb

@@ -36,10 +36,10 @@ module ActiveInteraction
     def self.convert_values(values, &block)
       return values.dup unless block_given?
 
-      filter_method = get_filter_method(FilterMethods.evaluate(&block))
-
+      method = get_filter_method(FilterMethods.evaluate(&block))
       values.map do |value|
-        Filter.factory(filter_method.method_name).prepare(filter_method.attribute, value, filter_method.options, &filter_method.block)
+        Filter.factory(method.method_name).
+          prepare(method.attribute, value, method.options, &method.block)
       end
     end
     private_class_method :convert_values

data/lib/active_interaction/filters/date_time_filter.rb

@@ -1,7 +1,8 @@
 module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to
-    #   the attributes are DateTimes. String values are processed using `parse`.
+    #   the attributes are DateTimes. String values are processed using
+    #   `parse`.
     #
     # @macro attribute_method_params
     #

data/lib/active_interaction/filters/file_filter.rb

@@ -2,8 +2,8 @@ module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to
     #   the attributes are Files or TempFiles. It will also extract a file from
-    #   any object with a `tempfile` method. This is useful when passing in Rails
-    #   params that include a file upload.
+    #   any object with a `tempfile` method. This is useful when passing in
+    #   Rails params that include a file upload.
     #
     # @macro attribute_method_params
     #

data/lib/active_interaction/filters/hash_filter.rb

@@ -34,10 +34,10 @@ module ActiveInteraction
     def self.convert_values(hash, &block)
       return hash unless block_given?
 
-      FilterMethods.evaluate(&block).each do |filter_method|
-        key = filter_method.attribute
-
-        hash[key] = Filter.factory(filter_method.method_name).prepare(key, hash[key], filter_method.options, &filter_method.block)
+      FilterMethods.evaluate(&block).each do |method|
+        key = method.attribute
+        hash[key] = Filter.factory(method.method_name).
+          prepare(key, hash[key], method.options, &method.block)
       end
 
       hash

data/lib/active_interaction/filters/model_filter.rb

@@ -4,7 +4,8 @@ module ActiveInteraction
     #   the attributes are the correct class.
     #
     # @macro attribute_method_params
-    # @option options [Class, String, Symbol] :class (use the attribute name) Class name used to ensure the value.
+    # @option options [Class, String, Symbol] :class (use the attribute name)
+    #   Class name used to ensure the value.
     #
     # @example Ensures that the class is `Account`
     #   model :account

data/lib/active_interaction/filters/time_filter.rb

@@ -2,8 +2,8 @@ module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to
     #   the attributes are Times. Numeric values are processed using `at`.
-    #   Strings are processed using `parse`. If `Time.zone` is available it will
-    #   be used so that the values are time zone aware.
+    #   Strings are processed using `parse`. If `Time.zone` is available it
+    #   will be used so that the values are time zone aware.
     #
     # @macro attribute_method_params
     #
@@ -33,7 +33,7 @@ module ActiveInteraction
     end
 
     def self.time
-      if Time.respond_to?(:zone)
+      if Time.respond_to?(:zone) && !Time.zone.nil?
         Time.zone
       else
         Time

data/lib/active_interaction/version.rb

@@ -1,3 +1,3 @@
 module ActiveInteraction
-  VERSION = Gem::Version.new('0.1.2')
+  VERSION = Gem::Version.new('0.1.3')
 end

data/spec/active_interaction/base_spec.rb

@@ -30,8 +30,8 @@ describe ActiveInteraction::Base do
 
           validates :thing, presence: true
 
-          def self.model_name
-            ActiveModel::Name.new(self, nil, SecureRandom.hex)
+          def self.name
+            SecureRandom.hex
           end
 
           def execute
@@ -62,13 +62,13 @@ describe ActiveInteraction::Base do
       end
     end
 
-    describe InteractionWithFilter do
+    describe 'with a filter' do
       let(:described_class) { InteractionWithFilter }
 
       context 'failing validations' do
         before { options.merge!(thing: thing) }
 
-        context 'InvalidValue' do
+        context 'with an invalid value' do
           let(:thing) { 'a' }
 
           it 'sets the attribute to the filtered value' do
@@ -76,7 +76,7 @@ describe ActiveInteraction::Base do
           end
         end
 
-        context 'MissingValue' do
+        context 'without a value' do
           let(:thing) { nil }
 
           it 'sets the attribute to the filtered value' do
@@ -176,7 +176,9 @@ describe ActiveInteraction::Base do
 
       context 'failing validations' do
         it 'raises an error' do
-          expect { result }.to raise_error ActiveInteraction::InteractionInvalid
+          expect {
+            result
+          }.to raise_error ActiveInteraction::InteractionInvalid
         end
       end
 

data/spec/active_interaction/filters/array_filter_spec.rb

@@ -13,7 +13,7 @@ describe ActiveInteraction::ArrayFilter do
       end
     end
 
-    context 'with block as a valid block' do
+    context 'with a block' do
       let(:block) { Proc.new { array } }
 
       context 'with an Array of Arrays' do
@@ -33,7 +33,7 @@ describe ActiveInteraction::ArrayFilter do
       end
     end
 
-    context 'with block as a nested block' do
+    context 'with a nested block' do
       let(:block) { Proc.new { array { array } } }
       let(:value) { [[[]]] }
 
@@ -42,7 +42,7 @@ describe ActiveInteraction::ArrayFilter do
       end
     end
 
-    context 'with block as an invalid block' do
+    context 'with an invalid block' do
       let(:block) { Proc.new { array; array } }
       let(:value) { [] }
 

data/spec/active_interaction/filters/hash_filter_spec.rb

@@ -13,7 +13,7 @@ describe ActiveInteraction::HashFilter do
       end
     end
 
-    context 'with block as a block' do
+    context 'with a block' do
       let(:block) { Proc.new { hash :a } }
 
       context 'with a Hash containing a Hash' do
@@ -33,7 +33,7 @@ describe ActiveInteraction::HashFilter do
       end
     end
 
-    context 'with block as a block with multiple filters' do
+    context 'with a block with multiple filters' do
       let(:block) { Proc.new { hash :a; hash :b } }
 
       context 'with a Hash containing Hashes' do
@@ -45,7 +45,7 @@ describe ActiveInteraction::HashFilter do
       end
     end
 
-    context 'with block as a nested block' do
+    context 'with a nested block' do
       let(:block) { Proc.new { hash :a do; hash :b end } }
       let(:value) { { a: { b: {} } } }
 

data/spec/active_interaction/filters/model_filter_spec.rb

@@ -9,7 +9,7 @@ describe ActiveInteraction::ModelFilter do
   before { options.merge!(class: TestModel) }
 
   describe '.prepare(key, value, options = {}, &block)' do
-    shared_examples 'typechecking' do
+    shared_examples 'type checking' do
       context 'with the right class' do
         let(:value) { TestModel.new }
 
@@ -20,11 +20,11 @@ describe ActiveInteraction::ModelFilter do
     end
 
     context 'with options[:class] as a Class' do
-      include_examples 'typechecking'
+      include_examples 'type checking'
     end
 
     context 'with options[:class] as a valid String' do
-      include_examples 'typechecking'
+      include_examples 'type checking'
 
       before { options.merge!(class: options[:class].to_s) }
     end

data/spec/active_interaction/filters/time_filter_spec.rb

@@ -14,7 +14,7 @@ describe ActiveInteraction::TimeFilter do
     end
 
     shared_examples 'conversion' do
-      context 'with a float' do
+      context 'with a Float' do
         let(:value) { rand }
 
         it 'converts the Float' do
@@ -52,14 +52,28 @@ describe ActiveInteraction::TimeFilter do
     end
 
     context 'with Time.zone' do
-      include_examples 'conversion'
+      context 'as nil' do
+        include_examples 'conversion'
+
+        before do
+          allow(Time).to receive(:zone).and_return(nil)
+        end
 
-      before do
-        allow(Time).to receive(:zone).and_return(Time)
+        after do
+          expect(Time).to have_received(:zone).once.with(no_args)
+        end
       end
 
-      after do
-        expect(Time).to have_received(:zone).with(no_args)
+      context 'as Time' do
+        include_examples 'conversion'
+
+        before do
+          allow(Time).to receive(:zone).and_return(Time)
+        end
+
+        after do
+          expect(Time).to have_received(:zone).twice.with(no_args)
+        end
       end
     end
   end

data/spec/active_interaction/integration/array_interaction_spec.rb

@@ -61,7 +61,7 @@ describe ArrayInteraction do
             array default: []
           end
         end
-        # TODO: We should fail when defining the class, not when trying to run it.
+        # TODO: Fail when defining class, not running it.
         klass.run(a: [])
       }.to raise_error ArgumentError
     end

data/spec/active_interaction/integration/hash_interaction_spec.rb

@@ -61,7 +61,7 @@ describe HashInteraction do
             hash :x, default: {}
           end
         end
-        # TODO: We should fail when defining the class, not when trying to run it.
+        # TODO: Fail when defining class, not running it.
         klass.run(a: {})
       }.to raise_error ArgumentError
     end

data/spec/active_interaction/integration/model_interaction_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe 'ModelInteraciton' do
+describe 'ModelInteraction' do
   it_behaves_like 'an interaction', :model, -> { Proc.new {} }, class: Proc
 end

data/spec/active_interaction/overload_hash_spec.rb

@@ -34,7 +34,12 @@ describe ActiveInteraction::OverloadHash do
             with(:hash, *arguments)
         end
 
-        it 'passes the block to method_missing'
+        it 'passes the block to method_missing' do
+          allow(subject).to receive(:method_missing) do |*, &other_block|
+            expect(other_block).to equal block
+          end
+          hash(&block)
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -3,4 +3,4 @@ Coveralls.wear!
 
 require 'active_interaction'
 
-Dir['./spec/support/**/*.rb'].sort.each {|f| require f}
+Dir['./spec/support/**/*.rb'].sort.each { |f| require f }

data/spec/support/interactions.rb

@@ -4,15 +4,16 @@ shared_context 'interactions' do
   let(:result) { outcome.result }
 end
 
-shared_examples_for 'an interaction' do |type, value_lambda, filter_options = {}|
+shared_examples_for 'an interaction' do |type, generator, filter_options = {}|
   include_context 'interactions'
 
   let(:described_class) do
     Class.new(ActiveInteraction::Base) do
       send(type, :required, filter_options)
       send(type, :optional, filter_options.merge(allow_nil: true))
-      send(type, :default, filter_options.merge(default: value_lambda.call))
-      send(type, :nil_default, filter_options.merge(allow_nil: true, default: nil))
+      send(type, :default, filter_options.merge(default: generator.call))
+      send(type, :nil_default,
+           filter_options.merge(allow_nil: true, default: nil))
 
       def execute
         {
@@ -32,7 +33,7 @@ shared_examples_for 'an interaction' do |type, value_lambda, filter_options = {}
   end
 
   context 'with options[:required]' do
-    let(:required) { value_lambda.call }
+    let(:required) { generator.call }
 
     before { options.merge!(required: required) }
 
@@ -57,7 +58,7 @@ shared_examples_for 'an interaction' do |type, value_lambda, filter_options = {}
     end
 
     context 'with options[:optional]' do
-      let(:optional) { value_lambda.call }
+      let(:optional) { generator.call }
 
       before { options.merge!(optional: optional) }
 
@@ -67,7 +68,7 @@ shared_examples_for 'an interaction' do |type, value_lambda, filter_options = {}
     end
 
     context 'with options[:default]' do
-      let(:default) { value_lambda.call }
+      let(:default) { generator.call }
 
       before { options.merge!(default: default) }
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -10,152 +9,134 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: bundler
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: coveralls
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: kramdown
-  type: :development
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
-    none: false
+        version: '10.1'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
-    none: false
-  prerelease: false
+        version: '10.1'
 - !ruby/object:Gem::Dependency
-  name: rake
-  type: :development
+  name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.1'
-    none: false
+        version: '0.9'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.1'
-    none: false
-  prerelease: false
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  type: :development
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
-    none: false
+        version: '4.0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
-    none: false
-  prerelease: false
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: yard
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-    none: false
-  prerelease: false
 description: Manage application specific business logic.
 email:
 - aaron.lasseigne@gmail.com
@@ -164,6 +145,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/active_interaction/base.rb
+- lib/active_interaction/errors.rb
+- lib/active_interaction/filter.rb
+- lib/active_interaction/filter_method.rb
+- lib/active_interaction/filter_methods.rb
+- lib/active_interaction/filters/array_filter.rb
+- lib/active_interaction/filters/boolean_filter.rb
+- lib/active_interaction/filters/date_filter.rb
+- lib/active_interaction/filters/date_time_filter.rb
+- lib/active_interaction/filters/file_filter.rb
+- lib/active_interaction/filters/float_filter.rb
+- lib/active_interaction/filters/hash_filter.rb
+- lib/active_interaction/filters/integer_filter.rb
+- lib/active_interaction/filters/model_filter.rb
+- lib/active_interaction/filters/string_filter.rb
+- lib/active_interaction/filters/time_filter.rb
+- lib/active_interaction/overload_hash.rb
+- lib/active_interaction/version.rb
+- lib/active_interaction.rb
 - spec/active_interaction/base_spec.rb
 - spec/active_interaction/filter_method_spec.rb
 - spec/active_interaction/filter_methods_spec.rb
@@ -194,31 +194,13 @@ files:
 - spec/spec_helper.rb
 - spec/support/filters.rb
 - spec/support/interactions.rb
-- lib/active_interaction/base.rb
-- lib/active_interaction/errors.rb
-- lib/active_interaction/filter.rb
-- lib/active_interaction/filter_method.rb
-- lib/active_interaction/filter_methods.rb
-- lib/active_interaction/filters/array_filter.rb
-- lib/active_interaction/filters/boolean_filter.rb
-- lib/active_interaction/filters/date_filter.rb
-- lib/active_interaction/filters/date_time_filter.rb
-- lib/active_interaction/filters/file_filter.rb
-- lib/active_interaction/filters/float_filter.rb
-- lib/active_interaction/filters/hash_filter.rb
-- lib/active_interaction/filters/integer_filter.rb
-- lib/active_interaction/filters/model_filter.rb
-- lib/active_interaction/filters/string_filter.rb
-- lib/active_interaction/filters/time_filter.rb
-- lib/active_interaction/overload_hash.rb
-- lib/active_interaction/version.rb
-- lib/active_interaction.rb
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
 homepage: https://github.com/orgsync/active_interaction
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -228,21 +210,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 669983182544330814
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Manage application specific business logic.
 test_files:
 - spec/active_interaction/base_spec.rb