coprl 3.0.0.beta.7 → 3.0.0.beta.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1e42760026c49cf31fd1e7b4828e1f35d425c4bd9210431854e19dd6791b0dc
-  data.tar.gz: fc418edb85902d702985446356561526ba54f04d36c96eb97871d9479a96cd1f
+  metadata.gz: 9e56a764f380a125709b14469cdf05aedccd86c0c0a094694f644947376b9362
+  data.tar.gz: 7dc3f5c57f3a17c9f20c8b3e87d05e408b723b2f00cb428979147cf4cbcbfc5b
 SHA512:
-  metadata.gz: 2f214706da76cc52329f24f92bdc16c83b54ef6550ca59ccf996f4baf665c00db04fe4b3eae5125ebd2cf7dacfa0fb3853e66d866e8e99981e315441ae99fab8
-  data.tar.gz: d36d7a083fd7d0d1212db2271a3c6669cb84f398ca02b7d64e7ed349c203456c0a3aecd71c727cd241f666265a527ade93b312c7203eb63f5048bebd49074741
+  metadata.gz: 07bf9ba427fb166e20b8a00f8a58b010b1ffe82b5f2c955b1e63d7c93d21859be015ca2f936204f1625dd80979ae244c23ab38cf56030b8c6040854aa9116d28
+  data.tar.gz: 907cd33e6a2cd1fcdf651c3d06adc2a1c8084b2eeff3a0255f0b5faf0eaa4689779b324ce7ace21b592401271fd657cb85b912cd2a63347856d8eba33bd83243

data/.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-       - image: circleci/ruby:2.7.2-node-browsers
+       - image: circleci/ruby:2.7.4-node-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -24,6 +24,7 @@ jobs:
             - v1-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
             - v1-gem-cache-{{ arch }}-{{ .Branch }}-
             - v1-gem-cache-{{ arch }}-
+      - run: gem install bundler:2.2.20
       - run: bundle install
       - run: bundle clean --force
       - save_cache:

data/.ruby-version

@@ -1,2 +1,2 @@
-2.7.2
+2.7.4
 

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+# [3.0.0-beta.11](https://github.com/rx/presenters/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-09-21)
+
+
+### Bug Fixes
+
+* forced release bump ([6c22e06](https://github.com/rx/presenters/commit/6c22e061acc2e714b5b87be8994b2eb0d488ac2d))
+
+# [3.0.0-beta.10](https://github.com/rx/presenters/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-09-21)
+
+### Bug Fixes
+
+* added POM scaffolding generators ([1323b32](https://github.com/rx/presenters/commit/1323b322f83fd9e9519740d9aa7ace4ef8d63b61))
+
+# [3.0.0-beta.9](https://github.com/rx/presenters/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-09-21)
+
+
+### Bug Fixes
+
+* added support for api base base_url ([8f69979](https://github.com/rx/presenters/commit/8f699793de899a450df5cfb8b95015a832200178))
+* fixed bug in context prep for api client ([d0558cf](https://github.com/rx/presenters/commit/d0558cf3966a9bdc91bd9d106dcb0a7ab6f56c34))
+
+# [3.0.0-beta.8](https://github.com/rx/presenters/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-09-17)
+
+
+### Bug Fixes
+
+* added check for engine coprl_presenters_rails_engine_url ([d2ee7b5](https://github.com/rx/presenters/commit/d2ee7b5900a256c30e6715d1246639dec682ff08))
+
 # [3.0.0-beta.7](https://github.com/rx/presenters/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-07-09)
 
 

data/Gemfile.lock

@@ -80,7 +80,7 @@ GIT
 PATH
   remote: .
   specs:
-    coprl (1.0.0)
+    coprl (3.0.0.beta.11)
       dry-configurable (> 0.1, <= 7.0)
       dry-container (~> 0.6)
       dry-inflector (~> 0.1)
@@ -101,15 +101,15 @@ GEM
     diff-lcs (1.4.4)
     docile (1.3.1)
     dotenv (2.7.6)
-    dry-configurable (0.12.1)
+    dry-configurable (0.13.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.8.0)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.6.0)
+      dry-configurable (~> 0.13, >= 0.13.0)
+    dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
-    dry-inflector (0.2.0)
+    dry-inflector (0.2.1)
     ice_nine (0.11.2)
     json (2.3.1)
     method_source (0.9.0)
@@ -159,7 +159,7 @@ GEM
     rspec-support (3.10.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     rubyzip (2.3.0)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
@@ -235,7 +235,7 @@ DEPENDENCIES
   webdrivers (~> 4.1)
 
 RUBY VERSION
-   ruby 2.7.2p137
+   ruby 2.7.4p191
 
 BUNDLED WITH
    2.2.20

data/lib/coprl/presenters/api/app.rb

@@ -66,9 +66,9 @@ module Coprl
 
         def prepare_context(base_params = params)
           prepare_context = Presenters::Settings.config.presenters.web_client.prepare_context.dup
-          prepare_context.push(method(:scrub_context))
+          prepare_context.push(method(:scrub_context)).push(method(:base_url_context))
           context = base_params.dup
-          prepare_context.reduce(context) do |params, context_proc|
+          context = prepare_context.reduce(context) do |params, context_proc|
             context_proc.call(params, session, env)
           end
           context
@@ -80,6 +80,11 @@ module Coprl
           end
           params
         end
+
+        def base_url_context(params, _session, env)
+          params[:base_url] = "#{request.base_url}#{env['SCRIPT_NAME']}"
+          params
+        end
       end
     end
   end

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

@@ -5,7 +5,7 @@ module Coprl
         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 }
+            ::Rails.application.config.action_controller.default_url_options || { :host => context[:base_url] ? context[:base_url] : context[:request].host_with_port }
           end
         end
       end

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

@@ -13,8 +13,13 @@ if defined?(Rails)
             presenter = _expand_namespace_(presenter, namespace)
             presenter = presenter.gsub(':', '/')
 
-            path = host ? coprl_presenters_web_client_app_url(params, host: router.base_url) :
-                          coprl_presenters_web_client_app_path(params)
+            path = if defined?(coprl_presenters_rails_engine_url)
+              host ? coprl_presenters_rails_engine_url(params, host: router.base_url) :
+                       coprl_presenters_rails_engine_path(params)
+            else
+              host ? coprl_presenters_web_client_app_url(params, host: router.base_url) :
+                       coprl_presenters_web_client_app_path(params)
+            end
 
             if path.include?('?')
               path = path.sub('?', "#{presenter}?")

data/lib/coprl/presenters/version.rb

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

data/lib/coprl.rb

@@ -15,6 +15,8 @@ loader = Zeitwerk::Loader.for_gem
 loader.inflector = MyInflector.new(__FILE__)
 #loader.logger = Logger.new($stderr)
 loader.setup
+generators = File.join(__dir__,'generators')
+loader.do_not_eager_load(generators)
 
 module Coprl
 end

data/lib/generators/pom/controller/controller_generator.rb

@@ -0,0 +1,15 @@
+require 'rails/generators/erb/controller/controller_generator'
+
+module Pom
+  module Generators
+    class ControllerGenerator < Erb::Generators::ControllerGenerator
+      source_root File.expand_path(File.join('..', 'templates'), __FILE__)
+
+      protected
+      def handler
+        :pom
+      end
+
+    end
+  end
+end

data/lib/generators/pom/controller/templates/view.html.pom

@@ -0,0 +1,2 @@
+h1 <%= class_name %>#<%= @action %>
+p Find me in <%= @path %>

data/lib/generators/pom/scaffold/scaffold_generator.rb

@@ -0,0 +1,27 @@
+require 'rails/generators/erb/scaffold/scaffold_generator'
+
+module Pom
+  module Generators
+    class ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
+      source_root File.expand_path(File.join('..', 'templates'), __FILE__)
+
+      def copy_view_files
+        available_views.each do |view|
+          filename = filename_with_extensions view
+          template "#{view}.html.pom", File.join('app', 'views', controller_file_path, filename)
+        end
+      end
+
+      hook_for :form_builder, as: :scaffold
+
+      protected
+      def available_views
+        ['index', 'edit', 'show', 'new', '_form']
+      end
+
+      def handler
+        :pom
+      end
+    end
+  end
+end

data/lib/generators/pom/scaffold/templates/_form.html.pom

@@ -0,0 +1,10 @@
+Coprl::Presenters.define("_form", namespace: :<%= plural_table_name %>) do
+  helpers  <%= controller_class_name %>Helper
+
+<% attributes.each do |attribute| -%>
+  text_field name: :<%= attribute.name %> do
+    label :<%= attribute.name %>
+    value <%= singular_table_name %>.<%= attribute.name %> if params[:<%= singular_table_name %>_id]
+  end
+<% end -%>
+end

data/lib/generators/pom/scaffold/templates/edit.html.pom

@@ -0,0 +1,19 @@
+Coprl::Presenters.define(:edit, namespace: :<%= plural_table_name %>) do
+  helpers  <%= controller_class_name %>Helper
+  grid do
+    column 1
+    column 5 do
+      heading 'Editing <%= human_name %>'
+      content do
+        attach '_form'
+        button 'Update' do
+          event :click do
+            updates <%= url_helper_prefix %>_path(<%= singular_table_name %>)
+          end
+        end
+      end
+      link 'Show', presenter_path(:show, <%= singular_table_name %>_id: <%= singular_table_name %>.id)
+      link 'Back', presenter_path(:index)
+    end
+  end
+end

data/lib/generators/pom/scaffold/templates/index.html.pom

@@ -0,0 +1,33 @@
+Coprl::Presenters.define(:index, namespace: :<%= plural_table_name %>) do
+  helpers  <%= controller_class_name %>Helper
+  snackbar params[:notice] if params[:notice]
+  grid do
+    column 1
+    column 5 do
+      heading '<%= human_name %>'
+      list do
+        <%= plural_table_name %>.each do |<%= singular_table_name %>|
+          line <%= attributes.first ? "#{singular_table_name}.#{attributes.first.name}" : "\"#{human_name}\"" %> do
+            actions do
+              icon :edit do
+                event :click do
+                  loads :edit, <%= singular_table_name %>_id: <%= singular_table_name %>.id
+                end
+              end
+              icon :delete do
+                event :click do
+                  dialog "are_you_sure#{<%= singular_table_name %>.id}"
+                end
+              end
+            end
+            event :click do
+              loads :show, <%= singular_table_name %>_id: <%= singular_table_name %>.id
+            end
+          end
+        end
+      end
+      link 'New <%= human_name %>', presenter_path(:new)
+    end
+  end
+  confirm_delete_dialog
+end

data/lib/generators/pom/scaffold/templates/new.html.pom

@@ -0,0 +1,17 @@
+Coprl::Presenters.define(:new, namespace: :<%= plural_table_name %>) do
+  grid do
+    column 1
+    column 5 do
+      heading 'New <%= human_name %>'
+      content do
+      attach '_form'
+      button 'Create' do
+        event :click do
+          creates <%= index_helper %>_path
+        end
+      end
+      end
+      link 'Back', presenter_path(:index)
+    end
+  end
+end

data/lib/generators/pom/scaffold/templates/show.html.pom

@@ -0,0 +1,21 @@
+Coprl::Presenters.define(:show, namespace: :<%= plural_table_name %>) do
+  helpers  <%= controller_class_name %>Helper
+
+  snackbar params[:notice] if params[:notice]
+  grid do
+    column 1
+    column 5 do
+      card do
+      <% attributes.each_with_index do |attribute,index| -%>
+        <% if index == 0 -%>
+          heading <%= singular_table_name %>.<%= attribute.name %>
+      <% else -%>
+          body <%= singular_table_name %>.<%= attribute.name %>
+      <%  end -%>
+      <% end -%>
+      end
+      link 'Edit', presenter_path(:edit,<%= singular_table_name %>_id: params[:<%= singular_table_name %>_id])
+      link 'Back', presenter_path(:index)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coprl
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.7
+  version: 3.0.0.beta.11
 platform: ruby
 authors:
 - Russell Edens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-09 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_nine
@@ -642,6 +642,14 @@ files:
 - lib/coprl/serializer.rb
 - lib/coprl/symbol/to_str.rb
 - lib/coprl/trace.rb
+- lib/generators/pom/controller/controller_generator.rb
+- lib/generators/pom/controller/templates/view.html.pom
+- lib/generators/pom/scaffold/scaffold_generator.rb
+- lib/generators/pom/scaffold/templates/_form.html.pom
+- lib/generators/pom/scaffold/templates/edit.html.pom
+- lib/generators/pom/scaffold/templates/index.html.pom
+- lib/generators/pom/scaffold/templates/new.html.pom
+- lib/generators/pom/scaffold/templates/show.html.pom
 - lib/hash_ext/traverse.rb
 - public/bundle.css
 - public/bundle.js
@@ -939,7 +947,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: COmmon PResenter Language - A Ruby gem for joyfully writing modern user interfaces