interactor 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3738599fd10bf883b7ccdc29ff2fbe4322a75851
-  data.tar.gz: 71e339e19b1dbcb3c4a874060ae4f38e1cd37702
+  metadata.gz: c80e8f066f85441403b978f5ac73afb31c327309
+  data.tar.gz: a8e6c26945bfa58ec2f1002ba424978722f75e63
 SHA512:
-  metadata.gz: c8c053d53c21e3ee48e905959e8ff8298b3caa93c7df9ad2c60793b3108cf0b1b3dd106563bd5630898bb54944b7bc6eb9b1b63dc88ee736eebdfe060265581d
-  data.tar.gz: b0c7b00554345b259ffbcaae25c1817f99e7796300a1c11e8f1f1939eb9e9cd20693b57667c247b74a7105fa5fadb9490adcace3d7527b8b869f61d94b222c04
+  metadata.gz: bdc2f6fedb3587b76a24cca6e5f87acdcabcb0ecf66b0a591604e074a813f4a790b8c154afc6876fff5c0727c3bec49f45d5816efed313eaaece3a7ef0dc304c
+  data.tar.gz: 7d7beedb7f72fb0445ceae4ddec156342d13e38a6a768c3b790d6f29791af54035ad2003ca6bc2a31db0b7e1f3b12992f21d7987fbf954160e8536fee0a148e5

data/Gemfile

@@ -3,6 +3,7 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
+  gem "activesupport", "~> 4.0", require: false
   gem "coveralls", "~> 0.6.7", require: false
   gem "rspec", "~> 2.14"
 end

data/interactor.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name    = "interactor"
-  spec.version = "2.0.1"
+  spec.version = "2.1.0"
 
   spec.author      = "Collective Idea"
   spec.email       = "info@collectiveidea.com"

data/lib/interactor.rb

@@ -43,10 +43,10 @@ module Interactor
   end
 
   def method_missing(method, *)
-    context.fetch(method) { super }
+    context.fetch(method) { context.fetch(method.to_s) { super } }
   end
 
   def respond_to_missing?(method, *)
-    (context && context.key?(method)) || super
+    (context && (context.key?(method) || context.key?(method.to_s))) || super
   end
 end

data/lib/interactor/context.rb

@@ -1,7 +1,13 @@
+require "delegate"
+
 module Interactor
-  class Context < ::Hash
+  class Context < SimpleDelegator
     def self.build(context = {})
-      self === context ? context : new.replace(context)
+      self === context ? context : new(context.dup)
+    end
+
+    def initialize(context = {})
+      super(context)
     end
 
     def success?

data/lib/interactor/organizer.rb

@@ -26,7 +26,13 @@ module Interactor
 
       def perform
         interactors.each do |interactor|
-          instance = interactor.perform(context)
+          begin
+            instance = interactor.perform(context)
+          rescue
+            rollback
+            raise
+          end
+
           rollback && break if failure?
           performed << instance
         end

data/spec/interactor/context_spec.rb

@@ -17,6 +17,18 @@ module Interactor
         expect(context).to eq({})
       end
 
+      it "doesn't affect the original hash" do
+        hash = { foo: "bar" }
+        context = Context.build(hash)
+
+        expect(context).to be_a(Context)
+        expect {
+          context[:foo] = "baz"
+        }.not_to change {
+          hash[:foo]
+        }
+      end
+
       it "preserves an already built context" do
         context1 = Context.build(foo: "bar")
         context2 = Context.build(context1)
@@ -30,6 +42,25 @@ module Interactor
       end
     end
 
+    describe "#initialize" do
+      it "defaults to empty" do
+        expect {
+          expect(Context.new).to eq({})
+        }.not_to raise_error
+      end
+    end
+
+    describe "#[]" do
+      it "maintains indifferent access" do
+        require "active_support/hash_with_indifferent_access"
+
+        context = Context.build(HashWithIndifferentAccess.new(foo: "bar"))
+
+        expect(context[:foo]).to eq("bar")
+        expect(context["foo"]).to eq("bar")
+      end
+    end
+
     describe "#success?" do
       let(:context) { Context.build }
 

data/spec/interactor/organizer_spec.rb

@@ -104,6 +104,19 @@ module Interactor
 
         instance.perform
       end
+
+      it "aborts and rolls back on error" do
+        error = StandardError.new("foo")
+        expect(interactor2).to receive(:perform).once.with(context).ordered { instance2 }
+        expect(interactor3).to receive(:perform).once.with(context).ordered { raise error }
+        expect(interactor4).not_to receive(:perform)
+
+        expect(instance).to receive(:rollback).once.ordered do
+          expect(instance.performed).to eq([instance2])
+        end
+
+        expect { instance.perform }.to raise_error(error)
+      end
     end
 
     describe "#rollback" do

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
-require "coveralls"
-Coveralls.wear!
+if ENV["TRAVIS"]
+  require "coveralls"
+  Coveralls.wear!
+end
 
 require "interactor"
 

data/spec/support/lint.rb

@@ -128,7 +128,7 @@ shared_examples :lint do
 
   describe "context deferral" do
     context "initialized" do
-      let(:instance) { interactor.new(foo: "bar") }
+      let(:instance) { interactor.new(foo: "bar", "hello" => "world") }
 
       it "defers to keys that exist in the context" do
         expect(instance).to respond_to(:foo)
@@ -136,6 +136,12 @@ shared_examples :lint do
         expect { instance.method(:foo) }.not_to raise_error
       end
 
+      it "defers to string keys that exist in the context" do
+        expect(instance).to respond_to(:hello)
+        expect(instance.hello).to eq("world")
+        expect { instance.method(:hello) }.not_to raise_error
+      end
+
       it "bombs if the key does not exist in the context" do
         expect(instance).not_to respond_to(:baz)
         expect { instance.baz }.to raise_error(NoMethodError)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: interactor
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Collective Idea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler