texture_packer 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dc38cd32c0b72a13abfdf07a46d636efba1b851
-  data.tar.gz: 8dbb0c5b77dab3c9efaa3eb8c5c29ba73fb0b786
+  metadata.gz: 41c159bf066da74aab198997c1f78a2ecc6c6bf6
+  data.tar.gz: 6d5473a3b14ccb99cdb030d638f50446d2e95c97
 SHA512:
-  metadata.gz: '0049b77322f41e5de83714b099b59982de5fb75334df7d8015f47d144f95851e3ef407c4b15cb758677cd399375005d9b2a772af9477012d2f2bd36a5942c067'
-  data.tar.gz: fb284485f416de0e4a75719f4ba705a078695eab063f70e46e6c7f6103ed922464775417c71eafba40d0f609f6d4da676910f81b75c9520297fe89f440727746
+  metadata.gz: 94f61a4db7e19bc00b685ce7c3d7c84bd7f11318e868fa172ea9804aecaa29580a99e17be97dcb8f987db69007b25f3806db2cf5967f5f5e6e3552ca14fb57be
+  data.tar.gz: 1c36f77fa566bcf998b1b174831618d4f8cfb4aaeca13cf1b607c7b55d9577bdb2421464663558057c5befb0cd0c1b89d83b9418fe39a88e13e91e747ec55130

data/.travis.yml

@@ -0,0 +1,25 @@
+sudo: false
+env:
+  global:
+    - CC_TEST_REPORTER_ID=48b7540803d9734cab527ea1b3281271d44588243af0098fd3ac34f539940322
+language: ruby
+rvm:
+  - 2.3
+  - 2.6
+  - 2.7
+gemfile:
+  - gemfiles/Gemfile.gemfile
+before_install:
+  - if `ruby -e 'exit(RUBY_VERSION.to_f < 2.7)'`; then
+      gem i rubygems-update -v '< 3' && update_rubygems;
+      gem install bundler -v '< 2';
+    fi
+  - gem --version
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+script:
+  - bundle exec rake test
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
+

data/README.md

@@ -1 +1,7 @@
 # texture_packer
+
+[![Gem Version](https://img.shields.io/gem/v/texture_packer.svg?style=flat)](https://rubygems.org/gems/texture_packer)
+[![Build Status](https://api.travis-ci.com/khiav223577/texture_packer.svg?branch=master)](https://travis-ci.com/khiav223577/texture_packer)
+[![RubyGems](http://img.shields.io/gem/dt/texture_packer.svg?style=flat)](https://rubygems.org/gems/texture_packer)
+[![Code Climate](https://codeclimate.com/github/khiav223577/texture_packer/badges/gpa.svg)](https://codeclimate.com/github/khiav223577/texture_packer)
+[![Test Coverage](https://codeclimate.com/github/khiav223577/texture_packer/badges/coverage.svg)](https://codeclimate.com/github/khiav223577/texture_packer/coverage)

data/executables/pack_scss

@@ -2,6 +2,7 @@
 require 'yaml'
 require 'pathname'
 require 'fileutils'
+require 'texture_packer'
 # ----------------------------------------------------------------
 # ● 載入 yaml
 # ----------------------------------------------------------------
@@ -30,23 +31,16 @@ end
 
 exec_cmd('TexturePacker packer.tps')
 
-def get_mixin(func, css)
-  return "@mixin #{func}{ #{css} }\n"
-end
-
 if File.exists?('packed_mobile.css') # 向下相容
   exec_cmd('mv packed_mobile.css packed_m.css')
   exec_cmd('mv packed_mobile.png packed_m.png')
 end
-$has_mobile = true if File.exists?('packed_m.css')
+has_mobile = true if File.exists?('packed_m.css')
 
 # ----------------------------------------------------------------
 # ● 由路徑計算 class 名字
 # ----------------------------------------------------------------
 dir_name = File.expand_path(Dir.pwd).gsub(/.*\/Texture-Packer\/.*?\/(.*)/, '\1')
-base_dir_name = File.basename(dir_name)
-theme = base_dir_name[/[^_]+$/]
-dir_without_theme = base_dir_name[0...-(theme.size + 1)]
 
 output_paths_mapping = Dir['*.css'].map do |path|
   name = File.basename(path, '.css')
@@ -54,103 +48,8 @@ output_paths_mapping = Dir['*.css'].map do |path|
 end.to_h
 
 content = output_paths_mapping.map{|_, path| File.read("#{path}.css") }.join
-
-Dir['images/**/'].map{|s| s[/images\/(.*)\//, 1] }.compact.map{|s| "#{s.gsub('/', '-')}-" }.each do |path| #"images/aaa/bbb/ccc.png" => "aaa-bbb-"
-  content.gsub!(path, path.gsub('-', '_')) #aaa-bbb => aaa_bbb
-end
-
-data = {}
-content.gsub!(/-disabled \{/, ':disabled {') #-disabled => :disabled
-loop{ break if content.gsub!(/-([\w]+)((?:[^\w][\w]+)*) \{/, '[\1]\2 {') == nil }
-output0 = content
-output0.sub!(/(\/\*(.|\n)*?\*\/)/, '') #去掉註解
-output0 = $1 + "\n"
-# puts content
-def extract_rule!(content)
-  content.sub!(/^\.([a-zA-Z0-9_-]+)((?:\:\w+|\[\w+\])*) \{(.*?)\}/, '') #抓 rule
-  return [$1, $2, $3] #$1 = selector, $2 = prefix, $3 = css
-end
-def split_prefixs(selector)
-  selector.sub!(/^\.([a-zA-Z0-9_-]+)(:\w+|\[\w+\])?/, '') #抓 rule
-end
-loop do
-  selector, prefix, css = extract_rule!(content)
-  break if selector == nil
-  next if selector == "sprite"
-  prefixs = prefix.scan(/\[\w+\]|\:\w+/) #[m]:disabled => ['[m]', ':disabled']
-  prefixs.map! do |prefix|
-    case prefix
-    when '[active]' ; ':active' # 因為 TexturePacker 會把 xxx-active-hover 轉成 xxx-active:hover 而不是 xxx:active:hover
-    when '[hover]' ; ':hover'
-    else ; prefix
-    end
-  end
-  # p [selector, prefix, css]
-  (data[selector] ||= {})[prefixs] = "#{css};"
-end
-# data = {selector => {nil => 'xxx', ':disabeld' => 'xxx', '[m]' => 'xxx'}}
-output1 = "" #mixin的output
-output_paths_mapping.map do |kind, name|
-  if kind == nil
-    output1 += get_mixin("#{base_dir_name}_sprite", "background-image: image-url('#{dir_name}.png');")
-  else
-    output1 += get_mixin("#{base_dir_name}_sprite_#{kind}", "background-image: image-url('#{dir_name}_#{kind}.png');")
-  end
-end
-output2 = "" #scss的output
-output2 += "body[theme='#{theme}']{\n"
-output2 += "  .#{dir_without_theme}_sprite{\n"
-if $has_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
-else
-  output2 += "    @include #{base_dir_name}_sprite;\n"
-end
-# output2 += "    &.split_mobile{ @include mobile{ @include #{base_dir_name}_sprite_m; }}\n" if $has_mobile
-class CssRule
-  def initialize
-    @hash = {}
-  end
-  def add(prefixs, css)
-    if prefixs.size > 0
-      (@hash[prefixs.first] ||= CssRule.new).add(prefixs[1..-1], css)
-    else
-      @css = css
-    end
-  end
-  def generate_css
-    inner_css = @hash.map do |prefix, obj|
-      case
-      when (prefix == nil || prefix == '')
-        [obj.generate_css]
-      when prefix[0] == ':'
-        ["&#{prefix}, &.#{prefix[1..-1]}{ ", obj.generate_css, " }"]
-      when prefix == '[m]'
-        ["@include mobile{ ", obj.generate_css, " }"]
-      else
-        ["&#{prefix}{ ", obj.generate_css, " }"]
-      end
-    end
-    inner = inner_css.size == 0 ? '' : " #{inner_css.join('')}"
-    return "#{@css}#{inner}"
-  end
-end
-for selector, css_data in data
-  func = "#{base_dir_name}_#{selector}"
-  rules = CssRule.new
-  css_data.each{|prefixs, css| #EX: prefixs == [':hover']
-    rules.add(prefixs, css)
-  }
-  output1 << get_mixin(func, rules.generate_css)
-  output2 << "    &.#{selector} { @include #{func}; }\n"
-end
-output2 += "  }\n"
-output2 += "}\n"
+packer = TexturePacker.new(dir_name, output_paths_mapping, content, has_mobile)
+output0, output1, output2 = packer.parse!
 output = output0 + output1 + output2
 
 # ----------------------------------------------------------------
@@ -167,17 +66,17 @@ write_to_file('packed.scss', output)
 # ----------------------------------------------------------------
 if SETTING['project_dir']
   css_pre_lines = ["@import './mixin.scss';"]
-  css_pre_lines.unshift("@import 'global_mixins';") if $has_mobile
+  css_pre_lines.unshift("@import 'global_mixins';") if has_mobile
 
   sub_dirs = dir_name.split(File::Separator)[0...-1]
-  css_path = Pathname.new(SETTING['project_dir']).join('app', 'assets', 'stylesheets', 'packed_sprites', *sub_dirs, dir_without_theme)
+  css_path = Pathname.new(SETTING['project_dir']).join('app', 'assets', 'stylesheets', 'packed_sprites', *sub_dirs, packer.dir_without_theme)
   img_path = Pathname.new(SETTING['project_dir']).join('app', 'assets', 'images', *sub_dirs)
   FileUtils.mkdir_p(css_path)
   FileUtils.mkdir_p(img_path)
   write_to_file(css_path.join('mixin.scss'), output1)
   write_to_file(css_path.join('ocean.scss'), "#{css_pre_lines.join("\n")}\n\n#{output2}")
   output_paths_mapping.each do |_, path|
-    FileUtils.cp("#{path}-fs8.png", img_path.join("#{path.sub('packed', base_dir_name)}.png"))
+    FileUtils.cp("#{path}-fs8.png", img_path.join("#{path.sub('packed', packer.base_dir_name)}.png"))
     exec_cmd("pngquant #{path}.png --force")
   end
 end

data/gemfiles/Gemfile.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem 'simplecov'
+end
+
+gemspec path: '../'

data/lib/texture_packer.rb

@@ -0,0 +1,134 @@
+require 'texture_packer/version'
+
+class TexturePacker
+  attr_reader :base_dir_name
+  attr_reader :dir_without_theme
+
+  def initialize(dir_name, output_paths_mapping, content, has_mobile)
+    @output_paths_mapping = output_paths_mapping
+    @content = content.dup
+    @has_mobile = has_mobile
+
+    @dir_name = dir_name
+    @base_dir_name = File.basename(@dir_name)
+    @theme = @base_dir_name[/[^_]+$/]
+    @dir_without_theme = @base_dir_name[0...-(@theme.size + 1)]
+  end
+
+  def parse!
+    Dir['images/**/'].map{|s| s[/images\/(.*)\//, 1] }.compact.map{|s| "#{s.gsub('/', '-')}-" }.each do |path| #"images/aaa/bbb/ccc.png" => "aaa-bbb-"
+      @content.gsub!(path, path.gsub('-', '_')) #aaa-bbb => aaa_bbb
+    end
+
+    data = {}
+    @content.gsub!(/-disabled \{/, ':disabled {') #-disabled => :disabled
+    loop{ break if @content.gsub!(/-([\w]+)((?:[^\w][\w]+)*) \{/, '[\1]\2 {') == nil }
+    output0 = @content
+    output0.sub!(/(\/\*(.|\n)*?\*\/)/, '') #去掉註解
+    output0 = $1 + "\n"
+
+    loop do
+      selector, prefix, css = extract_rule!
+      break if selector == nil
+      next if selector == "sprite"
+      prefixs = prefix.scan(/\[\w+\]|\:\w+/) #[m]:disabled => ['[m]', ':disabled']
+      prefixs.map! do |prefix|
+        case prefix
+        when '[active]' ; ':active' # 因為 TexturePacker 會把 xxx-active-hover 轉成 xxx-active:hover 而不是 xxx:active:hover
+        when '[hover]' ; ':hover'
+        else ; prefix
+        end
+      end
+      # p [selector, prefix, css]
+      (data[selector] ||= {})[prefixs] = "#{css};"
+    end
+    # data = {selector => {nil => 'xxx', ':disabeld' => 'xxx', '[m]' => 'xxx'}}
+    output1 = "" #mixin的output
+    @output_paths_mapping.map do |kind, name|
+      if kind == nil
+        output1 += get_mixin("#{base_dir_name}_sprite", "background-image: image-url('#{@dir_name}.png');")
+      else
+        output1 += get_mixin("#{base_dir_name}_sprite_#{kind}", "background-image: image-url('#{@dir_name}_#{kind}.png');")
+      end
+    end
+    output2 = "" #scss的output
+    output2 += "body[theme='#{@theme}']{\n"
+    output2 += "  .#{@dir_without_theme}_sprite{\n"
+    if @has_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
+    else
+      output2 += "    @include #{base_dir_name}_sprite;\n"
+    end
+    # output2 += "    &.split_mobile{ @include mobile{ @include #{base_dir_name}_sprite_m; }}\n" if @has_mobile
+    for selector, css_data in data
+      func = "#{base_dir_name}_#{selector}"
+      rules = CssRule.new
+      css_data.each{|prefixs, css| #EX: prefixs == [':hover']
+        rules.add(prefixs, css)
+      }
+      output1 << get_mixin(func, rules.generate_css)
+      output2 << "    &.#{parse_language_selector!(selector)} { @include #{func}; }\n"
+    end
+    output2 += "  }\n"
+    output2 += "}\n"
+    return [output0, output1, output2]
+  end
+
+  def extract_rule!
+    @content.sub!(/^\.([a-zA-Z0-9_-]+)((?:\:\w+|\[\w+\])*) \{(.*?)\}/, '') #抓 rule
+    return [$1, $2, $3] #$1 = selector, $2 = prefix, $3 = css
+  end
+
+  def get_mixin(func, css)
+    return "@mixin #{func}{ #{css} }\n"
+  end
+
+  def parse_language_selector!(selector)
+    language_parsed_array = selector.scan(/_(?:tw|cn|en)\z/)
+    return selector if language_parsed_array.count.zero? # 如果沒有語言分類就回傳原本的 selector
+
+    case language_parsed_array[0]
+    when '_tw'
+      return selector.gsub('_tw', ':lang(zh-TW)')
+    when '_cn'
+      return selector.gsub('_cn', ':lang(zh-CN)')
+    when '_en'
+      return selector.gsub('_en', ':lang(en)')
+    end
+  end
+
+  class CssRule
+    def initialize
+      @hash = {}
+    end
+    def add(prefixs, css)
+      if prefixs.size > 0
+        (@hash[prefixs.first] ||= CssRule.new).add(prefixs[1..-1], css)
+      else
+        @css = css
+      end
+    end
+    def generate_css
+      inner_css = @hash.map do |prefix, obj|
+        case
+        when (prefix == nil || prefix == '')
+          [obj.generate_css]
+        when prefix[0] == ':'
+          ["&#{prefix}, &.#{prefix[1..-1]}{ ", obj.generate_css, " }"]
+        when prefix == '[m]'
+          ["@include mobile{ ", obj.generate_css, " }"]
+        else
+          ["&#{prefix}{ ", obj.generate_css, " }"]
+        end
+      end
+      inner = inner_css.size == 0 ? '' : " #{inner_css.join('')}"
+      return "#{@css}#{inner}"
+    end
+  end
+end

data/lib/texture_packer/version.rb

@@ -1,3 +1,3 @@
-module TexturePacker
-  VERSION = "1.2.0"
+class TexturePacker
+  VERSION = "1.3.0"
 end

data/texture_packer.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = ['pack_scss']
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency 'bundler', '>= 1.17', '< 3.x'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
 end

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: texture_packer
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: executables
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.x
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.x
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -47,11 +67,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - LICENSE.txt
 - README.md
 - Rakefile
 - executables/pack_scss
+- gemfiles/Gemfile.gemfile
+- lib/texture_packer.rb
 - lib/texture_packer/version.rb
 - texture_packer.gemspec
 homepage: https://github.com/khiav223577/texture_packer