coprl 3.0.0.beta.6 → 3.0.0.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d5886d0ba61fa0e7a694b0463ef695007c3c64e3c601344b96e9d6cdcd74e14
-  data.tar.gz: c6acd24734fb08dfa86e416cefecf8936e816ee390fe2eb150be085c6e0b7552
+  metadata.gz: f1e42760026c49cf31fd1e7b4828e1f35d425c4bd9210431854e19dd6791b0dc
+  data.tar.gz: fc418edb85902d702985446356561526ba54f04d36c96eb97871d9479a96cd1f
 SHA512:
-  metadata.gz: e5b77286cfd3b3ee1df288e8a9394dbc16d3bae8ccb148dec73b90af4021c653b4266ca5f8cdc404268d7d6e118b5dd1f9a13fe34b1db4bad8e3aa2b7ba9159a
-  data.tar.gz: 0b8b5ce497af6367a3c48b1f82dae262441ef125e9908cd29c37d08e8f371cfe2e3c187b851fdc497cc7f7573d84a13d480569d0967d1e26a904157a1556516c
+  metadata.gz: 2f214706da76cc52329f24f92bdc16c83b54ef6550ca59ccf996f4baf665c00db04fe4b3eae5125ebd2cf7dacfa0fb3853e66d866e8e99981e315441ae99fab8
+  data.tar.gz: d36d7a083fd7d0d1212db2271a3c6669cb84f398ca02b7d64e7ed349c203456c0a3aecd71c727cd241f666265a527ade93b312c7203eb63f5048bebd49074741

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [3.0.0-beta.7](https://github.com/rx/presenters/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-07-09)
+
+
+### Bug Fixes
+
+* Rails routes automatically made available as helpers ([#322](https://github.com/rx/presenters/issues/322)) ([abb0031](https://github.com/rx/presenters/commit/abb00311940fda8741459f8aafe29cd7bf074b88))
+* view paths issue when using partials with Rails Engine ([#321](https://github.com/rx/presenters/issues/321)) ([2a917e7](https://github.com/rx/presenters/commit/2a917e7076895037e5a069e77525ef53d2ca45f1))
+
+
+### Features
+
+* switch to use Rails built-in watchers and reloader ([#320](https://github.com/rx/presenters/issues/320)) ([53e0ee4](https://github.com/rx/presenters/commit/53e0ee49caa663ce93ff731c280bcd754da73fc1))
+
 # [3.0.0-beta.6](https://github.com/rx/presenters/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-06-23)
 
 

data/Gemfile.lock

@@ -84,7 +84,6 @@ PATH
       dry-configurable (> 0.1, <= 7.0)
       dry-container (~> 0.6)
       dry-inflector (~> 0.1)
-      filewatcher (~> 1.1.1)
       ice_nine (~> 0.11)
       redcarpet (~> 3.4)
       sinatra (>= 1.4, < 3.0)
@@ -111,8 +110,6 @@ GEM
     dry-core (0.6.0)
       concurrent-ruby (~> 1.0)
     dry-inflector (0.2.0)
-    filewatcher (1.1.1)
-      optimist (~> 3.0)
     ice_nine (0.11.2)
     json (2.3.1)
     method_source (0.9.0)
@@ -125,7 +122,6 @@ GEM
       racc (~> 1.4)
     nokogiri (1.11.7-x86_64-darwin)
       racc (~> 1.4)
-    optimist (3.0.1)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)

data/coprl.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'tzinfo', '>=1.1', '< 3.0'
   spec.add_runtime_dependency 'tzinfo-data', '~>1.2018'
   spec.add_runtime_dependency 'redcarpet', '~>3.4'
-  spec.add_runtime_dependency 'filewatcher', '~> 1.1.1'
   spec.add_runtime_dependency 'zeitwerk', '~> 2.1'
 
   spec.add_development_dependency 'thor', '~> 1.1.0'

data/lib/coprl/presenters/dsl/components/base.rb

@@ -75,7 +75,6 @@ module Coprl
 
           alias params context
 
-
           def yield_block
             return @_yield_block_ if @_yield_block_
             @parent.send(:yield_block)

data/lib/coprl/presenters/dsl/definition.rb

@@ -17,8 +17,8 @@ module Coprl
           self
         end
 
-        def expand(router: , context:{}, &block)
-          presenter = UserInterface.new(router: router, context: context,  name: @name, namespace: @namespace, &@block)
+        def expand(router: , context:{}, plugins: [], &block)
+          presenter = UserInterface.new(router: router, context: context, plugins: plugins, name: @name, namespace: @namespace, &@block)
           yield(presenter) if block
           presenter.expand_instance
         end

data/lib/coprl/presenters/dsl/user_interface.rb

@@ -25,7 +25,7 @@ module Coprl
         private :context, :router, :namespace
         alias params context
 
-        def initialize(context:, parent: nil, router: nil, name: nil, namespace: [], &block)
+        def initialize(context:, parent: nil, router: nil, name: nil, plugins: [], namespace: [], &block)
           @parent = parent
           @router = router || @parent&.send(:router)
           @context = context || {}
@@ -36,7 +36,7 @@ module Coprl
           @footer = nil
           @name = name
           @namespace = namespace
-          @plugins = []
+          @plugins = plugins || []
           @csrf_meta_tags = authenticity_token_meta_tags(@context.fetch(:session, nil))
           add_global_helpers
           initialize_plugins

data/lib/coprl/presenters/helpers/rails.rb

@@ -6,12 +6,9 @@ if defined?(Rails)
           include ActionView::Helpers::AssetUrlHelper
           include Coprl::Presenters::Helpers::Rails::Currency
           include Coprl::Presenters::Helpers::Rails::ModelTable
+          include Coprl::Presenters::Helpers::Rails::Routes
           include Namespace
 
-          def default_url_options
-            {}
-          end
-
           def presenters_path(presenter, host: false, **params)
             presenter = _expand_namespace_(presenter, namespace)
             presenter = presenter.gsub(':', '/')

data/lib/coprl/presenters/helpers/rails/routes.rb

@@ -0,0 +1,14 @@
+module Coprl
+  module Presenters
+    module Helpers
+      module Rails
+        module Routes
+          include ::Rails.application.routes.url_helpers
+          def default_url_options
+            ::Rails.application.config.action_controller.default_url_options || { :host => context[:request].host_with_port }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/coprl/presenters/rails/concerns/coprl_partial.rb

@@ -0,0 +1,51 @@
+module Coprl
+  module Presenters
+    module Rails
+      module Concerns
+        module CoprlPartial
+          extend ActiveSupport::Concern
+
+          included do
+            before_action :set_view_path
+          end
+          
+          module ClassMethods
+            @plugins = []
+            def presenter_plugin(*plugins)
+              @plugins += Array(plugins)
+            end
+
+            def plugins
+              @plugins
+            end
+          end
+
+          def set_view_path
+            paths = Coprl::Presenters::WebClient::PluginViewsPath.new(pom: nil, plugins: self.class.plugins).render
+            paths.each do |path|
+              prepend_view_path path
+            end
+          end
+
+          def prepare_context(base_params = params)
+            prepare_context = Coprl::Presenters::Settings.config.presenters.web_client.prepare_context.dup
+            prepare_context.push(method(:scrub_context))
+            context = base_params.dup.to_unsafe_hash
+            prepare_context.reduce(context) do |params, context_proc|
+              context = context_proc.call(params, session, request.env)
+            end
+            context
+          end
+
+          def scrub_context(params, _session, _env)
+            %i(grid_nesting input_tag).each do |key|
+              params.delete(key) {params.delete(key.to_s)}
+            end
+            params
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/coprl/presenters/rails/engine.rb

@@ -12,6 +12,11 @@ module Coprl
           # TODO: should rename these since they are common names that are likely going to collide
           app.middleware.use ::ActionDispatch::Static, File.join(root, '..', 'public')
         end
+
+        ActiveSupport.on_load(:action_controller) do
+          include Concerns::CoprlPartial
+        end
+
       end
     end
   end

data/lib/coprl/presenters/rails/railtie.rb

@@ -1,5 +1,3 @@
-require 'filewatcher'
-
 module Coprl
   module Presenters
     module Rails
@@ -15,20 +13,14 @@ module Coprl
 
         WATCH = -> {
           return unless ::Rails.env.development?
+
           path = ::Rails.root.join('app', '**', '*.pom')
-          puts "Watching #{path} for changes..."
-          filewatcher = Filewatcher.new(path)
-          Thread.new(filewatcher) do |fw|
-            fw.watch do |f|
-              puts "Detected updated POM file: #{f}"
-              begin
-                BOOT.call
-              rescue Exception => exc
-                puts exc.backtrace
-                puts exc.message
-              end
-            end
+          file_watcher = ActiveSupport::FileUpdateChecker.new(Dir[path]) do
+            BOOT.call
           end
+
+          ::Rails.application.reloaders << Reloader.new(file_watcher)
+
         } unless defined?(WATCH)
 
         config.after_initialize do

data/lib/coprl/presenters/rails/reloader.rb

@@ -0,0 +1,15 @@
+module Coprl
+  module Presenters
+    module Rails
+      class Reloader
+        def initialize(file_watcher)
+          @file_watcher = file_watcher
+        end
+
+        def updated?
+          @file_watcher.execute_if_updated
+        end
+      end
+    end
+  end
+end

data/lib/coprl/presenters/version.rb

@@ -1,7 +1,7 @@
 module Coprl
   module Presenters
     module Version
-      VERSION = '3.0.0.beta.6'
+      VERSION = '3.0.0.beta.7'
     end
   end
 end

data/lib/coprl/presenters/web_client/plugin_views_path.rb

@@ -8,17 +8,17 @@ module Coprl
         extend Pluggable
         include_plugins(:WebClientComponents)
 
-        def initialize(pom:)
+        def initialize(pom: nil, plugins: nil)
           @pom = pom
+          @plugins = plugins || []
           initialize_plugins
         end
 
         def render
           results = []
-          ((@plugins||[]) + Coprl::Presenters::Settings.config.presenters.plugins).each do |plugin|
+          (@plugins + Coprl::Presenters::Settings.config.presenters.plugins).each do |plugin|
             view_dir_method = :"view_dir_#{plugin}"
-            results << send(view_dir_method,
-                 @pom) if respond_to?(view_dir_method)
+            results << send(view_dir_method, @pom) if respond_to?(view_dir_method)
           end
           results
         end
@@ -26,7 +26,7 @@ module Coprl
         private
 
         def initialize_plugins
-          @plugins = @pom.send(:plugins)
+          @plugins += @pom.send(:plugins) if @pom
           self.class.include_plugins(:WebClientComponents, plugins: @plugins)
         end
       end

data/rails-engine/app/controllers/coprl_controller.rb

@@ -23,21 +23,4 @@ class CoprlController < ApplicationController
       prepend_view_path path
     end
   end
-
-  def prepare_context(base_params = params)
-    prepare_context = Coprl::Presenters::Settings.config.presenters.web_client.prepare_context.dup
-    prepare_context.push(method(:scrub_context))
-    context = base_params.dup.to_unsafe_hash
-    prepare_context.reduce(context) do |params, context_proc|
-      context = context_proc.call(params, session, request.env)
-    end
-    context
-  end
-
-  def scrub_context(params, _session, _env)
-    %i(grid_nesting input_tag).each do |key|
-      params.delete(key) {params.delete(key.to_s)}
-    end
-    params
-  end
 end

data/rails-engine/config/initializers/presenters.rb

@@ -28,9 +28,11 @@ class CoprlTemplateHandler
         # otherwise we need to get the presenter name built from params
         presenter_name = local_assigns[:presenter] ? presenter : namespaced_presenter(params)
         presenter = Coprl::Presenters::App[presenter_name].call
-        context = params.dup.to_unsafe_hash
+        context = self.controller.prepare_context(params)
         router = Coprl::Presenters::WebClient::Router.new(base_url: request.base_url)
-        @pom = presenter.expand(router: router, context: context)
+        plugins = self.controller.class.plugins
+      
+        @pom = presenter.expand(router: router, context: context, plugins: plugins)
       end
       #{source}
       end

data/rails-engine/config/initializers/routes.rb

@@ -0,0 +1,5 @@
+Rails.application.config.to_prepare do
+  Coprl::Presenters::Settings.configure do |config|
+    config.presenters.helpers << Coprl::Presenters::Helpers::Rails
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coprl
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.6
+  version: 3.0.0.beta.7
 platform: ruby
 authors:
 - Russell Edens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2021-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_nine
@@ -140,20 +140,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: filewatcher
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -597,14 +583,17 @@ files:
 - lib/coprl/presenters/helpers/rails.rb
 - lib/coprl/presenters/helpers/rails/currency.rb
 - lib/coprl/presenters/helpers/rails/model_table.rb
+- lib/coprl/presenters/helpers/rails/routes.rb
 - lib/coprl/presenters/helpers/redact.rb
 - lib/coprl/presenters/helpers/route.rb
 - lib/coprl/presenters/helpers/time.rb
 - lib/coprl/presenters/namespace.rb
 - lib/coprl/presenters/pluggable.rb
 - lib/coprl/presenters/plugins.rb
+- lib/coprl/presenters/rails/concerns/coprl_partial.rb
 - lib/coprl/presenters/rails/engine.rb
 - lib/coprl/presenters/rails/railtie.rb
+- lib/coprl/presenters/rails/reloader.rb
 - lib/coprl/presenters/registry.rb
 - lib/coprl/presenters/router.rb
 - lib/coprl/presenters/settings.rb
@@ -685,6 +674,7 @@ files:
 - rails-engine/app/views/layouts/coprl.html.erb
 - rails-engine/config.ru
 - rails-engine/config/initializers/presenters.rb
+- rails-engine/config/initializers/routes.rb
 - rails-engine/config/initializers/session.rb
 - rails-engine/config/routes.rb
 - scripts/build.sh