trailblazer 2.0.0 → 2.0.1

data/test/operation/pundit_test.rb

@@ -17,8 +17,8 @@ class PolicyTest < Minitest::Spec
   #---
   # Instance-level: Only policy, no model
   class Create < Trailblazer::Operation
-    self.| Policy::Pundit( Auth, :only_user? )
-    self.| :process
+    step Policy::Pundit( Auth, :only_user? )
+    step :process
 
     def process(*)
       self["process"] = true
@@ -50,10 +50,10 @@ class PolicyTest < Minitest::Spec
   #---
   # inheritance, adding Model
   class Show < Create
-    self.| Model( Song, :new ), before: "policy.default.eval"
+    step Model( Song, :new ), before: "policy.default.eval"
   end
 
-  it { Show["pipetree"].inspect.must_equal %{[>>operation.new,&model.build,&policy.default.eval,&process]} }
+  it { Show["pipetree"].inspect.must_equal %{[>operation.new,>model.build,>policy.default.eval,>process]} }
 
   # invalid because user AND model.
   it do
@@ -75,9 +75,9 @@ class PolicyTest < Minitest::Spec
   ##--
   # TOOOODOOO: Policy and Model before Build ("External" or almost Resolver)
   class Edit < Trailblazer::Operation
-    self.| Model Song, :update
-    self.| Policy::Pundit( Auth, :user_and_model? )
-    self.| :process
+    step Model Song, :find
+    step Policy::Pundit( Auth, :user_and_model? )
+    step :process
 
     def process(*); self["process"] = true end
   end

data/test/operation/resolver_test.rb

@@ -1,47 +1,47 @@
-require "test_helper"
-
-class ResolverTest < Minitest::Spec
-  Song = Struct.new(:id) do
-    def self.find(id); new(id) end
-  end
-
-  class Auth
-    def initialize(*args); @user, @model = *args end
-    def only_user?; @user == Module && @model.nil? end
-    def user_object?; @user == Object end
-    def user_and_model?; @user == Module && @model.class == Song end
-    def inspect; "<Auth: user:#{@user.inspect}, model:#{@model.inspect}>" end
-  end
-
-  class A < Trailblazer::Operation
-    extend Builder::DSL
-    builds ->(options) {
-      return P if options["params"] == { some: "params", id:1 }
-      return B if options["policy.default"].inspect == %{<Auth: user:Module, model:#<struct ResolverTest::Song id=3>>} # both user and model:id are set!
-      return M if options["model"].inspect == %{#<struct ResolverTest::Song id=9>}
-    }
-
-    self.| Model( Song, :update ), before: "operation.new"
-    self.| Policy::Pundit( Auth, :user_and_model? ), before: "operation.new"
-    require "trailblazer/operation/resolver"
-    self.| Resolver(), before: "operation.new"
-
-    self.| :process
-
-    class P < self; end
-    class B < self; end
-    class M < self; end
-
-    def process(*); self["x"] = self.class end
-  end
-
-  it { A["pipetree"].inspect.must_equal %{[&model.build,&policy.default.eval,>>builder.call,>>operation.new,&process]} }
-
-  it { r=A.({ some: "params", id: 1 }, { "current_user" => Module })
-    puts r.inspect
-
-     }
-  it { A.({ some: "params", id: 1 }, { "current_user" => Module })["x"].must_equal A::P }
-  it { A.({                 id: 3 }, { "current_user" => Module })["x"].must_equal A::B }
-  it { A.({                 id: 9 }, { "current_user" => Module })["x"].must_equal A::M }
-end
+# require "test_helper"
+
+# class ResolverTest < Minitest::Spec
+#   Song = Struct.new(:id) do
+#     def self.find(id); new(id) end
+#   end
+
+#   class Auth
+#     def initialize(*args); @user, @model = *args end
+#     def only_user?; @user == Module && @model.nil? end
+#     def user_object?; @user == Object end
+#     def user_and_model?; @user == Module && @model.class == Song end
+#     def inspect; "<Auth: user:#{@user.inspect}, model:#{@model.inspect}>" end
+#   end
+
+#   class A < Trailblazer::Operation
+#     extend Builder::DSL
+#     builds ->(options) {
+#       return P if options["params"] == { some: "params", id:1 }
+#       return B if options["policy.default"].inspect == %{<Auth: user:Module, model:#<struct ResolverTest::Song id=3>>} # both user and model:id are set!
+#       return M if options["model"].inspect == %{#<struct ResolverTest::Song id=9>}
+#     }
+
+#     step Model( Song, :update ), before: "operation.new"
+#     step Policy::Pundit( Auth, :user_and_model? ), before: "operation.new"
+#     require "trailblazer/operation/resolver"
+#     step Resolver(), before: "operation.new"
+
+#     step :process
+
+#     class P < self; end
+#     class B < self; end
+#     class M < self; end
+
+#     def process(*); self["x"] = self.class end
+#   end
+
+#   it { A["pipetree"].inspect.must_equal %{[&model.build,&policy.default.eval,>>builder.call,>>operation.new,&process]} }
+
+#   it { r=A.({ some: "params", id: 1 }, { "current_user" => Module })
+#     puts r.inspect
+
+#      }
+#   it { A.({ some: "params", id: 1 }, { "current_user" => Module })["x"].must_equal A::P }
+#   it { A.({                 id: 3 }, { "current_user" => Module })["x"].must_equal A::B }
+#   it { A.({                 id: 9 }, { "current_user" => Module })["x"].must_equal A::M }
+# end

data/trailblazer.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "trailblazer-operation", ">= 0.0.9"
+  spec.add_dependency "trailblazer-operation", ">= 0.0.10", "< 0.1.0"
   spec.add_dependency "uber", ">= 0.1.0", "< 0.2.0"
   spec.add_dependency "reform", ">= 2.2.0", "< 3.0.0"
   spec.add_dependency "declarative"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer-operation
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.10
+    - - "<"
+      - !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.9
+        version: 0.0.10
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: uber
   requirement: !ruby/object:Gem::Requirement
@@ -180,11 +186,11 @@ files:
 - Rakefile
 - THOUGHTS
 - doc/Trb-The-Stack.png
+- doc/operation-2017.png
 - doc/trb.jpg
 - lib/trailblazer.rb
 - lib/trailblazer/dsl.rb
 - lib/trailblazer/operation/auto_inject.rb
-- lib/trailblazer/operation/builder.rb
 - lib/trailblazer/operation/callback.rb
 - lib/trailblazer/operation/contract.rb
 - lib/trailblazer/operation/guard.rb
@@ -198,15 +204,16 @@ files:
 - lib/trailblazer/operation/pundit.rb
 - lib/trailblazer/operation/representer.rb
 - lib/trailblazer/operation/rescue.rb
-- lib/trailblazer/operation/resolver.rb
 - lib/trailblazer/operation/validate.rb
 - lib/trailblazer/operation/wrap.rb
 - lib/trailblazer/version.rb
-- test/controller_test.rb
 - test/docs/auto_inject_test.rb
 - test/docs/contract_test.rb
 - test/docs/dry_test.rb
+- test/docs/fast_test.rb
 - test/docs/guard_test.rb
+- test/docs/macro_test.rb
+- test/docs/model_test.rb
 - test/docs/nested_test.rb
 - test/docs/operation_test.rb
 - test/docs/policy_test.rb
@@ -218,7 +225,6 @@ files:
 - 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/dsl/callback_test.rb
@@ -257,16 +263,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: A high-level architecture for Ruby and Rails.
 test_files:
-- test/controller_test.rb
 - test/docs/auto_inject_test.rb
 - test/docs/contract_test.rb
 - test/docs/dry_test.rb
+- test/docs/fast_test.rb
 - test/docs/guard_test.rb
+- test/docs/macro_test.rb
+- test/docs/model_test.rb
 - test/docs/nested_test.rb
 - test/docs/operation_test.rb
 - test/docs/policy_test.rb
@@ -278,7 +286,6 @@ test_files:
 - 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/dsl/callback_test.rb

data/lib/trailblazer/operation/builder.rb

@@ -1,24 +0,0 @@
-require "uber/builder"
-
-# http://trailblazer.to/gems/operation/2.0/builder.html
-class Trailblazer::Operation
-  module Builder
-    def self.import!(operation, import, user_builder)
-      import.(:>>, user_builder,
-        name:   "builder.call",
-        before: "operation.new")
-
-      false # suppress inheritance. dislike. FIXME at some point.
-    end
-
-    # Include this when you want the ::builds DSL.
-    def self.included(includer)
-      includer.extend DSL # ::builds, ::builders
-      includer.| includer.Builder( includer.builders ) # pass class Builders object to our ::import!.
-    end
-
-    DSL = Uber::Builder::DSL
-  end
-
-  DSL.macro!(:Builder, Builder) # Operation::Builder()
-end

data/lib/trailblazer/operation/resolver.rb

@@ -1,22 +0,0 @@
-class Trailblazer::Operation
-  module Resolver
-    def self.import!(operation, import)
-      operation.extend Model::BuildMethods
-      operation.| operation.Builder(operation.builders)
-    end
-
-    # def self.included(includer)
-    #   includer.class_eval do
-    #     extend Model::DSL  # ::model
-    #     extend Model::BuildMethods  # ::model!
-    #     extend Policy::DSL # ::policy
-    #     extend Policy::BuildPermission
-    #   end
-
-    #   includer.> Model::Build, prepend: true
-    #   includer.& Policy::Evaluate, after: Model::Build
-    # end
-  end
-
-  DSL.macro!(:Resolver, Resolver)
-end

data/test/controller_test.rb

@@ -1,115 +0,0 @@
-require "test_helper"
-require "trailblazer/operation/controller"
-
-class ControllerTest < Minitest::Spec
-  def self.controller!(&block)
-    let (:_controller) {
-      Class.new do
-        include Trailblazer::Operation::Controller
-
-        def initialize(params={})
-          @params = params
-        end
-        attr_reader :params, :request
-
-        class_eval(&block)
-        self
-      end
-    }
-  end
-
-  def controller(params={})
-    _controller.new(params)
-  end
-
-
-  User = Struct.new(:role)
-
-  Comment = Struct.new(:body)
-
-  class Comment::Update < Trailblazer::Operation
-    include Contract
-    include Present
-
-    def model!(params)
-      Comment.new(params[:body])
-    end
-
-    def inspect
-      "<Update: #{@params.inspect} #{self["model"].inspect}>"
-    end
-  end
-
-
-  describe "#present with options" do
-    controller! do
-      def show
-        present Comment::Update, params: { current_user: User.new(:admin) }
-      end
-    end
-
-    it do
-      controller.show.inspect.must_equal "<Update: {:current_user=>#<struct ControllerTest::User role=:admin>} #<struct ControllerTest::Comment body=nil>>"
-    end
-  end
-
-  describe "#params!" do
-    controller! do
-      def show
-        present Comment::Update, params: "Cool!"
-      end
-
-      def params!(params)
-        { body: params }
-      end
-    end
-
-    it { controller.show.inspect.must_equal "<Update: {:body=>\"Cool!\"} #<struct ControllerTest::Comment body=\"Cool!\">>" }
-  end
-
-  describe "#form" do
-    class Comment::Create < Trailblazer::Operation
-      def model!(params)
-        Comment.new
-      end
-
-      include Contract
-      contract do
-        def prepopulate!(options)
-          @options = options
-        end
-        attr_reader :options
-      end
-    end
-
-    describe "#prepopulate! options" do
-      controller! do
-        def show
-          form Comment::Create
-        end
-      end
-
-      it { controller(__body: "Great!").show.options.inspect.must_equal "{:params=>{:__body=>\"Great!\"}}" }
-    end
-
-    describe "with additional options" do
-      controller! do
-        def show
-          form Comment::Create, admin: true
-        end
-      end
-
-      it { controller(__body: "Great!").show.options.inspect.must_equal "{:admin=>true, :params=>{:__body=>\"Great!\"}}" }
-    end
-
-    describe "with options and :params" do
-      controller! do
-        def show
-          form Comment::Create, admin: true, params: params.merge(user: User.new)
-        end
-      end
-
-      it { controller(__body: "Great!").show.options.inspect.must_equal "{:admin=>true, :params=>{:__body=>\"Great!\", :user=>#<struct ControllerTest::User role=nil>}}" }
-    end
-  end
-end

data/test/operation/builder_test.rb

@@ -1,89 +0,0 @@
-require "test_helper"
-require "trailblazer/operation/builder"
-
-class BuilderTest < MiniTest::Spec
-  #---
-  # pass proc to Builder[]
-  # this is the puristic way.
-  class A < Trailblazer::Operation
-    builds = ->(klass, options) do
-      return B if options["params"][:sub]
-      klass
-    end
-
-    self.| Builder( builds )
-    self.| :process
-
-    class B < A
-    end
-
-    def process(*); self["x"] = self.class end
-  end
-
-  it { A.()["x"].must_equal A }
-  it { A.({ sub: true })["x"].must_equal A::B }
-  it { A::B["builder"].must_equal nil }
-
-  #---
-  # use manual Builders object
-  MyBuilders = Uber::Builder::Builders.new
-  MyBuilders << ->(options) { return self::B if options["params"][:sub] }
-
-  class Create < Trailblazer::Operation
-    self.| Builder( MyBuilders )
-    self["pipetree"].> ->(input, options) { options["x"] = input.class }
-  end
-
-  it { Create.()["x"].must_equal Create }
-
-  #---
-  #- Builder inheritance
-  class B < A
-  end
-
-  it { B["pipetree"].inspect.must_equal %{[>>operation.new,&process]} }
-
-  #---
-  # use Builder DSL
-  # you don't need to include Builder in the pipetree
-  class ParentOperation < Trailblazer::Operation
-    class Sub < self
-    end
-
-    include Builder
-    builds -> (options) do
-      return Sub if options["params"][:sub]
-    end
-
-    def process(*); self["x"] = self.class end
-    self.| :process
-  end
-
-  it { ParentOperation.({})["x"].must_equal ParentOperation }
-  it { ParentOperation.({ sub: true })["x"].must_equal ParentOperation::Sub }
-end
-
-#---
-# copying via Operation.builders
-class OperationBuilderClassTest < MiniTest::Spec
-  class SuperOperation < Trailblazer::Operation
-    include Builder
-
-    builds do |options|
-      self::Sub if options["params"][:sub] # Sub is defined in ParentOperation.
-    end
-  end
-
-  class ParentOperation < Trailblazer::Operation
-    class Sub < self
-    end
-
-    self.| Builder( SuperOperation.builders )
-
-    def process(*); self["x"] = self.class end
-    self.| :process
-  end
-
-  it { ParentOperation.({})["x"].must_equal ParentOperation }
-  it { ParentOperation.({ sub: true })["x"].must_equal ParentOperation::Sub }
-end