scms 4.0.1 → 4.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzZkNWExZWQzODM0MTVjNDcxNjFiYzk3MTk1MmNjYTQyZjdmODQzNw==
+    MmI3NGRjNzAxYjg5MzMwY2FkMWU2NGYwZjc3OTJkN2Y5YzA4YTAyOQ==
   data.tar.gz: !binary |-
-    ODFmODVjZTU0NjYyYmMxNmY4MzcwOWRmZDJkMTMzMDIyMzJjNjFjNw==
+    N2U5ODRiZDFkY2M4Yzk4YTNmZGQyYmVkZDYyN2NkZmE1MWJhNzk2Yw==
 SHA512:
   metadata.gz: !binary |-
-    YmUxY2VlMTU3ZDg5ODUyNGIzNGNiMjk1MDA2OTE5YmE0OGM3MTNkOGNmNDhh
-    ZmY2Njk5ZWMwNTVlMDIzNTUwNGQxYjBmNWEyYTc5Nzc5NzJkZWIzZjJhNDA3
-    NDU3NjZhYzUwOTRiMzcyZDcxNjEyNTA1MTUyMDlkNmUzM2FmNDY=
+    NTBlZDRhOWY1OTAxZmMzNjBiZDVlZTliNzk1ODMxNTk4MTFhYTA5MzdiYmMx
+    NDcwNGU4OTQ4ZWZlMjZhYzNiYWM0YjNhZmJmNDllNjYwNjZmOGNmMDBiOWMy
+    OGIxNzJiZjc2MGJjODM3Y2QxNzMyMGVjNjhkMGE3NTkyZWQ1YTY=
   data.tar.gz: !binary |-
-    YTFhMDY3YjgzNDFlNjQ2Mjk2NDZiY2QzNzgzYjI4MjQ5MDlkZTAzNWMwNmNj
-    ODM0OGUyZTNmZTA4YzlhNmU5ZjRmNTJhNWMwMjVkMTgxMmNmMWUxYzhkNTgx
-    YjdjNmEyNzJiMjNmODUxMjM1ODEzYzEwMTk2YmU3N2EyMzM5Yjk=
+    NTMyY2Y5ZDg1N2VmMzg5MDRjNjc0ZTczNmFiNGU5ZGY1ZGUxMzg3OGMyNDIw
+    ZTVmMjRmMWFmYjdjM2Q0MzcyYTA0ZWVlYjNmODQ4MGRmYzY5NGUxMGZlNWJi
+    YTgzNjI3M2I3Yzc0ZDdiMjRiMDFmZTUwMTRkMjg3MzUzODJkYTA=

data/lib/scms.rb

@@ -289,8 +289,13 @@ module Scms
             navModel = Scms.navModel(website, settings, options)
             #puts "navModel: #{navModel}"
 
+            websiteroot = '/'
+            websiteroot = settings["rooturl"] if settings["rooturl"] != nil
+            #puts "On save mode: #{options[:mode]}"
+            websiteroot = ScmsUtils.uriEncode("file:///#{website}/") if options[:mode] == "cms"
+
             monkeyhook = "";
-            monkeyhook = "<script src='scripts/air-monkey-hook.js'></script>" if options[:mode] == "cms"
+            monkeyhook = "<script src='~/scripts/air-monkey-hook.js'></script>".gsub("~/", websiteroot) if options[:mode] == "cms"
 
             livereload = ""
             if options[:watch]
@@ -324,13 +329,6 @@ module Scms
             #puts "pagemodel: #{pagemodel}"
             #html = ""
             html = Scms.render(erbtemplate, pagemodel)
-
-            
-            websiteroot = '/'
-            websiteroot = settings["rooturl"] if settings["rooturl"] != nil
-            #puts "On save mode: #{options[:mode]}"
-            websiteroot = ScmsUtils.uriEncode("file:///#{website}/") if options[:mode] == "cms"
-
             html = html.gsub('~/', websiteroot)
             begin
                 File.open(fileName, 'w') {|f| f.write(html) }
@@ -350,6 +348,7 @@ module Scms
         websiteroot = '/'
         websiteroot = settings["rooturl"] unless settings["rooturl"] == nil
         websiteroot = ScmsUtils.uriEncode("file:///#{website}/") if options[:mode] == "cms"
+        #websiteroot = "" if options[:mode] == "cms"
 
         navModel = Array.new
         if settings["pages"] != nil

data/lib/scms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Courtenay Probert
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Create simple static websites, in a jiffy