trailblazer 0.3.3 → 1.0.0.rc1

data/test/operation_test.rb

@@ -201,14 +201,14 @@ class OperationTest < MiniTest::Spec
 
 
   # unlimited arguments for ::run and friends.
-  class OperationReceivingLottaArguments < Trailblazer::Operation
-    def process(model, params)
-      @model = [model, params]
-    end
-    include Inspect
-  end
+  # class OperationReceivingLottaArguments < Trailblazer::Operation
+  #   def process(model, params)
+  #     @model = [model, params]
+  #   end
+  #   include Inspect
+  # end
 
-  it { OperationReceivingLottaArguments.run(Object, {}).to_s.must_equal %{[true, <OperationReceivingLottaArguments @model=[Object, {}]>]} }
+  # it { OperationReceivingLottaArguments.run(Object, {}).to_s.must_equal %{[true, <OperationReceivingLottaArguments @model=[Object, {}]>]} }
 
   # ::present only runs #setup! which runs #model!.
   class ContractOnlyOperation < Trailblazer::Operation
@@ -233,74 +233,6 @@ class OperationTest < MiniTest::Spec
 end
 
 
-class OperationBuilderTest < MiniTest::Spec
-  class ParentOperation < Trailblazer::Operation
-    def process(params)
-    end
-
-    class Sub < self
-    end
-
-    builds do |params|
-      Sub if params[:sub]
-    end
-  end
-
-  it { ParentOperation.run({}).last.class.must_equal ParentOperation }
-  it { ParentOperation.run({sub: true}).last.class.must_equal ParentOperation::Sub }
-  it { ParentOperation.({}).class.must_equal ParentOperation }
-  it { ParentOperation.({sub: true}).class.must_equal ParentOperation::Sub }
-end
-
-
-# ::contract builds Reform::Form class
-class OperationInheritanceTest < MiniTest::Spec
-  class Operation < Trailblazer::Operation
-    contract do
-      property :title
-      property :band
-
-      # TODO/DISCUSS: this is needed in order to "handle" the anon forms. but in Trb, that
-      # doesn't really matter as AM is automatically included?
-      def self.name
-        "Song"
-      end
-    end
-
-    class JSON < self
-      # inherit Contract
-      contract do
-        property :genre, validates: {presence: true}
-        property :band, virtual: true
-      end
-    end
-  end
-
-  # inherits subclassed Contract.
-  it { Operation.contract_class.wont_equal Operation::JSON.contract_class }
-
-  it do
-    form = Operation.contract_class.new(OpenStruct.new)
-    form.validate({})#.must_equal true
-    form.errors.to_s.must_equal "{}"
-
-    form = Operation::JSON.contract_class.new(OpenStruct.new)
-    form.validate({})#.must_equal true
-    form.errors.to_s.must_equal "{:genre=>[\"can't be blank\"]}"
-  end
-
-  # allows overriding options
-  it do
-    form = Operation::JSON.contract_class.new(song = OpenStruct.new)
-    form.validate({genre: "Punkrock", band: "Osker"}).must_equal true
-    form.sync
-
-    song.genre.must_equal "Punkrock"
-    song.band.must_equal nil
-  end
-end
-
-
 class OperationErrorsTest < MiniTest::Spec
   class Operation < Trailblazer::Operation
     contract do

data/test/rails/__respond_test.rb

@@ -0,0 +1,20 @@
+require "test_helper"
+require "rack/test"
+
+class Respond___Test < MiniTest::Spec
+  include Rack::Test::Methods
+
+  def app
+    Rails.application
+  end
+
+  it "respond with :namespace" do
+    # Rails.logger = Logger.new(STDOUT) # TODO: how do we get exceptions with rack-test?
+
+    post "/songs/create_with_namespace", {title: "Teenager Liebe"}.to_json, "CONTENT_TYPE" => "application/json", "HTTP_ACCEPT"=>"application/json"
+    # puts last_response.inspect
+    last_response.status.must_equal 201
+    id = Song.last.id
+    last_response.headers["Location"].must_equal "http://example.org/api/songs/#{id}"
+  end
+end

data/test/rails/controller_test.rb

@@ -42,99 +42,7 @@ class ProcessParamsTest < ActionController::TestCase
   end
 end
 
-class ResponderRespondTest < ActionController::TestCase
-  tests SongsController
-
-  # HTML
-  # #respond Create [valid]
-  test "Create [html/valid]" do
-    post :create, {song: {title: "You're Going Down"}}
-    assert_redirected_to song_path(Song.last)
-  end
-
-  test "Create [html/valid/location]" do
-    post :other_create, {song: {title: "You're Going Down"}}
-    assert_redirected_to other_create_songs_path
-  end
-
-  test "Create [html/invalid]" do
-    post :create, {song: {title: ""}}
-    assert_response 200
-    assert_equal @response.body, "{:title=&gt;[&quot;can&#39;t be blank&quot;]}"
-  end
-
-  test "Create [html/invalid/action]" do
-    post :other_create, {song: {title: ""}}
-    assert_response 200
-    assert_equal @response.body, "OTHER SONG\n{:title=&gt;[&quot;can&#39;t be blank&quot;]}\n"
-    assert_template "songs/another_view"
-  end
-
-  test "Delete [html/valid]" do
-    song = Song::Create[song: {title: "You're Going Down"}].model
-    delete :destroy, id: song.id
-    assert_redirected_to songs_path
-    # assert that model is deleted.
-  end
-
-  test "respond with block [html/valid]" do
-    post :create_with_block, {song: {title: "You're Going Down"}}
-    assert_response 200
-    assert_equal "block run, valid: true", response.body
-  end
-
-  test "respond with block [html/invalid]" do
-    post :create_with_block, {song: {title: ""}}
-    assert_response 200
-    assert_equal "block run, valid: false", response.body
-  end
-
-  # JSON
-  test "Delete [json/valid]" do
-    song = Song::Create[song: {title: "You're Going Down"}].model
-    delete :destroy, id: song.id, format: :json
-    assert_response 204 # no content.
-  end
-
-  # JS
-  test "Delete [js/valid]" do
-    song = Song::Create[song: {title: "You're Going Down"}].model
-    assert_raises ActionView::MissingTemplate do
-      # js wants to render destroy.js.erb
-      delete :destroy, id: song.id, format: :js
-    end
-  end
 
-  test "Delete with formats [js/valid]" do
-    song = Song::Create[song: {title: "You're Going Down"}].model
-
-    delete :destroy_with_formats, id: song.id, format: :js
-    assert_response 200
-    assert_equal "Song slayer!", response.body
-  end
-end
-
-class ResponderRespondWithJSONTest < ActionController::TestCase
-  tests BandsController
-
-  # JSON
-  test "Create [JSON/valid]" do
-    post :create, {name: "SNFU"}.to_json, format: :json
-    assert_response 201
-    assert_equal "SNFU", Band.last.name
-  end
-end
-
-# TODO: merge with above tests on SongsController.
-class ControllerRespondTest < ActionController::TestCase
-  tests BandsController
-
-  test "#respond with builds" do
-    post :create, band: {name: "SNFU"}, admin: true
-    assert_response 302
-    assert_equal "SNFU [ADMIN]", Band.last.name
-  end
-end
 
 class ResponderRunTest < ActionController::TestCase
   tests BandsController
@@ -170,7 +78,7 @@ class ControllerPresentTest < ActionController::TestCase
 
     get :show, id: band.id
 
-    assert_equal "bands/show.html: Band,Band,true,Band::Update,Essen\n", response.body
+    assert_equal "bands/show: Band,Band,true,Band::Update,Essen,nil", response.body
   end
 
   # TODO: this implicitely tests builds. maybe have separate test for that?
@@ -206,21 +114,15 @@ class ControllerFormTest < ActionController::TestCase
 
   test "#form" do
     get :new
-
     assert_select "form input#band_name"
-    assert_select "b", ",Band,true,Band::Create"
-  end
-
-  test "#form with block" do
-    get :new_with_block
-
-    assert_select "b", "Band,Band,true,Band::Create,Essen"
+    assert response.body =~ /<a>Sydney<\/a>/ # prepopulate!
+    assert_select "b", "Band,true,Band::Create,Band::Create,Essen"
   end
 
   test "#form with builder" do
     get :new, admin: true
 
-    assert_select "b", ",Band,true,Band::Create::Admin"
+    assert_select "b", "Band,true,Band::Create::Admin,Band::Create::Admin,Essen"
   end
 end
 

data/test/rails/endpoint_test.rb

@@ -1,47 +1,9 @@
 require "test_helper"
 
 module RailsEndpoint
-  # this tests "the rails way" where both JSON and HTML operation use the pre-parsed params hash.
-  class UnconfiguredTest < ActionDispatch::IntegrationTest
-    class Create < Trailblazer::Operation
-      include CRUD
-      model Band
-
-      def process(params)
-        @model = Band.create(params["band"].permit(:name)) # how ridiculous is strong_parameters?
-      end
-    end
-
-    class BandsController < ApplicationController
-      include Trailblazer::Operation::Controller
-      respond_to :html, :json
-      # missing document_formats.
-
-      def create
-        run Create if request.format == :json
-        run Create if request.format == :html
-        render text: ""
-      end
-    end
-
-    test "Create" do
-      post "/rails_endpoint/unconfigured_test/bands", {band: {name: "SNFU"}}
-      assert_response 200
-      assert_equal "SNFU", Band.last.name
-    end
-
-    test "Create: JSON" do
-      headers = { 'CONTENT_TYPE' => 'application/json' } # hahaha, oh god, rails, good bye!
-      post "/rails_endpoint/unconfigured_test/bands", {band: {name: "Strike Anywhere"}}.to_json, headers
-      assert_response 200
-      assert_equal "Strike Anywhere", Band.last.name
-    end
-  end
-
-
   class ConfiguredTest < ActionDispatch::IntegrationTest
     class Create < Trailblazer::Operation
-      include CRUD
+      include Model
       model Band
 
       def process(params)
@@ -49,20 +11,15 @@ module RailsEndpoint
       end
     end
 
-    class JSONCreate < Trailblazer::Operation
-      include CRUD
-      model Band
-
+    class JSONCreate < Create
       def process(params)
         @model = Band.create(JSON.parse(params["band"])) # document comes in keyed as "band".
       end
-
     end
 
     class BandsController < ApplicationController
       include Trailblazer::Operation::Controller
       respond_to :html, :json
-      operation document_formats: :json
 
       def create
         run Create if request.format == :html
@@ -78,9 +35,12 @@ module RailsEndpoint
     end
 
     test "Create: JSON" do
-      post "/rails_endpoint/configured_test/bands.json", {name: "NOFX"}.to_json#, headers # FIXME: headers do not work
+      post "/rails_endpoint/configured_test/bands.json", {name: "NOFX"}.to_json,'CONTENT_TYPE' => 'application/json',  "HTTP_ACCEPT"=>"application/json" #, headers # FIXME: headers do not work
       assert_response 200
       assert_equal "NOFX", Band.last.name
     end
   end
-end
+end
+
+# test :is_document
+# test :namespace

data/test/rails/fake_app/controllers.rb

@@ -21,11 +21,11 @@ ERB
   end
 
   def other_create
-    respond Song::Create, params, { location: other_create_songs_path, action: :another_view }
+    respond Song::Create, location: other_create_songs_path, action: :another_view
   end
 
   def create_with_params
-    respond Song::Create, song: {title: "A Beautiful Indifference"}
+    respond Song::Create, {}, song: {title: "A Beautiful Indifference"}
   end
 
   def create_with_block
@@ -34,6 +34,10 @@ ERB
     end
   end
 
+  def create_with_namespace
+    respond Song::Create::Json, namespace: [:api]
+  end
+
   def destroy
     respond Song::Delete
   end
@@ -48,41 +52,32 @@ end
 class BandsController < ApplicationController
   include Trailblazer::Operation::Controller
   respond_to :html, :json
-  operation document_formats: :json
 
   def index
     collection Band::Index
   end
 
   def show
-    present Band::Update do |op|
-      @klass    = op.model.class
-      @locality = params[:band][:locality] unless params[:format] == "json"
+    op = present Band::Update
+    @klass    = op.model.class
+    @locality = params[:band][:locality] unless params[:format] == "json"
 
-      render json: op.to_json if params[:format] == "json"
-    end # render :show
+    return render json: op.to_json if params[:format] == "json"
+    render text: "bands/show: #{[@klass, @model.class, @form.is_a?(Reform::Form), @operation.class, @locality, @form.locality.inspect].join(',')}"
   end
 
   def new
-    form Band::Create
+    @op = form Band::Create
+
+    @locality = params[:band][:locality]
 
     render inline: <<-ERB
 <%= form_for @form do |f| %>
   <%= f.text_field :name %>
+  <a><%= @form.locality %></a>
 <% end %>
 
-<b><%= [@klass, @model.class, @form.is_a?(Reform::Form), @operation.class].join(",") %></b>
-ERB
-  end
-
-  def new_with_block
-    form Band::Create do |op|
-      @klass = op.model.class
-      @locality = params[:band][:locality]
-    end
-
-    render inline: <<-ERB
-<b><%= [@klass, @model.class, @form.is_a?(Reform::Form), @operation.class, @locality].join(",") %></b>
+<b><%= [@model.class, @form.is_a?(Reform::Form), @operation.class, @op.class, @locality].join(",") %></b>
 ERB
   end
 

data/test/rails/fake_app/rails_app.rb

@@ -33,6 +33,7 @@ app.routes.draw do
       post :other_create
       post :create_with_params
       post :create_with_block
+      post :create_with_namespace
     end
   end
 
@@ -58,6 +59,10 @@ app.routes.draw do
     end
   end
 
+  namespace :api do
+    resources :songs
+  end
+
   resources :tenants, only: [:show]
 end
 

data/test/rails/fake_app/song/operations.rb

@@ -2,7 +2,7 @@ require 'trailblazer/autoloading'
 
 class Song < ActiveRecord::Base
   class Create < Trailblazer::Operation
-    include CRUD
+    include Model
     include Responder
     model Song, :create
 
@@ -17,6 +17,13 @@ class Song < ActiveRecord::Base
         contract.save
       end
     end
+
+
+    class Json < Create
+      def process(params)
+        @model = Song.create(JSON.parse(params[:song]))
+      end
+    end
   end
 
 
@@ -32,7 +39,7 @@ end
 
 class Band < ActiveRecord::Base
   class Create < Trailblazer::Operation
-    include CRUD, Responder#, Representer
+    include Model, Responder#, Representer
     model Band, :create
 
     contract do
@@ -40,7 +47,7 @@ class Band < ActiveRecord::Base
       model Band
 
       property :name, validates: {presence: true}
-      property :locality
+      property :locality, prepopulator: ->(*) { self.locality = "Sydney" }
 
       # class: Song #=> always create new song
       # instance: { Song.find(params[:id]) or Song.new } # same as find_or_create ?
@@ -130,7 +137,7 @@ end
 
 class Tenant < ActiveRecord::Base
   class Show < Trailblazer::Operation
-    include CRUD
+    include Model
     model Tenant, :update
   end
 end