maglove 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c38154b26021c721db6d6ad2bf034b0fdd5e2566
-  data.tar.gz: e62f24c697394784ecb63c8aecffb04db8babe5a
+  metadata.gz: b199dba9d5f78647e160d9d42c0078ff2155707c
+  data.tar.gz: 49fb2603772917364ddbfbe53549fe83f526b5a4
 SHA512:
-  metadata.gz: c80c978dfb918e9ebdd22ebad09d4b2048944c136ab05f5ff13d026be906a8742c81165e59739c9c4c076edc7a84579b3132f7758ff59ff0a0e0ef89d3778ef8
-  data.tar.gz: e6e002dcd604820f4b15012422e0727acc8d90983ab86d55ebf242b85c692003360c13b4533c98c8c9c8c150cb0ce52e06e6af3a91e17fb146c7e1f2620402e2
+  metadata.gz: 34ec3c0f3a6b84f10af55953358cabe83e9bd2e4df1bb537e9e206959b701aca1e10b42fa8acf9d5982e061a1d3ec598ea80c8381ef29566e0bc863a4ad18834
+  data.tar.gz: c9a8a25143b091def1d5aceb3ca5eba912db8c2aae205d01fe12268649ea46b494c95cb4ce60f133a52012d7cbd27efa7a497c85bb540291bfb5dac268b273fb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maglove (1.1.3)
+    maglove (1.1.4)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       bundler (~> 1.10)
@@ -52,7 +52,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    ast (2.3.0)
+    ast (2.4.0)
     builder (3.2.3)
     closure-compiler (1.1.13)
     coffee-script (2.4.1)
@@ -76,7 +76,7 @@ GEM
       em-socksify (>= 0.3)
       eventmachine (>= 1.0.3)
       http_parser.rb (>= 0.6.0)
-    em-socksify (0.3.1)
+    em-socksify (0.3.2)
       eventmachine (>= 1.0.0.beta.4)
     erubi (1.7.0)
     ethon (0.11.0)
@@ -84,7 +84,7 @@ GEM
     eventmachine (1.2.5)
     execjs (2.7.0)
     exifr (1.3.3)
-    faraday (0.13.1)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
     faraday-conductivity (0.3.1)
       faraday (~> 0.8)
@@ -112,7 +112,7 @@ GEM
       haml (~> 5.0)
       nokogiri (~> 1.8)
     http_parser.rb (0.6.0)
-    i18n (0.9.1)
+    i18n (0.9.3)
       concurrent-ruby (~> 1.0)
     image_optim (0.26.1)
       exifr (~> 1.2, >= 1.2.2)
@@ -120,7 +120,7 @@ GEM
       image_size (~> 1.5)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    image_optim_pack (0.5.0.20171208)
+    image_optim_pack (0.5.0.20180124)
       fspath (>= 2.1, < 4)
       image_optim (~> 0.19)
     image_size (1.5.0)
@@ -135,23 +135,23 @@ GEM
     loofah (2.1.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    maglove-widgets (1.1.7)
+    maglove-widgets (1.1.8)
       bundler (~> 1.14)
       hamloft (~> 0.2)
     mini_portile2 (2.3.0)
-    minitest (5.10.3)
-    multi_json (1.12.2)
+    minitest (5.11.3)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
     open_uri_redirections (0.2.1)
-    parallel (1.11.2)
-    parser (2.4.0.0)
-      ast (~> 2.2)
+    parallel (1.12.1)
+    parser (2.4.0.2)
+      ast (~> 2.3)
     powerpack (0.1.1)
     progress (3.4.0)
     public_suffix (3.0.1)
-    puma (3.11.0)
+    puma (3.11.2)
     rack (2.0.3)
     rack-test (0.8.2)
       rack (>= 1.0, < 3)
@@ -160,23 +160,21 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rainbow (2.2.2)
-      rake
-    rake (12.0.0)
+    rainbow (3.0.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     ref (2.0.0)
-    rubocop (0.49.1)
+    rubocop (0.52.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
+      parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.9.0)
     rubyzip (1.2.1)
-    sass (3.5.3)
+    sass (3.5.5)
       sass-listen (~> 4.0.0)
     sass-css-importer (1.0.0.beta.0)
       sass (>= 3.1)
@@ -208,4 +206,4 @@ DEPENDENCIES
   rubocop (~> 0.32)
 
 BUNDLED WITH
-   1.16.0.pre.3
+   1.16.1

data/lib/maglove/asset/theme.rb

@@ -20,6 +20,7 @@ module MagLove
         "less" => "css",
         "scss" => "css",
         "coffee" => "js",
+        "js" => "js",
         "yml" => "json"
       }
 

data/lib/maglove/middleware/live_reload.rb

@@ -63,6 +63,8 @@ module MagLove
             if workspace_file(".", filename).exists? and event != :delete
               if filename =~ %r{^src/base/#{theme_config(:base_version)}/.*\.coffee}
                 path = "theme.coffee"
+              elsif filename =~ %r{^src/base/#{theme_config(:base_version)}/.*\.js}
+                path = "theme.coffee"
               elsif filename =~ %r{^src/base/#{theme_config(:base_version)}/.*\.less}
                 path = "theme.less"
               elsif filename =~ %r{^src/base/#{theme_config(:base_version)}/.*\.scss}
@@ -73,6 +75,8 @@ module MagLove
                 path = "theme.scss"
               elsif filename =~ %r{^src/themes/#{@theme}/.*\.coffee}
                 path = "theme.coffee"
+              elsif filename =~ %r{^src/themes/#{@theme}/.*\.js}
+                path = "theme.coffee"
               else
                 path = filename.gsub("src/themes/#{@theme}/", '')
               end

data/lib/maglove/version.rb

@@ -1,3 +1,3 @@
 module MagLove
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maglove
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2018-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler