scms 3.0.2 → 3.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmEyNWY2NzYyNjE4NzNiODllNDFlMjFhZTIyMTRhM2YwNWUzNWQ2MQ==
+    MDgzOGM3ZWM3MTI5ZDVhMTE0NTk3YmNhMzI1ZWJkM2FiYzZkZmZmYw==
   data.tar.gz: !binary |-
-    NjYyNDhmNTEwOTQyZThmNWY1NDRjYTI3YjE4NDM1MjgyODRlY2M4Mg==
+    MGQ0OTAzZjhiZjI5ZWNkNDY2NjZmM2VhZDcwZTg2MWI4Yzk2YzAyOA==
 SHA512:
   metadata.gz: !binary |-
-    MTEyYjNjMzk3NWZkYTk4NTJhZTc2Y2QxODQ3YTQyNTU5NjQ4MGFkYWIyNmE2
-    ZTE4OWE0MmU0YWU3NzExN2YyYzBmYmNiMDhkMDUzYWQ4YTIwNGE3MjU5N2U0
-    NTFjNmViZjMyYTgwZjhmMDJlYmJjOTBlNmM3ZmI1ZGQ4M2M5NjY=
+    MWYxZDA3MWZkODk4OGVhZWNlYzYyZjFmZmMxZDViZDkxNTNjM2FiODI3Yzcz
+    MGY1MDU1MTM2MzA3ZjI1M2E2MjIzNDdiNzRhYWZlMTQ3MDFiZjI0NmVmNWZm
+    NWQzYmRjZTUyOWZmMGQ0Y2NhNzRiNTRlOWI1NGY4ZGI2OWVmY2E=
   data.tar.gz: !binary |-
-    ZjM5NWIyNDg1NGZlYTQ4NzVhNWJkOTM2NzEyZDQ4ZTQ5NjhlMDc0ZWFhM2I3
-    NjY1MmM2NGJlYTc1OTk4MTEzYWVlYzFkYTAyMGU0MWUxOTQzN2ViZGYyMzRh
-    YzY5ZjM3YTBhNDIwMDk0NDllZDQwMDBlYjY0NWM5MGIzMGU0NDY=
+    NWFhODAwMTYwNGIwNGVlMDNmNjY2YzEwZGFlYzNlMmY0MGRhYWI5MTg4ZmFj
+    YjRjNzE0M2VlZGQ4ZTg1M2JlMzVhOTVhMGEyNTRmMTUwZDZhY2E3MmQ2ODg2
+    ZDg1MzIxMGFhM2EzMGE0ZjFiODk4Yjg4NWU5NGVlNmVhN2RkMGI=

data/README.md

@@ -19,3 +19,6 @@ Further Reading
  * Homepage: http://cprobert.github.io/Static-CMS
  * WYSIWYG editor: http://ipassexam.github.io/Air-Monkey/
  * ERB template language: http://www.stuartellis.eu/articles/erb/
+
+ 
+ [![Gem Version](https://badge.fury.io/rb/scms.png)](http://badge.fury.io/rb/scms)

data/assets/blank-template/_config.yml

@@ -9,14 +9,14 @@ pages:
     description: Meta description
     keywords: "CMS, S3, Ruby"
     views:
-        intro: _views/home/intro.html
-        main: _views/home/main.html
+        intro: _views/home/intro.md
+        main: "_views/reuse.erb?h1=Heading 1&h2=Heading 2&h3=Heading 3"
 - about: 
     generate: about.html
     navigation: About
     views:
         intro: _views/about/intro.html
-        main: _views/about/main.html
+        main: "_views/reuse.erb?h1=Reuse 1&h2=Reuse 2&h3=Reuse 3"
 - contact: #Pageless for nav only
     navigation: contact
     navigation_meta: contactform
@@ -25,12 +25,12 @@ pages:
 # Define your bundles here (versioning is recomended if your caching assets)
 bundles:
 - script:
-    generate: js/bootstrap.min-v2.1.1.js
+    generate: js/script.bundle.min-v2.1.1.js
     files:
      - _source/scripts/bootstrap.js
      - _source/scripts/script.js
 - style:
-    generate: css/style-1.0.css
+    generate: css/style.bundle-1.0.css
     files:
       - _source/stylesheets/bootstrap.css
       - _source/stylesheets/bootstrap-responsive.css

data/assets/blank-template/_views/about/intro.html

@@ -1 +1,3 @@
+<h1>About Page</h1>
+
 <a href="index.html">goto home page</a></p>

data/assets/blank-template/_views/home/intro.md

@@ -0,0 +1,6 @@
+Hello, world!
+=============
+
+This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.
+
+<a class="btn btn-primary btn-large">Learn more</a>

data/assets/blank-template/_views/{home/main.html → reuse.erb}

@@ -1,15 +1,15 @@
 <div class="span4">
-  <h2>Heading</h2>
+  <h2><%= page.view[:model]["h1"] %></h2>
   <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
   <p><a class="btn" href="#">View details &raquo;</a></p>
 </div>
 <div class="span4">
-  <h2>Heading</h2>
+  <h2><%= page.view[:model]["h2"] %></h2>
   <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
   <p><a class="btn" href="#">View details &raquo;</a></p>
 </div>
 <div class="span4">
-  <h2>Heading</h2>
+  <h2><%= page.view[:model]["h3"] %></h2>
   <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
   <p><a class="btn" href="#">View details &raquo;</a></p>
 </div>

data/lib/scms.rb

@@ -130,7 +130,15 @@ module Scms
                         if pageconfig["views"] != nil
                             pageconfig["views"].each do |view| 
                                 views[view[0]] = ""
-                                viewpath = File.join(@website, view[1])
+                                viewparts = view[1].split("?") # This allows views to have a query string in the config
+                                viewname = viewparts[0]
+                                viewqs = viewparts[1]
+
+                                puts "viewname: #{viewname}, viewqs: #{viewqs}"
+
+                                viewpath = File.join(@website, viewname)
+                                
+
                                 if File.exists?(viewpath)
                                     begin
                                         htmlsnipet = File.read(viewpath)
@@ -143,6 +151,9 @@ module Scms
                                         ScmsUtils.log("Empty view: #{view[1]}")
                                     end
 
+                                    model = Hash.new
+                                    model = Hash[viewqs.split('&').map{ |q| q.split('=') }] if viewqs != nil
+
                                     viewmodel = Hash.new
                                     viewmodel = { 
                                         :name => pagename,
@@ -150,7 +161,11 @@ module Scms
                                         :url => pageurl,
                                         :data => pagedata,
                                         :rootdir => @website, 
-                                        :resource => resource 
+                                        :resource => resource,
+                                        :view => {
+                                            :name => viewname,
+                                            :model => model
+                                        }
                                     }
 
                                     if hasHandler
@@ -199,7 +214,9 @@ module Scms
                         monkeyhook = "<script src='scripts/air-monkey-hook.js'></script>" if @mode == "cms"
 
                         livereload = ""
-                        livereload = "<script>document.write('<script src=\"http://' + (location.host || 'localhost').split(':')[0] + ':35729/livereload.js?snipver=1\"></' + 'script>')</script>" if @mode != "deploy"
+                        if @mode != "deploy"
+                            livereload = "<script>document.write('<script src=\"http://' + (location.host || 'localhost').split(':')[0] + ':35729/livereload.js?snipver=1\"></' + 'script>')</script>" if @mode != "cms"
+                        end
                         
                         pagemodel = Hash.new
                         pagemodel = { 

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Courtenay Probert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cprobert-s3sync
@@ -162,8 +162,8 @@ files:
 - assets/blank-template/_source/stylesheets/style.css
 - assets/blank-template/_views/about/intro.html
 - assets/blank-template/_views/about/main.html
-- assets/blank-template/_views/home/intro.html
-- assets/blank-template/_views/home/main.html
+- assets/blank-template/_views/home/intro.md
+- assets/blank-template/_views/reuse.erb
 - assets/blank-template/images/glyphicons-halflings-white.png
 - assets/blank-template/images/glyphicons-halflings.png
 - assets/blank-template/js/jquery-1.8.2.min.js

data/assets/blank-template/_views/home/intro.html

@@ -1,3 +0,0 @@
-<h1>Hello, world!</h1>
-<p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
-<p><a class="btn btn-primary btn-large">Learn more &raquo;</a></p>