Merge pull request #52 from collectiveidea/ostruct-context

Change the context object to an OpenStruct rather than a Hash delegator

Gemfile

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

lib/interactor/context.rb

@@ -1,13 +1,9 @@
-require "delegate"
+require "ostruct"
 
 module Interactor
-  class Context < SimpleDelegator
+  class Context < OpenStruct
     def self.build(context = {})
-      self === context ? context : new(context.dup)
-    end
-
-    def initialize(context = {})
-      super(context)
+      self === context ? context : new(context)
     end
 
     def success?
@@ -19,7 +15,7 @@ def failure?
     end
 
     def fail!(context = {})
-      update(context)
+      modifiable.update(context)
       @failure = true
     end
   end

spec/interactor/context_spec.rb

@@ -7,14 +7,14 @@ module Interactor
         context = Context.build(foo: "bar")
 
         expect(context).to be_a(Context)
-        expect(context).to eq(foo: "bar")
+        expect(context.foo).to eq("bar")
       end
 
       it "builds an empty context if no hash is given" do
         context = Context.build
 
         expect(context).to be_a(Context)
-        expect(context).to eq({})
+        expect(context.send(:table)).to eq({})
       end
 
       it "doesn't affect the original hash" do
@@ -23,7 +23,7 @@ module Interactor
 
         expect(context).to be_a(Context)
         expect {
-          context[:foo] = "baz"
+          context.foo = "baz"
         }.not_to change {
           hash[:foo]
         }
@@ -35,32 +35,13 @@ module Interactor
 
         expect(context2).to be_a(Context)
         expect {
-          context2[:foo] = "baz"
+          context2.foo = "baz"
         }.to change {
-          context1[:foo]
+          context1.foo
         }.from("bar").to("baz")
       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 }
 
@@ -110,15 +91,15 @@ module Interactor
         expect {
           context.fail!
         }.not_to change {
-          context[:foo]
+          context.foo
         }
       end
 
       it "updates the context" do
         expect {
           context.fail!(foo: "baz")
         }.to change {
-          context[:foo]
+          context.foo
         }.from("bar").to("baz")
       end
     end

spec/support/lint.rb

@@ -52,13 +52,13 @@
     it "calls setup" do
       interactor.class_eval do
         def setup
-          context[:foo] = context[:bar]
+          context.foo = context.bar
         end
       end
 
       instance = interactor.new(bar: "baz")
 
-      expect(instance.context[:foo]).to eq("baz")
+      expect(instance.context.foo).to eq("baz")
     end
   end