lookbook 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e32460fbf9f0b09167b13eb27bacbb418f3a86425758caad4bdae58b738b06ff
-  data.tar.gz: c92f69fc1098a2798f5a35f150ea5024ab89aade365b54106e8f4861600bcc8e
+  metadata.gz: 64f02e35ce90b1e27249752c3ea536ead68b7f6dba3a6bb0991dff8f29f63d92
+  data.tar.gz: effca06a618749eb6be51880929f417d0de03fe180d60e3df026065a7d0718ee
 SHA512:
-  metadata.gz: b4b163234a695bdb337c4341db7203a457761a51e0dd4c9c9683f8e4035d0997658fccca15d35bc779d8cd9a2418556a9784e3d3fd64f776f20dbb22259c0c95
-  data.tar.gz: dfebd15c82892d8f504d7f51f838f6f4318f04c178df3b2a97f961f30cb66b0c1718cd4e11f1af614f2af01216f14bb8f5468034737b2aff19d37f77c8690c35
+  metadata.gz: 3323004e8ea85985c687adfe184b0519b3b168676df1640cdb5ada335ffef304a1266e6ad239e62968261e2c043c98b23589dd28ed3913e22c620500fc76cdde
+  data.tar.gz: a60ed3e4b295875fcac660f560d75dc4ac9ecff3cf26a410c30837326c84e26e8e2cea4ad183879ee94049836ab68fb81b3d59c0aab6c081d239744184cfc374

data/app/controllers/lookbook/app_controller.rb

@@ -152,7 +152,7 @@ module Lookbook
     end
 
     def previews
-      Lookbook::Preview.all
+      Lookbook::Preview.all.sort_by(&:label)
     end
 
     def preview_controller

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

@@ -1,5 +1,5 @@
 <li id="<%= node.id %>" x-data="navNode" <% if node.hierarchy_depth == 1 %> class="py-1 border-b border-gray-300 cursor-pointer"<% end %> :class="{hidden}" x-cloak>
-  <div @click="toggle(); if (open()) { <%= "navigate('#{path}')" if defined?(path) %>}" style="<%= nav_padding_style(node.hierarchy_depth) %>" class="hover:bg-gray-200 hover:bg-opacity-50">
+  <div @click="toggle" style="<%= nav_padding_style(node.hierarchy_depth) %>" class="hover:bg-gray-200 hover:bg-opacity-50">
     <div class="flex items-center cursor-pointer pr-3 py-[5px]">
       <svg class="feather w-3 h-3 mr-1 text-gray-500 flex-none">
         <use xlink:href="/lookbook-assets/feather-sprite.svg#chevron-down" x-show="open" x-cloak />
@@ -8,7 +8,7 @@
       <svg class="feather h-3.5 w-3.5 mr-1.5 flex-none text-indigo-500">
         <use xlink:href="/lookbook-assets/feather-sprite.svg#<%= node.type == :preview ? 'layers' : 'folder' %>" />
       </svg>
-      <div class="truncate whitespace-nowrap text-left <%= "font-bold" if node.type == :preview %>">
+      <div class="truncate w-full whitespace-nowrap text-left <%= "font-bold" if node.type == :preview %>" @click.stop="toggle(); if (open()) { <%= "navigate('#{path}')" if defined?(path) %>}">
         <%= node.label %>
       </div>
     </div>

data/lib/lookbook/collection.rb

@@ -12,11 +12,11 @@ module Lookbook
     end
 
     def name
-      @path ? @path.split("/").last : "root"
+      @path.present? ? @path.split("/").last : "root"
     end
 
     def label
-      name.titleize
+      name&.titleize
     end
 
     def hierarchy_depth
@@ -24,7 +24,7 @@ module Lookbook
     end
 
     def items(sorted = true)
-      sorted ? @items.sort_by(&:name) : @items
+      sorted ? @items.sort_by(&:label) : @items
     end
 
     def add(item)

data/lib/lookbook/engine.rb

@@ -23,6 +23,7 @@ module Lookbook
 
       options.auto_refresh = true if options.auto_refresh.nil?
       options.sort_examples = false if options.sort_examples.nil?
+      options.debug = false unless options.debug == true
 
       options.preview_paths = options.preview_paths.map(&:to_s)
       options.preview_paths += vc_options.preview_paths
@@ -43,10 +44,6 @@ module Lookbook
       end
     end
 
-    initializer "lookbook.cable.logger" do
-      Lookbook::Engine.cable.logger ||= Rails.logger
-    end
-
     initializer "lookbook.parser.tags" do
       Lookbook::Parser.define_tags
     end
@@ -58,6 +55,15 @@ module Lookbook
       )
     end
 
+    initializer "lookbook.logging" do
+      if config.lookbook.debug == true
+        Lookbook::Engine.cable.logger ||= Rails.logger
+      else
+        Lookbook::Engine.cable.logger = Lookbook::NullLogger.new
+        config.action_view.logger = Lookbook::NullLogger.new
+      end
+    end
+
     initializer "lookbook.preview.extend" do
       ActiveSupport.on_load(:view_component) do
         ViewComponent::Preview.extend Lookbook::Preview

data/lib/lookbook/null_logger.rb

@@ -0,0 +1,47 @@
+module Lookbook
+  class NullLogger
+    def unknown(*)
+      nil
+    end
+
+    def fatal(*)
+      nil
+    end
+
+    def fatal?
+      false
+    end
+
+    def error(*)
+      nil
+    end
+
+    def error?
+      false
+    end
+
+    def warn(*)
+      nil
+    end
+
+    def warn?
+      false
+    end
+
+    def info(*)
+      nil
+    end
+
+    def info?
+      false
+    end
+
+    def debug(*)
+      nil
+    end
+
+    def debug?
+      false
+    end
+  end
+end

data/lib/lookbook/parser.rb

@@ -5,7 +5,7 @@ module Lookbook
     YARDOC_FILE_PATH = Rails.root.join("tmp/storage/.yardoc").to_s
 
     def initialize(paths)
-      @paths = paths.map { |p| "#{p}/**/*.rb" }
+      @paths = paths.map { |p| "#{p}/**/*_preview.rb" }
       YARD::Registry.yardoc_file = YARDOC_FILE_PATH
     end
 

data/lib/lookbook/preview.rb

@@ -80,7 +80,7 @@ module Lookbook
 
     class << self
       def all
-        ViewComponent::Preview.all
+        ViewComponent::Preview.all.sort_by(&:label)
       end
 
       def find(path)
@@ -90,8 +90,6 @@ module Lookbook
       def exists?(path)
         !!find(path)
       end
-
-      
     end
 
     private

data/lib/lookbook/taggable.rb

@@ -1,17 +1,19 @@
 module Lookbook
   module Taggable
     def lookbook_hidden?
-      if code_object.tag(:hidden)
+      if code_object&.tag(:hidden)
         code_object.tag(:hidden).text.strip != "false"
       end
     end
 
     def lookbook_label
-      code_object.tag(:label)&.text
+      code_object&.tag(:label)&.text
     end
 
     def lookbook_notes
-      code_object.docstring.to_s.strip
+      if code_object&.docstring
+        code_object.docstring.to_s.strip
+      end
     end
 
     def lookbook_group

data/lib/lookbook/version.rb

@@ -1,3 +1,3 @@
 module Lookbook
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/lookbook.rb

@@ -12,4 +12,5 @@ module Lookbook
   autoload :PreviewExample, "lookbook/preview_example"
   autoload :PreviewGroup, "lookbook/preview_group"
   autoload :Taggable, "lookbook/taggable"
+  autoload :NullLogger, "lookbook/null_logger"
 end

data/lib/tasks/lookbook_tasks.rake

@@ -6,7 +6,7 @@ namespace :lookbook do
     task :bump_version, [:version] do |t, args|
       filename = Lookbook::Engine.root.join("lib/lookbook/version.rb")
       current_version = Lookbook::VERSION.to_s
-      new_version = args[:version].sub("v", "").gsub("-",".")
+      new_version = args[:version].sub("v", "").tr("-", ".")
       file = File.open(filename)
       contents = file.read
       File.write(filename, contents.gsub(current_version, new_version))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lookbook
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Mark Perkins
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-16 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -232,7 +232,7 @@ files:
 - lib/lookbook/collection.rb
 - lib/lookbook/engine.rb
 - lib/lookbook/lang.rb
-- lib/lookbook/navigation.rb
+- lib/lookbook/null_logger.rb
 - lib/lookbook/parser.rb
 - lib/lookbook/preview.rb
 - lib/lookbook/preview_controller.rb

data/lib/lookbook/navigation.rb

@@ -1,68 +0,0 @@
-module Lookbook
-  class Navigation
-    class << self
-      def previews
-        valid_previews = ViewComponent::Preview.all.filter { |preview| preview.get_visible_examples.any? && !preview.hidden? }
-        valid_previews.sort_by(&:normalized_name)
-      end
-
-      def flat
-        {
-          flat: true,
-          depth: 0,
-          items: previews.map do |preview|
-            nav_item_for_preview(preview, expand_name: true)
-          end
-        }
-      end
-
-      def nested
-        nav = {flat: false, depth: 0, items: []}
-        previews.each do |preview|
-          current = nav
-          depth = preview.path_parts.size
-          path = ""
-          preview.path_parts.each_with_index do |segment, i|
-            target = current[:items].find { |item| item[:name] == segment }
-            if target.nil?
-              path = "#{path.present? ? path + "." : ""}#{segment}"
-              target = {
-                depth: i + 1,
-                nested: true,
-                name: path,
-                label: segment.titleize,
-                type: :group,
-                items: []
-              }
-              current[:items].append(target)
-            end
-            if depth == i + 1
-              target[:items].push(nav_item_for_preview(preview))
-            else
-              current = target
-            end
-          end
-        end
-        nav
-      end
-
-      private
-
-      def nav_item_for_preview(preview, expand_name: false)
-        {
-          name: preview.preview_name.tr("/", "."),
-          label: expand_name ? "#{preview.pretty_path}/#{preview.label}" : preview.label,
-          type: :preview,
-          examples: preview.get_visible_examples.map do |example|
-            example_path = "#{preview.preview_name}/#{example.name}"
-            {
-              name: example.name,
-              label: example.label,
-              path: example_path
-            }
-          end
-        }
-      end
-    end
-  end
-end