trailblazer-operation 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 518732c6417e754d620873510361cd17958defb1
-  data.tar.gz: a77e4f2314161fb500b15017c79e81e1d53ffb09
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzgzYjgyM2I1NjUxYjEyOWIzZGViZDE2NjBkYmQyMTNkYjg5ZWIxOQ==
+  data.tar.gz: !binary |-
+    Y2M1MDU0Mzc4MDg0NGVlOGNlYjBkYWE2MTUyZmQyZGQ4ZGMwMjNkNA==
 SHA512:
-  metadata.gz: 0b88e57e5469ab4f41f13954a4c92469f98c661c883c8c1bb1a3f192a32a9f8389e3d941768c867faa9a40d119cf671bca666389a2da704f4957cb7cffcb785d
-  data.tar.gz: e265e9034e34e802d0364ad3402ab2c5d9f02e1ce5bff8a72a9f78341aa3f1c04abd84625d40cd3abce9d64c54a8455b4a4281809cc2ce5351ac758066c688f1
+  metadata.gz: !binary |-
+    MWI0ZmZmYjFmNjhlODZhYjQxOTYwNGRjNDRmM2Q1MGIzOGE3NTZmMjJjZWYw
+    YTBjZWM3MWNmNjhjN2QzZDY1MjY3Y2QwZGQyM2E0ZmQ5Zjk5ODdjOTc3OWI1
+    ODhhNWIwYWIyNzQ1M2Q0MGViNWEyYzc4MDA5MGRkMzNjN2FlZGQ=
+  data.tar.gz: !binary |-
+    NWQxZWU5YTc0YmY2NzNkNWFmMWFlMDYzYTEwNGM3NjZlZTFkMDU1YmZlZjRm
+    MDU3YTYxMThiOTY1ZjVkNTlhN2M3NzBiNGYzNWRmOWI3ZmEyMDdlMDU4NDZh
+    M2ZjOTJmMDY2YjllMjMxMzBjMzdjYzI0MTE1ZjQxODkyYTZlOGI=

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.0.6
+
+* Improvements with the pipe DSL.
+
 ## 0.0.5
 
 * `_insert` provides better API now.

data/lib/trailblazer/operation.rb

@@ -2,7 +2,6 @@ require "declarative" # FIXME: here?
 require "trailblazer/operation/skill"
 require "trailblazer/operation/pipetree"
 require "trailblazer/operation/generic"
-require "trailblazer/operation/macro"
 
 module Trailblazer
   # The Trailblazer-style operation.

data/lib/trailblazer/operation/pipetree.rb

@@ -4,7 +4,7 @@ require "trailblazer/operation/result"
 require "uber/option"
 
 class Trailblazer::Operation
-  New = ->(klass, options)     { klass.new(options) } # returns operation instance.
+  New = ->(klass, options) { klass.new(options) } # returns operation instance.
 
   # Implements the API to populate the operation's pipetree and
   # `Operation::call` to invoke the latter.
@@ -47,54 +47,100 @@ class Trailblazer::Operation
       def &(*args); _insert(:&, *args) end
       def <(*args); _insert(:<, *args) end
 
+      # self.| ->(*) { }, before: "operation.new"
+      # self.| :some_method
+      def |(cfg, user_options={})
+        DSL.import(self, self["pipetree"], cfg, user_options) &&
+          heritage.record(:|, cfg, user_options)
+      end
+
+      alias_method :step, :|
+      alias_method :consider, :&
+      alias_method :failure, :<
+      alias_method :success, :>
+
       # :private:
-      # High-level user step API that allows ->(options) procs.
-      def _insert(operator, proc, options={})
-        heritage.record(:_insert, operator, proc, options)
+      module Option
+        def self.call(proc, &block)
+          type = :proc
+
+          option =
+            if proc.is_a? Symbol
+              type = :symbol
+              ->(input, *_options) { input.send(proc, *_options) }
+            elsif proc.is_a? Proc
+              # ->(input, options) { proc.(**options) }
+              ->(input, *_options) { proc.(*_options) }
+            elsif proc.is_a? Uber::Callable
+              type = :callable
+              ->(input, *_options) { proc.(*_options) }
+            end
+
+          yield type if block_given?
+          option
+        end
+      end
 
+      # :public:
+      # Wrap the step into a proc that only passes `options` to the step.
+      # This is pure convenience for the developer and will be the default
+      # API for steps. ATM, we also automatically generate a step `:name`.
+      def self.insert(pipe, operator, proc, options={}, kws={}) # TODO: definer_name is a hack for debugging, only.
         # proc = Uber::Option[proc]
         _proc =
           if options[:wrap] == false
             proc
-          elsif proc.is_a? Symbol
-            options[:name] ||= proc
-            ->(input, _options) { input.send(proc, _options) }
-          elsif proc.is_a? Proc
-            options[:name] ||= "#{self.name}:#{proc.source_location.last}" if proc.is_a? Proc
-            # ->(input, options) { proc.(**options) }
-            ->(input, _options) { proc.(_options) }
-          elsif proc.is_a? Uber::Callable
-            options[:name] ||= proc.class
-            ->(input, _options) { proc.(_options) }
+          else
+            Option.(proc) do |type|
+              options[:name] ||= proc if type == :symbol
+              options[:name] ||= "#{kws[:definer_name]}:#{proc.source_location.last}" if proc.is_a? Proc if type == :proc
+              options[:name] ||= proc.class  if type == :callable
+            end
           end
 
-        self["pipetree"].send(operator, _proc, options) # ex: pipetree.> Validate, after: Model::Build
+        pipe.send(operator, _proc, options) # ex: pipetree.> Validate, after: Model::Build
       end
 
-      def ~(cfg)
-        heritage.record(:~, cfg)
+      def self.import(operation, pipe, cfg, user_options={})
+        if cfg.is_a?(Array) # e.g. from Contract::Validate
+          mod, args, block = cfg
 
-        self.|(cfg, inheriting: true) # FIXME: not sure if this is the final API.
-      end
+          import = Import.new(pipe, user_options) # API object.
+
+          return mod.import!(operation, import, *args, &block)
+        end
 
-      def |(cfg, user_options={}) # sorry for the magic here, but still playing with the DSL.
-        if cfg.is_a?(Macro) # e.g. Contract::Validate
-          import = Import.new(self, user_options)
+        insert(pipe, :>, cfg, user_options, {}) # DOEES NOOOT calls heritage.record
+      end
 
-          return cfg.import!(self, import) &&
-            heritage.record(:|, cfg, user_options)
+      Macros = Module.new
+      def self.macro!(name, constant)
+        Macros.send :define_method, name do |*args, &block|
+          [constant, args, block]
         end
+      end
+
+      # :private:
+      # High-level user step API that allows ->(options) procs.
+      def _insert(operator, proc, options={})
+        heritage.record(:_insert, operator, proc, options)
 
-        self.> cfg, user_options # calls heritage.record
+        DSL.insert(self["pipetree"], operator, proc, options, definer_name: self.name)
+      end
+
+      def ~(cfg)
+        heritage.record(:~, cfg)
+
+        self.|(cfg, inheriting: true) # FIXME: not sure if this is the final API.
       end
 
       # Try to abstract as much as possible from the imported module. This is for
       # forward-compatibility.
       # Note that Import#call will push the step directly on the pipetree which gives it the
       # low-level (input, options) interface.
-      Import = Struct.new(:operation, :user_options) do
+      Import = Struct.new(:pipetree, :user_options) do
         def call(operator, step, options)
-          operation["pipetree"].send operator, step, options.merge(user_options)
+          pipetree.send operator, step, options.merge(user_options)
         end
 
         def inheriting?
@@ -103,4 +149,6 @@ class Trailblazer::Operation
       end
     end
   end
+
+  extend Pipetree::DSL::Macros
 end

data/lib/trailblazer/operation/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   class Operation
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/test/gemfiles/Gemfile.ruby-1.9.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    trailblazer-operation (0.0.3)
+    trailblazer-operation (0.0.6)
       declarative
       pipetree (>= 0.0.4, < 0.1.0)
       uber (>= 0.1.0, < 0.2.0)

data/test/pipetree_test.rb

@@ -2,8 +2,6 @@ require "test_helper"
 
 class PipetreeTest < Minitest::Spec
   module Validate
-    extend Trailblazer::Operation::Macro
-
     def self.import!(operation, pipe)
       pipe.(:>, ->{ snippet }, name: "validate", before: "operation.new")
     end
@@ -13,21 +11,21 @@ class PipetreeTest < Minitest::Spec
   # ::|
   # without options
   class Create < Trailblazer::Operation
-    self.| Validate[]
+    self.| [Validate]
   end
 
   it { Create["pipetree"].inspect.must_equal %{[>validate,>>operation.new]} }
 
   # without any options or []
-  class New < Trailblazer::Operation
-    self.| Validate
-  end
+  # class New < Trailblazer::Operation
+  #   self.| Validate
+  # end
 
-  it { New["pipetree"].inspect.must_equal %{[>validate,>>operation.new]} }
+  # it { New["pipetree"].inspect.must_equal %{[>validate,>>operation.new]} }
 
   # with options
   class Update < Trailblazer::Operation
-    self.| Validate, after: "operation.new"
+    self.| [Validate], after: "operation.new"
   end
 
   it { Update["pipetree"].inspect.must_equal %{[>>operation.new,>validate]} }
@@ -68,7 +66,7 @@ class PipetreeTest < Minitest::Spec
   end
 
   it { Right.( id: 1 ).slice(">", "method_name!", "callable").must_equal [1, 1, 1] }
-  it { Right["pipetree"].inspect.must_equal %{[>>operation.new,>PipetreeTest::Right:58,>method_name!,>PipetreeTest::Right::MyCallable]} }
+  it { Right["pipetree"].inspect.must_equal %{[>>operation.new,>PipetreeTest::Right:56,>method_name!,>PipetreeTest::Right::MyCallable]} }
 
   #---
   # inheritance

metadata

@@ -1,109 +1,109 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-operation
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: declarative
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pipetree
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.4
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.4
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Trailblazer's operation object.
@@ -113,15 +113,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGES.md
 - Gemfile
 - README.md
 - Rakefile
 - lib/trailblazer/operation.rb
 - lib/trailblazer/operation/generic.rb
-- lib/trailblazer/operation/macro.rb
 - lib/trailblazer/operation/pipetree.rb
 - lib/trailblazer/operation/result.rb
 - lib/trailblazer/operation/skill.rb
@@ -151,17 +150,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Trailblazer's operation object with dependency management and pipetree flow.

data/lib/trailblazer/operation/macro.rb

@@ -1,17 +0,0 @@
-class Trailblazer::Operation
-  module Macro
-    Configuration = Struct.new(:mod, :args, :block) do
-      include Macro # mark it, so that ::| thinks this is a step module.
-
-      def import!(operation, import)
-        mod.import!(operation, import, *args)
-      end
-    end
-
-    def [](*args, &block)
-      # When called like Builder["builder.crud"], create a proxy
-      # object and Pipeline::| calls #import! on it.
-      Configuration.new(self, args, block)
-    end
-  end
-end