trailblazer 1.0.4 → 1.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed93c4cc7b13ae2e7ae67009df6080abb36eb352
-  data.tar.gz: 4fcf7486acf1eb5e33e1d5cb8da05f9d47a973cf
+  metadata.gz: c06b905e00be850d576dedb8139524da3f0f5f1d
+  data.tar.gz: f04942ee37e3c73ffc098bd5531fde00e293c566
 SHA512:
-  metadata.gz: b33013263162958cb68fe02e4d2db68a4990104d29c380fb678db5eed73e9860a9b4d9b15060e69a7fd8c81796e323c317dbb8c926ded0d0cb6945bb2d0a6f8b
-  data.tar.gz: 3098ba9e9c415cf53b9acf6f1e14cd904d0b5680fa76bcdd2ba6686f607bd73697aa223adfec4bc25f70928cc55f61436e64584de7b009acff73ac22f8654ad1
+  metadata.gz: f81051754c0537ed2c9c924a386274ed4c04c987968a8039da48318ac2ea565ce1a91f1edc5c433f7c08157a47e65319e3b32e711b5be979a235916548f70880
+  data.tar.gz: 5673d4ab693361e964212ec2d60624f69a3c79031cb062cd40dbf47540b9d528c7c3b215e59bd4b9fc6ab134af5b58496bdf45b4306864227f6419ac30cec33b

data/.travis.yml

@@ -3,4 +3,8 @@ rvm:
   - 2.2.0
   - 2.1.2
   - 2.0.0
-  # - 1.9.3
+gemfiles:
+  - gemfiles/Gemfile.reform-2.0
+  - gemfiles/Gemfile.reform-2.1
+before_install:
+  - gem install bundler

data/CHANGES.md

@@ -1,10 +1,23 @@
+# 1.1.0
+
+* `Representer#represented` defaults to `model` now, not to `contract` anymore.
+* The only way to let Trailblazer pass a document to the operation is via `is_document: true`. There is _no guessing_ anymore based on whether or not `Representer` is mixed into the operation or not.
+* Add `Operation#params!` that works exactly like `#model!`: return another params hash here if you want to change the `params` structure while avoiding modifying the original one.
+* Add `Controller#params!` that works exactly like `Operation#params!` and allows returning an arbitrary params object in the controller. Thanks to @davidpelaez for inspiration.
+* Deprecate `Dispatch` in favor of `Callback`. In operations, please include `Operation::Callback`. Also, introduced `Operation#callback!` which aliases to `#dispatch!`. Goal is having to think less, and now all naming is in line.
+
+## Fixes
+
+* `Representer#to_json` now allows passing options.
+* The `:params` key never got propagated to `prepopulate!` when using `Controller#form`. This is now fixed.
+
 # 1.0.4
 
 * Fix `Controller#run`, which now returns the operation instance instead of the `Else` object.
 
 # 1.0.3
 
-Remove unprofessional `puts`, @smathy.
+* Remove unprofessional `puts`, @smathy.
 
 # 1.0.2
 

data/Gemfile

@@ -3,11 +3,16 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in trailblazer.gemspec
 gemspec
 
-gem "representable", path: "../representable"
-# gem "disposable", path: "../disposable"
+# gem "representable", path: "../representable"
+gem "reform", path: "../reform"
+gem "disposable", path: "../disposable"
 gem "virtus"
 # gem "reform", github: "apotonick/reform"
-# gem "reform", "~> 2.0.0"
-gem "reform", path: "../reform"
+# gem "roar", github: "apotonick/roar"
+# gem "reform", "~> 2.0.5"
+# gem "roar"
+# gem "reform", path: "../reform"
 gem "roar", path: "../roar"
-gem "multi_json"
+gem "multi_json"
+
+gem "minitest-line"

data/README.md

@@ -14,7 +14,7 @@ _Trailblazer is a thin layer on top of Rails. It gently enforces encapsulation,
   * Optional [callback](#callbacks) objects allow declaring post-processing logic.
 3. [Controllers](#controllers) instantly delegate to an operation. No business code in controllers, only HTTP-specific logic.
 4. [Models](#models) are persistence-only and solely define associations and scopes. No business code is to be found here. No validations, no callbacks.
-5. The presentation layer offers optional [view models](#cells) (Cells) and [representers](#representers) for document APIs.
+5. The presentation layer offers optional [view models](#views) (Cells) and [representers](#representers) for document APIs.
 
 Trailblazer is designed to handle different contexts like user roles by applying [inheritance](#inheritance) between and [composing](#composing) of operations, form objects, policies, representers and callbacks.
 
@@ -95,7 +95,7 @@ class CommentsController < ApplicationController
 
 Again, the controller only dispatchs to the operation and handles successful/invalid processing on the HTTP level. For instance by redirecting, setting flash messages, or signing in a user.
 
-[Learn more.](http://trailblazerb.org/gems/operation/controller.html)
+[Learn more.](http://trailblazer.to/gems/operation/controller.html)
 
 ## Operation
 
@@ -115,7 +115,7 @@ end
 
 Operations only need to implement `#process` which receives the params from the caller.
 
-[Learn more.](http://trailblazerb.org/gems/operation)
+[Learn more.](http://trailblazer.to/gems/operation)
 
 ## Validations
 
@@ -144,7 +144,7 @@ The contract (aka _form_) is defined in the `::contract` block. You can implemen
 
 In the `#process` method you can define your business logic.
 
-[Learn more.](http://trailblazerb.org/gems/operation/api.html)
+[Learn more.](http://trailblazer.to/gems/operation/api.html)
 
 ## Callbacks
 
@@ -154,6 +154,7 @@ Callbacks can be defined in groups. They use the form object's state tracking to
 
 ```ruby
 class Comment::Create < Trailblazer::Operation
+  include Callback
   callback(:after_save) do
     on_change :markdownize_body! # this is only run when the form object has changed.
   end
@@ -163,10 +164,11 @@ Callbacks are never triggered automatically, you have to invoke them! This is ca
 
 ```ruby
 class Comment::Create < Trailblazer::Operation
+  include Callback
   def process(params)
     validate(params) do
       contract.save
-      dispatch!(:after_save) # run markdownize_body!, but only if form changed.
+      callback!(:after_save) # run markdownize_body!, but only if form changed.
     end
   end
 
@@ -178,7 +180,7 @@ end
 
 No magical triggering of unwanted logic anymore, but explicit invocations where you want it.
 
-[Learn more.](http://trailblazerb.org/gems/operation/callback.html)
+[Learn more.](http://trailblazer.to/gems/operation/callback.html)
 
 ## Models
 
@@ -223,7 +225,7 @@ class Comment::Create < Trailblazer::Operation
 
 The policy is evaluated in `#setup!`, raises an exception if `false` and suppresses running `#process`.
 
-[Learn more.](http://trailblazerb.org/gems/operation/policy.html)
+[Learn more.](http://trailblazer.to/gems/operation/policy.html)
 
 ## Views
 
@@ -266,7 +268,7 @@ class Comment::Create < Trailblazer::Operation
 
 The operation can then parse incoming JSON documents in `validate` and render a document via `to_json`.
 
-[Learn more.](http://trailblazerb.org/gems/operation/representer.html)
+[Learn more.](http://trailblazer.to/gems/operation/representer.html)
 
 ## Tests
 
@@ -276,7 +278,7 @@ Operations completely replace the need for leaky factories.
 
 ```ruby
 describe Comment::Update do
-  let(:comment) { Comment::Create.(comment: {body: "[That](http://trailblazerb.org)!"}) }
+  let(:comment) { Comment::Create.(comment: {body: "[That](http://trailblazer.to)!"}) }
 ```
 
 ## More

data/gemfiles/{Gemfile.rails → Gemfile.reform-2.0}

@@ -2,6 +2,5 @@ source "http://rubygems.org"
 
 gemspec path: '../'
 
-gem "railties"
-gem "activerecord"
-gem "sqlite3"
+gem "reform", "~> 2.0.5"
+gem "multi_json"

data/gemfiles/Gemfile.reform-2.1

@@ -0,0 +1,7 @@
+source "http://rubygems.org"
+
+gemspec path: '../'
+
+gem "reform",  github: "apotonick/reform" #"~> 2.1.0.rc1"
+gem "roar", github: "apotonick/roar" # "1.1.0"
+gem "multi_json"

data/lib/trailblazer/autoloading.rb

@@ -6,7 +6,8 @@ Trailblazer::Operation.class_eval do
   autoload :Controller, "trailblazer/operation/controller"
   autoload :Model,      "trailblazer/operation/model"
   autoload :Collection, "trailblazer/operation/collection"
-  autoload :Dispatch,   "trailblazer/operation/dispatch"
+  autoload :Dispatch,   "trailblazer/operation/dispatch" # TODO: remove in 1.2.
+  autoload :Callback,   "trailblazer/operation/callback"
   autoload :Module,     "trailblazer/operation/module"
   autoload :Representer,"trailblazer/operation/representer"
   autoload :Policy,     "trailblazer/operation/policy"

data/lib/trailblazer/endpoint.rb

@@ -8,7 +8,7 @@ module Trailblazer
       @operation_class = operation_class
       @params          = params
       @request         = request
-      @is_document     = document_request_for?(options)
+      @is_document     = options[:is_document]
     end
 
     def call
@@ -19,16 +19,6 @@ module Trailblazer
   private
     attr_reader :params, :operation_class, :request
 
-    # this is a really weak test but will make sure the document_body behavior is only enabled
-    # for people who know what they're doing. also, this won't work if you use a polymorphic dispatch,
-    # e.g. `run Comment::Create` where the builder will instantiate Create::JSON which has Representer
-    # included.
-    def document_request_for?(options)
-      return options[:is_document] if options.has_key?(:is_document)
-
-      operation_class < Operation::Representer # TODO: this doesn't work with polymorphic dispatch.
-    end
-
     def document_body!
       # this is what happens:
       # respond_with Comment::Update::JSON.run(params.merge(comment: request.body.string))

data/lib/trailblazer/operation/callback.rb

@@ -0,0 +1,53 @@
+require "declarative"
+require "disposable/callback"
+
+module Trailblazer::Operation::Callback
+  def self.included(base)
+    base.extend ClassMethods
+
+    base.extend Declarative::Heritage::Inherited
+    base.extend Declarative::Heritage::DSL
+  end
+
+  def callback!(name=:default, options={ operation: self, contract: contract, params: @params }) # FIXME: test options.
+    config  = self.class.callbacks.fetch(name) # TODO: test exception
+    group   = config[:group].new(contract)
+
+    options[:context] ||= (config[:context] == :operation ? self : group)
+    group.(options)
+
+    invocations[name] = group
+  end
+
+  def dispatch!(*args, &block)
+    callback!(*args, &block)
+  end
+
+  def invocations
+    @invocations ||= {}
+  end
+
+  module ClassMethods
+    def callbacks
+      @callbacks ||= {}
+    end
+
+    def callback(name=:default, constant=nil, &block)
+      return callbacks[name][:group] unless constant or block_given?
+
+      add_callback(name, constant, &block)
+    end
+
+  private
+    def add_callback(name, constant, &block)
+      heritage.record(:add_callback, name, constant, &block)
+
+      callbacks[name] ||= {
+        group:   Class.new(constant || Disposable::Callback::Group),
+        context: constant ? nil : :operation # `context: :operation` when the callback is inline. `context: group` otherwise.
+      }
+
+      callbacks[name][:group].class_eval(&block) if block_given?
+    end
+  end
+end

data/lib/trailblazer/operation/controller.rb

@@ -3,23 +3,23 @@ require "trailblazer/endpoint"
 module Trailblazer::Operation::Controller
 private
   def form(operation_class, options={})
-    options[:___dont_deprecate] = 1 # TODO: remove in 1.1.
+    res, op, options = operation!(operation_class, options)
+    op.contract.prepopulate!(options) # equals to @form.prepopulate!
 
-    operation!(operation_class, options).tap do |op|
-      op.contract.prepopulate!(options) # equals to @form.prepopulate!
-    end.contract
+    op.contract
   end
 
   # Provides the operation instance, model and contract without running #process.
   # Returns the operation.
   def present(operation_class, options={})
-    operation!(operation_class, skip_form: true)
+    res, op = operation!(operation_class, options.merge(skip_form: true))
+    op
   end
 
   def collection(*args)
-    operation!(*args).tap do |op|
-      @collection = op.model
-    end
+    res, op = operation!(*args)
+    @collection = op.model
+    op
   end
 
   def run(operation_class, options={}, &block)
@@ -32,9 +32,7 @@ private
 
   # The block passed to #respond is always run, regardless of the validity result.
   def respond(operation_class, options={}, &block)
-    options[:___dont_deprecate] = 1 # TODO: remove in 1.1.
-
-    res, op   = operation_for!(operation_class, options) { |params| operation_class.run(params) }
+    res, op = operation_for!(operation_class, options) { |params| operation_class.run(params) }
     namespace = options.delete(:namespace) || []
 
     return respond_with *namespace, op, options if not block_given?
@@ -43,37 +41,27 @@ private
 
 private
   def operation!(operation_class, options={}) # or #model or #setup.
-    res, op = operation_for!(operation_class, options) { |params| [true, operation_class.present(params)] }
-    op
+    operation_for!(operation_class, options) { |params| [true, operation_class.present(params)] }
   end
 
   def process_params!(params)
   end
 
+  # Override and return arbitrary params object.
+  def params!(params)
+    params
+  end
+
   # Normalizes parameters and invokes the operation (including its builders).
   def operation_for!(operation_class, options, &block)
-    options = deprecate_positional_params_argument!(options) # TODO: remove in 1.1.
-
-    params  = options.delete(:params) || self.params # TODO: test params: parameter properly in all 4 methods.
+    params = options[:params] || self.params # TODO: test params: parameter properly in all 4 methods.
+    params = params!(params)
+    process_params!(params) # deprecate or rename to #setup_params!
 
-    process_params!(params)
     res, op = Trailblazer::Endpoint.new(operation_class, params, request, options).(&block)
     setup_operation_instance_variables!(op, options)
 
-    [res, op]
-  end
-
-  def deprecate_positional_params_argument!(options) # TODO: remove in 1.1.
-    return options if options.has_key?(:skip_form)
-    return options if options.has_key?(:is_document)
-    return options if options.has_key?(:params)
-    return options if options.has_key?(:namespace)
-    return options if options.has_key?(:___dont_deprecate)
-    return options if options.size == 0
-
-    warn "[Trailblazer] The positional params argument for #run, #present, #form and #respond is deprecated and will be removed in 1.1.
-Please provide a custom params via `run Comment::Create, params: {..}` and have a nice day."
-    {params: options}
+    [res, op, options.merge(params: params)]
   end
 
   def setup_operation_instance_variables!(operation, options)

data/lib/trailblazer/operation/dispatch.rb

@@ -1,29 +1,3 @@
-require "disposable/callback"
-
-module Trailblazer::Operation::Dispatch
-  def self.included(base)
-    base.extend ClassMethods
-    base.inheritable_attr :callbacks
-    base.callbacks = Representable::Cloneable::Hash.new
-  end
-
-  def dispatch!(name=:default)
-    group = self.class.callbacks[name].new(contract)
-    group.(context: self)
-
-    invocations[name] = group
-  end
-
-  def invocations
-    @invocations ||= {}
-  end
-
-  module ClassMethods
-    def callback(name=:default, constant=nil, &block)
-      return callbacks[name] unless constant or block_given?
-
-      callbacks[name] ||= Class.new(constant || Disposable::Callback::Group).extend(Representable::Cloneable) # FIXME: why Representable?
-      callbacks[name].class_eval(&block) if block_given?
-    end
-  end
-end
+require "trailblazer/operation/callback"
+# TODO: deprecate this module.
+Trailblazer::Operation::Dispatch = Trailblazer::Operation::Callback

data/lib/trailblazer/operation/policy.rb

@@ -1,11 +1,11 @@
+require "trailblazer/operation/policy/guard"
+
 module Trailblazer
   class NotAuthorizedError < RuntimeError
   end
 
   # Adds #evaluate_policy to #setup!, and ::policy.
   module Operation::Policy
-    require "trailblazer/operation/policy/guard"
-
     def self.included(includer)
       includer.extend DSL
     end
@@ -30,14 +30,11 @@ module Trailblazer
   private
     module Setup
       def setup!(params)
-        super
-        evaluate_policy(params)
+        evaluate_policy(super)
       end
     end
     include Setup
 
-
-    private
     def evaluate_policy(params)
       user = params[:current_user]
 
@@ -84,4 +81,4 @@ module Trailblazer
       end
     end
   end
-end
+end

data/lib/trailblazer/operation/representer.rb

@@ -27,25 +27,44 @@ module Trailblazer::Operation::Representer
       self._representer_class = constant
     end
 
+    require "disposable/version"
     def infer_representer_class
-      Disposable::Twin::Schema.from(contract_class,
-        include:          [Representable::JSON],
-        options_from:     :deserializer, # use :instance etc. in deserializer.
-        superclass:       Representable::Decorator,
-        representer_from: lambda { |inline| inline.representer_class },
-        exclude_options:  [:default, :populator] # TODO: test with populator: in an operation.
-      )
+      if Disposable::VERSION =~ /^0.1/
+        warn "[Trailblazer] Reform 2.0 won't be supported in Trailblazer 1.2. Don't be lazy and upgrade to Reform 2.1."
+
+        Disposable::Twin::Schema.from(contract_class,
+          include:          [Representable::JSON],
+          options_from:     :deserializer, # use :instance etc. in deserializer.
+          superclass:       Representable::Decorator,
+          representer_from: lambda { |inline| inline.representer_class },
+        )
+      else
+        Disposable::Rescheme.from(contract_class,
+          include:          [Representable::JSON],
+          options_from:     :deserializer, # use :instance etc. in deserializer.
+          superclass:       Representable::Decorator,
+          definitions_from: lambda { |inline| inline.definitions },
+          exclude_options:  [:default, :populator], # TODO: test with populator: in an operation.
+          exclude_properties: [:persisted?]
+        )
+      end
     end
   end
 
 private
   module Rendering
-    def to_json(*)
-      self.class.representer_class.new(represented).to_json
+    # Override this if you need to pass options to the rendering.
+    #
+    #   def to_json(*)
+    #     super(include: @params[:include])
+    #   end
+    def to_json(options={})
+      self.class.representer_class.new(represented).to_json(options)
     end
 
+    # Override this if you want to render something else, e.g. the contract.
     def represented
-      contract
+      model
     end
   end
   include Rendering

data/lib/trailblazer/operation.rb

@@ -34,7 +34,7 @@ module Trailblazer
         build_operation(params, raise_on_invalid: true).run.last
       end
 
-      def [](*args) # TODO: remove in 1.1.
+      def [](*args) # TODO: remove in 1.2.
         warn "[Trailblazer] Operation[] is deprecated. Please use Operation.() and have a nice day."
         call(*args)
       end
@@ -59,7 +59,6 @@ module Trailblazer
 
 
     def initialize(params, options={})
-      @params           = params
       @options          = options
       @valid            = true
 
@@ -90,8 +89,21 @@ module Trailblazer
   private
     module Setup
       def setup!(params)
+        params = assign_params!(params)
         setup_params!(params)
         build_model!(params)
+        params # TODO: test me.
+      end
+
+      def assign_params!(params)
+        @params = params!(params)
+      end
+
+      # Overwrite #params! if you need to change its structure, by returning a new params object
+      # from this method.
+      # This is helpful if you don't want to change the original via #setup_params!.
+      def params!(params)
+        params
       end
 
       def setup_params!(params)

data/lib/trailblazer/version.rb

@@ -1,3 +1,3 @@
 module Trailblazer
-  VERSION = "1.0.4"
+  VERSION = "1.1.0.rc1"
 end

data/test/{dispatch_test.rb → callback_test.rb}

@@ -1,12 +1,12 @@
 require 'test_helper'
-require "trailblazer/operation/dispatch"
+require "trailblazer/operation/callback"
 
 # callbacks are tested in Disposable::Callback::Group.
 class OperationCallbackTest < MiniTest::Spec
   Song = Struct.new(:name)
 
   class Create < Trailblazer::Operation
-    include Trailblazer::Operation::Dispatch
+    include Trailblazer::Operation::Callback
 
     contract do
       property :name
@@ -23,7 +23,7 @@ class OperationCallbackTest < MiniTest::Spec
       @model = Song.new
 
       validate(params, @model) do
-        dispatch!
+        callback!
       end
     end
 
@@ -61,4 +61,44 @@ class OperationCallbackTest < MiniTest::Spec
     op = Update.({"name"=>"Keep On Running"})
     op.dispatched.must_equal [:notify_you!]
   end
+end
+
+# TODO: remove in 1.2.
+require "trailblazer/operation/dispatch"
+class OperationDeprecatedDispatchTest < MiniTest::Spec
+  Song = Struct.new(:name)
+
+  class Create < Trailblazer::Operation
+    include Trailblazer::Operation::Dispatch
+
+    contract do
+      property :name
+    end
+
+    callback do
+      on_change :notify_me!
+    end
+
+    def process(params)
+      @model = Song.new
+
+      validate(params, @model) do
+        dispatch!
+      end
+    end
+
+    def dispatched
+      @dispatched ||= []
+    end
+
+  private
+    def notify_me!(*)
+      dispatched << :notify_me!
+    end
+  end
+
+  it "invokes all callbacks [deprecated]" do
+    op = Create.({"name"=>"Keep On Running"})
+    op.dispatched.must_equal [:notify_me!]
+  end
 end

data/test/operation/controller_test.rb

@@ -0,0 +1,111 @@
+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
+    def model!(params)
+      Comment.new(params[:body])
+    end
+
+    def inspect
+      super.sub(/:0x\w+/, "")
+    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 "#<ControllerTest::Comment::Update @options={}, @valid=true, @params={:current_user=>#<struct ControllerTest::User role=:admin>}, @model=#<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 "#<ControllerTest::Comment::Update @options={}, @valid=true, @params={:body=>\"Cool!\"}, @model=#<struct ControllerTest::Comment body=\"Cool!\">>" }
+  end
+
+  describe "#form" do
+    class Comment::Create < Trailblazer::Operation
+      def model!(params)
+        Comment.new
+      end
+
+      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/dsl/callback_test.rb

@@ -53,12 +53,16 @@ class DslCallbackTest < MiniTest::Spec
   end
 
   describe "Op.callback" do
-    it { Operation.callback(:default).must_equal Operation.callbacks[:default] }
+    it { Operation.callback(:default).must_equal Operation.callbacks[:default][:group] }
   end
 
   describe "Op.callback :after_save, AfterSaveCallback" do
     class AfterSaveCallback < Disposable::Callback::Group
       on_change :after_save!
+
+      def after_save!(twin, options)
+        options[:operation]._invocations << :after_save!
+      end
     end
 
     class OpWithExternalCallback < Trailblazer::Operation
@@ -70,8 +74,6 @@ class DslCallbackTest < MiniTest::Spec
         contract(OpenStruct.new).validate(params)
         dispatch!(:after_save)
       end
-
-      def after_save!(*);    _invocations << :after_save!; end
     end
 
     it { OpWithExternalCallback.("title"=>"Thunder Rising")._invocations.must_equal([:after_save!]) }
@@ -80,13 +82,16 @@ class DslCallbackTest < MiniTest::Spec
   describe "Op.callback :after_save, AfterSaveCallback do .. end" do
     class DefaultCallback < Disposable::Callback::Group
       on_change :default!
+
+      def default!(twin, options)
+        options[:operation]._invocations << :default!
+      end
     end
 
     class OpUsingCallback < Trailblazer::Operation
       include Dispatch
       include SongProcess
       callback :default, DefaultCallback
-      def default!(*);       _invocations << :default!; end
     end
 
     class OpExtendingCallback < Trailblazer::Operation
@@ -94,15 +99,20 @@ class DslCallbackTest < MiniTest::Spec
       include SongProcess
       callback :default, DefaultCallback do
         on_change :after_save!
-      end
 
-      def default!(*);       _invocations << :default!; end
-      def after_save!(*);    _invocations << :after_save!; end
+        def default!(twin, options)
+          options[:operation]._invocations << :extended_default!
+        end
+
+        def after_save!(twin, options)
+          options[:operation]._invocations << :after_save!
+        end
+      end
     end
 
     # this operation copies DefaultCallback and shouldn't run #after_save!.
     it { OpUsingCallback.(title: "Thunder Rising")._invocations.must_equal([:default!]) }
     # this operation copies DefaultCallback, extends it and runs #after_save!.
-    it { OpExtendingCallback.(title: "Thunder Rising")._invocations.must_equal([:default!, :after_save!]) }
+    it { OpExtendingCallback.(title: "Thunder Rising")._invocations.must_equal([:extended_default!, :after_save!]) }
   end
 end

data/test/operation/guard_test.rb

@@ -60,9 +60,28 @@ class OpPolicyGuardTest < MiniTest::Spec
 
     it { Show.({}).wont_equal nil }
   end
-end
 
 
+  describe "#params!" do
+    class Index < Trailblazer::Operation
+      include Policy::Guard
+
+      # make sure the guard receives the correct params.
+      policy { |params| params[:valid] == "true" }
+
+      def params!(params)
+        { valid: params }
+      end
+
+      def process(*)
+      end
+    end
+
+    it { Index.("true").wont_equal nil }
+    it { assert_raises(Trailblazer::NotAuthorizedError) { Index.(false).wont_equal nil } }
+  end
+end
+
 class OpBuilderDenyTest < MiniTest::Spec
   Song = Struct.new(:name)
 
@@ -94,4 +113,4 @@ class OpBuilderDenyTest < MiniTest::Spec
       op = Create.(valid: false)
     end
   end
-end
+end

data/test/operation_test.rb

@@ -24,6 +24,21 @@ class OperationSetupParamsTest < MiniTest::Spec
   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

data/test/representer_test.rb

@@ -123,4 +123,56 @@ class RepresenterTest < MiniTest::Spec
     res, op = JsonApiCreate.run(album: %{{"title":"Run For Cover"}})
     op.contract.title.must_equal "Run For Cover"
   end
+end
+
+class InternalRepresenterAPITest < MiniTest::Spec
+  Song = Struct.new(:id)
+
+  describe "#represented" do
+    class Show < Trailblazer::Operation
+      include Representer, Model
+      model Song, :create
+
+      representer do
+        property :class
+      end
+    end
+
+    it "uses #model as represented, per default" do
+      Show.present({}).to_json.must_equal '{"class":"InternalRepresenterAPITest::Song"}'
+    end
+
+    class ShowContract < Show
+      def represented
+        contract
+      end
+    end
+
+    it "can be overriden to use the contract" do
+      ShowContract.present({}).to_json.must_equal %{{"class":"#{ShowContract.contract_class}"}}
+    end
+  end
+
+  describe "#to_json" do
+    class OptionsShow < Trailblazer::Operation
+      include Representer
+
+      representer do
+        property :class
+        property :id
+      end
+
+      def to_json(*)
+        super(@params)
+      end
+
+      def model!(params)
+        Song.new(1)
+      end
+    end
+
+    it "allows to pass options to #to_json" do
+      OptionsShow.present(include: [:id]).to_json.must_equal '{"id":1}'
+    end
+  end
 end

data/trailblazer.gemspec

@@ -7,9 +7,9 @@ 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 Rails with domain and form objects, view models, twin decorators and representers.}
-  spec.summary       = %q{A new architecture for Rails.}
-  spec.homepage      = "http://www.trailblazerb.org"
+  spec.description   = %q{A high-level, modular architecture for Ruby framworks with domain and form objects, view models, twin decorators and representers.}
+  spec.summary       = %q{A high-level architecture for Ruby and Rails.}
+  spec.homepage      = "http://trailblazer.to"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
 
 
   spec.add_dependency "uber", ">= 0.0.15"
-  spec.add_dependency "reform", ">= 1.2.0"
+  spec.add_dependency "reform", ">= 2.0.0", "< 3.0.0"
+  spec.add_dependency "declarative"
 
   spec.add_development_dependency "activemodel" # for Reform::AM::V
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0.rc1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
@@ -30,14 +30,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.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: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -136,8 +156,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A high-level, modular architecture for Rails with domain and form objects,
-  view models, twin decorators and representers.
+description: A high-level, modular architecture for Ruby framworks with domain and
+  form objects, view models, twin decorators and representers.
 email:
 - apotonick@gmail.com
 executables: []
@@ -155,13 +175,15 @@ files:
 - TODO.md
 - doc/Trb-The-Stack.png
 - doc/trb.jpg
-- gemfiles/Gemfile.rails
 - gemfiles/Gemfile.rails.lock
+- gemfiles/Gemfile.reform-2.0
+- gemfiles/Gemfile.reform-2.1
 - lib/trailblazer.rb
 - lib/trailblazer/autoloading.rb
 - lib/trailblazer/endpoint.rb
 - lib/trailblazer/operation.rb
 - lib/trailblazer/operation/builder.rb
+- lib/trailblazer/operation/callback.rb
 - lib/trailblazer/operation/collection.rb
 - lib/trailblazer/operation/controller.rb
 - lib/trailblazer/operation/dispatch.rb
@@ -175,12 +197,13 @@ files:
 - lib/trailblazer/operation/resolver.rb
 - lib/trailblazer/operation/uploaded_file.rb
 - lib/trailblazer/version.rb
+- test/callback_test.rb
 - test/collection_test.rb
-- test/dispatch_test.rb
 - test/model_test.rb
 - test/module_test.rb
 - test/operation/builder_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
@@ -194,7 +217,7 @@ files:
 - test/rollback_test.rb
 - test/test_helper.rb
 - trailblazer.gemspec
-homepage: http://www.trailblazerb.org
+homepage: http://trailblazer.to
 licenses:
 - MIT
 metadata: {}
@@ -209,22 +232,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '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.4.8
 signing_key: 
 specification_version: 4
-summary: A new architecture for Rails.
+summary: A high-level architecture for Ruby and Rails.
 test_files:
+- test/callback_test.rb
 - test/collection_test.rb
-- test/dispatch_test.rb
 - test/model_test.rb
 - test/module_test.rb
 - test/operation/builder_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