scms 4.4.3 → 4.4.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGUwODQ4ODJmMjdhY2NhMTMxMTZhZjBlN2MzMTY4ZTRlMzNmNTkxMQ==
+    OGY2OWVjNzNiZGJlNWUzZWI4NTA4ZjI3NGVkZDU2YzQ2YjE4ZDI1ZQ==
   data.tar.gz: !binary |-
-    MDJjNTA3MDNhN2ZmMGZhN2FkNjM1ZjdiZGViYWViODY4Y2I2NzRiZA==
+    ZjNlYzliNzgwMDVjOWU4MjE5Y2Q5Y2UyOWUwMjljNjI4MGNhMzc3Yw==
 SHA512:
   metadata.gz: !binary |-
-    ZjZhNzNmNTFiNzFlZTEyYjEwODc0M2QxYTE4MTk2ZDM0ZjNlZTFkNzJlOTMz
-    OGU4N2M4NDgzYWQxOGVhYTUxYzg1YTllNzdkNWZkYjAwYmRmMjVhNDA1OTU0
-    ZDQ5MGQzNDE4M2YyNjUxOWVmYmJhNTg1MmQ5MzQwMThhN2M2Mzc=
+    MmVmOTkxMDk5NGZjNTg0M2JlZjRjY2M4MzhhYmU4ZjQyMDk3OTVlNGFlNmNk
+    ZTBiYjE3ZDIzYjI3YmFiYjY2MzcxZDkwNDRjMDNmZDBmZTIxYjczNjFlYjBk
+    NTNkNDNkNDE5OGFlYWFhNGRjMTUwYmY4OWMxY2NkYmM1NmRhN2U=
   data.tar.gz: !binary |-
-    MGMzNjVkNGRiYjVlMmM5YmRhODQ1Y2NmMTQ2Zjg0NmIxMmYyMzk1MjZiZjQw
-    MGExYmExYzE4NzdiMTlmNDZlN2MxZGVkN2EyYjMyMWIwMmFmYWYwZThkMjA3
-    NzI3NDExMGJlZTM4YmJhNTk0NjVjMzk0NTBiNWU1OWFlODNjY2Y=
+    MGZmYWRkMjM5NjdmMmE1MDhmMjAzMDI1ZTNjY2FjNzE3MDM2Mjk0MGRhNmY5
+    YzI5ODVlZDUxNDllODc3YzFlNzgwM2NkMTlkOGIxNzRiYTg0MjFmMjlhODc0
+    OGYxMTk4MTBmZmQ0NDllZjRiOGFlMGVhZTcwMTA2YzZiNWFiYWM=

data/lib/scms/scms-pageoptions.rb

@@ -87,7 +87,7 @@ module Scms
                   ScmsUtils.writelog("type NUL > #{resourcepath}", website)
               end
           else
-            ymlresource = config
+            ymlresource = config.dup
             ymlresource.delete("view")
             ymlresource.delete("views")
             ymlresource.delete("resource")

data/lib/scms/scms-utils.rb

@@ -22,12 +22,12 @@ module ScmsUtils
     def ScmsUtils.readyaml(yamlpath)
         config = nil
         if File.exist?(yamlpath)
-            tree = File.read(yamlpath)
+            #tree = File.read(yamlpath)
             begin
-                myconfig = ERB.new(tree).result()
-                #puts "Conf = #{myconfig}"
-                config = YAML.load(myconfig)
-                #config = YAML.load_file(yamlpath)
+                # myconfig = ERB.new(tree).result()
+                # puts "Conf = #{myconfig}"
+                # config = YAML.load(myconfig)
+                config = YAML.load_file(yamlpath)
             rescue Exception => e  
                 ScmsUtils.errLog("Error Loading _config.yml (check there are no tabs in the file)")
                 ScmsUtils.log("Yaml: #{ScmsUtils.uriEncode("file:///#{yamlpath}")}")

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "4.4.3"
+  VERSION = "4.4.4"
 end

data/lib/scms.rb

@@ -51,7 +51,6 @@ module Scms
                     ScmsUtils.writelog("type NUL > #{bootstrap}", website)
                 end
             end 
-            ScmsUtils.log("Generating pages")
             Scms.generatePages(website, settings, options)
         else
             ScmsUtils.errLog("Config is empty")
@@ -71,6 +70,7 @@ module Scms
 
     private
     def Scms.generatePagesFromFolder(website, settings, options)
+        ScmsUtils.log("Generating from _pages folder")
         pagesFolder = File.join(website, "_pages")
         Dir.glob("#{pagesFolder}/**/*/").each do |pageFolder|
             pagename = File.basename(pageFolder, ".*")
@@ -110,20 +110,28 @@ module Scms
     private
     def Scms.generatePagesFromSettings(website, settings, options)
         if settings["pages"] != nil
-            ScmsUtils.log("Compiling Pages:")
+            ScmsUtils.log("Generating from pages from config")
             settings["pages"].each do |pagedata|
                 if pagedata != nil
                     pagedata.each do |pageOptions|
+                        
                         pagename =  pageOptions[0]
                         pageconfig = pageOptions[1]
+                        settingsViews = pageconfig['views']
 
                         pageOptions = PageOptions.new(pagename, website, pageconfig, settings)
-                        views = Scms.getSettingsViews(pageconfig["views"], website, pageOptions, options)
-
-                        # Dont save a page if no views have been defined (so the config han have pages for nav building)
-                        break if views.length < 1
+                        
+                        views = Scms.getSettingsViews(settingsViews, website, pageOptions, options)
+                        # Dont save a page if no views have been defined (so the config can have pages for nav building)
+                        if views.length < 1
+                            #ScmsUtils.log("No views specified for: #{pagename}")
+                            #puts "#{pageconfig}"
+                            break
+                        end
                         Scms.savePage(settings, website, pageOptions, views, options)
                     end
+                else
+                    ScmsUtils.errLog("No pagedata")
                 end
             end
         end
@@ -144,6 +152,8 @@ module Scms
                 viewmodel = Scms.getViewModel(viewname, viewpath, website, pageOptions, options, viewData)
                 views[viewname] = Scms.includeView(viewpath, viewmodel)
             end
+        else
+            #puts "No settingsViews"
         end
         return views
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 4.4.3
+  version: 4.4.4
 platform: ruby
 authors:
 - Courtenay Probert