trailblazer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2618bcea766e5192fadaa575315a4ad04170654
-  data.tar.gz: fe623b65e42ac232f9bc0ec45a723b5fa5da70e2
+  metadata.gz: 1c3291fbc4f467b44c4246b36472b29cc46b998b
+  data.tar.gz: e6a7c046f95d199a88375748a18d2be9fd9b6612
 SHA512:
-  metadata.gz: befbbee9f37e868da73002c26ce09b91f609ee0e1ded07ffc976dc56cd4440cfa23609911939394c48427d7e9a69bcf28839404a2fb411584d6215b11f79f8c2
-  data.tar.gz: e132220e955dc8b0338584b3fc1055d9abacd2100308277829cbf51bfa6b0ecb5bf2a605c7759bb9a36a191ac9985fe514c4a581ede512cd003a74728928c6e6
+  metadata.gz: 35ce9c252a11a60218d947f67db6b7de446ad4f1866480b18348604eb03ef9b6014ebb6747573b843ce76f794bb6f2c641c5eab1e92d73efeada8edeb531b95f
+  data.tar.gz: 7b94323221011e3f1233f44375420f39cc17a87401a410490aaca7aae0f4bbfd3fddce695e3edaac344b0f64919100a0649cc7c3e42229f9879fdb807f6a4b74

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 1.0.2
+
+* Treat all requests as `params` requests unless the operation has a representer mixed in. If you don't want that, you can override using `is_document: false`. This appears to be the smoothest solution for all.
+* In `Controller#form`, the options argument is now passed into `form.prepopulate!(options)`. This allows to use arbitrary options and the `options[:params]` for prepopulation.
+
 # 1.0.1
 
 * Treat `:js` requests as non-document, too.

data/Gemfile

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

data/lib/trailblazer/endpoint.rb

@@ -1,25 +1,35 @@
 module Trailblazer
   # Encapsulates HTTP-specific logic needed before running an operation.
-  # Right now, all this does is #document_body!
+  # Right now, all this does is #document_body! which figures out whether or not to pass the request body
+  # into params, so the operation can use a representer to deserialize the original document.
   # To be used in Lotus, Roda, Rails, etc.
   class Endpoint
     def initialize(operation_class, params, request, options)
       @operation_class = operation_class
-      @params  = params
-      @request = request
-      @is_document  = options[:is_document]
+      @params          = params
+      @request         = request
+      @is_document     = document_request_for?(options)
     end
 
     def call
-      document_body! if document_request?
+      document_body! if @is_document
       yield @params# Create.run(params)
     end
 
   private
     attr_reader :params, :operation_class, :request
 
-    def document_request?
-      @is_document
+    # 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)
+      puts "``#{options.inspect}"
+      return options[:is_document] if options.has_key?(:is_document)
+
+      result= operation_class < Operation::Representer # TODO: this doesn't work with polymorphic dispatch.
+      puts "@@ss@@@ #{result.inspect}"
+      result
     end
 
     def document_body!

data/lib/trailblazer/operation/controller.rb

@@ -2,9 +2,11 @@ require "trailblazer/endpoint"
 
 module Trailblazer::Operation::Controller
 private
-  def form(*args)
-    operation!(*args).tap do |op|
-      op.contract.prepopulate! # equals to @form.prepopulate!
+  def form(operation_class, options={})
+    options[:___dont_deprecate] = 1 # TODO: remove in 1.1.
+
+    operation!(operation_class, options).tap do |op|
+      op.contract.prepopulate!(options) # equals to @form.prepopulate!
     end.contract
   end
 
@@ -31,6 +33,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) }
     namespace = options.delete(:namespace) || []
 
@@ -49,11 +52,8 @@ private
 
   # Normalizes parameters and invokes the operation (including its builders).
   def operation_for!(operation_class, options, &block)
-    options = deprecate_positional_params_argument!(options)
+    options = deprecate_positional_params_argument!(options) # TODO: remove in 1.1.
 
-    # Per default, only treat :html and js as non-document.
-    default_options = {is_document: ![:html, :js].include?(request.format.to_sym)}
-    options = default_options.merge(options)
     params  = options.delete(:params) || self.params # TODO: test params: parameter properly in all 4 methods.
 
     process_params!(params)

data/lib/trailblazer/version.rb

@@ -1,3 +1,3 @@
 module Trailblazer
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber