trailblazer-rails 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3671c119c25e9f9f72575090dcdb7398d5c5d9f
-  data.tar.gz: 444bdd9e5f4737406451a8d9b65f3b99ab36cacf
+  metadata.gz: 717fe6cda0f26fc905222fb717c55df70e2da904
+  data.tar.gz: 0f583866a2b10db4f33e29b57d6e37f1274c8a4a
 SHA512:
-  metadata.gz: 39551d7596d3b73ceba16c4ca20eec455c5c1256ee91f6db0f2634ea3a3cb62dc3ef93696b2ef3a395683906b3e4d8882d32346e010f3139206024b5ae0abad0
-  data.tar.gz: 539c4660b17247ddfcf9f190b886ef504fddc13d3a3d069492f0314aba9e70869964aa49daa62241d6dda6a5dc8109653b6813a02a6ccdb38d9af748c5d3f257
+  metadata.gz: 0a960ad86eace338eea9218729a4d015b962215fd5d6734287da39aaf865f6fad5df69d8d056fe8af854a188621493e1575a46eb62ef2e356a505b07b514357b
+  data.tar.gz: e7c4c7a8dd737c6cff8b35cd81a4d6d3891d44d6fc75f9c9238b2ac3d6af0f91ace67f00c8f530ac4ef4e47263d261b01c929643d846cb83f0c751fc00985f87

data/.rubocop.yml

@@ -0,0 +1,9 @@
+inherit_from: .rubocop_todo.yml
+
+Style/ClassCheck:
+  Exclude:
+    - 'lib/trailblazer/rails/cell.rb'
+
+Metrics/AbcSize:
+  Exclude:
+    - 'lib/trailblazer/rails/controller.rb'

data/.rubocop_todo.yml

@@ -0,0 +1,294 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-04-05 15:17:59 +0800 using RuboCop version 0.52.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
+# Include: **/Gemfile, **/gems.rb
+Bundler/OrderedGems:
+  Exclude:
+    - 'test/rails5.0/Gemfile'
+    - 'test/rails5.1/Gemfile'
+    - 'test/rails5.2/Gemfile'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
+# Include: **/*.gemspec
+Gemspec/OrderedDependencies:
+  Exclude:
+    - 'trailblazer-rails.gemspec'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: outdent, indent
+Layout/AccessModifierIndentation:
+  Exclude:
+    - 'lib/trailblazer/rails/controller.rb'
+    - 'test/rails5.0/app/controllers/params_controller.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Layout/EmptyLines:
+  Exclude:
+    - 'test/rails5.2/Gemfile'
+    - 'test/test_helper.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+Layout/EmptyLinesAroundAccessModifier:
+  Exclude:
+    - 'lib/trailblazer/rails/controller.rb'
+    - 'test/rails5.0/app/controllers/params_controller.rb'
+    - 'test/rails5.1/app/controllers/params_controller.rb'
+    - 'test/rails5.2/app/controllers/params_controller.rb'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, no_empty_lines
+Layout/EmptyLinesAroundBlockBody:
+  Exclude:
+    - 'test/rails5.0/config/routes.rb'
+    - 'test/rails5.0/db/schema.rb'
+    - 'test/rails5.1/config/routes.rb'
+    - 'test/rails5.1/db/schema.rb'
+    - 'test/rails5.2/config/routes.rb'
+    - 'test/rails5.2/db/schema.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
+Layout/ExtraSpacing:
+  Exclude:
+    - 'test/rails5.0/bin/setup'
+    - 'test/rails5.1/bin/setup'
+    - 'test/rails5.2/bin/setup'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: normal, rails
+Layout/IndentationConsistency:
+  Exclude:
+    - 'test/rails5.1/app/controllers/params_controller.rb'
+    - 'test/rails5.2/app/controllers/params_controller.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Layout/LeadingCommentSpace:
+  Exclude:
+    - 'test/rails5.0/Gemfile'
+    - 'test/rails5.1/Gemfile'
+    - 'test/rails5.2/Gemfile'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Layout/SpaceAfterColon:
+  Exclude:
+    - 'test/rails5.1/app/controllers/args_controller.rb'
+    - 'test/rails5.2/app/controllers/args_controller.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+Layout/SpaceBeforeComment:
+  Exclude:
+    - 'test/rails5.0/Gemfile'
+    - 'test/rails5.1/Gemfile'
+    - 'test/rails5.2/Gemfile'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
+# SupportedStyles: space, no_space
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideBlockBraces:
+  Exclude:
+    - 'test/rails5.0/app/concepts/params/operation/with_args.rb'
+    - 'test/rails5.1/app/concepts/params/operation/with_args.rb'
+    - 'test/rails5.2/app/concepts/params/operation/with_args.rb'
+
+# Offense count: 51
+# Cop supports --auto-correct.
+Layout/SpaceInsideParens:
+  Exclude:
+    - 'test/rails5.0/app/concepts/song/operation/create.rb'
+    - 'test/rails5.0/app/concepts/song/operation/show.rb'
+    - 'test/rails5.0/app/controllers/artists_controller.rb'
+    - 'test/rails5.0/app/controllers/params_controller.rb'
+    - 'test/rails5.1/app/concepts/song/operation/create.rb'
+    - 'test/rails5.1/app/concepts/song/operation/show.rb'
+    - 'test/rails5.1/app/controllers/artists_controller.rb'
+    - 'test/rails5.1/app/controllers/params_controller.rb'
+    - 'test/rails5.2/app/concepts/song/operation/create.rb'
+    - 'test/rails5.2/app/concepts/song/operation/show.rb'
+    - 'test/rails5.2/app/controllers/artists_controller.rb'
+    - 'test/rails5.2/app/controllers/params_controller.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: space, no_space
+Layout/SpaceInsideStringInterpolation:
+  Exclude:
+    - 'test/rails5.0/app/concepts/params/operation/with_args.rb'
+    - 'test/rails5.1/app/concepts/params/operation/with_args.rb'
+    - 'test/rails5.2/app/concepts/params/operation/with_args.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/DeprecatedClassMethods:
+  Exclude:
+    - 'test/test_helper.rb'
+
+# Offense count: 1
+Lint/ParenthesesAsGroupedExpression:
+  Exclude:
+    - 'test/test_helper.rb'
+
+# Offense count: 1
+# Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
+Lint/UselessAccessModifier:
+  Exclude:
+    - 'lib/trailblazer/rails/cell.rb'
+
+# Offense count: 1
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'lib/trailblazer-rails.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: braces, no_braces, context_dependent
+Style/BracesAroundHashParameters:
+  Exclude:
+    - 'test/rails5.0/app/controllers/args_controller.rb'
+    - 'test/rails5.1/app/controllers/args_controller.rb'
+    - 'test/rails5.2/app/controllers/args_controller.rb'
+
+# Offense count: 23
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/ColonMethodCall:
+  Exclude:
+    - 'test/test_helper.rb'
+
+# Offense count: 10
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/trailblazer/operation/responder.rb'
+    - 'lib/trailblazer/rails.rb'
+    - 'lib/trailblazer/rails/cell.rb'
+    - 'lib/trailblazer/rails/controller.rb'
+    - 'lib/trailblazer/rails/form.rb'
+    - 'lib/trailblazer/rails/railtie.rb'
+
+# Offense count: 134
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: when_needed, always, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+Style/HashSyntax:
+  Exclude:
+    - 'Rakefile'
+    - 'test/rails5.0/app/controllers/args_controller.rb'
+    - 'test/rails5.0/app/controllers/params_controller.rb'
+    - 'test/rails5.1/app/controllers/args_controller.rb'
+    - 'test/rails5.1/app/controllers/params_controller.rb'
+    - 'test/rails5.2/app/controllers/args_controller.rb'
+    - 'test/rails5.2/app/controllers/params_controller.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: line_count_dependent, lambda, literal
+Style/Lambda:
+  Exclude:
+    - 'lib/trailblazer/rails/railtie.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: .
+# SupportedStyles: call, braces
+Style/LambdaCall:
+  EnforcedStyle: braces
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/MutableConstant:
+  Exclude:
+    - 'lib/trailblazer/rails/version.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: Strict.
+Style/NumericLiterals:
+  MinDigits: 15
+
+# Offense count: 10
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'test/rails5.0/app/concepts/params/operation/with_args.rb'
+    - 'test/rails5.0/test/integration/artists_controller_test.rb'
+    - 'test/rails5.1/app/concepts/params/operation/with_args.rb'
+    - 'test/rails5.1/test/integration/artists_controller_test.rb'
+    - 'test/rails5.2/app/concepts/params/operation/with_args.rb'
+    - 'test/rails5.2/test/integration/artists_controller_test.rb'
+    - 'trailblazer-rails.gemspec'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+  Exclude:
+    - 'lib/trailblazer/rails/controller.rb'
+
+# Offense count: 279
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoredMethods.
+# IgnoredMethods: respond_to, define_method
+Style/SymbolProc:
+  Exclude:
+    - 'lib/trailblazer/rails/railtie.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/UnneededPercentQ:
+  Exclude:
+    - 'trailblazer-rails.gemspec'
+
+# Offense count: 66
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 127

data/CHANGES.md

@@ -1,3 +1,9 @@
+# 2.1.1
+
+* Fixed issue for rails 5.2rc2 when loading model's files
+* Rubocop introduced
+* Allow enabling tracing when using `run` via `config.trailblazer.enable_tracing = true`
+
 # 2.1.0
 
 * Drop deprecated syntax for controller `run`

data/README.md

@@ -28,6 +28,11 @@ gem 'trailblazer-rails'
 
 Note that the 2.x version only runs with TRB >= 2.1.0.
 
+## Setting flags
+
+* `config.trailblazer.use_loader = false` to disable Trailblazer loader (default TRUE)
+* `config.trailblazer.enable_tracing = true` to enable tracing when using `run` (default FALSE)
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/trailblazer/rails/cell.rb

@@ -2,7 +2,7 @@ module Trailblazer::Rails::Controller::Cell
   private
 
   module Render
-    def render(cell=nil, options={}, *, &block)
+    def render(cell = nil, options = {}, *, &block)
       return super unless cell.kind_of?(::Cell::ViewModel)
       render_cell(cell, options)
     end
@@ -13,7 +13,7 @@ module Trailblazer::Rails::Controller::Cell
       # render the cell.
       content = cell.()
 
-      render( { html: content }.merge(options) )
+      render({ html: content }.merge(options))
     end
   end
 

data/lib/trailblazer/rails/controller.rb

@@ -1,10 +1,14 @@
 module Trailblazer::Rails
   module Controller
     def run(operation, *dependencies)
-      result = operation.({params: _run_params(self.params) }.merge(*_run_runtime_options(*dependencies)))
+      result = if Rails.application.config.trailblazer.enable_tracing
+                 _run_operation(operation, :trace, *dependencies).tap { |r| _operation_trace(r) }
+               else
+                 _run_operation(operation, :call, *dependencies)
+               end
 
       @model = result[:model]
-      @form  = Trailblazer::Rails::Form.new( result[ "contract.default" ], @model.class )
+      @form  = Trailblazer::Rails::Form.new(result["contract.default"], @model.class)
 
       yield(result) if result.success? && block_given?
 
@@ -19,7 +23,7 @@ module Trailblazer::Rails
     end
 
     # This is where we can inject Dry.RB containers and the like via dependencies.
-    def _run_runtime_options(ctx={}, *dependencies)
+    def _run_runtime_options(ctx = {}, *dependencies)
       [_run_options(ctx), *dependencies]
     end
 
@@ -29,6 +33,17 @@ module Trailblazer::Rails
       ctx
     end
 
+    def _run_operation(operation, call_method, *dependencies)
+      operation.send(
+        call_method,
+        { params: _run_params(self.params) }.merge(*_run_runtime_options(*dependencies))
+      )
+    end
+
+    def _operation_trace(result)
+      puts result.wtf?
+    end
+
     module Result
       def result
         @_result

data/lib/trailblazer/rails/railtie.rb

@@ -7,6 +7,7 @@ module Trailblazer
     ## Accept also an Array of controllers
     config.trailblazer.application_controller ||= 'ActionController::Base'
     config.trailblazer.use_loader ||= true
+    config.trailblazer.enable_tracing ||= false
 
     def self.load_concepts(app)
       # Loader.new.(insert: [ModelFile, before: Loader::AddConceptFiles]) { |file| require_dependency("#{app.root}/#{file}") }
@@ -42,7 +43,7 @@ module Trailblazer
       end
     end
 
-    initializer "trailblazer.application_controller", before: "finisher_hook" do |app|
+    initializer "trailblazer.application_controller", before: "finisher_hook" do
       reloader_class.to_prepare do
         ActiveSupport.on_load(:action_controller) do |app|
           Trailblazer::Railtie.extend_application_controller!(app)
@@ -53,12 +54,12 @@ module Trailblazer
     # Prepend model file, before the concept files like operation.rb get loaded.
     ModelFile = ->(input, options) do
       model = "app/models/#{options[:name]}.rb"
-      File.exist?(model) ? [model]+input : input
+      File.exist?(model) ? [model] + input : input
     end
 
     # Load all model files before any TRB files.
     AllModelFiles = ->(input, options) do
-      Dir.glob("#{options[:root]}/app/models/**/*.rb") + input
+      Dir.glob("#{options[:root]}/app/models/**/*.rb").sort + input
     end
 
     private
@@ -76,7 +77,7 @@ module Trailblazer
 
     module ExtendApplicationController
       def extend_application_controller!(app)
-        controllers = Array(::Rails.application.config.trailblazer.application_controller).map{ |x| x.to_s }
+        controllers = Array(::Rails.application.config.trailblazer.application_controller).map { |x| x.to_s }
         if controllers.include? app.to_s
           app.send :include, Trailblazer::Rails::Controller
           app.send :include, Trailblazer::Rails::Controller::Cell if defined?(::Cell)

data/lib/trailblazer/rails/test/integration.rb

@@ -3,4 +3,4 @@ require "minitest/rails/capybara" # loads Capybara, etc.
 module Trailblazer::Test
   class Integration < Capybara::Rails::TestCase
   end
-end
+end

data/lib/trailblazer/rails/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   module Rails
-    VERSION = "2.1.0"
+    VERSION = "2.1.1"
   end
 end

data/trailblazer-rails.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest"
-
+  spec.add_development_dependency "rubocop"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer
@@ -106,6 +106,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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: 
 email:
 - apotonick@gmail.com
@@ -114,6 +128,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".ruby-version"
 - ".travis.yml"
 - CHANGES.md