bullet_train-themes 1.0.22 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 685b92afad2e422cdc06cca2443590eaa4d845b865199afca11889494680230f
-  data.tar.gz: 10a9416768d934e69ed1105dcf1d5ce3170a1e60d71612a5901766510f92976d
+  metadata.gz: d4623fb873c292890f3bd1ec62a2897c7bd88870c46bd90f40af765a0b390cae
+  data.tar.gz: b18cb50bc536b5a48f210d0c0ff04a47244a7df494cb372e0ae7323aa3cbd7c3
 SHA512:
-  metadata.gz: 5500669ce576dcd48a105791dd4a98719cc311a80b2586f46e959f44533bf63abf76cee9fb4b53ee6f1f6f190e26a3441d0464a95550ce6ccefe68df43d39108
-  data.tar.gz: 8fde38b8386af1698559268a4766361d834bc781013b2653bdc29cd14da0f1f0d3154480e2cef64425ae69e9a6d64b90f4f108b78005b63639960712c334a89a
+  metadata.gz: b9b7d7f10d640bd3819bcff57c04d1b7db16dd834ee8007fdaa32cab4a125bb404222ae9b8e9d97f85a0ecb0e8f65f39dacf6a51e50cce8b3c0ab614dd4789c0
+  data.tar.gz: ed14ca4bd4d3c531e0d73235164e7c41e2c9f8ce5fc9aff809ac07e08ddeb3c67416a8df24b9a0e70b3911c97c536b9c60e3b5e932f2786aba63f73720d95ac5

data/app/helpers/theme_helper.rb

@@ -36,7 +36,7 @@ end
 
 module ThemeHelper
   def current_theme_object
-    BulletTrain::Themes.themes[current_theme]
+    @current_theme_object ||= "BulletTrain::Themes::#{current_theme.to_s.classify}::Theme".constantize.new
   end
 
   def render(options = {}, locals = {}, &block)

data/app/views/themes/base/attributes/_image.html.erb

@@ -1,5 +1,7 @@
 <% object ||= current_attributes_object %>
 <% strategy ||= current_attributes_strategy || :none %>
 <% url ||= nil %>
+<% options ||= {} %>
+<% options[:height] ||= 200 %>
 
-<%= cloudinary_image_tag object.send(attribute), height: 200 %>
+<%= cloudinary_image_tag object.send(attribute), options %>

data/app/views/themes/base/attributes/_options.html.erb

@@ -4,7 +4,8 @@
 
 <% if object.send(attribute).any? %>
   <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
-    <%= object.send(attribute).map do |value| %>
+    <%# TODO: Multiple option partials return arrays with blank characters in them. Is this expected? %>
+    <%= object.send(attribute).reject(&:blank?).map do |value| %>
       <% t("#{object.class.name.underscore.pluralize}.fields.#{attribute}.options.#{value}") %>
     <% end.map(&:strip).to_sentence %>
   <% end %>

data/lib/bullet_train/themes/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module Themes
-    VERSION = "1.0.22"
+    VERSION = "1.0.24"
   end
 end

data/lib/bullet_train/themes.rb

@@ -32,12 +32,19 @@ module BulletTrain
         end
 
         def resolved_partial_path_for(lookup_context, path, locals)
-          # TODO This caching should be disabled in development so new templates are taken into account without restarting the server.
+          # We disable partial path caching in development so new templates are taken into account without restarting the server.
+          partial_paths = {}
+
           BulletTrain::Themes.partial_paths.fetch(path) do
             if (theme_path = BulletTrain::Themes.theme_invocation_path_for(path))
               # TODO directory_order should probably come from the `Current` model.
               if (partial = lookup_context.find_all(theme_path, directory_order.map { "themes/#{_1}" }, true, locals.keys).first)
-                BulletTrain::Themes.partial_paths[path] = partial.virtual_path.gsub("/_", "/")
+                resolved_partial = partial.virtual_path.gsub("/_", "/")
+                if Rails.env.development?
+                  partial_paths[path] = resolved_partial
+                else
+                  BulletTrain::Themes.partial_paths[path] = resolved_partial
+                end
               end
             end
           end

data/lib/tasks/application.rb

@@ -0,0 +1,41 @@
+module BulletTrain
+  module Themes
+    module Application
+      def self.install_theme(theme_name)
+        unless theme_name == "light" || Dir.exist?("app/views/themes/#{theme_name}")
+          raise "We could not find '#{theme_name}'. Please eject Bullet Train's standard views to your main application first by using `rake bullet_train:themes:light:eject[custom_theme_name_here]`".red
+        end
+
+        # Grabs the current theme from
+        # def current_theme
+        #   :theme_name
+        # end
+        current_theme_regexp = /(^    :)(.*)/
+        current_theme = nil
+
+        new_lines = []
+        [
+          "./app/helpers/application_helper.rb",
+          "./Procfile.dev",
+          "./package.json"
+        ].each do |file|
+          File.open(file, "r") do |f|
+            new_lines = f.readlines
+            new_lines = new_lines.map do |line|
+              # Make sure we get the current theme before trying to replace it in any of the files.
+              # We grab it from the first file in the array above.
+              current_theme = line.scan(current_theme_regexp).flatten.last if line.match?(current_theme_regexp)
+
+              line.gsub!(/#{current_theme}/, theme_name) unless current_theme.nil?
+              line
+            end
+          end
+
+          File.open(file, "w") do |f|
+            f.puts new_lines.join
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tasks/bullet_train/themes_tasks.rake

@@ -1,4 +1,9 @@
-# desc "Explaining what the task does"
-# task :bullet_train_themes do
-#   # Task goes here
-# end
+require_relative "../application"
+
+namespace :bullet_train do
+  namespace :themes do
+    task :install, [:theme_name] => :environment do |task, args|
+      BulletTrain::Themes::Application.install_theme(args[:theme_name])
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-themes
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.24
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -80,6 +80,7 @@ files:
 - lib/bullet_train/themes.rb
 - lib/bullet_train/themes/engine.rb
 - lib/bullet_train/themes/version.rb
+- lib/tasks/application.rb
 - lib/tasks/bullet_train/themes_tasks.rake
 homepage: https://github.com/bullet-train-co/bullet_train-themes
 licenses: