RubyGems - scms - Versions diffs - 1.9.6 → 2.0.0 - Mend

scms 1.9.6 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

checksums.yaml +4 -4
data/.gitignore +4 -0
data/assets/{blank-template/scripts/air-monkey-hook.js → air-monkey-hook.js} +0 -0
data/assets/blank-template/_config.yml +19 -8
data/assets/blank-template/_templates/skin.erb.html +17 -16
data/assets/yuicompressor/readme +1 -0
data/bin/scms +13 -8
data/lib/scms/s3deploy.rb +16 -13
data/lib/scms/scms-utils.rb +28 -3
data/lib/scms/version.rb +1 -1
data/lib/scms/yui.rb +31 -0
data/lib/scms.rb +152 -208
data/scms.gemspec +0 -1
metadata +5 -18
data/assets/blank-template/_templates/menu.xml +0 -5

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef0303045a52ddd8fcd7999b9904b1d9149fa47d
-  data.tar.gz: aad39bc24d3458379629a8e9e8706eff9c23ff90
+  metadata.gz: bdb6469369b7419d7255f4d534c74bf8b49034bf
+  data.tar.gz: f3c2e3658b9f75017551ef6b80b2202f52fdbce5
 SHA512:
-  metadata.gz: 48b720247e9f72f87b223c6c8630f70b0e25957e74148d99f65c547fa2df939257c989eaa21cb749be651e377bf4a9859899868760d2a6ef4eb456e20df4159b
-  data.tar.gz: b880bda1b8863d08bcd5f4d1b0e9e941151db2549b8a6275a7d1471ba9c02a1b80660a432de9421c4442c9ec39cedb4641f1120a66a9f2f3b12e767c451a32ce
+  metadata.gz: 2ace91b95b0605de4079bd3e251b8fc0b4bca076695d49dfa45110f3751b9d30ad84656d885f447e5706b0cc36bfee15ac1a86d490229ded12dfd3943d7683ca
+  data.tar.gz: 8ceeec4bfdb74813411668b2403ee1eec99f2336dc3876f2cca6bfa780e8ec48dd20f95d2026ab70c71eef11f5dbe28ca244c75cc8d5bd6d21e0e5a8653f3ee8

data/.gitignore CHANGED Viewed

@@ -26,3 +26,7 @@ Desktop.ini
 # Mac crap
 .DS_Store
+/assets/blank-template/index.html
+/assets/blank-template/about.html
+/assets/blank-template/scripts/bootstrap.min-v2.1.1.js
+/assets/blank-template/stylesheets/style-1.0.css

data/assets/{blank-template/scripts/air-monkey-hook.js → air-monkey-hook.js} RENAMED Viewed

File without changes

data/assets/blank-template/_config.yml CHANGED Viewed

@@ -1,25 +1,36 @@
-template: _templates/skin.erb.html
+template: _templates/skin.erb.html # The website skin (erb template)
+#url: http://www.mywebsite.com/ #Whats the website root when published - All references in html ~/ will be replaced with this
+# Define your pages here
 pages:
 - index:
-    generate: index.html
-    views :
+    generate: ~/index.html
+    navigation: Home
+    title: My Homepage
+    description: Meta description
+    keywords: "CMS, S3, Ruby"
+    views:
         intro: _views/home-intro.html
         main: _views/home-main.html
 - about:
-    generate: about.html
-    views :
+    generate: ~/about.html
+    navigation: About
+    views:
         intro: _views/about-intro.html
         main: _views/about-main.html
+- contact: #Pageless for nav only
+    navigation: contact
+    navigation_meta: contactform
+    url: about:blank
+# Define your bundles here (versioning is recomended if your caching assets)
 bundles:
 - script:
     generate: scripts/bootstrap.min-v2.1.1.js
-    bundle:
+    files:
      - scripts/bootstrap.js
 - style:
     generate: stylesheets/style-1.0.css
-    bundle:
+    files:
       - stylesheets/bootstrap.css
       - stylesheets/bootstrap-responsive.css
       - stylesheets/style.css

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

@@ -2,14 +2,15 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>Static-CMS</title>
+    <title><%= page.title %></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
+    <meta name="description" content="<%= page.description %>">
+    <meta name="keywords" content="<%= page.keywords %>">
+    <meta name="author" content="Courtenay Probert">
-    <script src='scripts/jquery-1.8.2.min.js'></script>
-	<!-- Le styles -->
-	<link href='<%= data.stylesheets["style"] %>' rel="stylesheet">
+    <script src='~/scripts/jquery-1.8.2.min.js'></script>
+	  <!-- Le styles -->
+	  <link href='~/<%= page.bundles["style"] %>' rel="stylesheet">
     <style type="text/css">
       body {
         padding-top: 60px;
@@ -38,15 +39,15 @@
             <ul class="nav">
               <%
-                @currentpagename = data.pagename
+                @currentpagename = page.name
                 def isActive(pagename)
                     return active = "active" if @currentpagename == pagename
                 end
-                data.navigation.each do |nav|
+                page.navigation.each do |nav|
               %>
-                <li class='<%=isActive(nav[:name])%>'>
-                  <a href='<%= nav[:url] %>'>
-                    <%= nav[:name] %>
+                <li class='<%=isActive(nav["pagename"])%>  <%= nav["meta"]%>'>
+                  <a href='<%= nav["url"] %>'>
+                    <%= nav["text"] %>
                   </a>
                 </li>
               <% end %>
@@ -78,18 +79,19 @@
       <!-- Main hero unit for a primary marketing message or call to action -->
       <div class="hero-unit">
-		 <%= data.views["intro"] %>
+		    <%= page.views["intro"] %>
       </div>
       <!-- Example row of columns -->
       <div class="row">
-		<%= data.views["main"] %>
+		    <%= page.views["main"] %>
       </div>
       <hr>
       <footer>
         <p>&copy; Company <%= Time.now.strftime("%Y") %></p>
+        <p>Built with <a href="http://cprobert.github.io/Static-CMS/">Static-CMS</a></p>
       </footer>
     </div> <!-- /container -->
@@ -97,8 +99,7 @@
     <!-- Le javascript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-	<script src='<%= data.scripts["script"] %>'></script>
-	<%= data.monkeyhook %>
+	<script src='~/<%= page.bundles["script"] %>'></script>
+	<%= page.monkeyhook %>
   </body>
 </html>

data/assets/yuicompressor/readme ADDED Viewed

	@@ -0,0 +1 @@
1	+ Add yuicompressor-2.4.7.jar here to able to use the Yui minimise

data/bin/scms CHANGED Viewed

@@ -55,17 +55,15 @@ end
 optparse.parse!
 #Set globals
-$website = (options[:website].nil?) ? Dir.pwd : options[:website]
-$html = (ENV["SCMS_HTML_OUT"] or "false")
-#puts "html mode: #{$html}"
 $stdout.sync = true
 root_folder = File.expand_path("../", File.dirname(__FILE__))
+website = (options[:website].nil?) ? Dir.pwd : options[:website]
 Folders = {
   :root => root_folder,
-  :website => File.join($website),
+  :website => File.join(website),
   :pub => (ENV["SCMS_PUBLISH_FOLDER"] or options[:pub]),
   :assets => File.join(root_folder, "assets"),
-  :config => (ENV["SCMS_CONFIG_FOLDER"] or File.join($website))
+  :config => (ENV["SCMS_CONFIG_FOLDER"] or File.join(website))
 }
 if options[:action] == "create"
@@ -79,6 +77,13 @@ if options[:action] == "create"
     exit
 end
+monkeyhook = File.join(Folders[:website], "scripts", "air-monkey-hook.js")
+if options[:mode] == "cms"
+  FileUtils.cp(File.join(Folders[:assets], "air-monkey-hook.js"), monkeyhook)
+else
+  FileUtils.rm(monkeyhook) if File.exist?(monkeyhook)
+end
 #puts "System root folder = #{Folders[:root]}"
 #puts "Website folder = #{Folders[:website]}"
 #puts "Pub dir = #{Folders[:pub]}"
@@ -86,7 +91,7 @@ end
 #puts "Mode = #{options[:mode]}"
 raise "No website in folder #{Folders[:website]}" if !File::directory?(Folders[:website])
-Scms.Upgrade()
-deployDir = Scms.build(Folders[:pub], Folders[:config], options[:mode])
-#puts "deployDir = #{deployDir}"
+Scms.upgrade(Folders[:website])
+Scms.build(Folders[:website], Folders[:pub], Folders[:config], options[:mode])
+Scms.copywebsite(Folders[:website], Folders[:pub]) if Folders[:pub] != nil
 Scms.deploy(deployDir, Folders[:config]) if options[:action] == "deploy"

data/lib/scms/s3deploy.rb CHANGED Viewed

@@ -3,25 +3,28 @@ module S3Deploy
     require "scms/scms-utils.rb"
     def S3Deploy.sync(pub, config)
-        ScmsUtils.log( "Syncing with Amazon S3: #{$settings['bucket']}" )
+        yamlpath=File.join(config, "_config.yml")
+        settings = ScmsUtils.getsettings(yamlpath)
+        ScmsUtils.log( "Syncing with Amazon S3: #{settings['bucket']}" )
         @pub = pub
         ENV["S3CONF"] = config
         ENV["AWS_CALLING_FORMAT"] = "SUBDOMAIN"
         ENV["S3SYNC_MIME_TYPES_FILE"] = File.join(Folders[:root], "assets", "mime.types")
         yamlpath=File.join(config, "_s3config.yml")
-        $settings = YAML.load_file(yamlpath)
+        settings = YAML.load_file(yamlpath)
         removeold = "--delete"
-        if $settings['clean'] != nil
-            unless $settings['clean']
+        if settings['clean'] != nil
+            unless settings['clean']
                 removeold = ""
             end
         end
         exclude = "(\\.svn$)|(^_)"
-        if $settings['ignore'] != nil
-            exclude = "#{exclude}|(#{$settings["ignore"]})"
+        if settings['ignore'] != nil
+            exclude = "#{exclude}|(#{settings["ignore"]})"
         end
         cmd = "s3sync"
@@ -31,27 +34,27 @@ module S3Deploy
         Dir.glob("#{@pub}/_*/").each do |f|
             privatedir = File.basename(f)
             ScmsUtils.log( "Backing up #{privatedir} (private)" )
-            privateparams = "#{params} \"#{@pub}/#{privatedir}/\" #{$settings['bucket']}:#{privatedir}/"
+            privateparams = "#{params} \"#{@pub}/#{privatedir}/\" #{settings['bucket']}:#{privatedir}/"
             ScmsUtils.run(cmd, privateparams)
         end
         #Them deploy publid dir with caching
-        if $settings['cache'] != nil
-            $settings['cache'].each do |folder|
+        if settings['cache'] != nil
+            settings['cache'].each do |folder|
                 ScmsUtils.log( "Syncing #{folder}(public: caching: 1 year)" )
-                cacheparams = "#{params}  --public-read --cache-control='max-age=31449600' \"#{@pub}/#{folder}/\" #{$settings['bucket']}:#{folder}/"
+                cacheparams = "#{params}  --public-read --cache-control='max-age=31449600' \"#{@pub}/#{folder}/\" #{settings['bucket']}:#{folder}/"
                 ScmsUtils.run(cmd, cacheparams)
             end
         end
         ScmsUtils.log( "Syncing root (public)" )
-        roorparams = "#{params}  --public-read \"#{@pub}/\" #{$settings['bucket']}:/"
+        roorparams = "#{params}  --public-read \"#{@pub}/\" #{settings['bucket']}:/"
         #Finnaly deploy all remaining files (except excludes)
         ScmsUtils.run(cmd, roorparams)
         ScmsUtils.successLog("Deployed :)")
-        if $settings['uri'] != nil
-            ScmsUtils.log($settings['uri'])
+        if settings['uri'] != nil
+            ScmsUtils.log(settings['uri'])
         end
     end
 end

data/lib/scms/scms-utils.rb CHANGED Viewed

@@ -3,6 +3,31 @@ module ScmsUtils
     require 'fileutils'
     require 'open-uri'
+    def ScmsUtils.getsettings(yamlpath)
+        ScmsUtils.log("Loading Config: #{ScmsUtils.uriEncode("file:///#{yamlpath}")}")
+        config = nil
+        if File.exist?(yamlpath)
+            tree = File.read(yamlpath)
+            begin
+                myconfig = ERB.new(tree).result()
+                #puts "Conf = #{myconfig}"
+                config = YAML.load(myconfig)
+                #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")
+                ScmsUtils.log( "http://yaml-online-parser.appspot.com/")
+                ScmsUtils.errLog( e.message )
+                ScmsUtils.errLog( e.backtrace.inspect )
+            end
+        else
+            ScmsUtils.errLog("Config file does not exist: #{yamlpath}")
+        end
+        return config
+    end
     def ScmsUtils.run(cmd, params)
         if system("#{cmd} #{params}")
             ScmsUtils.successLog( "#{cmd} ran successfully" )
@@ -13,7 +38,7 @@ module ScmsUtils
     def ScmsUtils.errLog(msg)
         if !msg.nil?
-            if $html == "true"
+            if ENV["SCMS_HTML_OUT"] == "true"
                 puts "<div style='color: red;'>#{ScmsUtils.txt_2_html(msg)}</div>"
             else
                 puts msg
@@ -23,7 +48,7 @@ module ScmsUtils
     def ScmsUtils.successLog(msg)
         if !msg.nil?
-            if $html == "true"
+            if ENV["SCMS_HTML_OUT"] == "true"
                 puts "<div style='color: green;'>#{ScmsUtils.txt_2_html(msg)}</div>"
             else
                 puts msg
@@ -33,7 +58,7 @@ module ScmsUtils
     def ScmsUtils.log(msg)
         if !msg.nil?
-            if $html == "true"
+            if ENV["SCMS_HTML_OUT"] == "true"
                 puts "<div>#{ScmsUtils.txt_2_html(msg)}</div>"
             else
                 puts msg

data/lib/scms/version.rb CHANGED Viewed

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

data/lib/scms/yui.rb ADDED Viewed

@@ -0,0 +1,31 @@
+module Yui
+    def Yui.eatall(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)
+                Yui.compress(asset, ext)
+            end
+        end
+    end
+    def Yui.compress(asset, ext)
+        if File.exists?(asset)
+            #ScmsUtils.log( " Encoding: #{asset.encoding}" )
+            enc = "--charset utf-8"
+            enc = ""
+            cmd = "java"
+            params = "-jar \"#{File.join(Folders[:assets], "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.rb CHANGED Viewed

@@ -13,53 +13,21 @@ module Scms
     include YAML
-    def Scms.build(pub, config, mode)
-        @pub = $website
-        @cleanpub = false
-        if pub != nil
-            @pub = pub
-            @cleanpub = true
-        end
-        @configdir = config
+    def Scms.build(website, pub, config, mode)
+        @website = website
         @mode = mode
         #ScmsUtils.log("Mode: #{mode}")
-        @source = File.join($website)
-        # Support for legacy publick folders
-        if (Dir.exists? File.join($website, "public"))
-            @source =  File.join($website, "public")
-            @pub = File.join($website, "_site") if pub == nil
-        end
-        ScmsUtils.log("Source #{@source}")
-        Scms.sassall(@source)
+        ScmsUtils.log("Website #{@website}")
+        Scms.sassall(File.join(@website))
-        yamlpath=File.join(@configdir, "_config.yml")
-        ScmsUtils.log("Loading Config: #{ScmsUtils.uriEncode("file:///#{yamlpath}")}")
-        $settings = Scms.getsettings(yamlpath)
-        if $settings
-            if $settings["options"] != nil
-                # Don't overwrite environment settings
-                if ENV["SCMS_PUBLISH_FOLDER"] == nil && $settings["options"]["build_dir"] != nil
-                    ScmsUtils.log("_Getting pub dir from _config.yml_")
-                    @pub = $settings["options"]["build_dir"]
-                end
-                if $settings["options"]["clean_build_dir"] == true
-                    ScmsUtils.log("Cleaning build dir")
-                    @cleanpub = true
-                end
-            end
-            if @cleanpub
-                Scms.cleanpubdir(@pub)
-                @cleanpub = false
-            end
+        yamlpath=File.join(config, "_config.yml")
+        @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
@@ -67,76 +35,59 @@ module Scms
                         ScmsUtils.errLog( e )
                     end
                 else
-                    ScmsUtils.log("_Bootstrap does not exist #{bootstrap}_")
+                    ScmsUtils.log("Bootstrap does not exist #{bootstrap}")
                 end
             end
-            #Bundle resources
-            scripts = Scms.bundle($settings["scripts"], ".js")
-            stylesheets = Scms.bundle($settings["stylesheets"], ".css")
-            bundles = Scms.bundle($settings["bundles"])
-            #Generate pages
-            Scms.parsepages(scripts, stylesheets, bundles)
+            bundles = Scms.bundle(@settings["bundles"])
+            Scms.parsepages(bundles)
         else
             ScmsUtils.errLog("Config is empty")
         end
-        if @pub != $website
-            ScmsUtils.log("Merging 'public' folder")
-            Scms.cleanpubdir(@pub) if @cleanpub
-            FileUtils.mkdir @pub unless Dir.exists? @pub
-            Dir.chdir(@source) do
-                #files = Dir.glob('*')
-                #FileUtils.cp_r files, @pub
-                Dir.glob("**/*").reject{|f| f['.svn']}.each do |oldfile|
-                  newfile = File.join(@pub, oldfile.sub(@source, ''))
-                  #puts newfile
-                  File.file?(oldfile) ? FileUtils.copy(oldfile, newfile) : FileUtils.mkdir(newfile) unless File.exist? newfile
-                end
-            end
-        end
-        ScmsUtils.log(ScmsUtils.uriEncode("file:///#{@pub}"))
-        return @pub
+        ScmsUtils.log("Built website:")
+        ScmsUtils.log(ScmsUtils.uriEncode("file:///#{@website}"))
     end
-    def Scms.parsepages(scripts, stylesheets, bundles)
+    def Scms.parsepages(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 |page|
-                if page != nil
-                    page.each do |pageoptions|
+            @settings["pages"].each do |pagedata|
+                if pagedata != nil
+                    pagedata.each do |pageoptions|
                         pagename =  pageoptions[0]
                         pageconfig = pageoptions[1]
                         pageurl = pageconfig["generate"]
-                        navigation.push({:name => pagename, :url => pageurl}) unless pageconfig["navigation"] == false
+                        pageurl = pageconfig["url"] unless pageconfig["url"] == nil
+                        navtext = pageconfig["navigation"]
+                        navmeta = pageconfig["navigation_meta"]
+                        navigation.push({"text" => navtext, "url" => pageurl, "pagename" => pagename, "meta" => navmeta}) unless navtext == nil
                     end
                 end
             end
             ScmsUtils.log("Compiling Pages:")
-            $settings["pages"].each do |page|
-                if page != nil
-                    page.each do |pageoptions|
+            @settings["pages"].each do |pagedata|
+                if pagedata != nil
+                    pagedata.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
+                        title = pagename
+                        title = pageconfig["title"] unless pageconfig["title"] == nil
+                        description = pageconfig["description"]
+                        keywords = pageconfig["keywords"]
+                        skin = @template
+                        skin = pageconfig["template"] unless pageconfig["template"] == nil
                         resource = Hash.new
                         if pageconfig["resource"] != nil
-                            resourcepath = File.join($website, pageconfig["resource"])
+                            resourcepath = File.join(@website, pageconfig["resource"])
                             if File.exists?(resourcepath)
                                 #ScmsUtils.log( "_Resource found: #{pageconfig["resource"]}_" )
                                 resource = YAML.load_file(resourcepath)
@@ -145,15 +96,15 @@ module Scms
                             end
                         end
-                        hasHandler = "no"
+                        hasHandler = false
                         if pageconfig["handler"] != nil
-                            handlerpath = File.join($website, pageconfig["handler"])
+                            handlerpath = File.join(@website, pageconfig["handler"])
                             if File.exists?(handlerpath)
                                 #ScmsUtils.log( "Handler found: #{pageconfig["handler"]}" )
                                 require handlerpath
                                 funDefined = defined? Handler.render
                                 if funDefined != nil
-                                    hasHandler = "yes"
+                                    hasHandler = true
                                 else
                                     ScmsUtils.errLog( "Handler doesnt have a render method" )
                                 end
@@ -163,79 +114,93 @@ module Scms
                         end
                         views = Hash.new
-                        pageconfig["views"].each do |view|
-                            views[view[0]] = ""
-                            viewpath = File.join($website, view[1])
-                            if File.exists?(viewpath)
-                                htmlsnipet = File.read(viewpath)
-                                if !htmlsnipet.empty?
-                                    model = Hash.new
-                                    model = { :page => page, :sitedir => $website, :resource => resource }
-                                    if hasHandler == "yes"
-                                        ScmsUtils.log("Rendering with handler")
-                                        viewSnippet = Handler.render(viewpath)
-                                    else
-                                        snnipetCode = File.read(viewpath)
-                                        case File.extname(view[1])
-                                        when ".md"
-                                            begin
-                                                doc = Maruku.new(snnipetCode)
-                                                viewSnippet = doc.to_html
-                                            rescue Exception => e
-                                                viewSnippet = snnipetCode
-                                                puts e.message
-                                                puts e.backtrace.inspect
+                        if pageconfig["views"] != nil
+                            pageconfig["views"].each do |view|
+                                views[view[0]] = ""
+                                viewpath = File.join(@website, view[1])
+                                if File.exists?(viewpath)
+                                    htmlsnipet = File.read(viewpath)
+                                    if !htmlsnipet.empty?
+                                        viewmodel = Hash.new
+                                        viewmodel = {
+                                            :page => pagedata,
+                                            :sitedir => @website,
+                                            :resource => resource
+                                        }
+                                        if hasHandler
+                                            ScmsUtils.log("Rendering with handler")
+                                            viewSnippet = Handler.render(viewpath)
+                                        else
+                                            snnipetCode = File.read(viewpath)
+                                            case File.extname(view[1])
+                                            when ".md"
+                                                begin
+                                                    doc = Maruku.new(snnipetCode)
+                                                    viewSnippet = doc.to_html
+                                                rescue Exception => e
+                                                    viewSnippet = snnipetCode
+                                                    puts e.message
+                                                    puts e.backtrace.inspect
+                                                end
+                                            else
+                                              viewSnippet = snnipetCode
                                             end
+                                        end
+                                        if @mode == "cms"
+                                            views[view[0]] = "<div class='cms' data-view='#{view[1]}' data-page='#{pagedata}'>#{Scms.parsetemplate(viewSnippet, viewmodel)}</div>"
                                         else
-                                          viewSnippet = snnipetCode
+                                            views[view[0]] = Scms.parsetemplate(viewSnippet, viewmodel)
                                         end
-                                    end
-                                    if @mode == "cms"
-                                        views[view[0]] = "<div class='cms' data-view='#{view[1]}' data-page='#{page}'>#{Scms.parsetemplate(viewSnippet, model)}</div>"
                                     else
-                                        views[view[0]] = Scms.parsetemplate(viewSnippet, model)
+                                        ScmsUtils.writelog("Empty file: #{viewpath}")
                                     end
                                 else
-                                    ScmsUtils.writelog(@pub, "Empty file: #{viewpath}")
+                                    ScmsUtils.errLog("View not found: #{view[0]} - #{view[1]} [#{viewpath}]")
+                                    ScmsUtils.writelog("View not found: #{view[0]} - #{view[1]} [#{viewpath}]")
                                 end
-                            else
-                                ScmsUtils.errLog("View not found: #{view[0]} - #{view[1]} [#{viewpath}]")
-                                ScmsUtils.writelog(@pub, "View not found: #{view[0]} - #{view[1]} [#{viewpath}]")
+                                #ScmsUtils.log( "view = #{view[0]} - #{view[1]}" )
                             end
-                            #ScmsUtils.log( "view = #{view[0]} - #{view[1]}" )
                         end
                         monkeyhook = "";
-                        if @mode == "cms"
-                            monkeyhook = "<script src='scripts/air-monkey-hook.js'></script>"
-                        end
+                        monkeyhook = "<script src='scripts/air-monkey-hook.js'></script>" if @mode == "cms"
-                        hash = {
-                            :page => pageurl,
-                            :pagename => pagename,
-                            :pageurl => pageurl,
+                        pagemodel = Hash.new
+                        pagemodel = {
+                            :name => pagename,
+                            :title => title,
+                            :description => description,
+                            :keywords => keywords,
+                            :url => pageurl,
                             :views => views,
                             :resource => resource,
                             :config => pageconfig,
-                            :scripts => scripts,
-                            :stylesheets => stylesheets,
                             :bundles => bundles,
-                            :sitedir => $website,
-                            :monkeyhook => monkeyhook,
-                            :navigation => navigation
+                            :navigation => navigation,
+                            :data => pagedata,
+                            :rootdir => @website,
+                            :monkeyhook => monkeyhook
                         }
-                        erb = File.join($website, skin)
-                        out = File.join(@pub, pageconfig["generate"])
+                        erb = File.join(@website, skin)
+                        out = File.join(@website, File.join(pageconfig["generate"].sub('~/',''))) unless pageconfig["generate"] == nil
-                        if File.exists?(erb)
+                        ScmsUtils.successLog("#{pageurl}")
+                        ScmsUtils.errLog("Template doesn't exist: #{erb}") unless File.exists?(erb)
+                        if File.exists?(erb) && out != nil
                             pubsubdir = File.dirname(out)
                             Dir.mkdir(pubsubdir, 755) unless File::directory?(pubsubdir)
-                            html = Scms.parsetemplate(File.read(erb), hash)
+                            html = Scms.parsetemplate(File.read(erb), pagemodel)
+                            html = html.gsub('~/', ScmsUtils.uriEncode("file:///#{@website}/")) if @mode == "cms"
+                            websiteroot = ''
+                            websiteroot = @settings["url"] unless @settings["url"] == nil
+                            html = html.gsub('~/', websiteroot)
                             File.open(out, 'w') {|f| f.write(html) }
-                        else
-                            ScmsUtils.errLog("Template doesn't exist: #{erb}")
                         end
                     end
                 end
@@ -244,30 +209,42 @@ module Scms
         end
     end
-    def Scms.bundle(bundleConfig, defaultExt=".bundle")
-        scripts = Hash.new
+    def Scms.parsetemplate(template, hash)
+        #lagasy fix
+        template = template.gsub('data.','page.')
+        page = OpenStruct.new(hash)
+        result = ""
+        begin
+            result = ERB.new(template).result(page.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( e.message )
+        end
+        return result
+    end
+    def Scms.bundle(bundleConfig)
+        bundles = Hash.new
         if bundleConfig != nil
             ScmsUtils.log("Bundeling:")
             bundleConfig.each do |bundle|
                 #ScmsUtils.log( "bundle (#{bundle.class}) = #{bundle}" )
                 bundle.each do |option|
                     name = option[0]
-                    if option[1]["version"] != nil
-                        bundleVersion = option[1]["version"]
-                    else
-                        bundleVersion = 1
-                    end
-                    bundleName = File.join("scripts", "#{name}-v#{bundleVersion}.#{defaultExt}") #Legasy name filename from root and version
-                    bundleName = File.join(option[1]["generate"]) if option[1]["generate"] != nil #just use the generate
-                    scripts[name] = bundleName
+                    bundleName = File.join(option[1]["generate"])
+                    bundles[name] = bundleName
                     ScmsUtils.successLog("#{bundleName}")
                     content = ""
                     assetList = ""
-                    bundle = option[1]["bundle"]
-                    bundle.each do |asset|
+                    files = option[1]["files"]
+                    files.each do |asset|
                         assetList += "\t#{asset}\n"
-                        assetname = File.join(@source, asset)
+                        assetname = File.join(@website, asset)
                         if File::exists?(assetname)
                             content = content + "\n" + File.read(assetname)
                         else
@@ -286,55 +263,7 @@ module Scms
                 end
             end
         end
-        return scripts
-    end
-    def Scms.parsetemplate(template, hash)
-        data = OpenStruct.new(hash)
-        result = ""
-        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( e.message )
-        end
-        return result
-    end
-    def Scms.getsettings(yamlpath)
-        config = nil
-        if File.exist?(yamlpath)
-            tree = File.read(yamlpath)
-            begin
-                myconfig = ERB.new(tree).result()
-                #puts "Conf = #{myconfig}"
-                config = YAML.load(myconfig)
-                #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")
-                ScmsUtils.log( "http://yaml-online-parser.appspot.com/")
-                ScmsUtils.errLog( e.message )
-                ScmsUtils.errLog( e.backtrace.inspect )
-            end
-        else
-            ScmsUtils.errLog("Config file does not exist: #{yamlpath}")
-        end
-        return config
-    end
-    def Scms.cleanpubdir(pub)
-        ScmsUtils.log("_Cleaning pub folder #{pub}_")
-        FileUtils.rm_rf pub
-        #FileUtils.remove_dir(pub, force = true)
-        sleep 0.5 # seconds
-        FileUtils.mkdir_p(pub) unless File.exist? pub
-        FileUtils.chmod 0755, pub
+        return bundles
     end
     def Scms.sassall(crunchDir)
@@ -380,17 +309,32 @@ module Scms
         end
     end
-    def Scms.deploy(pub, config)
+    def Scms.deploy(website, config)
         yamlpath=File.join(config, "_s3config.yml")
         if File.exists?(yamlpath)
-            S3Deploy.sync(pub, config)
+            S3Deploy.sync(website, config)
         else
             raise "The following file doesn't exist #{yamlpath}"
         end
     end
-    def Scms.Upgrade()
-        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")
+    def Scms.copywebsite(website, pub)
+        if pub != nil
+            FileUtils.mkdir pub unless Dir.exists? pub
+            source = File.join(website)
+            Dir.chdir(source) do
+                Dir.glob("**/*").reject{|f| f['.svn']}.each do |oldfile|
+                  newfile = File.join(pub, oldfile.sub(source, ''))
+                  #puts newfile
+                  File.file?(oldfile) ? FileUtils.copy(oldfile, newfile) : FileUtils.mkdir(newfile) unless File.exist? newfile
+                end
+            end
+            ScmsUtils.log("Output to: #{ScmsUtils.uriEncode("file:///#{pub}")}")
+        end
+    end
+    def Scms.upgrade(website)
+        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
 end

data/scms.gemspec CHANGED Viewed

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.executables << 'scms'
   spec.add_dependency "cprobert-s3sync"
-  spec.add_dependency "nokogiri"
   spec.add_dependency "maruku"
   spec.add_dependency "sass"
   spec.add_dependency "packr"

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 1.9.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Courtenay Probert
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cprobert-s3sync
@@ -24,20 +24,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
@@ -122,9 +108,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- assets/air-monkey-hook.js
 - assets/blank-template/_config.yml
 - assets/blank-template/_s3config.template.yml
-- assets/blank-template/_templates/menu.xml
 - assets/blank-template/_templates/skin.erb.html
 - assets/blank-template/_views/about-intro.html
 - assets/blank-template/_views/about-main.html
@@ -133,7 +119,6 @@ files:
 - assets/blank-template/images/glyphicons-halflings-white.png
 - assets/blank-template/images/glyphicons-halflings.png
 - assets/blank-template/robots.txt
-- assets/blank-template/scripts/air-monkey-hook.js
 - assets/blank-template/scripts/bootstrap.js
 - assets/blank-template/scripts/jquery-1.8.2.min.js
 - assets/blank-template/scripts/script.js
@@ -141,12 +126,14 @@ files:
 - assets/blank-template/stylesheets/bootstrap.css
 - assets/blank-template/stylesheets/style.css
 - assets/mime.types
+- assets/yuicompressor/readme
 - bin/scms
 - build commands.txt
 - lib/scms.rb
 - lib/scms/s3deploy.rb
 - lib/scms/scms-utils.rb
 - lib/scms/version.rb
+- lib/scms/yui.rb
 - scms.gemspec
 homepage: http://cprobert.github.io/Static-CMS/
 licenses:

data/assets/blank-template/_templates/menu.xml DELETED Viewed

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<menu>
-	<page href="index.html">Home</page>
-	<page href="about.html">About</page>
-</menu>