rails-sprite 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28356398d2a27b45b10a9aae7eb1fbeec2a568e9
-  data.tar.gz: 23eb22bb38f164387cc88b6ff8fac5da6bafb547
+  metadata.gz: 825c1e7a5a56ce0cae657a9e9661392dac08d61e
+  data.tar.gz: 628287d731a7cf7a2b42938239f7e79f4e524bed
 SHA512:
-  metadata.gz: 9ab758d4054121d87c2080b28318eefbe2bc27aabfb7d1aa4eeba0fef84ea0e854b40304dc5eead62a23e65c9c760e5a6a29f03c0d2c3622269ac295d1c7ec90
-  data.tar.gz: 8ef7009ab864f4459abfa0e3415e6255f4d4fa4a7242a233b2976cad109b10e9966573a6af172cf8f471b218822950054903efde053eae521421b416edbcf083
+  metadata.gz: 9ce713cb639aaab16c70bc6c401833e850ffe344d17ab5848eba6465a696d586ecb10d5b71effad9e25ec01423e1bf8838e09c3839c075bc99eeb7e516bb3b9c
+  data.tar.gz: bc0938793c37a42b0293124853f8c9006450088547aa0e14e02003201125e6fdcad78822b6d1db8af7b9583c34b9b4d6436c6f0a082ff0930647538af34fd494

data/lib/rails_sprite/sprite_util.rb

@@ -6,7 +6,7 @@ module RailsSprite
       :spacing, :image_to_folder, :image_source_folder,
       :stylesheet_to, :image_to_file_path, :css_class_prefix, :css_class_shared,
       :image_scope_name, :stylesheet_scope_name,
-      :css_extend, :file_extend_name
+      :css_extend, :file_extend_name, :zoom
 
     #
     #  :css_extend => "",
@@ -51,6 +51,8 @@ module RailsSprite
 
       @css_class_shared         = options.fetch(:css_class_shared, "rs-#{@scope_str}")
       @css_class_prefix         = options.fetch(:css_class_prefix, "rs-#{@scope_str}-#{@recipe_str}-")
+
+      @zoom                     = options.fetch(:zoom, 1).to_i
     end
 
     def perform
@@ -71,9 +73,7 @@ module RailsSprite
         if file_name != '.' && file_name != '..' && file_name.end_with?(file_extend)
           file_path = "#{image_source_folder}/#{file_name}"
 
-          if ::File.file?( file_path )
-            # puts "#{file_path}"
-
+          if ::File.file?(file_path)
             file_name_split = file_name.split('.')
             file_name_split.pop
             file_purename = file_name_split.join('.')
@@ -90,7 +90,7 @@ module RailsSprite
             file_info[:x] = x
             file_info[:y] = y
 
-            y += ( spacing + file_info[:height] )
+            y += (spacing + file_info[:height])
 
             max_w = [max_w, file_info[:width]].max
             max_h = y
@@ -118,6 +118,7 @@ module RailsSprite
 
     def _composite_css file_infos
       stylesheet_generator.generate(
+        :zoom => zoom,
         :css_class_shared => css_class_shared,
         :css_class_prefix => css_class_prefix,
         :file_infos => file_infos,

data/lib/rails_sprite/stylesheet_generator.rb

@@ -2,6 +2,7 @@ module RailsSprite
   class StylesheetGenerator
 
     def self.generate options={}
+      zoom = options.fetch(:zoom, 1).to_i
       css_class_prefix = options[:css_class_prefix]
       css_class_shared = options[:css_class_shared]
       css_extend = options[:css_extend] 
@@ -10,26 +11,34 @@ module RailsSprite
       stylesheet_to = options[:stylesheet_to]
 
       result = {}
-
       styles = []
 
       file_infos.each do |file_info|
         style = {}
 
-        style[:width] = "#{file_info[:width]}px"
-        style[:height] = "#{file_info[:height]}px"
-        style[:x] = "#{file_info[:x]}px"
-        style[:y] = "#{file_info[:y]}px"
+        style[:width] = "#{file_info[:width] / zoom}px"
+        style[:height] = "#{file_info[:height] / zoom}px"
+        style[:x] = "#{file_info[:x] / zoom}px"
+        style[:y] = "#{file_info[:y] / zoom}px"
         style[:class] = "#{css_class_prefix}#{file_info[:file_purename]}"
 
         styles << style
       end
 
-
       result[:styles] = styles
       result[:image_scope_name] = image_scope_name
       result[:css_class_shared] = css_class_shared
 
+      ## 高度取总和
+      result[:background_y] = file_infos.map do |file_info|
+        file_info[:height]
+      end.sum / zoom
+
+      ## 宽度取最大值
+      result[:background_x] = file_infos.map do |file_info|
+        file_info[:width]
+      end.max / zoom
+
       css_filt_content = case css_extend
                          when '.css.scss.erb', '.scss.erb'
                            composite_css_scss_erb(result)
@@ -53,17 +62,28 @@ module RailsSprite
       styles << <<-END_CSS
 // 将下面3行，放入页面中(仅供参考)
 // .#{result[:css_class_shared]} {
-//   background: url(<%= static_url("#{result[:image_scope_name]}") %>) no-repeat;
+//   background-image: url(<%= image_path("#{result[:image_scope_name]}") %>);
 // }
+END_CSS
+
+      styles << <<-END_CSS
+.#{result[:css_class_shared]} {
+  background-repeat: no-repeat;
+  background-size: #{result[:background_x]}px #{result[:background_y]}px;
+}
 END_CSS
 
       result[:styles].each do |style|
         styles << <<-END_CSS
 .#{style[:class]} {
   background-position: #{style[:x]} -#{style[:y]};
+  height: #{style[:height]};
+  width: #{style[:width]};
 }
         END_CSS
       end
+
+      styles.join("\n")
     end
 
     def self.composite_css_scss_erb result
@@ -71,7 +91,9 @@ END_CSS
 
       styles << <<-END_CSS
 .#{result[:css_class_shared]} {
-  background: url(<%= image_path("#{result[:image_scope_name]}") %>) no-repeat;
+  background-image: url(<%= image_path("#{result[:image_scope_name]}") %>);
+  background-repeat: no-repeat;
+  background-size: #{result[:background_x]}px #{result[:background_y]}px;
 }
 END_CSS
 
@@ -79,6 +101,8 @@ END_CSS
         styles << <<-END_CSS
 .#{style[:class]} {
   background-position: #{style[:x]} -#{style[:y]};
+  height: #{style[:height]};
+  width: #{style[:width]};
 }
         END_CSS
 

data/lib/rails_sprite/version.rb

@@ -1,3 +1,3 @@
 module RailsSprite
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/dummy/log/test.log

@@ -65,3 +65,105 @@ RailsSpriteTest: test_truth
 RailsSpriteTest: test_perform
 -----------------------------
    (0.2ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.0ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-----------------------------
+RailsSpriteTest: test_perform
+-----------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------
+RailsSpriteTest: test_truth
+---------------------------
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.9ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-----------------------------
+RailsSpriteTest: test_perform
+-----------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------
+RailsSpriteTest: test_truth
+---------------------------
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.8ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-----------------------------
+RailsSpriteTest: test_perform
+-----------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------
+RailsSpriteTest: test_truth
+---------------------------
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.4ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-----------------------------
+RailsSpriteTest: test_perform
+-----------------------------
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------
+RailsSpriteTest: test_truth
+---------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (3.3ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.6ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-----------------------------
+RailsSpriteTest: test_perform
+-----------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------
+RailsSpriteTest: test_truth
+---------------------------
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.9ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-----------------------------
+RailsSpriteTest: test_perform
+-----------------------------
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------
+RailsSpriteTest: test_truth
+---------------------------
+   (0.2ms)  rollback transaction

data/test/fixtures/testing/app/assets/stylesheets/rails_xxx/sprite/icons/32x32.css.scss.erb

@@ -1,15 +1,23 @@
 .rails_xxx-icon {
-  background: url(<%= image_path("rails_xxx/sprite/icons/32x32.png") %>) no-repeat;
+  background-image: url(<%= image_path("rails_xxx/sprite/icons/32x32.png") %>);
+  background-repeat: no-repeat;
+  background-size: 16px 48px;
 }
 
 .icons-32x32-avatar {
   background-position: 0px -0px;
+  height: 16px;
+  width: 16px;
 }
 
 .icons-32x32-heart-rose {
-  background-position: 0px -42px;
+  background-position: 0px -21px;
+  height: 16px;
+  width: 16px;
 }
 
 .icons-32x32-mail {
-  background-position: 0px -84px;
+  background-position: 0px -42px;
+  height: 16px;
+  width: 16px;
 }

data/test/rails_sprite_test.rb

@@ -11,7 +11,8 @@ class RailsSpriteTest < ActiveSupport::TestCase
       :scope_name => "rails_xxx/",
       :recipe_path => "icons/32x32",
       :css_class_shared => 'rails_xxx-icon',
-      :css_class_prefix => 'icons-32x32-'
+      :css_class_prefix => 'icons-32x32-',
+      :zoom => 2
 
       #  :root_path => '.',
       #  :scope_name => "rails_xxx",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-sprite
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - happy
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Rails CSS Sprite Utils.