scms 4.2.0 → 4.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDVjYTM4YjlhZTdlZTM3MGE0YzlkNGRkYjE3MzgxYzc1OWQ1ZTZlMA==
+    NGJkMzc0YTk1MDZjNzUyYmFhM2MwMGM1MGE5NWM4ZTVlYTIwMDZjOQ==
   data.tar.gz: !binary |-
-    ZjQ4MzhhOTAzNDFiMDhlZjZkMTkxNTI1OWExMGM2YjQ0ZWM4NjMyMA==
+    NWNkMTA5YWI3ZmYyMDJiY2UwOTI4NDllYjliNjUwYTM4OTZkN2M4MA==
 SHA512:
   metadata.gz: !binary |-
-    ZDc3NDI0Y2RkYjRkZDNhMjZlMjUxN2Q3Y2MxYjFjYjE2YWZmN2RiODE4YTlh
-    MDE4Mjk4N2IyNTYwMWMwOGZlOGIyZjQ2OGFlNzNhZTU5MDM1NzFhODY5NWRj
-    NzIwYjE3ZDc3MWE1MzZlMGVmM2E0MjI2NGU2NDU5OWE5ZDRmZmQ=
+    ZDVmODk5Yjg0MzkxYjQ4N2RhZjYwYmY4ZGNhYjViMTg0YzM3ZTc5NTlkMDA0
+    ZWVkOTQ4MDgyYWEyYjcyYjNlYzM4Y2JkNDVhYTc2MDA5NDJlMjg3N2Y0YWE0
+    ZjBmMDJmM2FhODI4OTE4ODI0MWFiN2RkYjliZGJhYmRhOWU5NGI=
   data.tar.gz: !binary |-
-    NThjZDY1MGYyZDNjNDc3NGE2OWFmMzEzN2NkNGU2MjU3Njg3M2VkOGI2ZjQ0
-    N2E4NDMyMTA5ZTNkMTYzMjc5NTNiMjkwMjM3ZmM1MDc4ZGUzNjkyYWM3MTFj
-    YmY4Mzc2ZTA3YjM1NTVlYTdlM2NhOWU4MGY4ZWQ5NDAzMzg5Mzk=
+    OWJiNjNmYjM1NTdlNTY5NjNjMzk5ZjJmZDgzZGNiYzJhM2YwM2ZjYzMxZGRm
+    ZDYwMWFlNGZjMGJmMjA1OGNlNDEzZDBlNmZiZDI3ODdmNjgzMjE2MzYxNGI0
+    YTk1MGQ0NTYzM2FmN2NhMzgxOTQzMDZkNTZiNjQxOTdhNTQ1YTQ=

data/lib/scms.rb

@@ -311,7 +311,10 @@ module Scms
         websiteroot = ScmsUtils.uriEncode("file:///#{website}/") if options[:mode] == "cms"
         
         Dir.glob('**/*.bundle').each do|bundle|
-            bundleModel[bundle] = ScmsBundler.getGeneratedBundleName(bundle)
+            getGeneratedBundleName = ScmsBundler.getGeneratedBundleName(bundle)
+            stub = ScmsBundler.toStub(bundle)
+            bundleModel[bundle] = getGeneratedBundleName
+            bundleModel[stub] = getGeneratedBundleName #Access bundle model without bundle extention
         end 
 
         bundleConfig = settings["bundles"]

data/lib/scms/scms-bundler.rb

@@ -1,5 +1,6 @@
 module ScmsBundler
     require 'fileutils'
+    require 'packr'
     require 'scms/scms-bundler.rb'
 
     def ScmsBundler.run()
@@ -11,7 +12,6 @@ module ScmsBundler
     def ScmsBundler.bundle(bundle)
     	puts "Parsing bundle: #{bundle}"
 
-
     	content = ""
 		if File::exists?(bundle)
 			wd = File.dirname(bundle)
@@ -23,12 +23,20 @@ module ScmsBundler
 
 				next  if bundleFile == nil
 				next  if bundleFile == ""
+				next if line.match(/^generate:/)
 
 				if !line.match(/^#/)
 					b = File.join(wd, bundleFile)
 					puts "Including: #{line}"
 					if File::exists?(b)
-						content +=  File.read(b) + "\n"
+						fileContents = File.read(b)
+
+						if File.extname(b) == ".js"
+	                        puts "Minifing: #{b}"
+	                        fileContents = Packr.pack(fileContents) unless /(-min)|(\.min)|(\-pack)|(\.pack)/.match(b)
+						end
+
+						content += fileContents + "\n"
 					else
 						puts "Can not read: #{b}"
 					end
@@ -91,8 +99,12 @@ module ScmsBundler
 		return files
     end
 
+	def ScmsBundler.toStub(bundle)
+		return bundle.gsub(".bundle", "")
+	end
+
     def ScmsBundler.getGeneratedBundleName(bundle)
-		name = bundle.gsub(".bundle", "")
+		name = ScmsBundler.toStub(bundle)
 
 		if File::exists?(bundle)
 			wd = File.dirname(bundle)

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "4.2.0"
+  VERSION = "4.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.2
 platform: ruby
 authors:
 - Courtenay Probert