trailblazer 0.2.2 → 0.3.0

data/test/responder_test.rb

@@ -10,8 +10,7 @@ class Song
     include Responder
 
     def process(params)
-      invalid!(self) if params == false
-      self
+      invalid! if params == false
     end
   end
 end
@@ -26,8 +25,7 @@ module MyApp
       model Song
 
       def process(params)
-        invalid!(self) if params == false
-        self
+        invalid! if params == false
       end
     end
   end

data/test/rollback_test.rb

@@ -0,0 +1,47 @@
+require "test_helper"
+
+# TODO: rollback for composed operations: this is basically implemented already as every operation knows how to rollback.
+# however, this has to be run for composed operations.
+# we can also add Transaction and Lock for real uniqueness validators, etc.
+#
+# i am keen to try integrating https://github.com/collectiveidea/interactor organizers!
+module Trailblazer::Operation::Rollback
+  def run(params)
+    begin
+      super
+    rescue
+      rollback!(params, $!)
+      [false, self]
+    end
+  end
+end
+
+class RollbackTest < MiniTest::Spec
+  class ExceptionalOperation < Trailblazer::Operation
+    include Rollback
+
+    def process(params)
+      @_params = params
+      raise # something happens.
+    end
+
+    attr_reader :_params, :_rollback_args
+
+    def rollback!(params, exception)
+      @_rollback_args = [params, exception]
+    end
+  end
+
+  module Comparable
+    def ==(other)
+      self.class == other.class
+    end
+  end
+
+  it do
+    op = ExceptionalOperation.("amazing")
+    op._params.must_equal "amazing"
+
+    op._rollback_args.must_equal ["amazing", RuntimeError.new.extend(Comparable)]
+  end
+end

data/test/test_helper.rb

@@ -1,5 +1,32 @@
 require 'trailblazer'
 require 'minitest/autorun'
+require 'active_record'
+require 'database_cleaner'
+
+require 'fileutils'
+FileUtils::mkdir_p '/tmp/uploads'
+
+# ActiveRecord Connection
+# ActiveRecord::Base.logger = Logger.new(STDERR)
+ActiveRecord::Base.logger = false
+ActiveRecord::Base.establish_connection(
+  adapter:  "sqlite3",
+  database: ":memory:"
+)
+
+# Dot not show Active Record Migrations
+ActiveRecord::Migration.verbose = false
+ActiveRecord::Schema.define do
+  create_table :things do |table|
+    table.column :title, :string
+    table.column :active, :boolean, default: true
+  end
+
+  create_table(:bands) do |table|
+    table.column :name, :string
+    table.column :locality, :string
+  end
+end
 
 module TmpUploads
   extend ActiveSupport::Concern
@@ -12,4 +39,19 @@ end
 
 MiniTest::Spec.class_eval do
   include TmpUploads
-end
+end
+
+# Database Cleaning
+DatabaseCleaner.strategy = :transaction
+DatabaseCleaner.clean_with(:truncation)
+
+class MiniTest::Spec
+  before :each do
+    DatabaseCleaner.start
+  end
+
+  after :each do
+    DatabaseCleaner.clean
+  end
+end
+

data/test/uploaded_file_test.rb

@@ -13,9 +13,9 @@ class UploadedFileTest < MiniTest::Spec
    }
 
   let (:upload) { ActionDispatch::Http::UploadedFile.new(
-    :tempfile => tempfile,
-    :filename => "apotomo.png",
-    :type     => "image/png")
+    tempfile: tempfile,
+    filename: "apotomo.png",
+    type: "image/png")
   }
 
   describe "#to_hash" do
@@ -69,7 +69,7 @@ class UploadedFileTest < MiniTest::Spec
   describe "with custom tmp directory" do
     describe "#to_hash" do
       before {
-        @uploaded = Trailblazer::Operation::UploadedFile.new(upload, :tmp_dir => tmp_dir)
+        @uploaded = Trailblazer::Operation::UploadedFile.new(upload, tmp_dir: tmp_dir)
         @subject  = @uploaded.to_hash[:tempfile_path]
       }
 

data/test/worker_test.rb

@@ -28,7 +28,7 @@ class WorkerTest < MiniTest::Spec
 
   # test basic worker functionality.
   describe "with sidekiq" do
-    before { @res = Operation.run(:title => "Dragonfly") }
+    before { @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"}]) }
@@ -36,7 +36,7 @@ class WorkerTest < MiniTest::Spec
   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").must_equal "I was working hard on {:title=>\"Dragonfly\"}. title:Dragonfly \"title\"=>" }
 
 
   # test manual serialisation (to be done with UploadedFile etc automatically).
@@ -44,7 +44,7 @@ class WorkerTest < MiniTest::Spec
     include Worker
 
     def self.serializable(params)
-      {:wrap => params}
+      {wrap: params}
     end
 
     def deserializable(params)
@@ -53,7 +53,7 @@ class WorkerTest < MiniTest::Spec
   end
 
   describe "with serialization in sidekiq" do
-    before { @res = SerializingOperation.run(:title => "Dragonfly") }
+    before { @res = SerializingOperation.run(title: "Dragonfly") }
 
     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"}}]) }
@@ -68,9 +68,9 @@ class WorkerFileMarshallerTest < MiniTest::Spec
     tmp.write File.open("test/fixtures/#{name}").read
 
     ActionDispatch::Http::UploadedFile.new(
-    :tempfile => tmp,
-    :filename => name,
-    :type     => "image/png")
+    tempfile: tmp,
+    filename: name,
+    type: "image/png")
   end
 
   class Operation < Trailblazer::Operation
@@ -87,8 +87,10 @@ class WorkerFileMarshallerTest < MiniTest::Spec
     include Worker::FileMarshaller # should be ContractFileMarshaller
 
     def process(params)
-      params
+      @params = params
     end
+
+    attr_reader :params
   end
 
   # TODO: no image
@@ -104,7 +106,9 @@ class WorkerFileMarshallerTest < MiniTest::Spec
 
     args["album"]["image"]["filename"].must_equal "cells.png"
 
-    _, params = Operation.perform_one # deserialize.
+    _, op = Operation.perform_one # deserialize.
+
+    params = op.params
 
     params["title"].must_equal("Dragonfly")
     params[:title].must_equal("Dragonfly") # must allow indifferent_access.

data/trailblazer.gemspec

@@ -20,14 +20,18 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "actionpack", '>= 3.0.0' # this framework works on Rails.
   spec.add_dependency "uber", ">= 0.0.10" # no builder inheritance.
-  spec.add_dependency "representable", ">= 2.1.1", "<2.2.0" # Representable::apply.
-  spec.add_dependency "reform", "~> 1.2.0"
+  # spec.add_dependency "representable", ">= 2.1.1", "<2.3.0" # Representable::apply.
+  spec.add_dependency "reform", ">= 1.2.0"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   # spec.add_development_dependency "minitest-spec-rails" # TODO: can anyone make this work (test/rails).
   spec.add_development_dependency "sidekiq", "~> 3.1.0"
   spec.add_development_dependency "rails"
   spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "responders"
+  spec.add_development_dependency "database_cleaner"
+
+  spec.add_development_dependency "roar"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -38,54 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.10
-- !ruby/object:Gem::Dependency
-  name: representable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: reform
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +136,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: responders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: roar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !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.
 email:
@@ -179,21 +201,27 @@ files:
 - gemfiles/Gemfile.rails.lock
 - lib/trailblazer.rb
 - lib/trailblazer/autoloading.rb
+- lib/trailblazer/endpoint.rb
 - lib/trailblazer/operation.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/representer.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/operation_test.rb
 - test/rails/controller_test.rb
+- test/rails/endpoint_test.rb
 - test/rails/fake_app/app-cells/.gitkeep
 - test/rails/fake_app/cells.rb
 - test/rails/fake_app/config.rb
@@ -201,10 +229,14 @@ files:
 - test/rails/fake_app/models.rb
 - 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/test_helper.rb
+- test/representer_test.rb
 - test/responder_test.rb
+- test/rollback_test.rb
 - test/test_helper.rb
 - test/uploaded_file_test.rb
 - test/worker_test.rb
@@ -229,16 +261,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 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/operation_test.rb
 - test/rails/controller_test.rb
+- test/rails/endpoint_test.rb
 - test/rails/fake_app/app-cells/.gitkeep
 - test/rails/fake_app/cells.rb
 - test/rails/fake_app/config.rb
@@ -246,10 +281,14 @@ test_files:
 - test/rails/fake_app/models.rb
 - 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/test_helper.rb
+- test/representer_test.rb
 - test/responder_test.rb
+- test/rollback_test.rb
 - test/test_helper.rb
 - test/uploaded_file_test.rb
 - test/worker_test.rb