composable_operations 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 237f6bf42a1d019c2f0de93dd8baa18c187fa276
-  data.tar.gz: 1c8648513871178ab2d34127fa29b1799adbee28
+  metadata.gz: 16bacd4b97dcd28f11356d7a01dbc3957487b5a9
+  data.tar.gz: f622ff84700dccf7ed5fc89d99907706b124e0b5
 SHA512:
-  metadata.gz: 1f241f35e8737eb4b1aa2a585921ec97d44ccaf62210d7eb9b166e74933cbfb8a9d147c6aee31d36bcf13fca4acf8475ed3bdcb3bde30aa9115bab8c91e645fd
-  data.tar.gz: 483847be976d67e1afdcd24dd5a5cf28237a1598e4b1419de1ccb48dd623a318b1ec137b68688172d77c4ff6c17056c92dce1413a678bbf631258adb08270fdd
+  metadata.gz: 4a2bf743f4f0f86f5ab3f0c8265c68feedf626dbf76cf00c860184ae81e37dd4635a324adf46c9c4f0b7c90af675863ada47bcb0d12f732d4d47180e9683be57
+  data.tar.gz: 13dd02a2bdd146fab5bc27a265cf24a5180087303981c89b2aa23d89076a7fab70687be56971a6a63f6d8d78727267bb833b5080ec432776bed055963110eba7

data/composable_operations.gemspec

@@ -19,7 +19,7 @@ multiple of these operations in operation pipelines.}
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "smart_properties", "~> 1.0"
+  spec.add_dependency "smart_properties", "~> 1.10"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "pry", "~> 0.9.0"

data/lib/composable_operations/composed_operation.rb

@@ -8,8 +8,9 @@ module ComposableOperations
         @_options = options
       end
 
-      def create(context, *input)
-        new *input, Hash[Array(@_options).map do |key, value|
+      def new(context, *input)
+        input = input.shift(arity)
+        __getobj__.new *input, Hash[Array(@_options).map do |key, value|
           [key, value.kind_of?(Proc) ? context.instance_exec(&value) : value]
         end]
       end
@@ -23,6 +24,11 @@ module ComposableOperations
       end
 
       def use(operation, options = {})
+        if operations.empty?
+          arguments = operation.arguments
+          processes(*arguments) unless arguments.empty?
+        end
+
         (@operations ||= []) << OperationFactory.new(operation, options)
       end
 
@@ -47,9 +53,9 @@ module ComposableOperations
       def execute
         self.class.operations.inject(input) do |data, operation|
           operation = if data.respond_to?(:to_ary)
-                        operation.create(self, *data)
+                        operation.new(self, *data)
                       else
-                        operation.create(self, data)
+                        operation.new(self, data)
                       end
           operation.perform
 

data/lib/composable_operations/operation.rb

@@ -4,11 +4,14 @@ module ComposableOperations
     include SmartProperties
 
     class << self
+      attr_writer :arguments
 
-      attr_writer :arity
+      def arguments
+        @arguments ||= []
+      end
 
       def arity
-        @arity || 0
+        arguments.count
       end
 
       def perform(*args)
@@ -57,15 +60,13 @@ module ComposableOperations
         end
 
         def processes(*names)
-          self.arity = names.length
-
           case names.length
           when 0
             raise ArgumentError, "#{self}.#{__callee__} expects at least one argument"
           else
             names.each_with_index do |name, index|
-              define_method(name) { input[index] }
-              define_method("#{name}=") { |value| input[index] = value }
+              property(name, required: true) unless properties.key?(name)
+              arguments << name
             end
           end
         end
@@ -90,12 +91,21 @@ module ComposableOperations
     attr_reader :exception
 
     def initialize(*args)
-      named_input_parameters   = args.shift(self.class.arity)
-      options                  = args.last.kind_of?(Hash) ? args.pop : {}
-      unnamed_input_parameters = args
+      arity = self.class.arity
+      arguments = args.shift(arity)
+      attributes = args.last.kind_of?(Hash) ? args.pop : {}
+
+      raise ArgumentError, "wrong number of arguments #{arguments.length + args.length} for #{arity}" unless args.empty?
+
+      self.class.arguments.each_with_index do |name, index|
+        attributes[name] = arguments[index]
+      end
+
+      super(attributes)
+    end
 
-      @input = named_input_parameters + unnamed_input_parameters
-      super(options)
+    def input
+      self.class.arguments.map { |name| self[name] }
     end
 
     def failed?

data/lib/composable_operations/version.rb

@@ -1,3 +1,3 @@
 module ComposableOperations
-  VERSION = "0.9.2"
+  VERSION = "0.10.0"
 end

data/spec/composable_operations/composed_operation_spec.rb

@@ -29,6 +29,7 @@ describe ComposableOperations::ComposedOperation do
 
   let(:string_multiplier) do
     Class.new(ComposableOperations::Operation) do
+      processes :text
       property :multiplicator, default: 1, converts: :to_i, required: true
       property :separator, default: ' ', converts: :to_s, required: true
 
@@ -37,20 +38,24 @@ describe ComposableOperations::ComposedOperation do
       end
 
       def execute
-        (Array(input) * multiplicator).join(separator)
+        (Array(text) * multiplicator).join(separator)
       end
     end
   end
 
   let(:halting_operation) do
     Class.new(ComposableOperations::Operation) do
+      def self.name
+        "HaltingOperation"
+      end
+
       def execute
         halt
       end
     end
   end
 
-  context "when composed of one operation that generates a string no matter the input" do
+  context "when composed of one operation that generates" do
     subject(:composed_operation) do
       operation = string_generator
 
@@ -60,7 +65,7 @@ describe ComposableOperations::ComposedOperation do
     end
 
     it "should return this string as result" do
-      expect(composed_operation.perform(nil)).to eq("chunky bacon")
+      expect(composed_operation.perform).to eq("chunky bacon")
     end
   end
 
@@ -100,7 +105,7 @@ describe ComposableOperations::ComposedOperation do
     end
 
     it "should return a capitalized version of the generated string" do
-      expect(composed_operation.perform(nil)).to eq("CHUNKY BACON")
+      expect(composed_operation.perform).to eq("CHUNKY BACON")
     end
 
     it { is_expected.to utilize_operations(string_generator, string_capitalizer) }
@@ -123,5 +128,30 @@ describe ComposableOperations::ComposedOperation do
     end
     it { is_expected.to utilize_operations(string_generator, halting_operation, string_capitalizer) }
   end
+
+  context "when composed of two operations; one that that capitalizes a string and one that repeats the string" do
+    subject(:composed_operation) do
+      operations = [string_capitalizer, string_multiplier]
+
+      Class.new(described_class) do
+        use operations.first
+        use operations.last, multiplicator: 2
+      end
+    end
+
+    it "should raise when instantiated with no input" do
+      expect { composed_operation.new }.to raise_error(ArgumentError)
+    end
+
+    it "should not raise when instantiated with a string" do
+      expect { composed_operation.new("some string") }.to_not raise_error
+    end
+
+    it "should have an input argument with the same name as the first operation" do
+      expect(composed_operation.arguments).to eq(string_capitalizer.arguments)
+    end
+
+    it { is_expected.to succeed_to_perform.when_initialized_with("hello").and_return("HELLO HELLO") }
+  end
 end
 

data/spec/composable_operations/operation_input_processing_spec.rb

@@ -16,19 +16,6 @@ describe ComposableOperations::Operation, "input processing:" do
     it { is_expected.to succeed_to_perform.when_initialized_with(input).and_return(input) }
   end
 
-  describe "An operation that takes no arguments except for a Hash of additional options" do
-    subject(:operation) do
-      Class.new(described_class) do
-        def execute
-          input
-        end
-      end
-    end
-
-    it { is_expected.to succeed_to_perform.when_initialized_with(key: :value).and_return([]) }
-    it { is_expected.to succeed_to_perform.when_initialized_with(1, 2, 3, key: :value).and_return([1, 2, 3]) }
-  end
-
   describe "An operation that takes a Hash as input and an Hash of additional options" do
     let(:input) { { food: nil } }
 
@@ -71,7 +58,6 @@ describe ComposableOperations::Operation, "input processing:" do
     end
 
     it { is_expected.to succeed_to_perform.when_initialized_with(1, 2).and_return([1, 2]) }
-    it { is_expected.to succeed_to_perform.when_initialized_with(1, 2, 3).and_return([1, 2, 3]) }
   end
 
   describe "An operation that takes multiple arguments as input where the last of these arguments is a Hash" do
@@ -89,31 +75,33 @@ describe ComposableOperations::Operation, "input processing:" do
     it { is_expected.to succeed_to_perform.when_initialized_with(1, 2, operator: :*).and_return(2) }
   end
 
-  describe "An operation that takes multiple arguments as input where the last of these arguments is a Hash, as well as, a Hash of additional options" do
+  describe "An operation that takes a named argument and uses the setter for the named argument" do
     subject(:operation) do
       Class.new(described_class) do
-        processes :some_value, :yet_another_value, :a_hash
+        processes :some_value
         def execute
-          a_hash
+          self.some_value = "changed"
+          self.some_value
         end
       end
     end
 
-    it { is_expected.to succeed_to_perform.when_initialized_with(1, 2, {food: "chunky bacon"}, { additional: :options }).and_return(food: "chunky bacon") }
+    it { is_expected.to succeed_to_perform.when_initialized_with("unchanged").and_return("changed") }
   end
 
-  describe "An operation that takes a named argument and uses the setter for the named argument" do
+  describe "An operation that manually defines a property for its first input argument that upcases its assgined value" do
     subject(:operation) do
       Class.new(described_class) do
-        processes :some_value
+        property :text, converts: :upcase
+        processes :text
+
         def execute
-          self.some_value = "changed"
-          self.some_value
+          text
         end
       end
     end
 
-    it { is_expected.to succeed_to_perform.when_initialized_with("unchanged").and_return("changed") }
+    it { is_expected.to succeed_to_perform.when_initialized_with("hello").and_return("HELLO") }
   end
 end
 

data/spec/composable_operations/operation_spec.rb

@@ -2,28 +2,30 @@ require 'spec_helper'
 
 describe ComposableOperations::Operation do
   context "that always returns nil when executed" do
-    subject(:nil_operation) do
-      class << (operation = described_class.new(''))
+    let(:nil_operation) do
+       Class.new(described_class) do
         def execute
           nil
         end
       end
-      operation
     end
 
+    subject { nil_operation.new }
+
     it { is_expected.to succeed_to_perform.and_return(nil) }
   end
 
   context "that always halts and returns its original input" do
     let(:halting_operation) do
       Class.new(described_class) do
+        processes :message
         def execute
           halt "Full stop!", input.first
         end
       end
     end
 
-    let(:halting_operation_instance) do
+    subject(:halting_operation_instance) do
       halting_operation.new("Test")
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composable_operations
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Konstantin Tennhard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_properties
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Tool set for operation pipelines.
@@ -143,3 +143,4 @@ test_files:
 - spec/composable_operations/operation_input_processing_spec.rb
 - spec/composable_operations/operation_spec.rb
 - spec/spec_helper.rb
+has_rdoc: