maglove 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4e2e9a781d18a64e7f141302d3ecfe1b290d6f4
-  data.tar.gz: 8df539bc813f9a445c5e611bad09b169a4fdd06c
+  metadata.gz: bce86c531503d256e0dc73e065011c64a173b0ec
+  data.tar.gz: c108429a7d25c0a4ae306306c2c215fdc362a176
 SHA512:
-  metadata.gz: c4516a01d653724481049490caa3ff5f5b3f4e67878520e9b0ca5b2f7dc9af6df15a6a0fe90b3df49d08264d6f23c2dcf723cacfb61af40fae242147aad1e82f
-  data.tar.gz: 0f96c25155e090f5b849456827309e0a7be10f6e345983a00999139f875108354aa0071a8ef4c0136f1480e3002005db19e1d61a9ac42e70a061776efbcc3540
+  metadata.gz: 809d81a5786404b84fd67495dfbb2a8f3ecd98dee200aafd1e9e961f101c4de90ac720dd85925deaad68cd2599647a5a7cb6d4d2f4f0d9a16e4c9adcb4d108b7
+  data.tar.gz: 027e7542acd94948f05786eb2ef6ea2a1897ec210e9726ba53bab282ebab71c6ef49c0e395a43f5e37a76932a3e2bd34959bf9146fda99408335af7ad82e5771

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    maglove (0.7.0)
-      activesupport (~> 4.2)
+    maglove (0.7.1)
+      actionpack (~> 5.0)
+      activesupport (~> 5.0)
       bundler (~> 1.10)
       coffee-script (~> 2.4)
       commander (~> 4.3)
@@ -24,15 +25,28 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7)
+    actionpack (5.0.0)
+      actionview (= 5.0.0)
+      activesupport (= 5.0.0)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.0)
+      activesupport (= 5.0.0)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     ast (2.1.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
+    builder (3.2.2)
     coderay (1.1.0)
     coffee-script (2.4.1)
       coffee-script-source
@@ -41,13 +55,15 @@ GEM
     commander (4.4.0)
       highline (~> 1.7.2)
     commonjs (0.2.7)
+    concurrent-ruby (1.0.2)
     diff-lcs (1.2.5)
     dotenv (2.1.1)
+    erubis (2.7.0)
     execjs (2.7.0)
-    exifr (1.2.4)
+    exifr (1.2.5)
     filewatcher (0.5.3)
       trollop (~> 2.0)
-    fspath (2.1.1)
+    fspath (3.0.0)
     haml (4.0.7)
       tilt
     hamloft (0.1.8)
@@ -55,18 +71,17 @@ GEM
       nokogiri (~> 1.6)
     highline (1.7.8)
     i18n (0.7.0)
-    image_optim (0.22.1)
+    image_optim (0.23.0)
       exifr (~> 1.2, >= 1.2.2)
-      fspath (~> 2.1)
+      fspath (~> 3.0)
       image_size (~> 1.3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    image_optim_pack (0.2.1.20160510)
-      fspath (~> 2.1)
+    image_optim_pack (0.3.0)
+      fspath (>= 2.1, < 4)
       image_optim (~> 0.19)
     image_size (1.4.2)
     in_threads (1.3.1)
-    json (1.8.3)
     less (2.6.0)
       commonjs (~> 0.2.7)
     libv8 (3.16.14.15)
@@ -74,6 +89,8 @@ GEM
     logging (2.1.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
     method_source (0.8.2)
     mini_portile2 (2.1.0)
     minitar (0.5.4)
@@ -86,11 +103,19 @@ GEM
       ast (>= 1.1, < 3.0)
     pkg-config (1.1.7)
     powerpack (0.1.1)
-    progress (3.1.1)
+    progress (3.2.2)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    rack (2.0.1)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6.0)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
     rainbow (2.0.0)
     ref (2.0.0)
     rspec (3.3.0)

data/bin/maglove

@@ -8,7 +8,7 @@ Dotenv.load
 # Set up Hamloft
 Hamloft.register_template(:tumblr, MagLove::Template::Tumblr)
 Tilt.mappings["haml"] = [MagLove::Tilt::HamlTemplate]
-Tilt.mappings["sass"] = [MagLove::Tilt::SassTemplate]
+Tilt.mappings["scss"] = [MagLove::Tilt::ScssTemplate]
 Tilt.mappings["less"] = [MagLove::Tilt::LessTemplate]
 Tilt.mappings["yml"] = [MagLove::Tilt::YamlTemplate]
 Tilt.mappings["coffee"] = [MagLove::Tilt::CoffeeTemplate]

data/lib/maglove/command/theme.rb

@@ -7,7 +7,7 @@ module MagLove
 
         task :compile, theme: ENV["THEME"], sync: "NO", bucket: "localhost:3002" do |args, options|
           info("▸ compiling theme #{options.theme}")
-          invoke_tasks(["core:validate", "core:clean", "compile:coffee", "compile:css", "compile:yaml", "compile:templates", "copy:base_images", "copy:images", "copy:thumbs", "compress:theme"], options)
+          invoke_tasks(["core:validate", "core:clean", "compile:coffee", "copy:base_images", "copy:images", "compile:css", "compile:yaml", "compile:templates", "copy:thumbs", "compress:theme"], options)
           
           if options.sync == "YES"
             error!("▸ SYNC error: please specify a bucket to use (cdn.magloft.com, test-cdn.magloft.com)") if options.bucket == "localhost:3001"

data/lib/maglove/tilt/scss_template.rb

@@ -0,0 +1,42 @@
+module Sass::Script::Functions  
+  def asset(url)
+    assert_type url, :String
+    Sass::Script::Value::String.new("url(\"#{::Hamloft::Options.defaults[:asset_uri]}/#{url.value}\")")
+  end
+  # declare(:asset, [:url])
+  
+  def asset_data(url)
+    assert_type url, :String
+    theme = options[:locals][:theme]
+    asset_path = "dist/themes/#{theme}/#{url.value}"
+    asset_contents = File.open(asset_path).read
+    base64_string = Base64.strict_encode64(asset_contents)
+    extension = File.extname(url.value)[1..-1]
+    mime_type = Mime::Type.lookup_by_extension(extension).to_s
+    data_uri = "data:#{mime_type};base64,#{base64_string}"
+    Sass::Script::Value::String.new("url(#{data_uri})")
+  end
+  declare(:asset_data, [:url])
+end
+
+module MagLove
+  module Tilt
+    class ScssTemplate < ::Tilt::SassTemplate
+      self.default_mime_type = 'text/css'
+    
+      def prepare
+      end
+
+      def evaluate(scope, locals, &block)
+        prepared_data = "@base: \"#{locals[:base_path].sub("src/", "../../")}\";\n#{data}"
+        engine = Sass::Engine.new(prepared_data, sass_options.merge({locals: locals}))
+        @output ||= engine.render
+      end
+      
+      private
+        def sass_options
+          options.merge(:filename => eval_file, :line => line, :syntax => :scss)
+        end
+    end
+  end
+end

data/lib/maglove/version.rb

@@ -1,3 +1,3 @@
 module MagLove
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/lib/maglove.rb

@@ -12,6 +12,7 @@ require "coffee_script"
 require "therubyracer"
 require "less"
 require "sass"
+require "action_dispatch/http/mime_type"
 require "commander"
 require "image_optim"
 require "zlib"
@@ -22,7 +23,7 @@ require "maglove/version"
 require "maglove/tilt/twig_template"
 require "maglove/tilt/haml_template"
 require "maglove/tilt/less_template"
-require "maglove/tilt/sass_template"
+require "maglove/tilt/scss_template"
 require "maglove/tilt/coffee_template"
 require "maglove/tilt/js_template"
 require "maglove/tilt/yaml_template"

data/maglove.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'haml', "~> 4.0"
   s.add_runtime_dependency 'hamloft', "~> 0.1.7"
   s.add_runtime_dependency "rubyzip", "~> 1.1"
-  s.add_runtime_dependency "activesupport", "~> 4.2"
+  s.add_runtime_dependency "activesupport", "~> 5.0"
+  s.add_runtime_dependency "actionpack", "~> 5.0"
   s.add_runtime_dependency "logging", "~> 2.0"
   s.add_runtime_dependency "tilt", "~> 1.4"
   s.add_runtime_dependency "coffee-script", "~> 2.4"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maglove
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Tobias Strebitzer
@@ -86,14 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
@@ -411,7 +425,7 @@ files:
 - lib/maglove/tilt/haml_template.rb
 - lib/maglove/tilt/js_template.rb
 - lib/maglove/tilt/less_template.rb
-- lib/maglove/tilt/sass_template.rb
+- lib/maglove/tilt/scss_template.rb
 - lib/maglove/tilt/twig_template.rb
 - lib/maglove/tilt/yaml_template.rb
 - lib/maglove/version.rb

data/lib/maglove/tilt/sass_template.rb

@@ -1,32 +0,0 @@
-module Sass::Script::Functions  
-  def asset(url)
-    assert_type url, :String
-    Sass::Script::Value::String.new("url(\"#{::Hamloft::Options.defaults[:asset_uri]}/#{url.value}\")")
-  end
-  declare(:asset, [:url])
-end
-
-module MagLove
-  module Tilt
-    class SassTemplate < ::Tilt::Template
-      self.default_mime_type = 'theme/html'
-
-      def prepare
-        @options = options.merge({
-          style: :nested,
-          load_paths: [],
-          cache: false,
-          cache_location: nil,
-          syntax: :sass,
-          filesystem_importer: Sass::Importers::Filesystem
-        })
-      end
-    
-      def evaluate(scope, locals, &block)
-        prepared_data = "@base: \"#{locals[:base_path].sub("src/", "../../")}\";\n#{data}"
-        engine = Sass::Engine.new(prepared_data, @options)
-        @output ||= engine.render
-      end
-    end
-  end
-end