From ec96ed0162d5bc3f8a3bc4d0decb36af52f3fef1 Mon Sep 17 00:00:00 2001
From: Torsten <torsten@rubydesign.fi>
Date: Fri, 27 Jan 2023 19:21:19 +0200
Subject: [PATCH] no preloading so generator can run

---
 config/initializers/merged.rb                      | 11 +++++++++++
 lib/generators/merged/install/USAGE                |  5 ++---
 lib/generators/merged/install/install_generator.rb |  1 +
 lib/merged.rb                                      |  4 ++--
 lib/merged/engine.rb                               | 12 ------------
 test/dummy/merged/card_styles.yml                  |  1 +
 test/dummy/merged/page_styles.yml                  |  1 +
 test/dummy/merged/section_styles.yml               |  1 +
 8 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 config/initializers/merged.rb
 create mode 100644 test/dummy/merged/card_styles.yml
 create mode 100644 test/dummy/merged/page_styles.yml
 create mode 100644 test/dummy/merged/section_styles.yml

diff --git a/config/initializers/merged.rb b/config/initializers/merged.rb
new file mode 100644
index 0000000..88fe621
--- /dev/null
+++ b/config/initializers/merged.rb
@@ -0,0 +1,11 @@
+require "merged"
+
+# directory inside /app/assets/images where YOUR images are kept
+# if you change this and add own styles, you will still need a merged directory
+#  for the previews (card_preview and section_preview)
+Merged.images_dir = "merged"
+
+# directory where data and styles are kept
+# Notice that the data is ALWAYS inside a merged directory,
+# so in the default case Rails.root/merged/*.yml
+Merged.data_dir = "."
diff --git a/lib/generators/merged/install/USAGE b/lib/generators/merged/install/USAGE
index 27ce885..2ba3b15 100644
--- a/lib/generators/merged/install/USAGE
+++ b/lib/generators/merged/install/USAGE
@@ -8,6 +8,5 @@ Example:
     This will create:
         /merged directory for your data
         /merged/*yml empty data files
-        /app/assets/images/cms  for your images
-        /app/assets/stylesheets/merged/tailwind_extra.css
-        
+        /app/assets/images/merged  for your images
+        /config/initializers/merged.rb 
diff --git a/lib/generators/merged/install/install_generator.rb b/lib/generators/merged/install/install_generator.rb
index 80dbf24..3ee2507 100644
--- a/lib/generators/merged/install/install_generator.rb
+++ b/lib/generators/merged/install/install_generator.rb
@@ -10,6 +10,7 @@ module Merged
       :cards, :sections , :pages].each do |file|
         copy_file "empty.yml", "merged/#{file}.yml"
       end
+      copy_file "initializer.rb", "config/initializers/merged.rb"
       empty_directory Merged::Image.asset_root
       empty_directory Merged.data_dir + "/merged"
     end
diff --git a/lib/merged.rb b/lib/merged.rb
index 4c75997..207d4d3 100644
--- a/lib/merged.rb
+++ b/lib/merged.rb
@@ -7,8 +7,8 @@ module Merged
 
   # Directory inside the app/assets/images
   mattr_accessor :images_dir
-
+  @@images_dir = "merged"
   # directory in root to store data
   mattr_accessor :data_dir
-
+  @@data_dir = "."
 end
diff --git a/lib/merged/engine.rb b/lib/merged/engine.rb
index f35bd97..2f60a6e 100644
--- a/lib/merged/engine.rb
+++ b/lib/merged/engine.rb
@@ -20,7 +20,6 @@ module Merged
 
     initializer "after_initialize" do |app|
       ActiveSupport::Reloader.to_prepare do
-        Merged::Engine.load_data
       end
     end
 
@@ -32,17 +31,6 @@ module Merged
         config.assets.precompile << kid
       end
     end
-    def self.load_data
-      # pre-load data
-      [OptionDefinition,  CardStyle, SectionStyle , PageStyle,
-        Card , Section , Page ,  Image].each {|clazz| clazz.all }
-    end
-
-    def self.load_from( kind , path )
-      return unless File.exists?(path)
-      clazz = "Merged::#{kind.camelcase}".constantize
-      clazz.load(YAML.load_file( path ))
-    end
 
   end
 end
diff --git a/test/dummy/merged/card_styles.yml b/test/dummy/merged/card_styles.yml
new file mode 100644
index 0000000..dcd024e
--- /dev/null
+++ b/test/dummy/merged/card_styles.yml
@@ -0,0 +1 @@
+--- []
diff --git a/test/dummy/merged/page_styles.yml b/test/dummy/merged/page_styles.yml
new file mode 100644
index 0000000..dcd024e
--- /dev/null
+++ b/test/dummy/merged/page_styles.yml
@@ -0,0 +1 @@
+--- []
diff --git a/test/dummy/merged/section_styles.yml b/test/dummy/merged/section_styles.yml
new file mode 100644
index 0000000..dcd024e
--- /dev/null
+++ b/test/dummy/merged/section_styles.yml
@@ -0,0 +1 @@
+--- []