composable_operations 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb6d4feb567aaa5715d0cc18f4ce0fa9cb657f40
-  data.tar.gz: 90adbd786dc02ad45e48ba828d0a9d6f205a4d19
+  metadata.gz: 97911633d5ea509cebc6b53b4e91a2c8421c4e5c
+  data.tar.gz: 662c859656c3eb13d791c789d3f9c01b6c8d9610
 SHA512:
-  metadata.gz: 907056386820c76604a5cf0e9fcb99351b970b568b1fa24600a2240eaeb2a4a79db2c06fa0e3611d79a3f64591ff08e3ca3736b885f48b6fc261120a171cefdb
-  data.tar.gz: d5213f41b0f34e2f1e601159b836ed53e3175e78420a0da6769e3523133c4463723ff79a3e6311aeb6153328b75e34875c12e43d43c892203ea0d7ad646c7a38
+  metadata.gz: 5c0b471dc118210b6a3d01ce044aee797fbe8ec6cdf63796e310f7238d1955ec542b6d5f7f876f5efda312d2fb7b3cc1d970c4f7f2798fcbb298a319b49c68c6
+  data.tar.gz: 39062f7008cc98ae5b4a060d355cf8f011f3093b94f5580a8217cb56a6bca6da3b7cedad15aa78fd31ded75d9c5f09246fce73f4680f8d6cc58672a57026f3d0

data/lib/composable_operations/composed_operation.rb

@@ -1,22 +1,19 @@
 module ComposableOperations
   class ComposedOperation < Operation
 
-    class AutoConfiguringOperation < SimpleDelegator
+    class OperationFactory < SimpleDelegator
 
       def initialize(operation_class, options = {})
         super(operation_class)
-        @__options__ = options
+        @_options = options
       end
 
-      def new(input = nil, options = {})
-        options = Hash(__options__).merge(Hash(options))
-        __getobj__.new(input, options)
+      def create(context, input = nil)
+        new input, Hash[Hash(@_options).map do |key, value|
+          [key, value.kind_of?(Proc) ? context.instance_exec(&value) : value]
+        end]
       end
 
-      protected
-
-        attr_reader :__options__
-
     end
 
     class << self
@@ -26,7 +23,7 @@ module ComposableOperations
       end
 
       def use(operation, options = {})
-        (@operations ||= []) << AutoConfiguringOperation.new(operation, options)
+        (@operations ||= []) << OperationFactory.new(operation, options)
       end
 
       def compose(*operations, &block)
@@ -48,9 +45,8 @@ module ComposableOperations
     protected
 
       def execute
-        self.class.operations.inject(input) do |data, operation_and_options|
-          operation, options = *operation_and_options
-          operation = operation.new(data, options)
+        self.class.operations.inject(input) do |data, operation|
+          operation = operation.create(self, data)
           operation.perform
 
           if operation.failed?

data/lib/composable_operations/version.rb

@@ -1,3 +1,3 @@
 module ComposableOperations
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/composable_operations/composed_operation_spec.rb

@@ -72,8 +72,10 @@ describe ComposableOperations::ComposedOperation do
       string_multiplier = self.string_multiplier
 
       Class.new(described_class) do
+        property :multiplicator, default: 3
+
         use string_generator
-        use string_multiplier, separator: ' - ', multiplicator: 3
+        use string_multiplier, separator: ' - ', multiplicator: lambda { multiplicator }
       end.new
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composable_operations
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Konstantin Tennhard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_properties