wallaby-view 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f9bf01cc8876f03b073afdaa8b322f00d781ff50fefd39f2eaac22f8feb535d
-  data.tar.gz: 04e7113c6650b3b756d886d859d08369f96beb39c2f2e5ffac4d8ba5c44c16c9
+  metadata.gz: b3a499676db69e41f08251a98cd380af6875ac62ec9dee5f0e0a3b417ea04c8d
+  data.tar.gz: f614b7e34a5d24843550ccd17fd8f30e2f684c3d8a0198cab0ff09e6e9bea76b
 SHA512:
-  metadata.gz: bd9d7a5a6985bfd6e317a44d8adf737a8e5639227e154fed90bdb2ac7230d6094efd0bebf5a60763826571b3cbc574365a1bf22d4dd4a6f326df279fd4f049e4
-  data.tar.gz: 7658edb6c169b0e577043856abe82583b3312a24c514cb4355584e15e2c2dd695dca2994731207a51f9b48c6e4575f0ece43c4de06edb133aae387db555fcbfa
+  metadata.gz: a2011712b90441fab47976d2b9b381b6e7a879dbf5959be12bb5730ffb15472fc38f29985b615e46ea67821a7ab9657fa496750c71a904900a90e6c6c9cc0775
+  data.tar.gz: de63a2f32221fabbbfd905368ba74e95ba2342a96eda42b8d0e52f021e3e029387f25da8cb4be58f077156bb47fb4c24f69400120daa74af11ba90ce3aa4f306

data/README.md

@@ -53,7 +53,7 @@ end
 # app/controllers/admin/users_controller
 class Admin::UsersController < Admin::ApplicationController
   self.theme_name = 'account'
-  self.prefix_options = { mapping_actions: { edit: 'form' } }
+  self.prefix_options = { edit: 'form' }
 end
 ```
 
@@ -81,7 +81,7 @@ Then in the `admin/application#edit` template, rendering the relative `form` par
 <% render 'form' %>
 ```
 
-For `admin/users#edit` action, since `mapping_actions` option is set, `edit` will be mapped to `form`, and `form` will be added to the prefixes as well.
+For `admin/users#edit` action, since `prefix_options` option is set, `edit` will be mapped to `form`, and `form` will be added to the prefixes as well.
 Therefore, the lookup folder order of `admin/users#edit` becomes:
 
 - app/views/admin/users/edit

data/lib/wallaby/view.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'request_store'
-require 'action_view/partial_renderer'
-
 require 'wallaby/view/version'
 require 'wallaby/view/action_viewable'
 require 'wallaby/view/themeable'

data/lib/wallaby/view/action_viewable.rb

@@ -8,14 +8,21 @@ module Wallaby
       extend ActiveSupport::Concern
 
       module ClassMethods # :nodoc:
-        # @!attribute[w] prefix_options
+        # @!attribute [w] prefix_options
         attr_writer :prefix_options
 
-        # @!attribute[r] prefix_options
-        # It stores the options for {#_prefixes}. It can inherit options from superclass.
+        # @!attribute [r] prefix_options
+        # It stores the options for {#_prefixes #_prefixes}. It can inherit options from superclass.
         # @return [Hash] prefix options
         def prefix_options
-          @prefix_options ||= superclass.try(:prefix_options)
+          @prefix_options ||= superclass.try(:prefix_options).try(:dup) || {}
+        end
+
+        # Add prefix options
+        # @param new_options [Hash]
+        # @return [Hash] merged prefix options
+        def merge_prefix_options(new_options)
+          prefix_options.merge!(new_options)
         end
       end
 
@@ -31,7 +38,7 @@ module Wallaby
       # Override
       # {https://github.com/rails/rails/blob/master/actionview/lib/action_view/view_paths.rb#L97 lookup_context}
       # to provide caching for template/partial lookup.
-      # @return {Wallaby::View::CustomLookupContext}
+      # @return {CustomLookupContext}
 
       # (see #lookup_context)
       def override_lookup_context
@@ -41,12 +48,12 @@ module Wallaby
 
       # @!method _prefixes(prefixes: nil, controller_path: nil, action_name: nil, themes: nil, options: nil, &block)
       # Override {https://github.com/rails/rails/blob/master/actionview/lib/action_view/view_paths.rb#L90 _prefixes}
-      # to allow other (e.g. {Wallaby::View::CustomPrefixes#action_name},
-      # {Wallaby::View::CustomPrefixes#themes}) to be added to the prefixes list.
+      # to allow other (e.g. {CustomPrefixes#action_name},
+      # {CustomPrefixes#themes}) to be added to the prefixes list.
       # @param prefixes [Array<String>] the base prefixes
       # @param action_name [String] the action name to add to the prefixes list
       # @param themes [String] the theme name to add to the prefixes list
-      # @param options [Hash] the options that {Wallaby::View::CustomPrefixes} accepts
+      # @param options [Hash] the options that {CustomPrefixes} accepts
       # @return [Array<String>]
 
       # (see #_prefixes)
@@ -61,7 +68,7 @@ module Wallaby
             prefixes: prefixes || original_prefixes,
             action_name: action_name || params[:action],
             themes: themes || self.class.themes,
-            options: options || self.class.prefix_options, &block
+            options: self.class.prefix_options.merge(options || {}), &block
           )
       end
     end

data/lib/wallaby/view/custom_lookup_context.rb

@@ -4,11 +4,11 @@ module Wallaby
   module View
     # Custom lookup context to cache lookup results.
     class CustomLookupContext < ::ActionView::LookupContext
-      # Convert an ActionView::LookupContext instance into {Wallaby::View::CustomLookupContext}
+      # Convert an ActionView::LookupContext instance into {CustomLookupContext}
       # @param lookup_context [ActionView::LookupContext]
       # @param details [Hash]
       # @param prefixes [Array<String>]
-      # @return [Wallaby::View::CustomLookupContext]
+      # @return [CustomLookupContext]
       def self.convert(lookup_context, details: nil, prefixes: nil)
         return lookup_context if lookup_context.is_a? self
 

data/lib/wallaby/view/custom_prefixes.rb

@@ -7,7 +7,7 @@ module Wallaby
       # @!attribute [r] prefixes
       # Base prefixes to extend
       # @return [Array<String>]
-      # @see Wallaby::View::ActionViewable#_prefixes
+      # @see ActionViewable#_prefixes
       attr_reader :prefixes
 
       # @!attribute [r] action_name
@@ -18,7 +18,7 @@ module Wallaby
       # @!attribute [r] themes
       # Themes to be inserted
       # @return [Array<Hash>]
-      # @see Wallaby::View::Themeable#.themes
+      # @see Themeable#.themes
       attr_reader :themes
 
       # @!attribute [r] options
@@ -55,7 +55,7 @@ module Wallaby
       # @example To extend given prefixes with mapped action:
       #   Wallaby::View::CustomPrefixes.execute(
       #     prefixes: ['users', 'application'], action_name: 'edit',
-      #     options: { mapping_actions: { 'edit' => 'form' } }
+      #     options: { 'edit' => 'form' }
       #   )
       #
       #   # => [
@@ -110,7 +110,7 @@ module Wallaby
           insert_themes_into array
 
           # Be able to change the array in overriding methods
-          # in {Wallaby::View::ActionViewable#override_prefixes}
+          # in {ActionViewable#override_prefixes}
           new_array = yield array if block_given?
 
           # If the above block doesn't return a new array, it returns the old `array`.
@@ -120,7 +120,7 @@ module Wallaby
 
       # @return [Array<String>] Action names
       def actions
-        @actions ||= [action_name, mapped_action_name].compact
+        @actions ||= [action_name, *mapped_action_name].compact
       end
 
       # Insert theme names into the prefixes
@@ -133,9 +133,9 @@ module Wallaby
       end
 
       # Map the {#action_name} using `options[:mapping_actions]`
-      # @return [String, nil] mapped action name
+      # @return [Array<String>] mapped action name
       def mapped_action_name
-        options[:mapping_actions].try(:[], action_name)
+        Array((options[:mapping_actions] || options).try(:[], action_name))
       end
     end
   end

data/lib/wallaby/view/version.rb

@@ -2,6 +2,6 @@
 
 module Wallaby
   module View
-    VERSION = '0.1.5' # :nodoc:
+    VERSION = '0.1.6' # :nodoc:
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wallaby-view
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Tian Chen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,14 +27,17 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
-  name: request_store
+  name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -52,6 +58,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  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: simplecov
+  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: sqlite3
+  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: wallaby-cop
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +114,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  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: Wallaby View to extend Rails layout/template/partial inheritance chain.
 email:
 - me@tian.im
@@ -75,7 +137,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- lib/action_view/partial_renderer.rb
 - lib/wallaby/view.rb
 - lib/wallaby/view/action_viewable.rb
 - lib/wallaby/view/custom_lookup_context.rb
@@ -89,7 +150,7 @@ metadata:
   homepage_uri: https://github.com/wallaby-rails/wallaby-view
   source_code_uri: https://github.com/wallaby-rails/wallaby-view
   changelog_uri: https://github.com/wallaby-rails/wallaby-view/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Wallaby View to extend Rails layout/template/partial inheritance chain.
 test_files: []

data/lib/action_view/partial_renderer.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module ActionView # :nodoc:
-  # Re-open ActionView::PartialRenderer to disable logging for partials
-  # that have been rendered for more than once.
-  #
-  # Every log requires the IO. Reducing the logs will dramatically improve the performance.
-  # @see #instrument
-  class PartialRenderer
-    protected
-
-    # @!method original_instrument(name, **options, &block)
-    # Original method of {#instrument}
-    # @param name [String]
-    # @param options [Hash]
-    # @yield [payload]
-    # @yieldparam payload [Hash] payload object for instrument
-    # @return [ActionView::OutputBuffer]
-    alias original_instrument instrument
-
-    # Logs for partial rendering. Only one log will be printed
-    # even if a partial has been rendered for more than once.
-    #
-    # To disable this feature and see all logs,
-    # set `ENV['ALL_PARTIAL_LOGS']` to `true`
-    # @param name [String]
-    # @param options [Hash]
-    # @yield [payload]
-    # @yieldparam payload [Hash] payload object for instrument
-    # @return [ActionView::OutputBuffer]
-    def instrument(name, **options, &block)
-      identifier = options[:identifier] || @template.try(:identifier) || @path
-      instrumented = RequestStore.store[:instrumented] ||= {}
-
-      return yield({}) if !ENV['ALL_PARTIAL_LOGS'] && instrumented[identifier]
-
-      original_instrument(name, **options, &block).tap do
-        instrumented[identifier] ||= true
-      end
-    end
-  end
-end