css_sprite 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6df41d04aaa6354a28cddeaa23925065cc5284cb
-  data.tar.gz: bebb3f2a9996e960500e91a509ef05b728b67eaf
+  metadata.gz: 18f25e08cde10566c1a7dd5013b7f3d4f2a8c1cf
+  data.tar.gz: c7f7fb418fb34514aa42808aa240a914914ba272
 SHA512:
-  metadata.gz: 922145bb24514d2228cb3f278b3ccf36b4c2d1e5666c7768c495f439676ef7a86e3961dd21be5e95697f3c5528ca2604d7f40230f01d0dc6959d6f73aa3c2540
-  data.tar.gz: 7707f22462b2fd284501df2ff01a5ffbc465f713b4600e4d6fb58ac42d7ddaa9f6c52bf072e66b16d251497b35afcb79bc98443216b597426019dfebd2244b19
+  metadata.gz: 832945cbdff609176347e2ec3a7c5d9ed3de71edc338dd671214c9de3fec9abc8108a4d24bc85b68aa937d859f71ee3a23f09b92f99e4d136fb9e7a95a8dfec6
+  data.tar.gz: 9afd854ed47ac75f5fee950b3f66bad2d49fadf9e82e6185e0fd596c540f5e77207426d99cd697bf94952b7420b45d5269fb8aa239bef64655f1885991496eca

data/Gemfile.lock

@@ -3,9 +3,6 @@ PATH
   specs:
     css_sprite (2.2.0)
       mini_magick
-      mocha
-      rake
-      rspec
 
 GEM
   remote: https://rubygems.org/
@@ -49,3 +46,6 @@ PLATFORMS
 DEPENDENCIES
   coveralls
   css_sprite!
+  mocha
+  rake
+  rspec

data/README.md

@@ -101,6 +101,7 @@ There is no need to do any configurations by default for Rails 3.1 or higher pro
     image_path: public/images
     stylesheet_path: public/stylesheets
     css_images_path: images
+    source_images_path: app/sprites
 
 ### Destination Image Format
 
@@ -180,9 +181,10 @@ css_sprite follows the conventions that images are under
 
     image_path: public/images
     stylesheet_path: public/stylesheets
+    source_images_path: app/sprites
 
-By default, image_path is `app/assets/images` and stylesheet_path is
-`app/assets/stylesheets`.
+By default, source_images_path and image_path are `app/assets/images` and
+stylesheet_path is `app/assets/stylesheets`.
 
 ## Example
 

data/css_sprite.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = CssSprite::VERSION
 
-  gem.add_dependency("mini_magick")
-  gem.add_runtime_dependency("rake")
-  gem.add_runtime_dependency("rspec")
-  gem.add_runtime_dependency("mocha")
+  gem.add_runtime_dependency("mini_magick")
+  gem.add_development_dependency("rake")
+  gem.add_development_dependency("rspec")
+  gem.add_development_dependency("mocha")
 end

data/lib/css_sprite/sprite.rb

@@ -13,7 +13,9 @@ class Sprite
       @config = options
     end
 
-    @image_path = File.expand_path(File.join(base_dir, @config['image_path'] || 'app/assets/images'))
+    image_relative_path = @config['image_path'] || 'app/assets/images'
+    @image_path = File.expand_path(File.join(base_dir, image_relative_path))
+    @source_images_path = File.expand_path(File.join(base_dir, @config['source_images_path'] || image_relative_path))
     @stylesheet_path = File.expand_path(File.join(base_dir, @config['stylesheet_path'] || 'app/assets/stylesheets'))
 
     @css_images_path = @config['css_images_path'] ||= "assets"
@@ -76,8 +78,8 @@ class Sprite
 
   # detect all the css sprite directories. e.g. app/assets/images/css_sprite, app/assets/images/widget_css_sprite
   def css_sprite_directories
-    Dir.entries(@image_path).collect do |d|
-      File.join(@image_path, d) if File.directory?(File.join(@image_path, d)) and d =~ /css_sprite$/
+    Dir.entries(@source_images_path).collect do |d|
+      File.join(@source_images_path, d) if File.directory?(File.join(@source_images_path, d)) and d =~ /css_sprite$/
     end.compact
   end
 
@@ -183,7 +185,7 @@ class Sprite
 
         f.print class_names(results).join(",\n")
         if @config['use_asset_url']
-          f.print " \n  background: asset-url('#{dest_image_name}', image) no-repeat\n"
+          f.print " \n  background: asset-url('#{dest_image_name}') no-repeat\n"
         else
           f.print " \n  background: url('/#{@css_images_path}/#{dest_image_name}?#{dest_image_time.to_i}') no-repeat\n"
         end
@@ -219,7 +221,7 @@ class Sprite
 
         f.print class_names(results).join(",\n")
         if @config['use_asset_url']
-          f.print " \{\n  background: asset-url('#{dest_image_name}', image) no-repeat;\n\}\n"
+          f.print " \{\n  background: asset-url('#{dest_image_name}') no-repeat;\n\}\n"
         else
           f.print " \{\n  background: url('/#{@css_images_path}/#{dest_image_name}?#{dest_image_time.to_i}') no-repeat;\n\}\n"
         end
@@ -264,7 +266,7 @@ class Sprite
 
   # destination css sprite image path
   def dest_image_path(directory)
-    directory + "." + @format
+    File.join(@image_path, File.basename(directory) + "." + @format)
   end
 
   # destination css sprite image name

data/lib/css_sprite/version.rb

@@ -1,3 +1,3 @@
 module CssSprite
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: css_sprite
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -31,7 +31,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -45,7 +45,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -59,7 +59,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -84,7 +84,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- VERSION
 - css_sprite.gemspec
 - example/Rakefile
 - example/app/assets/images/css_sprite.png
@@ -137,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: css_sprite is a rails plugin/gem to generate css sprite image automatically.

data/VERSION

@@ -1 +0,0 @@
-1.4.10