scms 3.1.0 → 3.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2MxZTlmM2Y0OTMzZDI4MzVhNDE2N2M4YzE1MDJlZmQ0MzdjZDVlZg==
+    ODViYzEwYjJkYmM3OGFlMDY0ZGI3Y2U3ZTQ1YjVjMDBhOWRmMDYwMg==
   data.tar.gz: !binary |-
-    ZjJkNWQyNzlmMTY1MzVjOGQ2YzQ2NmIwZmZkYTIzYWNlNTMxYTI1OQ==
+    ODQ2Y2JhMDVjMmNkOGY0MGU3M2Q1OTU1MWM2N2VlZTBjNDEyNDNhYQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjJlZDU1MjFhYzFhNTkxYmE1N2UzZDJlOTU1OGFkYTUzNTljZWVkOTRjNWIz
-    ZDU4YWQ3MjY0OTM0ZTliY2NmYTdhYTEzMTdmMGNlZGY2MDU0NjgxNTFhNmY3
-    ZmI3M2Q2ZWYwYzZhZWZmYmVjMTAxNTAxOWNhMWQ1NDk2NTczYjA=
+    MjBlYTdiYTIzY2Y4NjQyMDIyMDU0MzNjZTQ5Mjg5NGVmMzEzZGUzNWM1ODlj
+    NGM3NTQ3YjM3NGYwNDc0OGRhNmI4YzhjNmY1M2ZhY2U3Nzk1ODRjZGIxZTA4
+    YjkxMDhhNzdkNmJmNmIxMWM3MmFjYWE2YjZjNDcwY2RmZmNlOGI=
   data.tar.gz: !binary |-
-    ZWE2ODc1NWNmOGRjNmQxODg1ZTRhOGNjNzQ1N2JlZjhjMjQ2ODZiNTVlNDQy
-    M2M2ZDcyMmNlYmY3MTgxYjY1ZGU0MThkZjg2YmYxNmFkZGM2NjkyNDIwMmZl
-    MDZiNzJiZDI2OTJmYzVmNGI3NTI0MTY5OTZjMjljZDI0YTI4MWE=
+    YzRiMmZmZGZkOGU0Y2Y4YThhZWRmMzhiODdlZjgwNGZkYzVjOGNhMWY5OWE5
+    MTYxMjAxNGNmY2FjOTZmZDVlZDg5MjFjZDM3MGJhYmM1MzcyZTc5NTk4ZmYz
+    NzRmMmQxOTUxYmZiNmFkZWVjZTgzNDg3NTk5MDY4ZWQ5YmY5ZTA=

data/lib/scms.rb

@@ -1,6 +1,7 @@
 require "scms/version"
 
 module Scms
+    require 'scms/scms-helpers.rb'
     require 'scms/scms-utils.rb'
     require 'scms/scms-xmlhandler.rb'
     require 'scms/s3deploy.rb'
@@ -23,12 +24,12 @@ module Scms
         Scms.sassall(File.join(@website))
         
         yamlpath=File.join(config, "_config.yml")
-        @settings = ScmsUtils.getsettings(yamlpath)
-        if @settings           
+        settings = ScmsUtils.getsettings(yamlpath)
+        if settings           
             #Bootstrap here
-            if @settings["bootstrap"] != nil
-                bootstrap = File.join(@website, @settings["bootstrap"])
-                #ScmsUtils.log("Bootstrap is: #{@settings["bootstrap"]}")
+            if settings["bootstrap"] != nil
+                bootstrap = File.join(@website, settings["bootstrap"])
+                #ScmsUtils.log("Bootstrap is: #{settings["bootstrap"]}")
                 if File.exists?(bootstrap)
                     begin
                         require_relative bootstrap
@@ -37,14 +38,13 @@ module Scms
                         ScmsUtils.log(e.backtrace.inspect)
                     end
                 else
-                    ScmsUtils.errLog("Bootstrap does not exist #{@settings["bootstrap"]}")
-                    ScmsUtils.writelog("::Bootstrap does not exist #{@settings["bootstrap"]}", @website)
+                    ScmsUtils.errLog("Bootstrap does not exist #{settings["bootstrap"]}")
+                    ScmsUtils.writelog("::Bootstrap does not exist #{settings["bootstrap"]}", @website)
                     ScmsUtils.writelog("type NUL > #{bootstrap}", @website)
                 end
             end 
             
-            bundles = Scms.bundle(@settings["bundles"])
-            Scms.parsepages(bundles)
+            Scms.parsepages(settings)
         else
             ScmsUtils.errLog("Config is empty")
         end
@@ -53,14 +53,15 @@ module Scms
         ScmsUtils.log(ScmsUtils.uriEncode("file:///#{@website}"))
     end
 
-    def Scms.parsepages(bundles)
+    def Scms.parsepages(settings)
+        bundles = Scms.bundle(settings["bundles"])
         # build views from templates
-        @template = @settings["template"] 
+        @template = settings["template"] 
         
-        if @settings["pages"] != nil
+        if settings["pages"] != nil
             # Build navigation
             navigation = Array.new
-            @settings["pages"].each do |pagedata|
+            settings["pages"].each do |pagedata|
                 if pagedata != nil
                     pagedata.each do |pageoptions|
                         pagename =  pageoptions[0]
@@ -76,7 +77,7 @@ module Scms
             end
 
             ScmsUtils.log("Compiling Pages:")
-            @settings["pages"].each do |pagedata|
+            settings["pages"].each do |pagedata|
                 if pagedata != nil
                     pagedata.each do |pageoptions|
                         pagename =  pageoptions[0]
@@ -264,7 +265,7 @@ module Scms
 
                             html = html.gsub('~/', ScmsUtils.uriEncode("file:///#{@website}/")) if @mode == "cms"
                             websiteroot = '/'
-                            websiteroot = @settings["url"] unless @settings["rooturl"] == nil
+                            websiteroot = settings["url"] unless settings["rooturl"] == nil
 
                             html = html.gsub('~/', websiteroot)
                             begin
@@ -285,9 +286,15 @@ module Scms
         end
     end
 
-    def Scms.parsetemplate(template, hash)
-        page = OpenStruct.new(hash)
+    def Scms.parsetemplate(template, hash = Hash.new)
         result = ""
+        OpenStruct.new(hash)
+
+        if hash.class == OpenStruct 
+            page = hash 
+        else
+            page = OpenStruct.new(hash)
+        end
         
         begin 
             result = ERB.new(template).result(page.instance_eval { binding })

data/lib/scms/scms-helpers.rb

@@ -0,0 +1,27 @@
+module ScmsHelpers
+    require 'find'
+    
+    def ScmsHelpers.isActive(pagename, activepage)
+        return active = "active" if activepage.include? pagename
+    end
+
+	def ScmsHelpers.txt_2_html(rawsnippet)
+		if rawsnippet != nil
+			rawsnippet.gsub!(/(http:\/\/\S+)/, '<a href="\1" target="_blank" ref="external">\1</a>')
+            rawsnippet.gsub!(/(file:\/\/\/\S+)/, '<a href="\1" target="_blank" ref="external">\1</a>')
+			rawsnippet.gsub!(/\n/, "<br />")
+		end
+		
+		return rawsnippet
+	end
+    
+    def ScmsHelpers.uriEncode(uri)
+        return uri.gsub(" ", "%20")
+    end
+    
+    def ScmsHelpers.uriDecode(uri)
+        return uri.gsub("%20", " ")
+    end
+    
+end
+

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Courtenay Probert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cprobert-s3sync
@@ -189,6 +189,7 @@ files:
 - build commands.txt
 - lib/scms.rb
 - lib/scms/s3deploy.rb
+- lib/scms/scms-helpers.rb
 - lib/scms/scms-httpserver.rb
 - lib/scms/scms-utils.rb
 - lib/scms/scms-xmlhandler.rb