texture_packer 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ab7f3e967ebc61b0115b4d3b144798545453d8c6
-  data.tar.gz: 6957e630fbc4dad6558ae829f2e60d9566737c06
+SHA256:
+  metadata.gz: 0270c54ea7b25a4186653eda157aeade991e5baa1313c0c72c2306b16d448713
+  data.tar.gz: fe77658cb80970d46cf38e7bfcb370546cd33abc2a7cf469cf181cbfdfaeaa53
 SHA512:
-  metadata.gz: 6ad985efd0f9028e1f22ff5ca6ab533a4cf0a43425ad8d8c09b4b79a5a4c929d67a8f073f558fd6ae9e6cd103aaa90af4076ebe2f47d0e9758f0169a2ed9e4cf
-  data.tar.gz: 818aeb8ae58e26980999084957e7e8a82531580906b5ad13cad418a651c0e272add37d0ab434d0f2e53c4a023da9553f607314144a162b933311bef5a88924bc
+  metadata.gz: 160e7d0d84f2573d6337660d0d9ce96da4a13bad66cd4e464c239efd0b1d37d8c15b527b3090196ae6281b3ccef157723980192021be5eac7b0c1bf456b1264f
+  data.tar.gz: 88621992c34aebf99778f74ef538099c4a84c31642d48fe8f2a3369c24584597c61ea77dd60613e1b9970de5cc99f7a8a1828168409557095000f023acb0e317

data/lib/texture_packer/cli.rb

@@ -38,13 +38,17 @@ class TexturePacker::Cli
   end
 
   def create_packer
-    has_mobile = true if File.exists?('packed_m.css')
+    split_type = case
+                 when File.exists?('packed_m.css')  ; TexturePacker::SPLIT_BY_MOBILE
+                 when File.exists?('packed_tw.css') ; TexturePacker::SPLIT_I18N
+                 else                               ; nil
+                 end
 
     # 由路徑計算 class 名字
     dir_name = File.expand_path(Dir.pwd).gsub(/.*\/Texture-Packer\/.*?\/(.*)/, '\1')
 
     content = output_paths_mapping.map{|_, path| File.read("#{path}.css") }.join
-    return TexturePacker.new(dir_name, output_paths_mapping, content, has_mobile)
+    return TexturePacker.new(dir_name, output_paths_mapping, content, split_type)
   end
 
   def output_paths_mapping
@@ -61,7 +65,7 @@ class TexturePacker::Cli
   # ----------------------------------------------------------------
   def write_to_project_dir!(packer, output1, output2)
     css_pre_lines = ["@import './mixin.scss';"]
-    css_pre_lines.unshift("@import 'global_mixins';") if packer.has_mobile
+    css_pre_lines.unshift("@import 'global_mixins';") if packer.need_global_mixins?
 
     sub_dirs = packer.dir_name.split(File::Separator)[0...-1]
 

data/lib/texture_packer/version.rb

@@ -1,3 +1,3 @@
 class TexturePacker
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 end

data/lib/texture_packer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'texture_packer/version'
 
 class TexturePacker
@@ -5,12 +7,14 @@ class TexturePacker
   attr_reader :base_dir_name
   attr_reader :dir_without_theme
   attr_reader :output_paths_mapping
-  attr_reader :has_mobile
 
-  def initialize(dir_name, output_paths_mapping, content, has_mobile)
+  SPLIT_BY_MOBILE = 'mobile'
+  SPLIT_BY_I18N = 'i18n'
+
+  def initialize(dir_name, output_paths_mapping, content, split_type = nil)
     @output_paths_mapping = output_paths_mapping
     @content = content.dup
-    @has_mobile = has_mobile
+    @split_type = split_type
 
     @dir_name = dir_name
     @base_dir_name = File.basename(@dir_name)
@@ -57,18 +61,25 @@ class TexturePacker
     output2 = "" #scss的output
     output2 += "body[theme='#{@theme}']{\n"
     output2 += "  .#{@dir_without_theme}_sprite{\n"
-    if @has_mobile
+    case @split_type
+    when SPLIT_BY_MOBILE
       output2 += "    @include desktop{ @include #{base_dir_name}_sprite; }\n"
       output2 += "    @include mobile{ @include #{base_dir_name}_sprite_m; }\n"
-    elsif @output_paths_mapping.size > 1
-      output2 += @output_paths_mapping.map do |kind, name|
-        next "    @include #{base_dir_name}_sprite;\n" if kind == nil
-        next "    &[kind=\"#{kind}\"] { @include #{base_dir_name}_sprite_#{kind}; }\n"
-      end.join
+    when SPLIT_BY_I18N
+      output2 += "    &:lang(zh-TW){ @include #{base_dir_name}_sprite_tw; }\n"
+      output2 += "    &:lang(zh-CN){ @include #{base_dir_name}_sprite_cn; }\n"
+      output2 += "    &:lang(en){ @include #{base_dir_name}_sprite_en; }\n"
     else
-      output2 += "    @include #{base_dir_name}_sprite;\n"
+      if @output_paths_mapping.size > 1
+        output2 += @output_paths_mapping.map do |kind, name|
+          next "    @include #{base_dir_name}_sprite;\n" if kind == nil
+          next "    &[kind=\"#{kind}\"] { @include #{base_dir_name}_sprite_#{kind}; }\n"
+        end.join
+      else
+        output2 += "    @include #{base_dir_name}_sprite;\n"
+      end
     end
-    # output2 += "    &.split_mobile{ @include mobile{ @include #{base_dir_name}_sprite_m; }}\n" if @has_mobile
+    # output2 += "    &.split_mobile{ @include mobile{ @include #{base_dir_name}_sprite_m; }}\n" if @split_type == SPLIT_BY_MOBILE
     for selector, css_data in data
       func = "#{base_dir_name}_#{selector}"
       rules = CssRule.new
@@ -92,7 +103,7 @@ class TexturePacker
     return "@mixin #{func}{ #{css} }\n"
   end
 
-  def parse_language_selector!(selector)
+  def parse_language_selector!(selector) # 向下相容
     language_parsed_array = selector.scan(/_(?:tw|cn|en)\z/)
     return selector if language_parsed_array.count.zero? # 如果沒有語言分類就回傳原本的 selector
 
@@ -106,6 +117,11 @@ class TexturePacker
     end
   end
 
+  def need_global_mixins?
+    return true if @split_type == SPLIT_BY_MOBILE
+    return false
+  end
+
   class CssRule
     def initialize
       @hash = {}
@@ -119,13 +135,19 @@ class TexturePacker
     end
     def generate_css
       inner_css = @hash.map do |prefix, obj|
-        case
-        when (prefix == nil || prefix == '')
+        case prefix
+        when nil, ''
           [obj.generate_css]
-        when prefix[0] == ':'
+        when /\A:/
           ["&#{prefix}, &.#{prefix[1..-1]}{ ", obj.generate_css, " }"]
-        when prefix == '[m]'
+        when '[m]'
           ["@include mobile{ ", obj.generate_css, " }"]
+        when '[tw]'
+          ["&:lang(zh-TW){ ", obj.generate_css, " }"]
+        when '[cn]'
+          ["&:lang(zh-CN){ ", obj.generate_css, " }"]
+        when '[en]'
+          ["&:lang(en){ ", obj.generate_css, " }"]
         else
           ["&#{prefix}{ ", obj.generate_css, " }"]
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: texture_packer
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: executables
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,8 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: texture packer