maglove 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80be4fcc389c5eb11f5e440cb0df7b8598bed7ae
-  data.tar.gz: f38ee17373a3c0708340ceee7ff7ce2ba64cde41
+  metadata.gz: 08ca49391827d294cadcc43751da092f9589bf6c
+  data.tar.gz: 8453341f83eef48ef91f0fb9167a80fb50ff72fa
 SHA512:
-  metadata.gz: 9db79b23d637c1741e1bd26cdbe56bcb6771190036903d3a748459594452c305f1f00d60fc31f8124c67505207b5df202bbb9fdab76801574b64e25e6499f5b3
-  data.tar.gz: 2c0cf6cc041b8e451dc9c490621f5879723976508b954fa159fcef859cb0698968a09c1f4880c6452089c82c72c2a338416f460e1b178b6eaadc43ac0f72d8ef
+  metadata.gz: b9a1f0373f7954394030aa98b40a139bfc9d276c396c24246b07d2e88be4797f74423c62c3333d69f61573ecb8d75358f6f04fd83c68c2911ba46b9a8541f254
+  data.tar.gz: cc5af7486f4601377d25b3c5d43ef590f00b20abd7d1d17375a6d9e391904dc0e36bab2ff6a3dcfb8b2a48e96677f650c0d19fe89d20d006315396d98a390231

data/Gemfile.lock

@@ -1,11 +1,14 @@
 PATH
   remote: .
   specs:
-    maglove (1.0.9)
+    maglove (1.1.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       bundler (~> 1.10)
+      closure-compiler (~> 1.1)
       coffee-script (~> 2.4)
+      crush (~> 0.3)
+      cssminify (~> 1.0)
       dialers (~> 0.2)
       faye (~> 1.2)
       filewatcher (~> 0.5)
@@ -51,6 +54,7 @@ GEM
       public_suffix (~> 2.0, >= 2.0.2)
     ast (2.3.0)
     builder (3.2.2)
+    closure-compiler (1.1.12)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -58,6 +62,9 @@ GEM
     commonjs (0.2.7)
     concurrent-ruby (1.0.2)
     cookiejar (0.3.3)
+    crush (0.3.3)
+      tilt (~> 1.3)
+    cssminify (1.0.2)
     dialers (0.2.2)
       faraday (~> 0.9)
       faraday-conductivity (~> 0.3)

data/lib/maglove/commands/assets.rb

@@ -7,6 +7,7 @@ module MagLove
       def compile
         invoke(:clean)
         invoke(:images)
+        invoke(:videos)
         invoke(:javascript)
         invoke(:stylesheet)
         invoke(:yaml)
@@ -33,6 +34,15 @@ module MagLove
         end
       end
       
+      desc "videos", "Copy videos"
+      def videos
+        info("▸ Copying Videos")
+        theme_dir.files("videos/**/*.{mp4,webm,ogg}").each do |file|
+          debug("~> Copying #{file}")
+          file.asset(theme: options.theme).write!
+        end
+      end
+      
       desc "imageoptim", "Optimize images"
       option :percent, type: :numeric, required: true, default: 25
       def imageoptim
@@ -73,6 +83,17 @@ module MagLove
         info("▸ Compiling YAML Manifest")
         theme_dir.file("theme.yml").asset.write!
       end
+      
+      desc "compress", "Compress Assets for Distribution"
+      def compress
+        invoke(:javascript)
+        invoke(:stylesheet)
+        
+        info("▸ Compressing JavaScript")
+        theme_dir(root: "dist").file("theme.js").minify!
+        info("▸ Compressing Stylesheet")
+        theme_dir(root: "dist").file("theme.css").minify!
+      end
 
       desc "templates", "Compile HAML Templates"
       def templates

data/lib/maglove/commands/theme.rb

@@ -55,6 +55,7 @@ module MagLove
         # invoke asset compilation
         invoke(Fonts, :compile, [], {})
         invoke(Assets, :compile, [], { theme: options.theme })
+        invoke(Assets, :compress, [], { theme: options.theme })
 
         # update theme
         info("▸ Synchronizing Metadata")
@@ -109,9 +110,10 @@ module MagLove
         hydra.run
 
         # upload css/js
-        info("▸ Synchronizing JavaScript and Stylesheet")
-        theme.upload_stylesheet(theme_dir(root: "dist").file("theme.css").to_s)
+        info("▸ Synchronizing JavaScript")
         theme.upload_javascript(theme_dir(root: "dist").file("theme.js").to_s)
+        info("▸ Synchronizing Stylesheet")
+        theme.upload_stylesheet(theme_dir(root: "dist").file("theme.css").to_s)
 
         # upload templates
         info("▸ Synchronizing Templates")

data/lib/maglove/tilt/coffee_template.rb

@@ -19,7 +19,7 @@ module MagLove
         @output = CoffeeScript.compile(@data, options)
 
         # handle includes
-        @output.gsub(/^include\("([^"]+)"\);$/) do |match|
+        @output.gsub!(/^include\("([^"]+)"\);$/) do |match|
           path = Regexp.last_match[1]
           path = "#{path}.coffee" if File.extname(path).empty?
           include_path = File.absolute_path(path, File.dirname(file))
@@ -36,6 +36,8 @@ module MagLove
             raise "Path not found: #{include_path}"
           end
         end
+        
+        @output
       end
 
       def allows_script?

data/lib/maglove/version.rb

@@ -1,3 +1,3 @@
 module MagLove
-  VERSION = "1.0.9"
+  VERSION = "1.1.0"
 end

data/lib/workspace/workspace_file.rb

@@ -1,3 +1,5 @@
+require 'cssminify'
+require 'closure-compiler'
 require 'workspace/workspace_file/archive'
 require 'workspace/workspace_file/media'
 require 'workspace/workspace_file/net'
@@ -104,5 +106,20 @@ module Workspace
     def size
       File.size(to_s)
     end
+    
+    def minify
+      if extension == "js"
+        set(Closure::Compiler.new.compile(contents))
+      elsif extension == "css"
+        set(CSSminify.compress(contents))
+      end
+      self
+    end
+    
+    def minify!
+      minify.write
+      self
+    end
+    
   end
 end

data/maglove.gemspec

@@ -31,6 +31,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "dialers", "~> 0.2"
   s.add_runtime_dependency "rubyzip", "~> 1.1"
   s.add_runtime_dependency "image_optim", "~> 0.21"
+  s.add_runtime_dependency "crush", "~> 0.3"
+  s.add_runtime_dependency "closure-compiler", "~> 1.1"
+  s.add_runtime_dependency "cssminify", "~> 1.0"
   s.add_runtime_dependency "image_optim_pack", "~> 0.2"
   s.add_runtime_dependency "puma", "~> 3.6"
   s.add_runtime_dependency "filewatcher", "~> 0.5"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maglove
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Tobias Strebitzer
@@ -262,6 +262,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
+- !ruby/object:Gem::Dependency
+  name: crush
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: closure-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: cssminify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: image_optim_pack
   requirement: !ruby/object:Gem::Requirement