scms 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4d890650bc4b0a2fb20e609ec9e71bcb22f318f
-  data.tar.gz: 246fa4d2b29c5480c9fa1e886f8077fc1c94a70d
+  metadata.gz: 5f381843ee93fb7c0c758ba3205076e82392b921
+  data.tar.gz: 6458d3e0809e62af6f6ba24c417f0c88b3d29e1c
 SHA512:
-  metadata.gz: d8174103d4c85d19fe0a2febc793e4484d8196ab08b1f7a1901776b8e08a3e406c4798e735983606dd44e5e36bdf0f9a3c3a8a34976851905871c389db02b44a
-  data.tar.gz: 0367a45b24d39f7a11073caaf278d5b243cff1cc695945b3eeaaa7a8dd108c3d0b0acd6c0fd374153488cb064f396df75e8fc14815324d996316c815e0dfb423
+  metadata.gz: 39ac479902d10445c3189c93cb0eb0e2267f046a620f41fb849317a9a2172a7a417c2525b339d7d54d75650b02cd432db0e754487af7da5f5023e5dafde1f470
+  data.tar.gz: db12283f651d7d18c4da2f0b2a74fddddce747549cff8e685f66e39d1ff3357d33beea9534f75b8768755a3d5a6c972d4b3f6894b24571c424c783ac2f224048

data/lib/scms.rb

@@ -123,8 +123,11 @@ module Scms
                                     if !htmlsnipet.empty?
                                         viewmodel = Hash.new
                                         viewmodel = { 
-                                            :page => pagedata, 
-                                            :sitedir => @website, 
+                                            :name => pagename,
+                                            :title => title,
+                                            :url => pageurl,
+                                            :data => pagedata,
+                                            :rootdir => @website, 
                                             :resource => resource 
                                         }
 
@@ -149,7 +152,7 @@ module Scms
                                         end
                                         
                                         if @mode == "cms"
-                                            views[view[0]] = "<div class='cms' data-view='#{view[1]}' data-page='#{pagedata}'>#{Scms.parsetemplate(viewSnippet, viewmodel)}</div>"
+                                            views[view[0]] = "<div class='cms' data-view='#{view[1]}' data-page='#{pageurl}'>#{Scms.parsetemplate(viewSnippet, viewmodel)}</div>"
                                         else
                                             views[view[0]] = Scms.parsetemplate(viewSnippet, viewmodel)
                                         end
@@ -244,23 +247,27 @@ module Scms
                     content = ""
                     assetList = ""
                     files = option[1]["files"]
-                    files.each do |asset|
-                        assetList += "\t#{asset}\n" 
-                        assetname = File.join(@website, asset)
-                        if File::exists?(assetname)
-                            content = content + "\n" + File.read(assetname)
-                        else
-                            ScmsUtils.errLog( "Error: No such file #{assetname}" )
+                    if files != nil
+                        files.each do |asset|
+                            assetList += "\t#{asset}\n" 
+                            assetname = File.join(@website, asset)
+                            if File::exists?(assetname)
+                                content = content + "\n" + File.read(assetname)
+                            else
+                                ScmsUtils.errLog( "Error: No such file #{assetname}" )
+                            end
                         end
-                    end
-                    ScmsUtils.log("#{assetList}")
-                    
-                    bundleDir = File.dirname(bundleName)
-                    Dir.mkdir(bundleDir, 755) unless File::directory?(bundleDir)
-                    File.open(bundleName, 'w') {|f| f.write(content) }
-                    if File.extname(bundleName) == ".js"
-                        puts "Minifing: #{bundleName}"
-                        Scms.packr(bundleName) unless /(-min)|(\.min)/.match(bundleName)
+                        ScmsUtils.log("#{assetList}")
+                        
+                        bundleDir = File.dirname(bundleName)
+                        Dir.mkdir(bundleDir, 755) unless File::directory?(bundleDir)
+                        File.open(bundleName, 'w') {|f| f.write(content) }
+                        if File.extname(bundleName) == ".js"
+                            puts "Minifing: #{bundleName}"
+                            Scms.packr(bundleName) unless /(-min)|(\.min)/.match(bundleName)
+                        end
+                    else
+                        ScmsUtils.errLog("No files in bundle"); 
                     end
                 end
             end

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

metadata

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