scms 4.4.4 → 4.4.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGY2OWVjNzNiZGJlNWUzZWI4NTA4ZjI3NGVkZDU2YzQ2YjE4ZDI1ZQ==
+    Nzk5MDBjMmFlZGNjNDVlOTA3OTIxMjgwMzY3YzQ2NDRiMWRjZjAxZA==
   data.tar.gz: !binary |-
-    ZjNlYzliNzgwMDVjOWU4MjE5Y2Q5Y2UyOWUwMjljNjI4MGNhMzc3Yw==
+    Mzc0MTgwOTk1NTRlZjAyNzk5NTg0ZDEzYWI1ODJiM2M2Y2IwMThhNA==
 SHA512:
   metadata.gz: !binary |-
-    MmVmOTkxMDk5NGZjNTg0M2JlZjRjY2M4MzhhYmU4ZjQyMDk3OTVlNGFlNmNk
-    ZTBiYjE3ZDIzYjI3YmFiYjY2MzcxZDkwNDRjMDNmZDBmZTIxYjczNjFlYjBk
-    NTNkNDNkNDE5OGFlYWFhNGRjMTUwYmY4OWMxY2NkYmM1NmRhN2U=
+    MjM1OTQ3MTY0Zjk4YWRiZWQ5ZTcyZGIwZGEzODk3NjM5YWJkMDNmYTRkMzM3
+    Y2I4ODc1MmJmMDFhNGE5NzUzNjEzYjZjMmNmOTc3NWI0ZWU4YjI1NDRlNGEz
+    MTVkNDdiOTA3NDI0MzQwNDIwYzEyNTE0OGJmNjgzYmM3MTk4N2M=
   data.tar.gz: !binary |-
-    MGZmYWRkMjM5NjdmMmE1MDhmMjAzMDI1ZTNjY2FjNzE3MDM2Mjk0MGRhNmY5
-    YzI5ODVlZDUxNDllODc3YzFlNzgwM2NkMTlkOGIxNzRiYTg0MjFmMjlhODc0
-    OGYxMTk4MTBmZmQ0NDllZjRiOGFlMGVhZTcwMTA2YzZiNWFiYWM=
+    YmQzNTdjNjY4YjExYzM2YmZiNGZkYjJlOWQzN2Q3NmM1YzA5Yjg5YjFmMDYz
+    ZDI4MjE3ZTIwNzNjMmY0MTdjYjE0MjMxN2EwNDljMTVlZWE3MzdlMmZkMTFm
+    MzlkMDYwYTU3ZDI1NjA5YWQ3NWFmYjQ1YjEzZDU5ODcwMzY5NTI=

data/.gitignore

@@ -1,16 +1,11 @@
 *.gem
 *.sublime-project
 *.sublime-workspace
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
+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
+assets/blank-template/getting-started.html
 
 
 ############
@@ -26,8 +21,3 @@ 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
-assets/blank-template/getting-started.html

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    scms (4.2.6)
+    scms (4.4.4)
       cprobert-s3sync
-      filewatcher
-      launchy
-      listen
-      maruku
-      nokogiri
-      packr
-      sass
-      webrick
+      filewatcher (~> 0.3)
+      launchy (~> 2.4)
+      listen (~> 2.5)
+      maruku (~> 0.7)
+      nokogiri (~> 1.6)
+      packr (~> 3.2)
+      sass (~> 3.2)
+      webrick (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
@@ -18,18 +18,23 @@ GEM
     addressable (2.3.5)
     celluloid (0.15.2)
       timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
     cprobert-s3sync (1.4.1)
     ffi (1.9.3-x86-mingw32)
     filewatcher (0.3.2)
       trollop (>= 1.16.2)
     launchy (2.4.2)
       addressable (~> 2.3)
-    listen (2.4.0)
+    listen (2.7.1)
       celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     maruku (0.7.1)
-    mini_portile (0.5.2)
+    mini_portile (0.5.3)
+    nio4r (1.0.0)
     nokogiri (1.6.1-x86-mingw32)
       mini_portile (~> 0.5.0)
     oyster (0.9.5)
@@ -39,7 +44,7 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
       ffi (>= 0.5.0)
-    sass (3.2.13)
+    sass (3.3.4)
     timers (1.1.0)
     trollop (2.0)
     webrick (1.3.1)
@@ -48,5 +53,5 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
-  rake
+  rake (~> 10.1, >= 10.1.1)
   scms!

data/README.md

@@ -1,10 +1,10 @@
 A static website CMS
 ====================
 
-If you need to build a quick html website but don't want to maintain each page independantly Static-CMS could be for you.
+If you need to build a quick html website but don't want to maintain each page independently Static-CMS could be for you.
 StaticCMS is a static website builder that creates html files from an eruby template.  This facilitates the management of the layout/skin/theme from a single file.
 It also has a few nifty features such as JavaScript and CSS bundeling and minimisation
-When your happy with your website StaticCMS will also deploy to AmazonS3 setting approperate caching settings.
+When your happy with your website StaticCMS will also deploy to AmazonS3 setting appropriate caching settings.
 
 Find it useful? Then let me know: https://twitter.com/c_probert
 

data/lib/scms.rb

@@ -196,8 +196,9 @@ module Scms
         #ScmsUtils.log("Generating: #{fileName} with #{pageOptions.template}")
 
         if File.exists?(erb)
-            bundleModel = Scms.getBundleModel(website, settings, options)# Build bundle model
-            navModel = Scms.getNavModel(website, settings, options)# Build navigation model
+            bundleModel = Scms.getBundleModel(website, settings, options) # Build bundle model
+            navModel = Scms.getNavModel(website, settings, options) # Build navigation model
+            metaModel = Scms.getMetaModel(settings)
 
             websiteroot = '/'
             websiteroot = settings["rooturl"] if settings["rooturl"] != nil
@@ -221,6 +222,7 @@ module Scms
                 :resource => pageOptions.resource, 
                 :bundles => bundleModel,
                 :navigation => navModel,
+                :meta => metaModel,
                 :views => views, 
                 :rootdir => website, 
                 :monkeyhook => monkeyhook,
@@ -301,6 +303,15 @@ module Scms
             end
         end
         return navModel
+    end
+
+    private
+    def Scms.getMetaModel(settings)
+        metaModel = Hash.new
+        if settings["meta"] != nil
+            metaModel = settings["meta"]
+        end
+        return metaModel
     end  
 
     private
@@ -485,7 +496,7 @@ module Scms
         if page.views != nil
             htmlSnippet = page.views[viewname]
             if htmlSnippet != nil
-                return htmlSnippet
+                return ScmsUtils.makeSafe(htmlSnippet)
             else
                 begin
                     viewPath = File.join(page.rootdir, "_pages", page.name, viewname +"."+ ext)

data/lib/scms/scms-bundler.rb

@@ -32,8 +32,10 @@ module ScmsBundler
 						fileContents = File.read(b)
 
 						if File.extname(b) == ".js"
-	                        puts "Minifing: #{b}"
-	                        fileContents = Packr.pack(fileContents) unless /(-min)|(\.min)|(\-pack)|(\.pack)/.match(b)
+							if f.include? ".fat."
+	                        	puts "Minifing: #{b}"
+	                        	fileContents = Packr.pack(fileContents) unless /(-min)|(\.min)|(\-pack)|(\.pack)/.match(b)
+	                    	end
 						end
 
 						content += fileContents + "\n"

data/lib/scms/scms-utils.rb

@@ -98,6 +98,10 @@ module ScmsUtils
             }
         end
 	end
+
+    def ScmsUtils.makeSafe(txt)
+        return txt.gsub(/\u2018/, "'")
+    end
     
 	def ScmsUtils.txt_2_html(rawsnippet)
 		if rawsnippet != nil

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "4.4.4"
+  VERSION = "4.4.5"
 end

data/scms.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'maruku', '~> 0.7'
   spec.add_dependency 'packr', '~> 3.2'
-  spec.add_dependency 'listen', '~> 2.0'
+  spec.add_dependency 'listen', '~> 2.5'
   spec.add_dependency 'filewatcher', '~> 0.3'
   spec.add_dependency 'webrick', '~> 1.3'
   spec.add_dependency 'launchy', '~> 2.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 4.4.4
+  version: 4.4.5
 platform: ruby
 authors:
 - Courtenay Probert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cprobert-s3sync
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: filewatcher
   requirement: !ruby/object:Gem::Requirement