maglove 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac4a4d4178023b6ef6d3b8c59db88d97029d121b
-  data.tar.gz: 1a959b3e664855db05664b21101279048fa8e5a3
+  metadata.gz: c4e2e9a781d18a64e7f141302d3ecfe1b290d6f4
+  data.tar.gz: 8df539bc813f9a445c5e611bad09b169a4fdd06c
 SHA512:
-  metadata.gz: 093a2a9fb7d0ec9dcf7a2d9f935fb1ace06e212e142a8673c89e836ca1ff47be5e2995011939ff1df17013703d1f4dc9f6c8ecf0b54c1ea2783cbfbb97657fe2
-  data.tar.gz: abaac26ed8d5c8f89478b81f33ed0a109a4657f3a3ad19485ec0ab17509b7b565270185cedbb5e28f10bc8f58e8652e80504611f86af5d91d732066595dd7658
+  metadata.gz: c4516a01d653724481049490caa3ff5f5b3f4e67878520e9b0ca5b2f7dc9af6df15a6a0fe90b3df49d08264d6f23c2dcf723cacfb61af40fae242147aad1e82f
+  data.tar.gz: 0f96c25155e090f5b849456827309e0a7be10f6e345983a00999139f875108354aa0071a8ef4c0136f1480e3002005db19e1d61a9ac42e70a061776efbcc3540

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maglove (0.6.5)
+    maglove (0.7.0)
       activesupport (~> 4.2)
       bundler (~> 1.10)
       coffee-script (~> 2.4)
@@ -16,6 +16,7 @@ PATH
       logging (~> 2.0)
       minitar (~> 0.5)
       rubyzip (~> 1.1)
+      sass (~> 3.4)
       therubyracer (~> 0.12)
       tilt (~> 1.4)
       webrick (~> 1.3)
@@ -23,7 +24,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
+    activesupport (4.2.7)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -42,7 +43,7 @@ GEM
     commonjs (0.2.7)
     diff-lcs (1.2.5)
     dotenv (2.1.1)
-    execjs (2.6.0)
+    execjs (2.7.0)
     exifr (1.2.4)
     filewatcher (0.5.3)
       trollop (~> 2.0)
@@ -60,7 +61,7 @@ GEM
       image_size (~> 1.3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    image_optim_pack (0.2.1.20160413)
+    image_optim_pack (0.2.1.20160510)
       fspath (~> 2.1)
       image_optim (~> 0.19)
     image_size (1.4.2)
@@ -74,14 +75,16 @@ GEM
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     method_source (0.8.2)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     minitar (0.5.4)
-    minitest (5.8.4)
-    multi_json (1.11.3)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    minitest (5.9.0)
+    multi_json (1.12.1)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
+    pkg-config (1.1.7)
     powerpack (0.1.1)
     progress (3.1.1)
     pry (0.10.3)
@@ -111,6 +114,7 @@ GEM
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.7.5)
     rubyzip (1.2.0)
+    sass (3.4.22)
     slop (3.6.0)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
@@ -132,4 +136,4 @@ DEPENDENCIES
   rubocop (~> 0.32)
 
 BUNDLED WITH
-   1.11.2
+   1.12.4

data/bin/maglove

@@ -8,6 +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["less"] = [MagLove::Tilt::LessTemplate]
 Tilt.mappings["yml"] = [MagLove::Tilt::YamlTemplate]
 Tilt.mappings["coffee"] = [MagLove::Tilt::CoffeeTemplate]

data/data/maglove/sdk.haml

@@ -15,12 +15,13 @@
       div#__inspector a:hover{color:#FFFFFF !important;background:#000000 !important;}
       div#__inspector a:first-child{border-left:none !important;}
       div#__bs_notify__{border-radius:0 !important;right:inherit !important;left:8px !important;height:32px !important;top:8px !important;line-height:32px !important;padding:0px 26px !important;color:#171717 !important;z-index:1000000 !important;background:#FFF !important;}
-    :javascript
-      window.ThemeApi.init({deviceId: 'AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE', appId: 'com.magloft.maglove', apiHost: 'www.magloft.com'}) if window.ThemeApi
-
   %body
     = contents
     #__inspector
       - templates.each do |template|
         %a{href: "/#{template}"}
           = template
+    :javascript
+      if(window.ThemeApi) {
+        window.ThemeApi.init({deviceId: 'AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE', appId: 'com.magloft.maglove', apiHost: 'www.magloft.com'});
+      }

data/lib/maglove/asset/theme.rb

@@ -10,6 +10,7 @@ module MagLove
         "haml" => "html",
         "twig" => "html",
         "less" => "css",
+        "scss" => "css",
         "coffee" => "js",
         "yml" => "json"
       }

data/lib/maglove/command/compile.rb

@@ -9,9 +9,13 @@ module MagLove
           asset = theme_asset("theme.coffee", options.theme)
           debug("▸ created #{asset.logical_path}") if asset.write!
         end
-  
-        task :less, theme: "!" do |args, options|
-          asset = theme_asset("theme.less", options.theme)
+        
+        task :css, theme: "!" do |args, options|
+          if File.exists?(theme_path("theme.scss", options.theme))
+            asset = theme_asset("theme.scss", options.theme)
+          else
+            asset = theme_asset("theme.less", options.theme)
+          end
           debug("▸ created #{asset.logical_path}") if asset.write!
         end
   

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:less", "compile:yaml", "compile:templates", "copy:base_images", "copy:images", "copy:thumbs", "compress:theme"], options)
+          invoke_tasks(["core:validate", "core:clean", "compile:coffee", "compile:css", "compile:yaml", "compile:templates", "copy:base_images", "copy:images", "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/command/util.rb

@@ -26,7 +26,7 @@ module MagLove
           info("▸ watching theme #{options.theme}")
           watch_config({
             "compile:coffee" => [theme_path("**/*.{coffee,js}", options.theme), theme_base_path("**/*.{coffee,js}", options.theme)],
-            "compile:less" => [theme_path("**/*.{less,css}", options.theme), theme_base_path("**/*.{less,css}", options.theme)],
+            "compile:css" => [theme_path("**/*.{less,scss,css}", options.theme), theme_base_path("**/*.{less,scss,css}", options.theme)],
             "compile:templates" => [theme_path("**/*.{haml,twig,html}", options.theme)],
             "copy:base_images" => theme_base_path("images/**/*.{jpg,jpeg,gif,png,svg}", options.theme),
             "copy:images" => theme_path("images/**/*.{jpg,jpeg,gif,png,svg}", options.theme)

data/lib/maglove/tilt/sass_template.rb

@@ -0,0 +1,32 @@
+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

data/lib/maglove/version.rb

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

data/lib/maglove.rb

@@ -11,6 +11,7 @@ require "logging"
 require "coffee_script"
 require "therubyracer"
 require "less"
+require "sass"
 require "commander"
 require "image_optim"
 require "zlib"
@@ -21,6 +22,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/coffee_template"
 require "maglove/tilt/js_template"
 require "maglove/tilt/yaml_template"

data/maglove.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "minitar", "~> 0.5"
   s.add_runtime_dependency "therubyracer", "~> 0.12"
   s.add_runtime_dependency "less", "~> 2.6"
+  s.add_runtime_dependency "sass", "~> 3.4"
   s.add_runtime_dependency "webrick", "~> 1.3"
   s.add_runtime_dependency "commander", "~> 4.3"
   s.add_runtime_dependency "filewatcher", "~> 0.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maglove
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -397,6 +411,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/twig_template.rb
 - lib/maglove/tilt/yaml_template.rb
 - lib/maglove/version.rb
@@ -421,9 +436,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.4.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: MagLove - MagLoft Theme Toolkit.
 test_files: []
-has_rdoc: