scms 1.9.5 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8afbf980cb75d561c9a31da6363773ed87695218
-  data.tar.gz: 14b0ec6f0fe85009bcc5758ac7ddd6d761bb5f81
+  metadata.gz: ef0303045a52ddd8fcd7999b9904b1d9149fa47d
+  data.tar.gz: aad39bc24d3458379629a8e9e8706eff9c23ff90
 SHA512:
-  metadata.gz: eeb4cac2eea8f198918e020d4c5ffeebce645b18299306290603577382d7a598fc0798f33a15b3a8b827bccd07f4995bbc601373749726d667568cc3ebc8d41f
-  data.tar.gz: d366328cd072ca5f08a6434c987b2f17685073d46e3960a138ade8028a145e2abc7502bfa2c78d4201f7dce2338c96daa73e7d77889dda45e97439b6ccaedb3f
+  metadata.gz: 48b720247e9f72f87b223c6c8630f70b0e25957e74148d99f65c547fa2df939257c989eaa21cb749be651e377bf4a9859899868760d2a6ef4eb456e20df4159b
+  data.tar.gz: b880bda1b8863d08bcd5f4d1b0e9e941151db2549b8a6275a7d1471ba9c02a1b80660a432de9421c4442c9ec39cedb4641f1120a66a9f2f3b12e767c451a32ce

data/assets/blank-template/_templates/skin.erb.html

@@ -37,23 +37,19 @@
           <div class="nav-collapse collapse">
             <ul class="nav">
 
-				<%
-					@page = data.page
-					@page = "/" if @page == "index.html"
-					def isActive(href)
-						if @page == href
-							return "active"
-						end
-					end
-
-					require 'nokogiri'
-					xml_doc  = Nokogiri::XML(File.read(File.join(data.sitedir, "_templates", "menu.xml")))
-					xml_doc.xpath('/menu/page').each do |link|
-				%>
-					<li><a href='<%= link.attr("href") %>' class='<%=isActive(link.attr("href"))%> <%= link.attr("class") %>'>
-						<%= link.content %>
-					</a></li>	
-				<% end %>
+              <%
+                @currentpagename = data.pagename
+                def isActive(pagename)
+                    return active = "active" if @currentpagename == pagename
+                end
+                data.navigation.each do |nav|
+              %>
+                <li class='<%=isActive(nav[:name])%>'>
+                  <a href='<%= nav[:url] %>'>
+                    <%= nav[:name] %>
+                  </a>
+                </li> 
+              <% end %>
 			  
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>

data/lib/scms.rb

@@ -105,24 +105,35 @@ module Scms
     def Scms.parsepages(scripts, stylesheets, bundles)
         # build views from templates
         @template = $settings["template"] 
+        
         if $settings["pages"] != nil
+            # Build navigation
+            navigation = Array.new
+            $settings["pages"].each do |page|
+                if page != nil
+                    page.each do |pageoptions|
+                        pagename =  pageoptions[0]
+                        pageconfig = pageoptions[1]
+                        pageurl = pageconfig["generate"]
+                        navigation.push({:name => pagename, :url => pageurl}) unless pageconfig["navigation"] == false
+                    end
+                end
+            end
+
             ScmsUtils.log("Compiling Pages:")
             $settings["pages"].each do |page|
                 if page != nil
-                    page.each do |option|
-                        #ScmsUtils.log( "option (#{option.class}) = #{option[0]}" )
-                        pageconfig = option[1]
-                        #ScmsUtils.log( "Pageconfig = #{pageconfig}" )
-                        
+                    page.each do |pageoptions|
+                        pagename =  pageoptions[0]
+                        pageconfig = pageoptions[1]
+                        pageurl = pageconfig["generate"]
+                        ScmsUtils.successLog("#{pageurl}")
                         if pageconfig["template"] == nil
                             skin = @template
                         else
                             skin = pageconfig["template"]
                         end
                         
-                        page = pageconfig["generate"]
-                        ScmsUtils.successLog("#{page}")
-                        
                         resource = Hash.new
                         if pageconfig["resource"] != nil
                             resourcepath = File.join($website, pageconfig["resource"])
@@ -194,14 +205,16 @@ module Scms
                             end
                             #ScmsUtils.log( "view = #{view[0]} - #{view[1]}" )
                         end
-                        
+
                         monkeyhook = "";
                         if @mode == "cms"
                             monkeyhook = "<script src='scripts/air-monkey-hook.js'></script>"
                         end
                         
                         hash = { 
-                            :page => page, 
+                            :page => pageurl,
+                            :pagename => pagename,
+                            :pageurl => pageurl,
                             :views => views, 
                             :resource => resource, 
                             :config => pageconfig, 
@@ -209,7 +222,8 @@ module Scms
                             :stylesheets => stylesheets, 
                             :bundles => bundles,
                             :sitedir => $website, 
-                            :monkeyhook => monkeyhook 
+                            :monkeyhook => monkeyhook,
+                            :navigation => navigation
                         }
                         
                         erb = File.join($website, skin)
@@ -282,8 +296,8 @@ module Scms
         begin 
             result = ERB.new(template).result(data.instance_eval { binding })
         rescue Exception => e  
-                    ScmsUtils.errLog("**Critical Error: Could not parse template**")
-                    ScmsUtils.log( "_(if your using resources make sure their not empty)_" )
+                    ScmsUtils.errLog("Critical Error: Could not parse template")
+                    ScmsUtils.log( "(if your using resources make sure their not empty)" )
                     ScmsUtils.errLog( e.message )
         end
         
@@ -302,7 +316,8 @@ module Scms
                 #config = YAML.load_file(yamlpath)
             rescue Exception => e  
                 ScmsUtils.errLog("Error Loading _config.yml (check there are no tabs in the file)")
-                ScmsUtils.log( "_[Verify your config](http://yaml-online-parser.appspot.com/)_")
+                ScmsUtils.log( "Verify your config")
+                ScmsUtils.log( "http://yaml-online-parser.appspot.com/")
                 ScmsUtils.errLog( e.message )
                 ScmsUtils.errLog( e.backtrace.inspect )
             end
@@ -378,34 +393,4 @@ module Scms
         File.rename("config.yml", "_config.yml") if File.exists? File.join($website, "config.yml")
         File.rename("s3config.yml", "_s3config.yml") if File.exists? File.join($website, "s3config.yml")
     end
-
-    def Scms.crunch(crunchDir)
-        ScmsUtils.log( "Starting crunching CSS and JavaScript in:\n#{crunchDir}\n\n" )
-        Dir.chdir(crunchDir) do
-            Dir.glob("**/*.{css, js}").each do |asset|
-                #fullFileName = File.basename(asset)
-                #ScmsUtils.log( "Crunching #{fullFileName}" )
-                ext = File.extname(asset)
-                Scms.yuicompress(asset, ext)
-            end
-        end
-    end 
-
-    def Scms.yuicompress(asset, ext)
-        if File.exists?(asset)
-            #ScmsUtils.log( " Encoding: #{asset.encoding}" )
-            enc = "--charset utf-8"
-            enc = ""
-            cmd = "java"
-            params = "-jar \"#{File.join(Folders[:tools], "yuicompressor", "yuicompressor-2.4.7.jar")}\"  #{enc} --type #{ext.gsub(".","")} \"#{asset}\" -o \"#{asset}\""
-            ##Need to check if asset exists
-            if system("#{cmd} #{params}")
-                ScmsUtils.log( "_Crunched #{File.basename(asset)}_" )
-            else
-                ScmsUtils.errLog( "Error crunching: #{asset}" )
-            end
-        else
-            ScmsUtils.errLog( "#{asset} does not exist" )
-        end
-    end
 end

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "1.9.5"
+  VERSION = "1.9.6"
 end

metadata

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