maglove 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b081cf7ee1ddef23b4df6d82955438f54e626e87
-  data.tar.gz: 1be99808e2b23f445cd0155cf4e9f0410df67a59
+  metadata.gz: 28aa277ef1e3d61e0a73ca340fce4063ee3e9187
+  data.tar.gz: b6ee63e3775ee7d9c5a0ea00e04b48e9df687159
 SHA512:
-  metadata.gz: 456c2e5b1d097dfe6f06e7751630792971c25b3c63c6a19a56e4a5a484eedf0fe52e0ed081cf067a296399e75b417d19ae93a7a31aa5455fb2734fbc6078ffae
-  data.tar.gz: 9481b2f9acb212c5cd39496f61c3a1dac2f8ff0985e6279dd169e2b458d4e075e01dce48e1baf632a503d34099043e4c4b8278372b585ab01ad0b536274beafc
+  metadata.gz: 9224bf9bc2ac596d1b92f3436568ba28d7d1f021408d219854078727d535c71212eb03e67b92173c25131fc0878d73bc99c6bd118bb3ff9c6587bdeaa8ab64f8
+  data.tar.gz: 0a6cf9be836d074519da9519500ef74c4bb74518619a02a7e8c5bfcf960690b40f232492820a4c4b39410ee9693f448df4f7cebdc4b805d10e1ab3ec8f8a8b76

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maglove (1.0.7)
+    maglove (1.0.8)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       bundler (~> 1.10)
@@ -20,6 +20,7 @@ PATH
       puma (~> 3.6)
       rubyzip (~> 1.1)
       sass (~> 3.4)
+      sass-css-importer (>= 1.0.0.beta.0)
       therubyracer (~> 0.12)
       thor (~> 0.19)
       tilt (~> 1.4)
@@ -46,7 +47,8 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     ast (2.3.0)
     builder (3.2.2)
     coffee-script (2.4.1)
@@ -137,6 +139,7 @@ GEM
       ast (~> 2.2)
     powerpack (0.1.1)
     progress (3.2.2)
+    public_suffix (2.0.3)
     puma (3.6.0)
     rack (2.0.1)
     rack-test (0.6.3)
@@ -157,6 +160,8 @@ GEM
     ruby-progressbar (1.8.1)
     rubyzip (1.2.0)
     sass (3.4.22)
+    sass-css-importer (1.0.0.beta.0)
+      sass (>= 3.1)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
@@ -181,4 +186,4 @@ DEPENDENCIES
   rubocop (~> 0.32)
 
 BUNDLED WITH
-   1.12.4
+   1.13.6

data/data/maglove/index.haml

@@ -11,7 +11,7 @@
     #templates-container
       - templates.each do |template|
         %div.template-item
-          %a.template{href: "/#{template}", style: "background-image: url(#{MagLoft::ApiCaller::MAGLOFT_CDN_URL}/themes/#{theme}/thumbnails/#{template}.png);"}
+          %a.template{href: "/#{template}", style: "background-image: url(#{MagLoft::ApiCaller.cdn_url}/themes/#{theme}/thumbnails/#{template}.png);"}
             %div.template-label
               %span
                 #{template}

data/lib/magloft/typeloft_block.rb

@@ -14,10 +14,10 @@ module MagLoft
       response = conn.put(nil, File.read(file_path))
       return (response.status == 200)
     end
-    
+
     def queue_upload_thumbnail(file_path, &block)
       return false if thumbnail_policy.nil?
-      request = Typhoeus::Request.new(thumbnail_policy["url"], method: :put, headers: thumbnail_policy["headers"], body: File.read(file_path), timeout: 200000)
+      request = Typhoeus::Request.new(thumbnail_policy["url"], method: :put, headers: thumbnail_policy["headers"], body: File.read(file_path), timeout: 200_000)
       request.on_complete(&block) if block
       request
     end

data/lib/magloft/typeloft_image.rb

@@ -14,10 +14,10 @@ module MagLoft
       response = conn.put(nil, File.read(file_path))
       return (response.status == 200)
     end
-    
+
     def queue_upload(file_path, &block)
       return false if policy.nil?
-      request = Typhoeus::Request.new(policy["url"], method: :put, headers: policy["headers"], body: File.read(file_path), timeout: 200000)
+      request = Typhoeus::Request.new(policy["url"], method: :put, headers: policy["headers"], body: File.read(file_path), timeout: 200_000)
       request.on_complete(&block) if block
       request
     end

data/lib/magloft/typeloft_template.rb

@@ -14,10 +14,10 @@ module MagLoft
       response = conn.put(nil, File.read(file_path))
       return (response.status == 200)
     end
-    
+
     def queue_upload_thumbnail(file_path, &block)
       return false if thumbnail_policy.nil?
-      request = Typhoeus::Request.new(thumbnail_policy["url"], method: :put, headers: thumbnail_policy["headers"], body: File.read(file_path), timeout: 200000)
+      request = Typhoeus::Request.new(thumbnail_policy["url"], method: :put, headers: thumbnail_policy["headers"], body: File.read(file_path), timeout: 200_000)
       request.on_complete(&block) if block
       request
     end

data/lib/maglove/commands/assets.rb

@@ -42,7 +42,7 @@ module MagLove
       desc "stylesheet", "Compile Stylesheet"
       def stylesheet
         info("▸ Compiling Stylesheet")
-        theme_dir.files("theme.{scss,less}").first.asset.write!
+        theme_dir.files("theme.{scss,less}").first.asset(asset_uri: ".").write!
       end
 
       desc "yaml", "Compile YAML Manifest"

data/lib/maglove/commands/theme.rb

@@ -97,13 +97,13 @@ module MagLove
             if image_file.md5 != existing_image.md5
               info("▸ Updating Image '#{remote_file}'")
               existing_image.md5 = image_file.md5
-              hydra.queue(existing_image.queue_upload(image_file.to_s) {debug("▸ Finished updating Image '#{remote_file}'")})
+              hydra.queue(existing_image.queue_upload(image_file.to_s) { debug("▸ Finished updating Image '#{remote_file}'") })
               existing_image.save
             end
           else
             info("▸ Creating Image '#{remote_file}'")
             new_image = theme.typeloft_images.create(remote_file: remote_file, title: image_file.basename.titlecase, md5: image_file.md5)
-            hydra.queue(new_image.queue_upload(image_file.to_s) {info("▸ Finished creating Image '#{remote_file}'")})
+            hydra.queue(new_image.queue_upload(image_file.to_s) { info("▸ Finished creating Image '#{remote_file}'") })
           end
         end
         hydra.run
@@ -139,13 +139,13 @@ module MagLove
         if options.thumbnails
           invoke(:thumbnails, [], { theme: options.theme })
           hydra = Typhoeus::Hydra.new
-          
+
           info("▸ Synchronizing Template Thumbnails")
           theme.typeloft_templates.all.each do |template|
             thumbnail_file = theme_dir(root: "dist").dir("templates").file("#{template.identifier}.png")
             if thumbnail_file.exists?
               info("~> Uploading Thumbnail for '#{template.identifier}'")
-              hydra.queue(template.queue_upload_thumbnail(thumbnail_file.to_s) {info("▸ Finished uploading Thumbnail for '#{template.identifier}'")})
+              hydra.queue(template.queue_upload_thumbnail(thumbnail_file.to_s) { info("▸ Finished uploading Thumbnail for '#{template.identifier}'") })
             end
           end
 
@@ -154,7 +154,7 @@ module MagLove
             thumbnail_file = theme_dir(root: "dist").dir("blocks").file("#{block.identifier}.png")
             if thumbnail_file.exists?
               info("~> Uploading Thumbnail for '#{block.identifier}'")
-              hydra.queue(block.queue_upload_thumbnail(thumbnail_file.to_s) {info("▸ Finished uploading Thumbnail for '#{block.identifier}'")})
+              hydra.queue(block.queue_upload_thumbnail(thumbnail_file.to_s) { info("▸ Finished uploading Thumbnail for '#{block.identifier}'") })
             end
           end
           hydra.run

data/lib/maglove/server.rb

@@ -10,6 +10,7 @@ module MagLove
       app = Rack::Builder.new do
         use MagLove::Middleware::LiveReload, mount: "/maglove", theme: theme, templates: templates
         use Rack::Static, urls: ["/fonts", "/themes"], root: "dist"
+        use Rack::Static, urls: ["/images"], root: "dist/themes/#{theme}"
         run MagLove::Server.new(theme: theme, templates: templates, port: port)
       end
       Rack::Server.start(app: app, Port: port, server: :puma)

data/lib/maglove/tilt/scss_template.rb

@@ -1,3 +1,4 @@
+require 'sass-css-importer'
 module Sass::Script::Functions
   def asset(url)
     assert_type url, :String

data/lib/maglove/version.rb

@@ -1,3 +1,3 @@
 module MagLove
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/lib/powersnap.rb

@@ -5,7 +5,7 @@ class Powersnap
     def powersnap_config
       @system_prefix ||= (File.exist?("powersnap.yml") ? YAML.load_file("powersnap.yml") : default_powersnap_config)
     end
-    
+
     def default_powersnap_config
       { "prefix" => nil }
     end

data/maglove.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "less", "~> 2.6"
   s.add_runtime_dependency "therubyracer", "~> 0.12"
   s.add_runtime_dependency "sass", "~> 3.4"
+  s.add_runtime_dependency "sass-css-importer", ">= 1.0.0.beta.0"
   s.add_runtime_dependency "dialers", "~> 0.2"
   s.add_runtime_dependency "rubyzip", "~> 1.1"
   s.add_runtime_dependency "image_optim", "~> 0.21"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maglove
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2016-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: sass-css-importer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta.0
 - !ruby/object:Gem::Dependency
   name: dialers
   requirement: !ruby/object:Gem::Requirement
@@ -478,7 +492,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.4.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: MagLove - MagLoft Theme Toolkit.