lookbook 0.4.0.beta.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9dc941aff608e601ffdf5e883aaf65a48ec815b40d01db58e85af66c793539d
-  data.tar.gz: 84e1027d39111c49e101b37dbc9aeaabe63dfcbab2fd3adfaa762de4fd39ee36
+  metadata.gz: 6556e23e693e27f706b4989f25c13c75a453ce5582e835e6c380a226840feff8
+  data.tar.gz: c28f4d88136a02522fb23adc826ec1066c0800ef6a223451149b4516448d318c
 SHA512:
-  metadata.gz: 1f1399cdf6ed3f6184208ffaac1aaf36fd18e8abd5dcec96b73cac5d1384a722b6f742a61c7ec404d5faecd255231bf3f54dff33e2825ce5a4dd0f01c5e2a331
-  data.tar.gz: 875fb74128ed3cc0f8d72a57245207e8224318d08a8f6f35dc4b627c06e4c0a159501be042917e92340b536a1fbdb81d379fd6b805bccaa70796bfcbbce4dc67
+  metadata.gz: 92076777e5a0e2ca449eec799a4702965bc78c12ae1d48f0a7de9276832f02b320f25ecc5384d56aeb5138a953b26a8251ad44756d6a36a58c7fbe84255078e4
+  data.tar.gz: e840534cd52b19c9db2b39316739b7ee8df820c96837f59cfd03e96fe99d90778eddc5518ffc5ac0167f61e27f74a2fafaa83642eb7697fd433d34cd09f28550

data/README.md

@@ -143,7 +143,7 @@ The following Lookbook-specific tags are available for use:
 
 * `@label <label>` -[Customise navigation labels](#-label-text)
 * `@hidden` - [Prevent items displaying in the navigation](#-hidden)
-* `@display <key>:<value>` - [Specify params to pass into the preview template](#-display-key-value)
+* `@display <key> <value>` - [Specify params to pass into the preview template](#-display-key-value)
 * `@!group <name> ... @!endgroup` - [Render examples in a group on the same page](#-group-name--endgroup)
 
 ### 🔖 `@label <text>`

data/app/controllers/lookbook/app_controller.rb

@@ -96,8 +96,8 @@ module Lookbook
           }
         end
         set_params
-        joined = render_to_string "lookbook/preview_group", locals: {examples: examples}, layout: nil
-        preview_controller.render_in_layout_to_string(joined, @preview.lookbook_layout || current_layout)
+        layout = @preview.lookbook_layout || Rails.configuration.view_component.default_preview_layout || current_layout
+        preview_controller.render_in_layout_to_string("lookbook/preview/group", {examples: examples}, layout)
       else
         set_params(@example)
         preview_controller.params[:path] = "#{@preview.preview_name}/#{@example.name}".chomp("/")
@@ -106,10 +106,10 @@ module Lookbook
     end
 
     def set_params(example = nil)
-      example_params = @preview.lookbook_display_params.deep_merge(example ? example.lookbook_display_params : {})
+      example_params = example.nil? ? @preview.display_params : example.display_params
       preview_controller.params.merge!({
         lookbook: {
-          display: Lookbook.config.preview_display_params.deep_merge(example_params)
+          display: example_params
         }
       })
     end

data/app/views/lookbook/nav/_preview.html.erb

@@ -1,4 +1,4 @@
-<% examples = node.get_examples %>
+<% examples = node.get_examples.reject(&:hidden?) %>
 <% if examples.many? %>
   <%= render "nav/node", node: node, path: show_path(examples.first.path) do %>
     <% examples.each do |example| %>

data/app/views/lookbook/workbench/_inspector.html.erb

@@ -3,6 +3,7 @@
     <nav class="-mb-px flex space-x-8 cursor-auto">
       <% panes.each do |key, props| %>
         <a
+          id="inspector-tab-<%= key %>"
           href="#<%= key %>"
           class="whitespace-nowrap py-2 px-1 border-b-2 cursor-pointer <%= "!text-gray-300" if props[:disabled] %>"
           :class="{
@@ -23,7 +24,7 @@
         <% if props[:clipboard].present? %>
           <%= render "shared/clipboard" do %><%= h props[:clipboard].strip %><% end %>
         <% end %>
-        <div class="flex flex-col h-full overflow-auto">
+        <div id="inspector-content-<%= key %>" class="flex flex-col h-full overflow-auto">
           <%= render "workbench/inspector/#{props[:template]}", key: key, **props %>
         </div>
       </div>

data/lib/lookbook/engine.rb

@@ -30,7 +30,7 @@ module Lookbook
 
       options.preview_controller = vc_options.preview_controller if options.preview_controller.nil?
       options.preview_srcdoc = true if options.preview_srcdoc.nil?
-      options.preview_display_params ||= {}
+      options.preview_display_params ||= {}.with_indifferent_access
 
       options.listen_paths = options.listen_paths.map(&:to_s)
       options.listen_paths += options.preview_paths

data/lib/lookbook/preview.rb

@@ -23,8 +23,8 @@ module Lookbook
       return @lookbook_examples if @lookbook_examples.present?
       public_methods = public_instance_methods(false)
       public_method_objects = code_object.meths.filter { |m| public_methods.include?(m.name) }
-      visible = public_method_objects.map { |m| PreviewExample.new(m.name.to_s, self) }.reject(&:hidden?)
-      sorted = Lookbook.config.sort_examples ? visible.sort_by(&:label) : visible
+      examples = public_method_objects.map { |m| PreviewExample.new(m.name.to_s, self) }
+      sorted = Lookbook.config.sort_examples ? examples.sort_by(&:label) : examples
       @lookbook_examples = []
       if code_object.groups.any?
         sorted.group_by { |m| m.group }.each do |name, examples|
@@ -78,6 +78,10 @@ module Lookbook
       defined?(@layout) ? @layout : nil
     end
 
+    def display_params
+      Lookbook.config.preview_display_params.deep_merge(lookbook_display_params)
+    end
+
     class << self
       def all
         ViewComponent::Preview.all.sort_by(&:label)

data/lib/lookbook/preview_controller.rb

@@ -14,9 +14,10 @@ module Lookbook
       render_to_string template, opts
     end
 
-    def render_in_layout_to_string(content, layout_override)
+    def render_in_layout_to_string(template, locals, layout_override = nil)
+      append_view_path Lookbook::Engine.root.join("app/views")
       layout = determine_layout(layout_override, prepend_views: false)[:layout]
-      render_to_string html: content, layout: layout
+      render_to_string template, locals: locals, layout: layout
     end
   end
 end

data/lib/lookbook/preview_example.rb

@@ -21,6 +21,10 @@ module Lookbook
       lookbook_label.presence || name.titleize
     end
 
+    def display_params
+      @preview.display_params.merge(lookbook_display_params)
+    end
+
     def method_source
       code_object.source.split("\n")[1..-2].join("\n").strip_heredoc
     end

data/lib/lookbook/preview_group.rb

@@ -26,6 +26,10 @@ module Lookbook
       :group
     end
 
+    def hidden?
+      false
+    end
+
     def matchers
       [@preview.label, label].map { |m| m.gsub(/\s/, "").downcase }
     end

data/lib/lookbook/taggable.rb

@@ -21,7 +21,7 @@ module Lookbook
     end
 
     def lookbook_display_params
-      display_params = {}
+      display_params = {}.with_indifferent_access
       if code_object&.tags(:display).present?
         code_object.tags(:display).each do |tag|
           parts = tag.text.strip.match(/^([^\s]*)\s?(.*)$/)

data/lib/lookbook/version.rb

@@ -1,3 +1,3 @@
 module Lookbook
-  VERSION = "0.4.0.beta.2"
+  VERSION = "0.4.1"
 end

data/lib/tasks/lookbook_tasks.rake

@@ -11,5 +11,10 @@ namespace :lookbook do
       contents = file.read
       File.write(filename, contents.gsub(current_version, new_version))
     end
+
+    desc "Build Gem and push to RubyGems"
+    task :build_and_push do
+      sh("rake build && gem push pkg/lookbook-#{Lookbook::VERSION}.gem")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lookbook
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta.2
+  version: 0.4.1
 platform: ruby
 authors:
 - Mark Perkins
@@ -216,7 +216,7 @@ files:
 - app/views/lookbook/nav/_leaf.html.erb
 - app/views/lookbook/nav/_node.html.erb
 - app/views/lookbook/nav/_preview.html.erb
-- app/views/lookbook/preview_group.html.erb
+- app/views/lookbook/preview/group.html.erb
 - app/views/lookbook/shared/_clipboard.html.erb
 - app/views/lookbook/shared/_header.html.erb
 - app/views/lookbook/shared/_sidebar.html.erb
@@ -259,9 +259,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: []
 rubygems_version: 3.1.2
 signing_key: