trailblazer-operation 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzgzYjgyM2I1NjUxYjEyOWIzZGViZDE2NjBkYmQyMTNkYjg5ZWIxOQ==
-  data.tar.gz: !binary |-
-    Y2M1MDU0Mzc4MDg0NGVlOGNlYjBkYWE2MTUyZmQyZGQ4ZGMwMjNkNA==
+SHA1:
+  metadata.gz: c0ec02e51e1d32a39bfcb2ae86381ada7fa9659a
+  data.tar.gz: eaa3b0ae603fa52a37e3f9cd9624a6522cd0d64d
 SHA512:
-  metadata.gz: !binary |-
-    MWI0ZmZmYjFmNjhlODZhYjQxOTYwNGRjNDRmM2Q1MGIzOGE3NTZmMjJjZWYw
-    YTBjZWM3MWNmNjhjN2QzZDY1MjY3Y2QwZGQyM2E0ZmQ5Zjk5ODdjOTc3OWI1
-    ODhhNWIwYWIyNzQ1M2Q0MGViNWEyYzc4MDA5MGRkMzNjN2FlZGQ=
-  data.tar.gz: !binary |-
-    NWQxZWU5YTc0YmY2NzNkNWFmMWFlMDYzYTEwNGM3NjZlZTFkMDU1YmZlZjRm
-    MDU3YTYxMThiOTY1ZjVkNTlhN2M3NzBiNGYzNWRmOWI3ZmEyMDdlMDU4NDZh
-    M2ZjOTJmMDY2YjllMjMxMzBjMzdjYzI0MTE1ZjQxODkyYTZlOGI=
+  metadata.gz: 7d6bfe1597f701fdbf17a581fe4edd2f52d304d46d0ac53d9d90544e9aa1fc30a522281fc02b4d67cf9ad0f278d89b3994336c58e6377ac306d0727fcbe51736
+  data.tar.gz: 4f21e43d502bc7abefa28b1f05261f34d90e2b4f32d72d1d63b5167a84e41637f4965d4fef7320344fc6f461844e9e73dd3db9ecebb57226b6cc2adeb1bee851

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.0.7
+
+* Simplify inheritance by basically removing it.
+
 ## 0.0.6
 
 * Improvements with the pipe DSL.

data/Gemfile

@@ -6,7 +6,6 @@ gemspec
 gem "multi_json"
 
 gem "dry-auto_inject"
-gem "dry-matcher"
 
 gem "minitest-line"
 gem "benchmark-ips"

data/Rakefile

@@ -11,9 +11,7 @@ Rake::TestTask.new(:test) do |test|
 
   if RUBY_VERSION == "1.9.3"
     test_files = test_files - %w{test/dry_container_test.rb}
-
   end
 
-  puts test_files.inspect
   test.test_files = test_files
 end

data/lib/trailblazer/operation/pipetree.rb

@@ -15,7 +15,7 @@ class Trailblazer::Operation
       includer.extend DSL          # ::|, ::> and friends.
 
       includer.initialize_pipetree!
-      includer.>> New, name: "operation.new", wrap: false
+      includer._insert(:>>, New, name: "operation.new", wrap: false)
     end
 
     module ClassMethods
@@ -36,28 +36,35 @@ class Trailblazer::Operation
       # Dry.RB provides it. It has to be executed with every subclassing.
       def initialize_pipetree!
         heritage.record :initialize_pipetree!
-        self["pipetree"] = ::Pipetree::Flow[]
+        self["pipetree"] = ::Pipetree::Flow.new
       end
     end
 
     module DSL
       # They all inherit.
-      def >>(*args); _insert(:>>, *args) end
       def >(*args); _insert(:>, *args) end
       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 :step,     :|
       alias_method :consider, :&
-      alias_method :failure, :<
-      alias_method :success, :>
+      alias_method :failure,  :<
+      alias_method :success,  :>
+      alias_method :override, :|
+      alias_method :~, :override
+
+      # :private:
+      # High-level user step API that allows ->(options) procs.
+      def _insert(operator, proc, options={})
+        heritage.record(:_insert, operator, proc, options)
+
+        DSL.insert(self["pipetree"], operator, proc, options, definer_name: self.name)
+      end
 
       # :private:
       module Option
@@ -101,37 +108,16 @@ class Trailblazer::Operation
         pipe.send(operator, _proc, options) # ex: pipetree.> Validate, after: Model::Build
       end
 
+      # note: does not calls heritage.record
       def self.import(operation, pipe, cfg, user_options={})
-        if cfg.is_a?(Array) # e.g. from Contract::Validate
-          mod, args, block = cfg
-
-          import = Import.new(pipe, user_options) # API object.
-
-          return mod.import!(operation, import, *args, &block)
-        end
-
-        insert(pipe, :>, cfg, user_options, {}) # DOEES NOOOT calls heritage.record
-      end
-
-      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)
+        return insert(pipe, :>, cfg, user_options, {}) unless cfg.is_a?(Array)
 
-        DSL.insert(self["pipetree"], operator, proc, options, definer_name: self.name)
-      end
+        # e.g. from Contract::Validate
+        mod, args, block = cfg
 
-      def ~(cfg)
-        heritage.record(:~, cfg)
+        import = Import.new(pipe, user_options) # API object.
 
-        self.|(cfg, inheriting: true) # FIXME: not sure if this is the final API.
+        mod.import!(operation, import, *args, &block)
       end
 
       # Try to abstract as much as possible from the imported module. This is for
@@ -140,14 +126,26 @@ class Trailblazer::Operation
       # low-level (input, options) interface.
       Import = Struct.new(:pipetree, :user_options) do
         def call(operator, step, options)
-          pipetree.send operator, step, options.merge(user_options)
+          insert_options = options.merge(user_options)
+
+          # Inheritance: when the step is already defined in the pipe,
+          # simply replace it with the new.
+          if name = insert_options[:name]
+            insert_options[:replace] = name if pipetree.index(name)
+          end
+
+          pipetree.send operator, step, insert_options
         end
+      end
 
-        def inheriting?
-          user_options[:inheriting]
+      Macros = Module.new
+      # create a class method on `target`, e.g. Contract::Validate() for step macros.
+      def self.macro!(name, constant, target=Macros)
+        target.send :define_method, name do |*args, &block|
+          [constant, args, block]
         end
       end
-    end
+    end # DSL
   end
 
   extend Pipetree::DSL::Macros

data/lib/trailblazer/operation/version.rb

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

data/test/gemfiles/Gemfile.ruby-2.3

@@ -2,4 +2,3 @@ source 'https://rubygems.org'
 gemspec path: "../../"
 
 gem "dry-auto_inject"
-gem "dry-matcher"

data/test/pipetree_test.rb

@@ -11,28 +11,32 @@ class PipetreeTest < Minitest::Spec
   # ::|
   # without options
   class Create < Trailblazer::Operation
-    self.| [Validate]
+    step [Validate]
   end
 
   it { Create["pipetree"].inspect.must_equal %{[>validate,>>operation.new]} }
 
   # without any options or []
   # class New < Trailblazer::Operation
-  #   self.| Validate
+  #   step Validate
   # end
 
   # it { New["pipetree"].inspect.must_equal %{[>validate,>>operation.new]} }
 
   # with options
   class Update < Trailblazer::Operation
-    self.| [Validate], after: "operation.new"
+    step [Validate], after: "operation.new"
   end
 
   it { Update["pipetree"].inspect.must_equal %{[>>operation.new,>validate]} }
 
-  # with :symbol
+  #---
+  # ::step
+
+  #-
+  #- with :symbol
   class Delete < Trailblazer::Operation
-    self.| :call!
+    step :call!
 
     def call!(options)
       self["x"] = options["params"]
@@ -41,9 +45,15 @@ class PipetreeTest < Minitest::Spec
 
   it { Delete.("yo")["x"].must_equal "yo" }
 
+  #- inheritance
+  class Remove < Delete
+  end
+
+  it { Remove.("yo")["x"].must_equal "yo" }
+
   # proc arguments
   class Forward < Trailblazer::Operation
-    self.| ->(input, options) { puts "@@@@@ #{input.inspect}"; puts "@@@@@ #{options.inspect}" }
+    step ->(input, options) { puts "@@@@@ #{input.inspect}"; puts "@@@@@ #{options.inspect}" }
   end
 
   it { skip; Forward.({ id: 1 }) }
@@ -66,7 +76,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:56,>method_name!,>PipetreeTest::Right::MyCallable]} }
+  it { Right["pipetree"].inspect.must_equal %{[>>operation.new,>PipetreeTest::Right:66,>method_name!,>PipetreeTest::Right::MyCallable]} }
 
   #---
   # inheritance

data/trailblazer-operation.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "uber", ">= 0.1.0", "< 0.2.0"
   spec.add_dependency "declarative"
-  spec.add_dependency "pipetree", ">= 0.0.4", "< 0.1.0"
+  spec.add_dependency "pipetree", ">= 0.0.5", "< 0.1.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

metadata

@@ -1,109 +1,109 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-operation
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-12 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
-    - - <
+        version: 0.0.5
+    - - "<"
       - !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
-    - - <
+        version: 0.0.5
+    - - "<"
       - !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,8 +113,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - README.md
@@ -150,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.4.8
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Trailblazer's operation object with dependency management and pipetree flow.