roger_themes 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76fc57d42183dffca4cd97846cdf5874e3fd849d
-  data.tar.gz: bbd6603a9c732670c0351b13edc29bdc05574735
+  metadata.gz: 8c0420e45b64eb7bb1249b9a715f37c8a75a6220
+  data.tar.gz: c62ac39fb65807afa30fd5c888ed3bce288aa9ca
 SHA512:
-  metadata.gz: e5d6460310efd4822829c96890f1c9275f064957307e2b1d74dad16e96d3a50517673d2fa5021f19629af914e3decbc1ac8ee02de200cb0f72e4dad490bc8c45
-  data.tar.gz: d0dd0779c0796010a7478050b2802e480693e35e730e771cb988ff171f2bbfc0e36d2d5aa4740b097cdfc29804a798cb3ad6c6dd709cbe2ba8355ff3a6a33743
+  metadata.gz: c46652f12dc3c238a624c8980b1d041d3e473095750bf03fecd233da66b283f4b20a8ca861e98814b07d688d1f78bb60b7e5d6ee974f59f0f98cfeb4448e8fd9
+  data.tar.gz: 800c20999641f4c6027c0987ddd6a7d5a382655069495d7f3d383fbb247f5243c1e299aedeac5c96b5ea93f9c0f53a8f676fd3c0321d0ea4bd0eda051dcef4c2

data/README.md

@@ -48,6 +48,11 @@ mockup.release do |r|
 
 ## Changelog
 
+### v0.7.0
+* Allow config of shard folders in manifest files
+* Allow disabling of shared templates in manifest files
+* Make sure all templates in a theme folder are processed with the theme env variables set.
+
 ### v0.6.0
 * Attention! `env["SITE_THEME"]` has been renamed to `env["MAIN_THEME"]`. Also it will now return a `RogerThemes::Theme` object instead of a string. The old behaviour can be restored by replacing `env["SITE_THEME"]` with `env["MAIN_THEME"].name`
 * Add compatibility for subthemes

data/lib/roger_themes/manifest.rb

@@ -7,6 +7,8 @@ module RogerThemes
       title: nil,
       type: "main",
       mains: nil,
+      shared_folders: nil,
+      shared_templates: true,
       assets: []
     }
 

data/lib/roger_themes/middleware.rb

@@ -13,7 +13,6 @@ module RogerThemes
       }
 
       @options = defaults.update(options)
-      @shared_folders = SharedFolders.new(@options[:shared_folders])
     end
 
     def call(env)
@@ -21,27 +20,36 @@ module RogerThemes
       themes_path = project.html_path + RogerThemes.themes_path
 
       path = ::Rack::Utils.unescape(env["PATH_INFO"])
-      r = /\A\/#{Regexp.escape(RogerThemes.themes_path)}\/([^\/]+)\/theme\//
+
+      # Regexp to match the theme url
+      theme_url_regex = /\A\/#{Regexp.escape(RogerThemes.themes_path)}\/([^\/]+)\//
+      shared_url_regex = Regexp.new(theme_url_regex.to_s + "theme\/")
 
       env["SUB_THEME"] = nil
 
-      if theme = path[r,1]
+      # Set the theme ENV paramaters
+      if theme = path[theme_url_regex,1]
         main_theme, sub_theme = theme.split(".", 2)
         orig_path = env["PATH_INFO"].dup
         env["MAIN_THEME"] = Theme.new(main_theme, themes_path)
         env["SUB_THEME"] = Theme.new(sub_theme, themes_path) if sub_theme
-        env["PATH_INFO"].sub!(r,"")
       else
         # Set default theme
         env["MAIN_THEME"] = Theme.new(@options[:default_theme], themes_path)
       end
 
+      # See if we have to render shared paths on /THEMES_PATH/THEME_NAME/theme/*
+      if env["MAIN_THEME"].shared_templates && shared_url_regex.match(path)
+        env["PATH_INFO"].sub!(shared_url_regex,"")
+      end
+
       ret = @app.call(env)
 
       # Fallback for shared images
       if ret[0] == 404
+        shared_folders = SharedFolders.new(env["MAIN_THEME"].shared_folders || @options[:shared_folders])
 
-        shared_path = @shared_folders.local_to_shared_path(path)
+        shared_path = shared_folders.local_to_shared_path(path)
 
         if shared_path
           # Store so we can restore later

data/lib/roger_themes/processor.rb

@@ -19,7 +19,6 @@ module RogerThemes
     end
 
     def copy_templates_to_theme(template_files, template_root, theme_path)
-      puts "--> #{template_root} - #{theme_path}"
       mkdir_p theme_path
 
       template_files.each do |file|
@@ -29,11 +28,15 @@ module RogerThemes
     end
 
     def copy_shared_to_theme(theme, theme_path)
-      release.debug self, "Copying shared assets from #{options[:shared_folders]} for #{theme.name}"
-      shared_folders = SharedFolders.new(options[:shared_folders])
+      shared_folder_paths = theme.shared_folders || options[:shared_folders]
+      return if shared_folder_paths.empty?
+
+      release.debug self, "Copying shared assets from #{shared_folder_paths} for #{theme.name}"
+      shared_folders = SharedFolders.new(shared_folder_paths)
 
       shared_folders.folders.each do |source, target|
         if File.directory? release.build_path + source.to_s
+          mkdir_p File.dirname(theme_path + target)
           cp_r release.build_path + "#{source}/.", theme_path + target
         end
       end
@@ -61,11 +64,13 @@ module RogerThemes
       template_files = Dir.glob(release.project.html_path + options[:template_glob]).map{ |f| f.sub(release.project.html_path.to_s + "/", "") }
       template_files.reject!{|c| options[:excludes].detect{|e| e.match(c) } }
 
-      release.debug self, "Copying theme files #{template_files.inspect}"
 
       main_themes.each do |main_theme|
-        copy_templates_to_theme(template_files, release.project.html_path, main_theme.html_path)
-        mockup(main_theme.html_path, { "MAIN_THEME" => main_theme })
+        if main_theme.shared_templates
+          release.debug self, "Copying theme files #{template_files.inspect}"
+          copy_templates_to_theme(template_files, release.project.html_path, main_theme.html_path)
+        end
+        mockup(main_theme.path, { "MAIN_THEME" => main_theme })
         copy_shared_to_theme(main_theme, main_theme.path)
 
         # Copy sub theme to MAINTHEME.SUBTHEME
@@ -76,7 +81,7 @@ module RogerThemes
           copy_templates_to_theme(template_files, release.project.html_path, sub_theme_html_path)
 
           # Run mockup
-          mockup(sub_theme_html_path, { "MAIN_THEME" => main_theme, "SUB_THEME" => sub_theme })
+          mockup(sub_theme.path_in_main(main_theme.name), { "MAIN_THEME" => main_theme, "SUB_THEME" => sub_theme })
         end
       end
 

data/lib/roger_themes/theme.rb

@@ -18,7 +18,6 @@ module RogerThemes
 
     def self.sub_themes_for(main_theme_name, themes_path)
       all(themes_path).select{|theme| theme.type == "sub" && theme.compatible_with_main?(main_theme_name) }
-
     end
 
     def self.main_themes(themes_path)
@@ -55,6 +54,18 @@ module RogerThemes
       @assets = manifest[:assets].map {|asset_data| Asset.new(asset_data, self) }
     end
 
+    # Wether or not we take the toplevel templates
+    # and render them as our own.
+    def shared_templates
+      manifest[:shared_templates]
+    end
+
+    # Shared folders to use. Will default to the
+    # globally set shared folders if nil or false
+    def shared_folders
+      manifest[:shared_folders]
+    end
+
     def sub_themes
       self.class.sub_themes_for(name, @themes_path)
     end

data/lib/roger_themes/version.rb

@@ -1,3 +1,3 @@
 module RogerThemes
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger_themes
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Edwin van der Graaf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roger