asset-pocket 0.1 → 0.2

data/features/rails.feature

@@ -1,9 +1,5 @@
 
 Feature: Rails integration
-    Rails views have a helper method sprite_tag to create a HTML tag which will
-    show the image.
-
-    The rake task pocket:update will generate the pocket.
 
     @rails
     Scenario: create a new application and define a pocket with some files
@@ -20,33 +16,3 @@ Feature: Rails integration
         When update the pocket
         Then a file named "public/stylesheets/application.css" contains "1\n2"
 
-    @rails
-    Scenario: create a CSS sprite in a rails application
-        Given a rails application in a temporary directory
-        And a file named "app/views/images/first.png" with a random image of 10x20
-        And a file named "app/views/images/second.png" with a random image of 10x30
-        And the application has a pocket with:
-        """
-        css "public/stylesheets/sprites.css" do
-            sprite "icons" do
-                layout :vertical
-                use "app/views/images/*"
-            end
-        end
-        """
-        And the controller "foo" has a view "index" with:
-        """
-        <%= sprite_tag "icons/first" %>
-        generated HTML from rails
-        <%= sprite_tag "icons/second" %>
-        """
-        When update the pocket
-        Then the sprite "icons" is generated in "public/stylesheets/sprites.css"
-        And this sprite has 2 images
-        And this sprite is 10x50
-        And this sprite format is PNG
-        And this sprite has the image "first"
-        And this sprite has the image "second"
-        Then the page at "/foo/index" include "generated HTML from rails"
-        And this page has a tag matched with ".sprite-icons--first"
-        And this page has a tag matched with ".sprite-icons--second"

data/lib/asset_pocket/pocket.rb

@@ -1,6 +1,5 @@
 
 require 'asset_pocket/compressor'
-require 'asset_pocket/css_sprites'
 
 module AssetPocket
     class Pocket
@@ -94,42 +93,6 @@ module AssetPocket
         end
 
         class CSSDefinitions < Definitions
-
-            def sprite(name, &block)
-                @current_sprite = SpriteDefition.new(name, self)
-                block.call
-                @current_sprite.generate!
-            ensure
-                @current_sprite = nil
-            end
-
-            def layout(value)
-                ensure_sprite!
-                @current_sprite.layout = value
-            end
-
-            def images_location(value)
-                ensure_sprite!
-                @current_sprite.images_location = value
-            end
-
-            def quality(value)
-                ensure_sprite!
-                @current_sprite.quality = value
-            end
-
-            def use(pattern)
-                if @current_sprite
-                    @current_sprite.use pattern
-                else
-                    super
-                end
-            end
-
-        private
-            def ensure_sprite!
-                raise NameError, "this macro has to be used in a sprite block" if @current_sprite.nil?
-            end
         end
 
         class JSDefinitions < Definitions

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: asset-pocket
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Ayose Cazorla
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 +01:00
+date: 2010-10-14 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -30,22 +31,16 @@ files:
 - features/support/env.rb
 - features/step_definitions/files.rb
 - features/step_definitions/rails.rb
-- features/step_definitions/sprites.rb
 - features/rails.feature
 - features/images.feature
 - features/sass.feature
 - features/javascripts.feature
-- features/sprites.feature
 - lib/asset_pocket/pocket.rb
-- lib/asset_pocket/css_sprites.rb
 - lib/asset_pocket/source_filter.rb
 - lib/asset_pocket/compressor.rb
 - lib/asset_pocket/generator.rb
-- lib/asset_pocket/rails.rb
-- lib/asset_pocket.rb
 - lib/tasks/pocket.rake
-- rails/init.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/setepo/asset_pocket
 licenses: []
 
@@ -55,23 +50,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Manages assets in a versatile way

data/features/sprites.feature

@@ -1,94 +0,0 @@
-
-Feature: generate CSS sprites from the pocket
-
-    @sprites
-    Scenario: create a simple sprite with different images
-        Given a file named "images/a.png" with a random image of 10x10
-        And a file named "images/b.png" with a random image of 10x20
-        And a file named "images/c.png" with a random image of 20x20
-        When generate a pocket with:
-        """
-        css "sprites/css/first.css" do
-            sprite "all" do
-                layout :vertical
-                use "images/*"
-            end
-        end
-        """
-        Then the sprite "all" is generated in "sprites/css/first.css"
-        And this sprite has 3 images
-        And this sprite is 20x50
-        And this sprite format is PNG
-
-    @sprites
-    Scenario Outline: sprites can be generated with different layoutes
-        Given 20 random images at "images/<case>/firstNN.png" with a random image of 10x30
-        When generate a pocket with:
-        """
-        css "sprites/css/<case>.css" do
-            sprite "all-<case>" do
-                layout <layout>
-                use "images/<case>/*"
-            end
-        end
-        """
-        Then the sprite "all-<case>" is generated in "sprites/css/<case>.css"
-        And this sprite has 20 images
-        And this sprite is <size>
-        And this sprite format is PNG
-
-        Scenarios:
-            | case       | layout        | size   |
-            | vertical   | :vertical     | 10x600 |
-            | horizontal | :horizontal   | 200x30 |
-            | table      | :columns => 5 | 50x120 |
-
-    @sprites
-    Scenario: different formats create different sprites
-        Given a file named "images/a.png" with a random image of 10x10
-        And a file named "images/b.png" with a random image of 10x20
-        And a file named "images/c.gif" with a random image of 20x20
-        And 10 random images at "images/firstNN.jpeg" with a random image of 10x30
-        When generate a pocket with:
-        """
-        css "sprites/css/multiformat.css" do
-            sprite "multiformat" do
-                layout :vertical
-                use "images/*"
-            end
-        end
-        """
-        Then the sprite "multiformat" encoded in PNG is generated in "sprites/css/multiformat.css"
-        And this sprite has 2 images
-        And this sprite is 10x30
-        And the sprite "multiformat" encoded in GIF is generated in "sprites/css/multiformat.css"
-        And this sprite has 1 image
-        And this sprite is 20x20
-        And the sprite "multiformat" encoded in JPEG is generated in "sprites/css/multiformat.css"
-        And this sprite has 10 images
-        And this sprite is 10x300
-
-    @sprites
-    Scenario: the sprites can be generated using different quality values
-        Given a file named "images/a.jpeg" with a random image of 10x10
-        And a file named "images/b.jpeg" with a random image of 10x20
-        And a file named "images/c.jpeg" with a random image of 20x20
-        When generate a pocket with:
-        """
-        css "sprites/css/everything.css" do
-            sprite "best" do
-                layout :vertical
-                quality 100
-                use "images/*"
-            end
-
-            sprite "worst" do
-                layout :vertical
-                quality 1
-                use "images/*"
-            end
-        end
-        """
-        Then the sprite "worst" is generated in "sprites/css/everything.css"
-        And the sprite "best" is generated in "sprites/css/everything.css"
-        And the size of the sprite "worst" is smaller than the size of the sprite "best"

data/features/step_definitions/sprites.rb

@@ -1,76 +0,0 @@
-
-def random_image(filename, width, height)
-    img = Magick::Image.new(width, height)
-    img.import_pixels 0, 0, width, height, "RGB", File.read("/dev/urandom", width*height*3)
-
-    filename = @temp_dir.join(filename)
-    filename.dirname.mkpath
-    img.write filename.to_s
-
-    @created_files.unshift filename if @created_files
-end
-
-Given /^(\d+) random images at "([^"]*)" with a random image of (\d+)x(\d+)$/ do |count, pattern, width, height|
-    width = width.to_i
-    height = height.to_i
-    count.to_i.times do |iter|
-        random_image pattern.sub("NN", iter.to_s), width, height
-    end
-end
-
-Given /^a file named "([^"]*)" with a random image of (\d+)x(\d+)$/ do |filename, width, height|
-    random_image filename, width.to_i, height.to_i
-end
-
-
-def just_parse_css(content)
-    content.scan(/(\S+)\s*\{(.*?)\}/m).inject({}) do |hash, item|
-        rule, attributes = item
-        hash[rule] = attributes.split(";").map {|attribute| attribute.strip }
-        hash
-    end
-end
-
-Then /^the sprite "([^"]*)" is generated in "([^"]*)"$/ do |sprite, css_file|
-    Then %|the sprite "#{sprite}" encoded in \\w+ is generated in "#{css_file}"|
-end
-
-Then /^the sprite "([^"]*)" encoded in (\S+) is generated in "([^"]*)"$/ do |sprite, format, css_file|
-
-    @found_sprites ||= {}
-
-    @sprite_name = sprite
-
-    css_file = @temp_dir.join(css_file)
-    @css_loaded = just_parse_css(css_file.read)
-    @css_loaded.should include_key(/\.sprite-#{sprite}--/)
-
-    @sprite = @css_loaded.reject {|key, value| key !~ /\.sprite-#{sprite}--/ or value.join !~ /url\([^)]+\.#{format}\)/i }
-    @image_sprite = Magick::Image.read(css_file.dirname.join(@sprite.values.to_s.first =~ /url\((.*?\.#{format})\)/i && $1).to_s).first
-
-    @found_sprites[sprite] = @image_sprite
-end
-
-Then /^this sprite has (\d+) images?$/ do |count|
-    @sprite.size.should eql(count.to_i)
-end
-
-Then /^this sprite is (\d+)x(\d+)$/ do |width, height|
-    @image_sprite.columns.should eql(width.to_i)
-    @image_sprite.rows.should eql(height.to_i)
-end
-
-Then /^this sprite format is (\S+)$/ do |format|
-    @image_sprite.format.downcase.should eql(format.downcase)
-end
-
-Then /^this sprite has the image "([^"]*)"$/ do |image_name|
-    @css_loaded.should include_key(/\.sprite-#{@sprite_name}--#{image_name}\b/)
-end
-
-Then /^the size of the sprite "([^"]*)" is smaller than the size of the sprite "([^"]*)"$/ do |big_sprite, small_sprite|
-    @found_sprites[big_sprite].should_not be_nil
-    @found_sprites[small_sprite].should_not be_nil
-    (@found_sprites[big_sprite].to_blob > @found_sprites[small_sprite].to_blob).should be_true
-end
-

data/lib/asset_pocket.rb

@@ -1,4 +0,0 @@
-
-if defined?(Rails)
-    require 'asset_pocket/rails'
-end

data/lib/asset_pocket/css_sprites.rb

@@ -1,141 +0,0 @@
-
-require 'RMagick'
-require 'md5'
-
-module AssetPocket
-    class Pocket
-        class SpriteDefition
-            attr_accessor :layout, :quality
-            attr_reader :name, :css_block, :images_location
-
-            def initialize(name, css_block)
-                @name = name
-                @css_block = css_block
-                @files = {}
-                @layout = :vertical
-
-                self.images_location = "../images/"
-            end
-
-            def images_location=(location)
-                @images_location = css_block.pocket.generator.root_path.join(css_block.filename).dirname.join(location)
-            end
-
-            def generate!
-                @images_location.mkpath
-
-                @files.each_pair do |format, images|
-
-                    sprite_name = @images_location.join("sprite-#{name}.#{format.downcase}")
-                    url_css_sprite = sprite_name.relative_path_from(css_block.full_filename.dirname)
-
-                    # Compute the canvas size
-                    width = 0
-                    height = 0
-
-                    distribute_images images do |image, cx, cy|
-                        cx = cx + image.columns
-                        cy = cy + image.rows
-
-                        height = cy if cy > height
-                        width = cx if cx > width
-                    end
-
-                    canvas = Magick::Image.new(width, height)
-                    canvas.format = format
-
-                    distribute_images images do |image, cx, cy|
-                        canvas.composite! image, cx, cy, Magick::OverCompositeOp
-
-                        css = ".sprite.sprite-#{name}--#{File.basename(image.filename).gsub(/\.\w+$/, "")} {"
-                        css << "background: url(#{url_css_sprite}) -#{cx}px -#{cy}px;"
-                        css << "width: #{image.columns}px;"
-                        css << "height: #{image.rows}px;"
-                        css << "} \n"
-                        css_block.content << [ :string, css]
-                    end
-
-                    images.clear
-                    quality = quality() # Force variable creation. Block passed to canvas.write losses instance reference (called with instance_eval?)
-                    canvas.write(sprite_name.to_s) do |info|
-                        info.quality = quality if quality
-                    end
-                end
-            end
-
-            def use(pattern)
-                @files ||= []
-                Dir[css_block.pocket.generator.root_path.join(pattern)].each do |image_file|
-                    begin
-                        image = Magick::Image.read(image_file)
-                        if image.size != 1
-                            # Animated images can not be sprited
-                            # TODO log the action
-                            next
-                        end
-
-                        image = image.first
-
-                    rescue Magick::ImageMagickError
-                        # TODO log the error
-                        next
-                    end
-
-                    @files[image.format] ||= []
-                    @files[image.format] << image
-                end
-            end
-
-        private
-            def distribute_images(images, &block)
-                cx = cy = 0
-                valid_layout = true
-
-                case layout
-                when :vertical
-                    images.each do |image|
-                        block.call image, cx, cy
-                        cy += image.rows
-                    end
-
-                when :horizontal
-                    images.each do |image|
-                        block.call image, cx, cy
-                        cx += image.columns
-                    end
-
-                when Hash
-                    if layout[:columns]
-                        column = 0
-                        row_height = 0
-                        columns_per_row = layout[:columns]
-
-                        images.each do |image|
-                            column += 1
-                            if column > columns_per_row
-                                column = 1
-                                cx = 0
-                                cy += row_height
-                                row_height = 0
-                            end
-
-                            block.call image, cx, cy
-                            cx += image.columns
-                            row_height = image.rows if image.rows > row_height
-                        end
-
-                    else
-                        valid_layout = false
-                    end
-
-                else
-                    valid_layout = false
-                end
-
-                unless valid_layout
-                    raise ArgumentError, "Unknown layout: #{layout} in sprite #{name}"
-                end
-            end
-        end
-    end
-end

data/lib/asset_pocket/rails.rb

@@ -1,15 +0,0 @@
-
-module AssetPocket
-    module ViewHelperMethods
-        def sprite_tag(name, options = {})
-            # TODO options: tag_name, :class, :style, something like that
-            # TODO Generate the CSS class name inside AssetPocket, and not hardcoded
-            group, image = name.split("/")
-            %[<span class="sprite-#{group}--#{image}">&nbsp;</span>].html_safe
-        end
-    end
-end
-
-ActionView::Base.class_eval do
-    include AssetPocket::ViewHelperMethods
-end

data/rails/init.rb

@@ -1 +0,0 @@
-require 'asset_pocket/rails'