trailblazer 1.1.2 → 2.0.0.beta1

data/test/operation_test.rb

@@ -7,73 +7,18 @@ module Inspect
   alias_method :to_s, :inspect
 end
 
-class OperationSetupParamsTest < MiniTest::Spec
-  class OperationSetupParam < Trailblazer::Operation
-    def process(params)
-      @model = params
-    end
-
-    def setup_params!(params)
-      params.merge!(garrett: "Rocks!")
-    end
-
-    include Inspect
-  end
-
-  # allows you changing params in #setup_params!.
-  it { OperationSetupParam.run({valid: true}).to_s.must_equal "[true, <OperationSetupParam @model={:valid=>true, :garrett=>\"Rocks!\"}>]" }
-end
-
-class OperationParamsTest < MiniTest::Spec
-  class Operation < Trailblazer::Operation
-    def process(params)
-      @model = "#{params} and #{@params==params}"
-    end
-
-    def params!(params)
-      { params: params }
-    end
-  end
-
-  # allows you returning new params in #params!.
-  it { Operation.({valid: true}).model.to_s.must_equal "{:params=>{:valid=>true}} and true" }
-end
-
-# Operation#model.
-class OperationModelTest < MiniTest::Spec
-  class Operation < Trailblazer::Operation
-    def process(params)
-    end
-
-    def model!(params)
-      params
-    end
-  end
-
-  # #model.
-  it { Operation.(Object).model.must_equal Object }
-end
-
-# Operation#model=.
-class OperationModelWriterTest < MiniTest::Spec
+class OperationRunTest < MiniTest::Spec
   class Operation < Trailblazer::Operation
-    def process(params)
-      self.model = "#{params}"
-    end
-  end
 
-  it { Operation.("I can set @model via a private setter").model.to_s.must_equal "I can set @model via a private setter" }
-end
+    require "trailblazer/operation/contract"
+    include Contract::Explicit
 
-class OperationRunTest < MiniTest::Spec
-  class Operation < Trailblazer::Operation
     # allow providing your own contract.
-    self.contract_class = class Contract
+    self["contract.default.class"] = class MyContract
       def initialize(*)
       end
-      def validate(params)
-        return true if params == "yes, true"
-        false
+      def call(params)
+        Mock::Result.new(params)
       end
 
       def errors
@@ -84,192 +29,115 @@ class OperationRunTest < MiniTest::Spec
 
     def process(params)
       model = Object
-      validate(params, model)
+      validate(params, model: model)
     end
 
     include Inspect
   end
 
-  # contract is inferred from self::contract_class.
-  # ::run returns result set when run without block.
-  it { Operation.run("not true").to_s.must_equal %{[false, <Operation @model=>]} }
-  it { Operation.run("yes, true").to_s.must_equal %{[true, <Operation @model=>]} }
-
-  # ::call raises exception when invalid.
-  it do
-    exception = assert_raises(Trailblazer::Operation::InvalidContract) { Operation.("not true") }
-    exception.message.must_equal "Op just calls #to_s on Errors!"
-  end
-
-  # return operation when ::call
-  it { Operation.("yes, true").to_s.must_equal %{<Operation @model=>} }
-  # #[] is alias for .()
-  it { Operation["yes, true"].to_s.must_equal %{<Operation @model=>} }
-
-
-  # ::run with block returns operation.
-  # valid executes block.
-  it "block" do
-    outcome = nil
-    res = Operation.run("yes, true") do
-      outcome = "true"
-    end
-
-    outcome.must_equal "true" # block was executed.
-    res.to_s.must_equal %{<Operation @model=>}
-  end
-
-  # invalid doesn't execute block.
-  it "block, invalid" do
-    outcome = nil
-    res = Operation.run("no, not true, false") do
-      outcome = "true"
-    end
-
-    outcome.must_equal nil # block was _not_ executed.
-    res.to_s.must_equal %{<Operation @model=>}
-  end
-
-  # block yields operation
-  it do
-    outcome = nil
-    res = Operation.run("yes, true") do |op|
-      outcome = op
-    end
-
-    outcome.to_s.must_equal %{<Operation @model=>} # block was executed.
-    res.to_s.must_equal %{<Operation @model=>}
-  end
-
-  # # Operation#contract returns @contract
-  it { Operation.("yes, true").contract.class.to_s.must_equal "OperationRunTest::Operation::Contract" }
-
-
 
+  describe "Raise" do
+    class Follow < Trailblazer::Operation
+      require "trailblazer/operation/raise"
+      require "trailblazer/operation/contract"
+      include Contract::Explicit
+      contract do
+      end
 
-  describe "::present" do
-    class NoContractOp < Trailblazer::Operation
-      self.contract_class = nil
+      module Validate
+        def validate(is_valid)
+          is_valid
+        end
+      end
+      include Validate
+      include Contract::Raise
 
-      def model!(*)
-        Object
+      def process(params)
+        validate(params[:is_valid])
       end
     end
-
-    # the operation and model are available, but no contract.
-    it { NoContractOp.present({}).model.must_equal Object }
-    # no contract is built.
-    it { assert_raises(NoMethodError) { NoContractOp.present({}).contract } }
-    it { assert_raises(NoMethodError) { NoContractOp.run({}) } }
+    # #validate raises exception when invalid.
+    it do
+      exception = assert_raises(Trailblazer::Operation::InvalidContract) { Follow.(is_valid: false) }
+      # exception.message.must_equal "Op just calls #to_s on Errors!"
+    end
+    it { Follow.(is_valid:true).success?.must_equal true }
   end
 end
 
 
 class OperationTest < MiniTest::Spec
-  # test #invalid!
-  class OperationWithoutValidateCall < Trailblazer::Operation
-    def process(params)
-      params || invalid!(params)
-    end
-
-    include Inspect
-  end
-
-  # ::run
-  it { OperationWithoutValidateCall.run(true).to_s.must_equal %{[true, <OperationWithoutValidateCall @model=>]} }
-  # invalid.
-  it { OperationWithoutValidateCall.run(false).to_s.must_equal %{[false, <OperationWithoutValidateCall @model=>]} }
-
-
   # #validate yields contract when valid
   class OperationWithValidateBlock < Trailblazer::Operation
-    self.contract_class = class Contract
+    require "trailblazer/operation/contract"
+    include Contract::Explicit
+    self["contract.default.class"] = class Contract
       def initialize(*)
       end
 
-      def validate(params)
-        params
+      def call(params)
+        Mock::Result.new(params)
       end
+
+      attr_reader :errors
       self
     end
 
     def process(params)
-      validate(params, Object.new) do |c|
-        @secret_contract = c.class
+      validate(params, model: Object.new) do |c|
+        self["secret_contract"] = c.class
       end
     end
-
-    attr_reader :secret_contract
   end
 
-  it { OperationWithValidateBlock.run(false).last.secret_contract.must_equal nil }
-  it { OperationWithValidateBlock.(true).secret_contract.must_equal OperationWithValidateBlock::Contract }
+  it { OperationWithValidateBlock.(false)["secret_contract"].must_equal nil }
+  it { OperationWithValidateBlock.(true)["secret_contract"].to_s.must_equal "Mock::Result" }
 
 
   # test validate wit if/else
   class OperationWithValidateAndIf < Trailblazer::Operation
-    self.contract_class = class Contract
+    require "trailblazer/operation/contract"
+    include Contract::Explicit
+    self["contract.default.class"] = class Contract
       def initialize(*)
       end
 
-      def validate(params)
-        params
+      def call(params)
+        Mock::Result.new(params)
       end
+      attr_reader :errors
       self
     end
 
     def process(params)
-      if validate(params, Object.new)
-        @secret_contract = contract.class
+      if validate(params, model: Object.new)
+        self["secret_contract"] = contract.class
       else
-        @secret_contract = "so wrong!"
+        self["secret_contract"] = "so wrong!"
       end
     end
-
-    attr_reader :secret_contract
-  end
-
-  it { OperationWithValidateAndIf.run(false).last.secret_contract.must_equal "so wrong!" }
-  it { OperationWithValidateAndIf.(true).secret_contract.must_equal OperationWithValidateAndIf::Contract }
-
-
-
-  # ::present only runs #setup! which runs #model!.
-  class ContractOnlyOperation < Trailblazer::Operation
-    self.contract_class = class Contract
-      def initialize(model)
-        @_model = model
-      end
-      attr_reader :_model
-      self
-    end
-
-    def model!(params)
-      Object
-    end
-
-    def process(params)
-      raise "This is not run!"
-    end
   end
 
-  it { ContractOnlyOperation.present({}).contract._model.must_equal Object }
+  it { OperationWithValidateAndIf.(false)["secret_contract"].must_equal "so wrong!" }
+  it { OperationWithValidateAndIf.(true)["secret_contract"].must_equal OperationWithValidateAndIf::Contract }
 end
 
 
 class OperationErrorsTest < MiniTest::Spec
   class Operation < Trailblazer::Operation
+    require "trailblazer/operation/contract"
+    include Contract::Explicit
     contract do
-      property :title, validates: {presence: true}
+      property :title, validates: { presence: true }
     end
 
     def process(params)
-      validate(params, OpenStruct.new) {}
+      validate(params, model: OpenStruct.new) {}
     end
   end
 
   it do
-    res, op = Operation.run({})
-    op.errors.to_s.must_equal "{:title=>[\"can't be blank\"]}"
+    result = Operation.({})
+    result["errors.contract"].to_s.must_equal "{:title=>[\"can't be blank\"]}"
   end
 end

data/test/test_helper.rb

@@ -1,9 +1,29 @@
-require 'trailblazer'
-require 'minitest/autorun'
+require "trailblazer"
+require "minitest/autorun"
 
+# TODO: convert tests to non-rails.
+require "reform"
 require "reform/form/active_model/validations"
 Reform::Form.class_eval do
   include Reform::Form::ActiveModel::Validations
 end
 
-require "trailblazer/operation/model"
+require "trailblazer/operation/callback"
+require "trailblazer/operation/procedural/validate"
+
+module Mock
+  class Result
+    def initialize(bool); @bool = bool end
+    def success?; @bool end
+    def errors; ["hihi"] end
+  end
+end
+
+module Test
+  module ReturnCall
+    def self.included(includer)
+      includer._insert :_insert, ReturnResult, {replace: Trailblazer::Operation::Result::Build}, ReturnResult, ""
+    end
+  end
+  ReturnResult = ->(last, input, options) { input }
+end

data/trailblazer.gemspec

@@ -7,19 +7,19 @@ Gem::Specification.new do |spec|
   spec.version       = Trailblazer::VERSION
   spec.authors       = ["Nick Sutterer"]
   spec.email         = ["apotonick@gmail.com"]
-  spec.description   = %q{A high-level, modular architecture for Ruby framworks with domain and form objects, view models, twin decorators and representers.}
+  spec.description   = %q{A high-level architecture for Ruby introducing new abstractions such as operations, form objects or policies.}
   spec.summary       = %q{A high-level architecture for Ruby and Rails.}
   spec.homepage      = "http://trailblazer.to"
-  spec.license       = "MIT"
+  spec.license       = "LGPL-3.0"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-
-  spec.add_dependency "uber", ">= 0.0.15", "< 0.1.0"
-  spec.add_dependency "reform", ">= 2.0.0", "< 3.0.0"
+  spec.add_dependency "trailblazer-operation"
+  spec.add_dependency "uber", ">= 0.1.0", "< 0.2.0"
+  spec.add_dependency "reform", ">= 2.2.0", "< 3.0.0"
   spec.add_dependency "declarative"
 
   spec.add_development_dependency "activemodel" # for Reform::AM::V
@@ -27,8 +27,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "database_cleaner"
+  spec.add_development_dependency "nokogiri"
 
   spec.add_development_dependency "roar"
+  # spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.0.0'
 end

metadata

@@ -1,42 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: trailblazer-operation
+  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: uber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.15
+        version: 0.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.15
+        version: 0.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: reform
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -46,7 +60,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -121,21 +135,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  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: database_cleaner
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -162,8 +162,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A high-level, modular architecture for Ruby framworks with domain and
-  form objects, view models, twin decorators and representers.
+description: A high-level architecture for Ruby introducing new abstractions such
+  as operations, form objects or policies.
 email:
 - apotonick@gmail.com
 executables: []
@@ -173,6 +173,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - CHANGES.md
+- COMM-LICENSE
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -181,51 +182,68 @@ files:
 - TODO.md
 - doc/Trb-The-Stack.png
 - doc/trb.jpg
-- gemfiles/Gemfile.rails.lock
-- gemfiles/Gemfile.reform-2.0
-- gemfiles/Gemfile.reform-2.1
+- draft-1.2.rb
 - lib/trailblazer.rb
-- lib/trailblazer/autoloading.rb
-- lib/trailblazer/endpoint.rb
-- lib/trailblazer/operation.rb
+- lib/trailblazer/dsl.rb
+- lib/trailblazer/operation/auto_inject.rb
 - lib/trailblazer/operation/builder.rb
 - lib/trailblazer/operation/callback.rb
-- lib/trailblazer/operation/collection.rb
+- lib/trailblazer/operation/contract.rb
 - lib/trailblazer/operation/controller.rb
-- lib/trailblazer/operation/dispatch.rb
+- lib/trailblazer/operation/guard.rb
 - lib/trailblazer/operation/model.rb
-- lib/trailblazer/operation/model/dsl.rb
-- lib/trailblazer/operation/model/external.rb
 - lib/trailblazer/operation/module.rb
+- lib/trailblazer/operation/nested.rb
+- lib/trailblazer/operation/params.rb
+- lib/trailblazer/operation/persist.rb
 - lib/trailblazer/operation/policy.rb
-- lib/trailblazer/operation/policy/guard.rb
+- lib/trailblazer/operation/present.rb
+- lib/trailblazer/operation/procedural/contract.rb
+- lib/trailblazer/operation/procedural/validate.rb
+- lib/trailblazer/operation/pundit.rb
 - lib/trailblazer/operation/representer.rb
+- lib/trailblazer/operation/rescue.rb
 - lib/trailblazer/operation/resolver.rb
-- lib/trailblazer/operation/uploaded_file.rb
+- lib/trailblazer/operation/validate.rb
+- lib/trailblazer/operation/wrap.rb
 - lib/trailblazer/version.rb
-- test/callback_test.rb
-- test/collection_test.rb
-- test/model_test.rb
+- test/controller_test.rb
+- test/docs/auto_inject_test.rb
+- test/docs/contract_test.rb
+- test/docs/dry_test.rb
+- test/docs/guard_test.rb
+- test/docs/nested_test.rb
+- test/docs/policy_test.rb
+- test/docs/pundit_test.rb
+- test/docs/representer_test.rb
+- test/docs/rescue_test.rb
+- test/docs/wrap_test.rb
+- test/gemfiles/Gemfile.ruby-1.9
+- test/gemfiles/Gemfile.ruby-2.0
+- test/gemfiles/Gemfile.ruby-2.3
 - test/module_test.rb
 - test/operation/builder_test.rb
+- test/operation/callback_test.rb
 - test/operation/contract_test.rb
-- test/operation/controller_test.rb
 - test/operation/dsl/callback_test.rb
 - test/operation/dsl/contract_test.rb
 - test/operation/dsl/representer_test.rb
-- test/operation/external_model_test.rb
 - test/operation/guard_test.rb
-- test/operation/policy_test.rb
-- test/operation/reject_test.rb
+- test/operation/model_test.rb
+- test/operation/params_test.rb
+- test/operation/persist_test.rb
+- test/operation/pipedream_test.rb
+- test/operation/pipetree_test.rb
+- test/operation/present_test.rb
+- test/operation/pundit_test.rb
+- test/operation/representer_test.rb
 - test/operation/resolver_test.rb
 - test/operation_test.rb
-- test/representer_test.rb
-- test/rollback_test.rb
 - test/test_helper.rb
 - trailblazer.gemspec
 homepage: http://trailblazer.to
 licenses:
-- MIT
+- LGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -235,12 +253,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.3
@@ -248,22 +266,36 @@ signing_key:
 specification_version: 4
 summary: A high-level architecture for Ruby and Rails.
 test_files:
-- test/callback_test.rb
-- test/collection_test.rb
-- test/model_test.rb
+- test/controller_test.rb
+- test/docs/auto_inject_test.rb
+- test/docs/contract_test.rb
+- test/docs/dry_test.rb
+- test/docs/guard_test.rb
+- test/docs/nested_test.rb
+- test/docs/policy_test.rb
+- test/docs/pundit_test.rb
+- test/docs/representer_test.rb
+- test/docs/rescue_test.rb
+- test/docs/wrap_test.rb
+- test/gemfiles/Gemfile.ruby-1.9
+- test/gemfiles/Gemfile.ruby-2.0
+- test/gemfiles/Gemfile.ruby-2.3
 - test/module_test.rb
 - test/operation/builder_test.rb
+- test/operation/callback_test.rb
 - test/operation/contract_test.rb
-- test/operation/controller_test.rb
 - test/operation/dsl/callback_test.rb
 - test/operation/dsl/contract_test.rb
 - test/operation/dsl/representer_test.rb
-- test/operation/external_model_test.rb
 - test/operation/guard_test.rb
-- test/operation/policy_test.rb
-- test/operation/reject_test.rb
+- test/operation/model_test.rb
+- test/operation/params_test.rb
+- test/operation/persist_test.rb
+- test/operation/pipedream_test.rb
+- test/operation/pipetree_test.rb
+- test/operation/present_test.rb
+- test/operation/pundit_test.rb
+- test/operation/representer_test.rb
 - test/operation/resolver_test.rb
 - test/operation_test.rb
-- test/representer_test.rb
-- test/rollback_test.rb
 - test/test_helper.rb