trailblazer 1.0.0.rc2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07471cd851403f80b0a26ef761be0ceb009dc745
-  data.tar.gz: cad5f9dfb9a3e6ecce4623d4d32bff7688ac62e0
+  metadata.gz: 706f11d67b247409077b6cf7dd236ee0cbb67490
+  data.tar.gz: 02c05af733cceef4436e35f018a71e667ef45db5
 SHA512:
-  metadata.gz: 7896872cf410a207510668b7589f5e39b45c7d5ae3180682ecd5036745646742ccf1c487a26b7df5407f57ef8c12c94832948d22746472a463ce0a42c7be1594
-  data.tar.gz: 35a858f63b046ff83c7f456e043ccefa1f10e52a0e84c5ac967dfeed36987c03fb8c0a909552060363335779080536a59e7d6c82669a07636fd86012ea532762
+  metadata.gz: 389626ff14345d9a37ca9159ecce584233d74ccb09248f34eb09a332af95bf9457b13dcf653a8579d23bc45ee92e778f8c19218665167c768e8b8961f4ef4dfb
+  data.tar.gz: 5ec3b0a491cf5a56159f79463a15f88971ef53ef9e72984d9c2a3aec627fdbefd8c2de58eeed9e5cfc3a6747e2f7e59d4635bf1a9e736c7f6f586eef6617243e

data/CHANGES.md

@@ -1,10 +1,11 @@
 # 1.0.0
 
+* All Rails-relevant files are now in the `trailblazer-rails` gem. You have to include it should you be in a Rails environment.
 * `Operation[{..}]` is deprecated in favor of `Operation.({..})`.
-setup in initialize: when Op.run() with Worker, the policy will be run "delayed" and not with the actual permission set. this will result in many crashing sidekiq workers.
 * `Operation::CRUD` is now `Operation::Model`.
 * `Controller#form` now invokes `#prepopulate!` before rendering the view.
 * `Controller#present` does not instantiate and assign `@form` anymore.
+* The internal `Operation` API has changed from `#initialize()` and `#run(params)` to `#initialize(params)` and `#run`.
 
 # 0.3.4
 

data/Rakefile

@@ -1,23 +1,10 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-task :default => [:build]
-default_task = Rake::Task[:build]
+task :default => [:test]
 
 Rake::TestTask.new(:test) do |test|
   test.libs << 'test'
-  test.test_files = FileList['test/*_test.rb', "test/operation/**/*_test.rb"]
+  test.test_files = FileList['test/**/*_test.rb']
   test.verbose = true
-end
-
-# this how the rails test must be run: BUNDLE_GEMFILE=gemfiles/Gemfile.rails bundle exec rake rails
-Rake::TestTask.new(:rails) do |test|
-  test.libs << 'test/rails'
-  test.test_files = FileList['test/rails/*_test.rb']
-  test.verbose = true
-end
-
-rails_task = Rake::Task["rails"]
-test_task = Rake::Task["test"]
-default_task.enhance { test_task.invoke }
-default_task.enhance { rails_task.invoke }
+end

data/lib/trailblazer/autoloading.rb

@@ -1,6 +1,5 @@
 Trailblazer::Operation.class_eval do
   autoload :Controller, "trailblazer/operation/controller"
-  autoload :Responder,  "trailblazer/operation/responder"
   autoload :Model,      "trailblazer/operation/model"
   autoload :Collection, "trailblazer/operation/collection"
   autoload :Dispatch,   "trailblazer/operation/dispatch"

data/lib/trailblazer/operation.rb

@@ -4,15 +4,10 @@ module Trailblazer
   class Operation
     require "trailblazer/operation/builder"
     extend Builder # imports ::builder_class and ::build_operation.
+
     extend Uber::InheritableAttr
     inheritable_attr :contract_class
     self.contract_class = Reform::Form.clone
-    self.contract_class.class_eval do
-      def self.name # FIXME: don't use ActiveModel::Validations in Reform, it sucks.
-        # for whatever reason, validations climb up the inheritance tree and require _every_ class to have a name (4.1).
-        "Reform::Form"
-      end
-    end
 
     class << self
       def run(params, &block) # Endpoint behaviour

data/lib/trailblazer/version.rb

@@ -1,3 +1,3 @@
 module Trailblazer
-  VERSION = "1.0.0.rc2"
+  VERSION = "1.0.0"
 end

data/test/operation/dsl/representer_test.rb

@@ -16,7 +16,6 @@ class DslRepresenterTest < MiniTest::Spec
   describe "inheritance across operations" do
     class Operation < Trailblazer::Operation
       include Representer
-      include Responder
       include SongProcess
 
       representer do

data/test/test_helper.rb

@@ -1,60 +1,5 @@
 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
-
-  included do
-    let (:tmp_dir) { "/tmp/uploads" }
-    before { Dir.mkdir(tmp_dir) unless File.exists?(tmp_dir) }
-  end
-end
-
-MiniTest::Spec.class_eval do
-  include TmpUploads
-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
-
 
 require "reform/form/active_model/validations"
 Reform::Form.class_eval do

data/trailblazer.gemspec

@@ -19,17 +19,14 @@ Gem::Specification.new do |spec|
 
 
   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 "activemodel" # for Reform::AM::V
+
   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 "actionpack", '>= 3.0.0' # Rails is optional.
-  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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0
 platform: ruby
 authors:
 - Nick Sutterer
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,35 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  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
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: rails
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,20 +108,6 @@ 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
@@ -206,7 +164,6 @@ files:
 - 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/dispatch.rb
 - lib/trailblazer/operation/model.rb
 - lib/trailblazer/operation/model/dsl.rb
@@ -216,14 +173,10 @@ files:
 - 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/version.rb
 - test/collection_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
@@ -237,27 +190,9 @@ files:
 - 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
-- test/rails/fake_app/cells.rb
-- test/rails/fake_app/config.rb
-- test/rails/fake_app/controllers.rb
-- 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/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
 - test/rollback_test.rb
 - test/test_helper.rb
-- test/uploaded_file_test.rb
-- test/worker_test.rb
 - trailblazer.gemspec
 homepage: http://www.trailblazerb.org
 licenses:
@@ -274,9 +209,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
@@ -286,8 +221,6 @@ summary: A new architecture for Rails.
 test_files:
 - test/collection_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
@@ -301,25 +234,7 @@ test_files:
 - 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
-- test/rails/fake_app/cells.rb
-- test/rails/fake_app/config.rb
-- test/rails/fake_app/controllers.rb
-- 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/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
 - test/rollback_test.rb
 - test/test_helper.rb
-- test/uploaded_file_test.rb
-- test/worker_test.rb
 has_rdoc: 

data/lib/trailblazer/operation/controller/active_record.rb

@@ -1,16 +0,0 @@
-# Assigns an additional instance variable for +@model+ named after the model's table name (e.g. @comment).
-module Trailblazer::Operation::Controller::ActiveRecord
-private
-  def setup_operation_instance_variables!(operation, options)
-    super
-    instance_variable_set(:"@#{operation_model_name}", @model)
-  end
-
-  def operation_model_name
-    # set the right variable name if collection
-    if @operation.is_a?(Trailblazer::Operation::Collection)
-      return @model.model.table_name.split(".").last
-    end
-    @model.class.table_name.split(".").last.singularize
-  end
-end

data/lib/trailblazer/operation/responder.rb

@@ -1,23 +0,0 @@
-module Trailblazer::Operation::Responder
-  def self.included(base)
-    base.extend ClassMethods
-  end
-
-  module ClassMethods
-    def model_name
-      model_class.model_name
-    end
-  end
-
-  extend Forwardable
-  def_delegators :@model, :to_param, :destroyed?, :persisted?
-
-  def errors
-    return [] if @valid
-    [1]
-  end
-
-  def to_model
-    @model
-  end
-end

data/lib/trailblazer/operation/worker.rb

@@ -1,111 +0,0 @@
-require 'sidekiq/worker'
-require 'active_support/core_ext/hash/indifferent_access'
-
-
-class Trailblazer::Operation
-  # only kicks in when Operation::run, #run will still do it real-time
-  # Works with Reform 2, only.
-  module Worker
-    def self.included(base)
-      base.send(:include, Sidekiq::Worker)
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-      def run(params)
-        if background?
-          return perform_async(serializable(params))
-        end
-
-        super(params)
-      end
-
-      def new(*args)
-        return super if args.any?
-        # sidekiq behavior: (not a big fan of this)
-        self
-      end
-
-      def perform(params) # called by Sidekiq.
-        build_operation(params).perform
-      end
-
-      def jid=(jid)
-        puts "@@@@@ #{jid.inspect}"
-      end
-
-    private
-      def perform_async(*args)
-        client_push('class' => self, 'args' => args) # calls class.new.perform(params)
-      end
-
-      def background? # TODO: make configurable.
-        true
-        # if Rails.env == "production" or Rails.env == "staging"
-      end
-
-      def serializable(params)
-        params # this is where we convert file uloads into Trailblazer::UploadedFile, etc. soon.
-      end
-    end
-
-
-    def perform#(params)
-      # the serialized params hash from Sidekiq contains a Op::UploadedFile hash.
-
-      # the following code is basically what happens in a controller.
-      # this is a bug in Rails, it doesn't work without requiring as/hash/ina
-      # params = ActiveSupport::HashWithIndifferentAccess.new_from_hash_copying_default(params) # TODO: this might make it ultra-slow as Reform converts it back to strings.
-      params = @params.with_indifferent_access
-      @params = deserializable(params)
-      run
-    end
-
-  private
-    def deserializable(params)
-      params # this is where we convert file uloads into Trailblazer::UploadedFile, etc. soon.
-    end
-
-
-    # Overrides ::serializable and #deserializable and handles file properties from the Contract schema.
-    module FileMarshaller
-      # NOTE: this is WIP and the implementation will be more understandable and performant soon.
-      def self.included(base)
-        base.extend ClassMethods
-      end
-
-
-    private
-      module ClassMethods
-        def file_marshaller_representer
-          @file_marshaller_representer ||= contract_class.schema(include: [Representable::Hash]).apply do |dfn|
-            dfn.merge!(
-              getter: lambda { |*| self[dfn.name.to_sym] },
-              setter: lambda { |fragment, *| self[dfn.name.to_s] = fragment }
-            ) # FIXME: allow both sym and str.
-
-            dfn.merge!(class: Hash) and next if dfn[:form] or dfn[:twin] # nested properties need a class for deserialization.
-            next unless dfn[:file]
-
-            # TODO: where do we set /tmp/uploads?
-            dfn.merge!(
-              serialize: lambda { |file, *| Trailblazer::Operation::UploadedFile.new(file, tmp_dir: "/tmp/uploads").to_hash },
-              deserialize: lambda { |object, hash, *| Trailblazer::Operation::UploadedFile.from_hash(hash) },
-              class: Hash
-            )
-          end
-        end
-
-        def serializable(params)
-          file_marshaller_representer.new(params).to_hash
-        end
-      end
-
-      # todo: do with_indifferent_access in #deserialize and call super here.
-      def deserializable(hash)
-        # self.class.file_marshaller_representer.new({}).extend(Representable::Debug).from_hash(hash)
-        self.class.file_marshaller_representer.new({}.with_indifferent_access).from_hash(hash)
-      end
-    end
-  end
-end