trailblazer 0.3.3 → 1.0.0.rc1

data/test/rails/respond_test.rb

@@ -0,0 +1,95 @@
+require "test_helper"
+
+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

data/test/responder_test.rb

@@ -5,7 +5,7 @@ class Song
   extend ActiveModel::Naming
 
   class Operation < Trailblazer::Operation
-    include CRUD
+    include Model
     model Song
     include Responder
 
@@ -20,7 +20,7 @@ module MyApp
     extend ActiveModel::Naming
 
     class Operation < Trailblazer::Operation
-      include CRUD
+      include Model
       include Responder
       model Song
 
@@ -46,8 +46,8 @@ class ResponderTestForModelWithoutNamespace < MiniTest::Spec
   it { Song::Operation.model_name.singular_route_key.must_equal "song" }
 
   # #errors
-  it { Song::Operation[true].errors.must_equal [] }
-  it { Song::Operation[false].errors.must_equal [1] } # TODO: since we don't want responder to render anything, just return _one_ error. :)
+  it { Song::Operation.(true).errors.must_equal [] }
+  it { Song::Operation.(false).errors.must_equal [1] } # TODO: since we don't want responder to render anything, just return _one_ error. :)
 
   # TODO: integration test with Controller.
 end
@@ -68,8 +68,8 @@ class ResponderTestForModelWitNamespace < MiniTest::Spec
     it { MyApp::Song::Operation.model_name.singular_route_key.must_equal "my_app_song" } # "song" for AR.
 
     # #errors
-    it { MyApp::Song::Operation[true].errors.must_equal [] }
-    it { MyApp::Song::Operation[false].errors.must_equal [1] } # TODO: since we don't want responder to render anything, just return _one_ error. :)
+    it { MyApp::Song::Operation.(true).errors.must_equal [] }
+    it { MyApp::Song::Operation.(false).errors.must_equal [1] } # TODO: since we don't want responder to render anything, just return _one_ error. :)
 
     # TODO: integration test with Controller.
 end

data/test/rollback_test.rb

@@ -6,11 +6,11 @@ require "test_helper"
 #
 # i am keen to try integrating https://github.com/collectiveidea/interactor organizers!
 module Trailblazer::Operation::Rollback
-  def run(params)
+  def run
     begin
       super
     rescue
-      rollback!(params, $!)
+      rollback!(@params, $!)
       [false, self]
     end
   end

data/test/worker_test.rb

@@ -13,10 +13,10 @@ class WorkerTest < MiniTest::Spec
   class Operation < Trailblazer::Operation
     include Worker
 
-    def run(params)
+    def process(params)
       with_symbol = params[:title]
       with_string = params["title"]
-      "I was working hard on #{params.inspect}. title:#{with_symbol} \"title\"=>#{with_string}"
+      @model = "I was working hard on #{params.inspect}. title:#{with_symbol} \"title\"=>#{with_string}"
     end
   end
 
@@ -27,16 +27,18 @@ class WorkerTest < MiniTest::Spec
   end
 
   # test basic worker functionality.
-  describe "with sidekiq" do
-    before { @res = Operation.run(title: "Dragonfly") }
+  describe "with sidekiq ss" do
+    it do
+      res = Operation.run(title: "Dragonfly")
 
-    it { @res.kind_of?(String).must_equal true } # for now, we return the job from sidekiq.
-    it { Operation.jobs[0]["args"].must_equal([{"title"=>"Dragonfly"}]) }
-    it { Operation.perform_one.must_equal "I was working hard on {\"title\"=>\"Dragonfly\"}. title:Dragonfly \"title\"=>Dragonfly" }
+      res.kind_of?(String).must_equal true # for now, we return the job from sidekiq
+      Operation.jobs[0]["args"].must_equal([{"title"=>"Dragonfly"}])
+      Operation.perform_one.last.model.must_equal "I was working hard on {\"title\"=>\"Dragonfly\"}. title:Dragonfly \"title\"=>Dragonfly"
+    end
   end
 
   # without sidekiq, we don't have indifferent_access automatically.
-  it { NoBackgroundOperation.run(title: "Dragonfly").must_equal "I was working hard on {:title=>\"Dragonfly\"}. title:Dragonfly \"title\"=>" }
+  it { NoBackgroundOperation.run(title: "Dragonfly").last.model.must_equal "I was working hard on {:title=>\"Dragonfly\"}. title:Dragonfly \"title\"=>" }
 
 
   # test manual serialisation (to be done with UploadedFile etc automatically).
@@ -57,11 +59,13 @@ class WorkerTest < MiniTest::Spec
 
     it { @res.kind_of?(String).must_equal true } # for now, we return the job from sidekiq.
     it { SerializingOperation.jobs[0]["args"].must_equal([{"wrap"=>{"title"=>"Dragonfly"}}]) }
-    it { SerializingOperation.perform_one.must_equal "I was working hard on {\"title\"=>\"Dragonfly\"}. title:Dragonfly \"title\"=>Dragonfly" }
+    it { SerializingOperation.perform_one.last.model.must_equal "I was working hard on {\"title\"=>\"Dragonfly\"}. title:Dragonfly \"title\"=>Dragonfly" }
   end
 end
 
 
+require "trailblazer/operation/uploaded_file"
+require "action_dispatch/http/upload"
 class WorkerFileMarshallerTest < MiniTest::Spec
   def uploaded_file(name)
     tmp = Tempfile.new("bla")

data/trailblazer.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
 
-  spec.add_dependency "uber", ">= 0.0.10" # no builder inheritance.
+  spec.add_dependency "uber", ">= 0.0.15"
   # spec.add_dependency "representable", ">= 2.1.1", "<2.3.0" # Representable::apply.
   spec.add_dependency "reform", ">= 1.2.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
-  spec.add_development_dependency "sidekiq", "~> 3.1.0"
+  spec.add_development_dependency "sidekiq", ">= 3.1.0"
   spec.add_development_dependency "actionpack", '>= 3.0.0' # Rails is optional.
   spec.add_development_dependency "rails"
   spec.add_development_dependency "sqlite3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.15
 - !ruby/object:Gem::Dependency
   name: reform
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +84,14 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
@@ -203,27 +203,41 @@ files:
 - lib/trailblazer/autoloading.rb
 - lib/trailblazer/endpoint.rb
 - lib/trailblazer/operation.rb
+- lib/trailblazer/operation/builder.rb
 - lib/trailblazer/operation/collection.rb
 - lib/trailblazer/operation/controller.rb
 - lib/trailblazer/operation/controller/active_record.rb
-- lib/trailblazer/operation/crud.rb
 - lib/trailblazer/operation/dispatch.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/policy.rb
+- lib/trailblazer/operation/policy/guard.rb
 - lib/trailblazer/operation/representer.rb
+- lib/trailblazer/operation/resolver.rb
 - lib/trailblazer/operation/responder.rb
 - lib/trailblazer/operation/uploaded_file.rb
 - lib/trailblazer/operation/worker.rb
-- lib/trailblazer/rails/railtie.rb
 - lib/trailblazer/version.rb
 - test/collection_test.rb
-- test/crud_test.rb
 - test/dispatch_test.rb
 - test/fixtures/apotomo.png
 - test/fixtures/cells.png
+- test/model_test.rb
 - test/module_test.rb
+- test/operation/builder_test.rb
 - test/operation/contract_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/resolver_test.rb
 - test/operation_test.rb
+- test/rails/__respond_test.rb
 - test/rails/controller_test.rb
 - test/rails/endpoint_test.rb
 - test/rails/fake_app/app-cells/.gitkeep
@@ -234,9 +248,9 @@ files:
 - test/rails/fake_app/rails_app.rb
 - test/rails/fake_app/song/operations.rb
 - test/rails/fake_app/views/bands/index.html.erb
-- test/rails/fake_app/views/bands/show.html.erb
 - test/rails/fake_app/views/songs/another_view.html.erb
 - test/rails/fake_app/views/songs/new.html.erb
+- test/rails/respond_test.rb
 - test/rails/test_helper.rb
 - test/representer_test.rb
 - test/responder_test.rb
@@ -260,25 +274,34 @@ 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.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A new architecture for Rails.
 test_files:
 - test/collection_test.rb
-- test/crud_test.rb
 - test/dispatch_test.rb
 - test/fixtures/apotomo.png
 - test/fixtures/cells.png
+- test/model_test.rb
 - test/module_test.rb
+- test/operation/builder_test.rb
 - test/operation/contract_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/resolver_test.rb
 - test/operation_test.rb
+- test/rails/__respond_test.rb
 - test/rails/controller_test.rb
 - test/rails/endpoint_test.rb
 - test/rails/fake_app/app-cells/.gitkeep
@@ -289,9 +312,9 @@ test_files:
 - test/rails/fake_app/rails_app.rb
 - test/rails/fake_app/song/operations.rb
 - test/rails/fake_app/views/bands/index.html.erb
-- test/rails/fake_app/views/bands/show.html.erb
 - test/rails/fake_app/views/songs/another_view.html.erb
 - test/rails/fake_app/views/songs/new.html.erb
+- test/rails/respond_test.rb
 - test/rails/test_helper.rb
 - test/representer_test.rb
 - test/responder_test.rb

data/lib/trailblazer/operation/crud.rb

@@ -1,82 +0,0 @@
-module Trailblazer
-  class Operation
-    # The CRUD module will automatically create/find models for the configured +action+.
-    # It adds a public  +Operation#model+ reader to access the model (after performing).
-    module CRUD
-      module Included
-        def included(base)
-          base.extend Uber::InheritableAttr
-          base.inheritable_attr :config
-          base.config = {}
-
-          base.extend ClassMethods
-        end
-      end
-      # this makes ::included overrideable, e.g. to add more featues like CRUD::ActiveModel.
-      extend Included
-
-
-      module ClassMethods
-        def model(name, action=nil)
-          self.config[:model] = name
-          action(action) if action # coolest line ever.
-        end
-
-        def action(name)
-          self.config[:action] = name
-        end
-
-        def action_name # considered private.
-          self.config[:action] or :create
-        end
-
-        def model_class # considered private.
-          self.config[:model] or raise "[Trailblazer] You didn't call Operation::model." # TODO: infer model name.
-        end
-      end
-
-
-      # #validate no longer accepts a model since this module instantiates it for you.
-      def validate(params, model=self.model, *args)
-        super(params, model, *args)
-      end
-
-    private
-      def model!(params)
-        instantiate_model(params)
-      end
-
-      def instantiate_model(params)
-        send("#{self.class.action_name}_model", params)
-      end
-
-      def create_model(params)
-        self.class.model_class.new
-      end
-
-      def update_model(params)
-        self.class.model_class.find(params[:id])
-      end
-
-      alias_method :find_model, :update_model
-
-
-      # Rails-specific.
-      # ActiveModel will automatically call Form::model when creating the contract and passes
-      # the operation's +::model+, so you don't have to call it twice.
-      # This assumes that the form class includes Form::ActiveModel, though.
-      module ActiveModel
-        def self.included(base)
-          base.extend ClassMethods
-        end
-
-        module ClassMethods
-          def contract(&block)
-            super
-            contract_class.model(model_class) # this assumes that Form::ActiveModel is mixed in.
-          end
-        end
-      end
-    end
-  end
-end