ballast 1.5.3 → 1.6.0

data/lib/ballast/operations_chain.rb

@@ -32,7 +32,14 @@ module Ballast
     def initialize(operations, context)
       @context = context
       @operations = operations.ensure_array
-      setup
     end
+
+    private
+      # Returns the operations to perform.
+      #
+      # @return [Array] An array of operations to perform.
+      def interactors
+        @operations
+      end
   end
 end

data/lib/ballast/version.rb

@@ -13,10 +13,10 @@ module Ballast
     MAJOR = 1
 
     # The minor version.
-    MINOR = 5
+    MINOR = 6
 
     # The patch version.
-    PATCH = 3
+    PATCH = 0
 
     # The current version of ballast.
     STRING = [MAJOR, MINOR, PATCH].compact.join(".")

data/spec/ballast/concerns/ajax_spec.rb

@@ -113,6 +113,18 @@ describe Ballast::Concerns::Ajax do
         "Access-Control-Max-Age" => "31557600"
       })
     end
+
+    it "should append custom headers values" do
+      subject.allow_cors(allow_origin: "ORIGIN", allow_methods: [:first, :second], allow_headers: "_", max_age: 1.day, allow_credentials: true)
+
+      expect(subject.headers).to eq({
+        "Access-Control-Allow-Origin" => "ORIGIN",
+        "Access-Control-Allow-Methods" => "FIRST, SECOND",
+        "Access-Control-Allow-Headers" => "_",
+        "Access-Control-Max-Age" => "86400",
+        "Access-Control-Allow-Credentials" => "true"
+      })
+    end
   end
 
   describe "#disallow_robots" do

data/spec/ballast/concerns/common_spec.rb

@@ -57,6 +57,18 @@ describe Ballast::Concerns::Common do
     end
   end
 
+  describe "#perform_operations_chain" do
+    it "should perform the requested operation chain and memoize it" do
+      expect(Ballast::OperationsChain).to receive(:perform).with("OWNER", [:a, :b], a: 1, b: 2).and_return("OPERATION 1")
+      expect(Ballast::OperationsChain).to receive(:perform).with(subject, [:c, :d], c: 3, d: 4).and_return("OPERATION 2")
+
+      subject.perform_operations_chain([:a, :b], "OWNER", a: 1, b: 2)
+      expect(subject.instance_variable_get(:@operation)).to eq("OPERATION 1")
+      subject.perform_operations_chain([:c, :d], c: 3, d: 4)
+      expect(subject.instance_variable_get(:@operation)).to eq("OPERATION 2")
+    end
+  end
+
   describe "#format_short_duration" do
     it "should format a date" do
       now = DateTime.civil(2013, 12, 9, 15, 6, 00)

data/spec/ballast/operations_chain_spec.rb

@@ -7,27 +7,55 @@ require "spec_helper"
 
 describe Ballast::OperationsChain do
   describe ".perform" do
-    before(:each) do
-      expect_any_instance_of(Ballast::OperationsChain).to receive(:perform)
+    class SuccessOperation < Ballast::Operation
+      def perform
+        response[:result] ||= 0
+        response[:result] += 1
+      end
     end
 
-    it "should initialize with the set of operations and the first argument as context" do
-      context = Ballast::Context.new
-      expect(Ballast::Context).not_to receive(:build)
-      expect(Ballast::OperationsChain).to receive(:new).with([:A, :B, :C], context).and_call_original
-      Ballast::OperationsChain.perform(context, [:A, :B, :C])
+    class FailureOperation < Ballast::Operation
+      def perform
+        fail!
+      end
     end
 
-    it "shuold use the provided owner and context" do
-      context = Ballast::Context.new
-      expect(Ballast::Context).not_to receive(:build)
-      expect(Ballast::OperationsChain).to receive(:new).with([:A, :B, :C], context).and_call_original
-      Ballast::OperationsChain.perform(nil, [:A, :B, :C], context: context)
+    class FinalOperation < Ballast::Operation
+      def perform
+        response[:result] = "#{response[:result]}F"
+      end
     end
 
-    it "should created the context on the fly if needed" do
-      expect(Ballast::Context).to receive(:build).with("A", {a: 1})
-      Ballast::OperationsChain.perform("A", [:A, :B, :C], params: {a: 1})
+    describe ".perform" do
+      before(:each) do
+        expect_any_instance_of(Ballast::OperationsChain).to receive(:perform)
+      end
+
+      it "should initialize with the set of operations and the first argument as context" do
+        context = Ballast::Context.new
+        expect(Ballast::Context).not_to receive(:build)
+        expect(Ballast::OperationsChain).to receive(:new).with([:A, :B, :C], context).and_call_original
+        Ballast::OperationsChain.perform(context, [:A, :B, :C])
+      end
+
+      it "should use the provided owner and context" do
+        context = Ballast::Context.new
+        expect(Ballast::Context).not_to receive(:build)
+        expect(Ballast::OperationsChain).to receive(:new).with([:A, :B, :C], context).and_call_original
+        Ballast::OperationsChain.perform(nil, [:A, :B, :C], context: context)
+      end
+
+      it "should created the context on the fly if needed" do
+        expect(Ballast::Context).to receive(:build).with("A", {a: 1})
+        Ballast::OperationsChain.perform("A", [:A, :B, :C], params: {a: 1})
+      end
+    end
+
+    describe "#perform" do
+      it "should execute the operations unless they fail" do
+        expect(Ballast::OperationsChain.perform(nil, [SuccessOperation, FinalOperation]).response[:result]).to eq("1F")
+        expect(Ballast::OperationsChain.perform(nil, [SuccessOperation, FailureOperation, FinalOperation]).response[:result].to_s).not_to match(/F$/)
+      end
     end
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ballast
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Shogun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
@@ -52,34 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.3
-- !ruby/object:Gem::Dependency
-  name: lazier
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.3.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.3.10
 - !ruby/object:Gem::Dependency
   name: brauser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: interactor
   requirement: !ruby/object:Gem::Requirement