sassmagic 0.1.3 → 0.1.4

data/Readme.md

@@ -1,50 +1,60 @@
-### sassmagic
-
-
-description:Sass extention tool
-
-
-### install
-
-
-sudo gem install sassmagic
-
-
-### use
-
-
-same to sass
-
-eg: sassmagic --style nested --x test.scss test.css
-
-### configuration
-
-
-sassmagic.json 配置文件:
-
-
-
-
-     {
-            "isNeedPxToRem": true,
-            "browserDefaultFontSize": "75px",
-            "ignore": [
-                "1px",
-                "[data-dpr=",
-                "font-size"
-            ],
-            "outputExtra": [
-                "1x",
-                "2x",
-                "3x"
-            ],
-            "imageMaxSize": "5120",
-            "imageLoader": "imageuploader.js",
-            "imagesPath": {
-            },
-            "remoteStylesheet":"",
-            "tinypngKye",""
-        }
-
-imageuploader.js
-图片上传
+### sassmagic
+
+
+description:Sass extention tool
+
+
+### install
+
+
+sudo gem install sassmagic
+
+
+### use
+
+start:
+
+####sassmagic init
+
+or  
+
+####sassmagic creat [project]
+
+other
+
+same to sass
+
+eg: sassmagic --style nested --x test.scss test.css
+
+### configuration
+
+
+sassmagic.json 配置文件:
+
+
+
+
+     {
+            "isNeedPxToRem": true,//是否自动转rem
+            "browserDefaultFontSize": "75px",//rem设置
+            "devicePixelRatio":"2",//dpr设置
+            "ignore": [//过滤不需要转rem的内容
+                "1px",
+                "[data-dpr=",
+                "font-size"
+            ],
+            "outputExtra": [//额外输出1x 2x 3x样式表
+                "1x",
+                "2x",
+                "3x"
+            ],
+            "imageMaxSize": "5120",//图片时候上传阀值
+            "imageLoader": "../config/imageuploader.js",//上传任务nodeJs
+            "imagesPath": {//上传文件缓存
+            },
+            "remoteStylesheet":"",//远程stylesheet路径
+            "tinypngKye",""//tinypngApiKey
+        }
+
+imageuploader.js
+图片上传

data/lib/sassmagic/reset.rb

@@ -259,7 +259,8 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
 
   # Avoid allocating lots of new strings for `#output`. This is important
   # because `#output` is called all the time.
-  NEWLINE = "\n"
+  # 注释常量重复声明
+  # NEWLINE = "\n"
 
   # Add `s` to the output string and update the line and offset information
   # accordingly.
@@ -520,6 +521,10 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
       str.scan(/([\.\d]+)+(px)+([;\s]+|$)/i){ |c,v|
         if !(ignore.include? c+v) && (c != '1') && c =~ /^[^0]+/
           ret = ret.gsub(c.to_s,(format("%.3f",c.to_f/rem).to_f).to_s).gsub(v,'rem')
+        else
+          # debugger
+          ret = ret.gsub(/^0+/,'0').gsub(/(^0+)(\d+)/,'\2')
+          # ret = ret.to_s.gsub(/(^0+)(\d+)/,'\2')
         end
       }
     end
@@ -813,7 +818,8 @@ module Sass::Exec
       @options[:input], @options[:output] = input, output
     end
 
-    COLORS = {:red => 31, :green => 32, :yellow => 33}
+    # 注释常量重复声明
+    # COLORS = {:red => 31, :green => 32, :yellow => 33}
 
     # Prints a status message about performing the given action,
     # colored using the given color (via terminal escapes) if possible.

data/lib/sassmagic/utils.rb

@@ -250,7 +250,7 @@ module Sass::Script::Functions
     ts = timestamp(kwargs['timestamp'])
 
     paths = paths.map { |path| sass_to_ruby(path) }.flatten
-    .map { |path| compress_img(path);to_url(path, encode, ts) }
+    .map { |path| compress_img(path, encode, ts); }
 
     list(paths, :comma)
   end
@@ -258,55 +258,65 @@ module Sass::Script::Functions
 
 
   private
-  def compress_img(path)
-    #图片压缩
+  def compress_img(path,encode,ts)
     # debugger
-    # 未设置tinypngKye或者url图片，则不优化
-    if !$configHash.has_key?('tinypngKye') || $configHash['tinypngKye'] == '' || path =~ /^(http:|https:)\/\//
-
-    else
-      output = path.gsub(/\.(png|jpg)$/,'_tinypng.\1')
-      if File.exist?("#{File.dirname(options[:filename])}/#{output}")
-        path.gsub!(/\.(png|jpg)$/,'_tinypng.\1')
-        return
-      end
-
-      require "net/https"
-      require "uri"
-
-      key = $configHash['tinypngKye'] || ''
-      input = path
-      # real_path = File.expand_path("#{File.dirname(path)}/#{path}")
-      # output = "tiny-output.png"
-
-      uri = URI.parse("https://api.tinypng.com/shrink")
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-
-      # Uncomment below if you have trouble validating our SSL certificate.
-      # Download cacert.pem from: http://curl.haxx.se/ca/cacert.pem
-      # http.ca_file = File.join(File.dirname(__FILE__), "cacert.pem")
+    if path.is_a?(String) && path =~ PATH_REGEX
 
-      request = Net::HTTP::Post.new(uri.request_uri)
-      request.basic_auth("api", key)
+      path, ext, query, anchor = $1 + $2, $2[1..-1].downcase.to_sym, $3, $4
 
-      response = http.request(request, File.binread("#{File.dirname(options[:filename])}/#{input}"))
-      # debugger
-      if response.code == "201"
-        # Compression was successful, retrieve output from Location header.
+      if MIME_TYPES.key? ext
+        #图片压缩
         # debugger
-        output = path
-        path.gsub!(/\.(png|jpg)$/,'_tinypng.\1')
-        # output['.png'] = '_tinypng.png'
-        # output['.jpg'] = '_tinypng.jpg'
-        File.binwrite("#{File.dirname(options[:filename])}/#{output}", http.get(response["location"]).body)
-      else
-        # Something went wrong! You can parse the JSON body for details.
-        puts "Compression failed"
+        # 未设置tinypngKye或者url图片，则不优化
+        if !$configHash.has_key?('tinypngKye') || $configHash['tinypngKye'] == '' || path =~ /^(http:|https:)\/\//
+
+        else
+          output = path.dup.gsub(/\.(png|jpg)$/,'_tinypng.\1')
+          if File.exist?("#{File.dirname(options[:filename])}/#{output}")
+            # debug exception while processing events: can't modify frozen String , Backtrace:
+            path.gsub!(/\.(png|jpg)$/,'_tinypng.\1')
+          else
+            require "net/https"
+            require "uri"
+
+            key = $configHash['tinypngKye'] || ''
+            input = path
+            # real_path = File.expand_path("#{File.dirname(path)}/#{path}")
+            # output = "tiny-output.png"
+
+            uri = URI.parse("https://api.tinypng.com/shrink")
+
+            http = Net::HTTP.new(uri.host, uri.port)
+            http.use_ssl = true
+
+            # Uncomment below if you have trouble validating our SSL certificate.
+            # Download cacert.pem from: http://curl.haxx.se/ca/cacert.pem
+            # http.ca_file = File.join(File.dirname(__FILE__), "cacert.pem")
+
+            request = Net::HTTP::Post.new(uri.request_uri)
+            request.basic_auth("api", key)
+
+            response = http.request(request, File.binread("#{File.dirname(options[:filename])}/#{input}"))
+            # debugger
+            if response.code == "201"
+              # Compression was successful, retrieve output from Location header.
+              # debugger
+              output = path
+              path.gsub!(/\.(png|jpg)$/,'_tinypng.\1')
+              # output['.png'] = '_tinypng.png'
+              # output['.jpg'] = '_tinypng.jpg'
+              File.binwrite("#{File.dirname(options[:filename])}/#{output}", http.get(response["location"]).body)
+            else
+              # Something went wrong! You can parse the JSON body for details.
+              puts "Compression failed"
+            end
+          end
+        end
       end
     end
 
+    #调用to_url函数
+    to_url(path, encode, ts)
   end
   def timestamp(ts)
     # no kwargs
@@ -415,22 +425,22 @@ module Sass::Script::Functions
         # puts 'nodetask success'
         $configHash = load_json(File.expand_path("#{File.dirname(options[:filename])}/../config/sassmagic.json"))
         $configHash["imagesPath"] ||= Hash.new
-        if $configHash["imagesPath"].has_key?(path)
-          return $configHash["imagesPath"][path]
+        if $configHash["imagesPath"].has_key?(taskargs)
+          return $configHash["imagesPath"][taskargs]
         else
           return path
         end
       else
         # puts 'nodetask faile'
-        if $configHash["imagesPath"].has_key?(path)
-          return $configHash["imagesPath"][path]
+        if $configHash["imagesPath"].has_key?(taskargs)
+          return $configHash["imagesPath"][taskargs]
         else
           return path
         end
       end
     else
-      if $configHash["imagesPath"].has_key?(path)
-        return $configHash["imagesPath"][path]
+      if $configHash["imagesPath"].has_key?(taskargs)
+        return $configHash["imagesPath"][taskargs]
       else
         return path
       end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sassmagic
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
-- ringself
+- ring
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -34,7 +34,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.5'
 description: Awesome features that you wanted
-email: ringself@163.com
+email: ring.wangh@alibaba-inc.com
 executables:
 - sassmagic
 extensions: []