scms 1.9.4 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d13e89ab65773ba3b85c1bbf9fdd3336faf0535
-  data.tar.gz: 9cd9682ef55ce720cd9d3d3d79330d26a475e665
+  metadata.gz: 8afbf980cb75d561c9a31da6363773ed87695218
+  data.tar.gz: 14b0ec6f0fe85009bcc5758ac7ddd6d761bb5f81
 SHA512:
-  metadata.gz: cde4753adbc84538ffa0fd7cb1d41e079c16a488adbfec7693813104f11fd1a77f450dc32f87221c10117d12b40f31c7989196da9431ac5e3ec6437d292de4a8
-  data.tar.gz: 213efe391c2e75b4e22b2a100974170ce452b7dae4cb901f7ca29f10861aa628221678e7c930e1f985ddac273ebea0e244c0247561b3fe93c8de6175f5bd8870
+  metadata.gz: eeb4cac2eea8f198918e020d4c5ffeebce645b18299306290603577382d7a598fc0798f33a15b3a8b827bccd07f4995bbc601373749726d667568cc3ebc8d41f
+  data.tar.gz: d366328cd072ca5f08a6434c987b2f17685073d46e3960a138ade8028a145e2abc7502bfa2c78d4201f7dce2338c96daa73e7d77889dda45e97439b6ccaedb3f

data/lib/scms/version.rb

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

data/lib/scms.rb

@@ -72,8 +72,8 @@ module Scms
             end 
             
             #Bundle resources
-            scripts = Scms.bundle($settings["scripts"])
-            stylesheets = Scms.bundle($settings["stylesheets"])
+            scripts = Scms.bundle($settings["scripts"], ".js")
+            stylesheets = Scms.bundle($settings["stylesheets"], ".css")
             bundles = Scms.bundle($settings["bundles"])
             #Generate pages
             Scms.parsepages(scripts, stylesheets, bundles)
@@ -230,7 +230,7 @@ module Scms
         end
     end
 
-    def Scms.bundle(bundleConfig)
+    def Scms.bundle(bundleConfig, defaultExt=".bundle")
         scripts = Hash.new
         if bundleConfig != nil
             ScmsUtils.log("Bundeling:")
@@ -243,7 +243,7 @@ module Scms
                     else
                         bundleVersion = 1
                     end
-                    bundleName = File.join("scripts", "#{name}-v#{bundleVersion}.js") #Legasy name filename from root and version
+                    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
                     ScmsUtils.successLog("#{bundleName}")
@@ -265,7 +265,10 @@ module Scms
                     bundleDir = File.dirname(bundleName)
                     Dir.mkdir(bundleDir, 755) unless File::directory?(bundleDir)
                     File.open(bundleName, 'w') {|f| f.write(content) }
-                    Scms.packr(bundleName) unless /(-min)|(\.min)/.match(bundleName)
+                    if File.extname(bundleName) == ".js"
+                        puts "Minifing: #{bundleName}"
+                        Scms.packr(bundleName) unless /(-min)|(\.min)/.match(bundleName)
+                    end
                 end
             end
         end

metadata

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