scms 4.0.2 → 4.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmI3NGRjNzAxYjg5MzMwY2FkMWU2NGYwZjc3OTJkN2Y5YzA4YTAyOQ==
+    MTE5MWU1NDc5ZTM1MDNmNDQzMzI5M2U2NGZjNThlOTI3ZmQxMGI3NA==
   data.tar.gz: !binary |-
-    N2U5ODRiZDFkY2M4Yzk4YTNmZGQyYmVkZDYyN2NkZmE1MWJhNzk2Yw==
+    ZWUwYmE2ZTNmYWQyN2QwNGJjMmMxNTUyZGJlNDEyM2ZhY2I0MTJkOA==
 SHA512:
   metadata.gz: !binary |-
-    NTBlZDRhOWY1OTAxZmMzNjBiZDVlZTliNzk1ODMxNTk4MTFhYTA5MzdiYmMx
-    NDcwNGU4OTQ4ZWZlMjZhYzNiYWM0YjNhZmJmNDllNjYwNjZmOGNmMDBiOWMy
-    OGIxNzJiZjc2MGJjODM3Y2QxNzMyMGVjNjhkMGE3NTkyZWQ1YTY=
+    ODc5MTRhMDQxNTllOGVmM2NlZTMzNmNmNmVlOTZkMWFiNDg0YTAyNzU0ZTgy
+    MjE3MDExYzhmMWE5NTE5NDk2YjBkNWE4NDk4MzMwNmVjMDIzZDgzODcxMTY1
+    NTc4NzMxMGFlNDkyOWMxOTM4MzY1ODY2MzNhNTU2ODJjYTQ1OWQ=
   data.tar.gz: !binary |-
-    NTMyY2Y5ZDg1N2VmMzg5MDRjNjc0ZTczNmFiNGU5ZGY1ZGUxMzg3OGMyNDIw
-    ZTVmMjRmMWFmYjdjM2Q0MzcyYTA0ZWVlYjNmODQ4MGRmYzY5NGUxMGZlNWJi
-    YTgzNjI3M2I3Yzc0ZDdiMjRiMDFmZTUwMTRkMjg3MzUzODJkYTA=
+    NjY0MmQyY2U4ZjJlZTMzMTQ3MGM3ZDkxMTQ2MDE5YzI0N2IzZWIyNDY0MDA1
+    MWUzNDEzOWFjYmViZmI1NDI5ZDE2NWU2NmUyZmI1ZTJhMDQzZjRiNjhmYWY4
+    YTIyN2I4MTU1NzVhYjMwMzJlMDkzYjU1YjhiMTA1NDBlNWY3ODE=

data/bin/scms

@@ -103,6 +103,7 @@ $cmsmode = options[:mode] == "cms"
 # ScmsUtils.log "Mode = #{options[:mode]}"
 
 raise "Invalid working directory! #{Folders[:website]}" if !File::directory?(Folders[:website])
+Dir.chdir Folders[:website]
 
 if options[:create] != nil
     puts "Creating scms website: #{options[:create]}"

data/lib/scms.rb

@@ -28,8 +28,6 @@ module Scms
     end
 
     def Scms.build(website, settings, options)
-
-        
         ScmsUtils.boldlog("Compiling #{website}")
         
         if settings           
@@ -68,7 +66,6 @@ module Scms
 
     def Scms.parseSettingsPages(website, settings, options)
         if settings["pages"] != nil
-
             ScmsUtils.log("Compiling Pages:")
             settings["pages"].each do |pagedata|
                 #puts "pagedata: #{pagedata}"
@@ -260,7 +257,7 @@ module Scms
                     puts "nil value foy key: #{key}" if value == nil
                     singleton_class.send(:define_method, key) { value }
                 end
-                result = "</code></pre>"
+                result += "</code></pre>"
 
                 
                 result += "\n\n"
@@ -276,13 +273,11 @@ module Scms
     end
 
     def Scms.save(settings, website, pageOptions, views, options)
-
         fileName = File.join(website, File.join(pageOptions.url.sub('~/',''))) 
         erb = File.join(website, pageOptions.template)
         #ScmsUtils.log("Generating: #{fileName} with #{pageOptions.template}")
 
         if File.exists?(erb)
-
             # Build bundle model
             bundleModel = Scms.bundleModel(website, settings, options)
             # Build navigation model
@@ -373,11 +368,22 @@ module Scms
                     pagedata.each do |pageoptions|
                         pagename =  pageoptions[0]
                         pageconfig = pageoptions[1]
+
                         pageurl = "about:blank"
                         pageurl = pageconfig["url"] unless pageconfig["url"] == nil
+
+                        #pageUrlExt = File.extname(pageurl) 
+                        #puts "pageUrlExt: #{pageUrlExt}"
+                        #puts "No extension" if pageUrlExt == ""
+                        if options[:mode] == "cms"
+                            pageurl += "index.html"  if pageurl.match(/\/$/)
+                        end
+
                         navtext = pagename
                         navtext = pageconfig["text"]
+
                         navmeta = pageconfig["meta"]
+
                         navModel.push({"text" => navtext, "url" => pageurl.gsub("~/", websiteroot), "pagename" => pagename, "meta" => navmeta})
                     end
                 end

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "4.0.2"
+  VERSION = "4.0.3"
 end

metadata

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