polymer 1.0.0.beta.5 → 1.0.0.beta.6

data/lib/polymer/cache.rb

@@ -14,6 +14,10 @@ module Polymer
       :paths         => {}
     }
 
+    # If the first three characters of a path match this, the path isn't
+    # in a subtree of the project.
+    NON_SUBTREE = '../'.freeze
+
     # Returns the path to the cache file.
     #
     # @return [Pathname]
@@ -22,15 +26,16 @@ module Polymer
 
     # Creates a new Cache.
     #
-    # If the given +path+ does not exist, an empty cache instance will be
-    # created, and calling +write+ will create a new file at +path+.
+    # If the project's +cache+ method returns a path which does not exist, the
+    # path -- and parent directories -- will be created.
     #
-    # @param [Pathname] path
-    #   Path to the cache file to be loaded. If no +path+ is given, the cache
-    #   will operate in-memory only and +write+ is disabled.
+    # @param [Polymer::Project] project
+    #   The project whose cache file is to be loaded. If no +project+ is
+    #   given, the cache will operate in-memory only and +write+ is disabled.
     #
-    def initialize(path = nil)
-      @path = path
+    def initialize(project = nil)
+      @project = project
+      @path    = project && project.cachefile
 
       if @path and @path.file?
         @cache = YAML.load_file @path
@@ -59,7 +64,13 @@ module Polymer
     # @return [Boolean]
     #
     def fresh?(thing)
-      return false if thing.is_a?(Sprite)   and not thing.save_path.file?
+      if thing.is_a?(Sprite) and not thing.save_path.file?
+        # If this is a data URI sprite a non-existent file is normal.
+        if ! @project || ! @project.data_uri_sprites.include?(thing)
+          return false
+        end
+      end
+
       return false if thing.is_a?(Pathname) and not thing.cleanpath.file?
 
       @cache[section(thing)][key(thing)] == digest(thing)
@@ -83,19 +94,19 @@ module Polymer
       @cache[section(thing)].delete(key(thing))
     end
 
-    # Removes any sprites no longer present in a project, and any cached
+    # Removes any sprites no longer present in the project, and any cached
     # images which cannot be located.
     #
-    # @param [Flexo::Project] project
-    #
-    def clean!(project)
+    def clean!
       return false unless @path
 
       @cache[:paths].delete_if do |key, _|
-        not @path.dirname.join(key).file?
+        not @path.dirname.join(key).file? or
+        # Remove any path to a file not in a subtree (:data_uri images).
+        key[0..2] == NON_SUBTREE
       end
 
-      sprite_keys = project.sprites.map { |sprite| key(sprite) }
+      sprite_keys = @project.sprites.map { |sprite| key(sprite) }
 
       @cache[:sprites].delete_if do |key, _|
         not sprite_keys.include?(key)
@@ -113,6 +124,8 @@ module Polymer
     def write
       return false unless @path
 
+      clean!
+
       @path.open('w') do |file|
         file.puts YAML.dump(@cache)
       end

data/lib/polymer/cli.rb

@@ -83,9 +83,6 @@ module Polymer
         end
       end
 
-      # Clean up the cache, removing sprites which no longer exist.
-      project.cache.clean!(project)
-
       # Finish by writing the new cache.
       project.cache.write
 
@@ -234,7 +231,7 @@ module Polymer
         end
       end
 
-      cache.clean!(project) if project
+      cache.clean! if project
       cache.write
     end
 

data/lib/polymer/man/polymer-bond.1

@@ -2,7 +2,7 @@
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .ad l
 .
-.TH "POLYMER\-BOND" "1" "October 2010" "POLYMER 1.0.0.BETA.5" "Polymer Manual"
+.TH "POLYMER\-BOND" "1" "November 2010" "POLYMER 1.0.0.BETA.6" "Polymer Manual"
 .
 .SH "NAME"
 \fBpolymer\-bond\fR \- Create sprite images defined in your \.polymer file

data/lib/polymer/man/polymer-bond.1.txt

@@ -63,4 +63,4 @@ SEE ALSO
 
 
 
-POLYMER 1.0.0.BETA.5		 October 2010		       POLYMER-BOND(1)
+POLYMER 1.0.0.BETA.6		 November 2010		       POLYMER-BOND(1)

data/lib/polymer/man/polymer-init.1

@@ -2,7 +2,7 @@
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .ad l
 .
-.TH "POLYMER\-INIT" "1" "October 2010" "POLYMER 1.0.0.BETA.5" "Polymer Manual"
+.TH "POLYMER\-INIT" "1" "November 2010" "POLYMER 1.0.0.BETA.6" "Polymer Manual"
 .
 .SH "NAME"
 \fBpolymer\-init\fR \- Create a new Polymer project in the current directory

data/lib/polymer/man/polymer-init.1.txt

@@ -39,4 +39,4 @@ OPTIONS
 
 
 
-POLYMER 1.0.0.BETA.5		 October 2010		       POLYMER-INIT(1)
+POLYMER 1.0.0.BETA.6		 November 2010		       POLYMER-INIT(1)

data/lib/polymer/man/polymer-optimise.1

@@ -2,7 +2,7 @@
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .ad l
 .
-.TH "POLYMER\-OPTIMISE" "1" "October 2010" "POLYMER 1.0.0.BETA.5" "Polymer Manual"
+.TH "POLYMER\-OPTIMISE" "1" "November 2010" "POLYMER 1.0.0.BETA.6" "Polymer Manual"
 .
 .SH "NAME"
 \fBpolymer\-optimise\fR \- Optimise PNG images

data/lib/polymer/man/polymer-optimise.1.txt

@@ -27,4 +27,4 @@ DESCRIPTION
 
 
 
-POLYMER 1.0.0.BETA.5		 October 2010		   POLYMER-OPTIMISE(1)
+POLYMER 1.0.0.BETA.6		 November 2010		   POLYMER-OPTIMISE(1)

data/lib/polymer/man/polymer-position.1

@@ -2,7 +2,7 @@
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .ad l
 .
-.TH "POLYMER\-POSITION" "1" "October 2010" "POLYMER 1.0.0.BETA.5" "Polymer Manual"
+.TH "POLYMER\-POSITION" "1" "November 2010" "POLYMER 1.0.0.BETA.6" "Polymer Manual"
 .
 .SH "NAME"
 \fBpolymer\-position\fR \- Information about your sprite sources

data/lib/polymer/man/polymer-position.1.txt

@@ -39,4 +39,4 @@ DESCRIPTION
 
 
 
-POLYMER 1.0.0.BETA.5		 October 2010		   POLYMER-POSITION(1)
+POLYMER 1.0.0.BETA.6		 November 2010		   POLYMER-POSITION(1)

data/lib/polymer/man/polymer.1

@@ -2,7 +2,7 @@
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .ad l
 .
-.TH "POLYMER" "1" "October 2010" "POLYMER 1.0.0.BETA.5" "Polymer Manual"
+.TH "POLYMER" "1" "November 2010" "POLYMER 1.0.0.BETA.6" "Polymer Manual"
 .
 .SH "NAME"
 \fBpolymer\fR \- Image spriting for web applications

data/lib/polymer/man/polymer.1.txt

@@ -57,4 +57,4 @@ SEE ALSO
 
 
 
-POLYMER 1.0.0.BETA.5		 October 2010			    POLYMER(1)
+POLYMER 1.0.0.BETA.6		 November 2010			    POLYMER(1)

data/lib/polymer/man/polymer.5

@@ -2,7 +2,7 @@
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .ad l
 .
-.TH "\.POLYMER" "5" "October 2010" "POLYMER 1.0.0.BETA.5" "Polymer Manual"
+.TH "\.POLYMER" "5" "November 2010" "POLYMER 1.0.0.BETA.6" "Polymer Manual"
 .
 .SH "NAME"
 \fB\.polymer\fR \- a format for describing image sprites and their sources

data/lib/polymer/man/polymer.5.txt

@@ -156,4 +156,4 @@ SEE ALSO
 
 
 
-POLYMER 1.0.0.BETA.5		 October 2010			   .POLYMER(5)
+POLYMER 1.0.0.BETA.6		 November 2010			   .POLYMER(5)

data/lib/polymer/project.rb

@@ -30,13 +30,20 @@ module Polymer
     #
     attr_reader :sass
 
-    # @return [Pathname, false]
+    # @return [Pathname]
     #   The path to the CSS file.
     # @return [false]
     #   False if CSS generation has been disabled.
     #
     attr_reader :css
 
+    # @return [Pathname]
+    #   Returns the path to the project cache file.
+    # @return [false]
+    #   Returns false if the project cache is disabled.
+    #
+    attr_reader :cachefile
+
     # An array containing all of the sprites in the project.
     #
     # @return [Array<Polymer::Sprite>]
@@ -115,7 +122,7 @@ module Polymer
     # @return [Polymer::Cache]
     #
     def cache
-      @cache ||= Polymer::Cache.new(@cachefile)
+      @cache ||= Polymer::Cache.new(self)
     end
 
     # Returns a path to a temporary directory which may be used by this

data/lib/polymer/sass_generator.rb

@@ -27,9 +27,24 @@ module Polymer
         save_to = project.sass + '_polymer.sass'
       end
 
+      # We need to keep track of any existing data URI values since, if the
+      # sprite is unchanged, we won't have access to it.
+      existing_data_uris = extract_existing_data_uris(
+        save_to, project.data_uri_sprites)
+
       data_uris = project.data_uri_sprites.inject({}) do |memo, sprite|
-        data = [sprite.save_path.read].pack('m').strip
-        memo[sprite.name] = "data:image/png;base64,#{data}"
+        if sprite.save_path.file?
+          data = [sprite.save_path.read].pack('m')
+
+          # Ruby < 1.9 doesn't support pack('m0'),
+          # so we have to do it manually.
+          data.gsub!(/\n/, '')
+
+          memo[sprite.name] = "data:image/png;base64,#{data}"
+        else
+          memo[sprite.name] = existing_data_uris[sprite.name]
+        end
+
         memo
       end
 
@@ -40,5 +55,22 @@ module Polymer
       true
     end # self.generate
 
+    # Given a path to a Sass file, extracts the existing data URI strings.
+    #
+    def self.extract_existing_data_uris(path, sprites)
+      return {} unless path.file?
+
+      sass = path.read.split("\n")
+
+      sprites.inject({}) do |memo, sprite|
+        if index = sass.index(".#{sprite.name}_data")
+          # The data is contained on the line following the selector.
+          memo[sprite.name] = sass[index + 1].scan(/url\((.+)\)/).first.first
+        end
+
+        memo
+      end
+    end
+
   end # SassGenerator
 end # Polymer

data/lib/polymer/sprite.rb

@@ -80,6 +80,14 @@ module Polymer
       Digest::SHA256.hexdigest(sources.map { |source| source.digest }.join)
     end
 
+    # A sprite is equal to another sprite if the names are the same.
+    #
+    # @return [Boolean]
+    #
+    def ==(other)
+      other.respond_to?(:name) and other.name == name
+    end
+
     # Saves the composited sprite to disk.
     #
     # In the event that the sprite has no sources, +save+ will return false

data/lib/polymer/version.rb

@@ -1,4 +1,4 @@
 module Polymer
   # The current version of the Polymer library.
-  VERSION = '1.0.0.beta.5'.freeze
+  VERSION = '1.0.0.beta.6'.freeze
 end

data/polymer.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   # rake task. It it completely safe to edit them, but using the rake task
   # is easier.
   s.name              = 'polymer'
-  s.version           = '1.0.0.beta.5'
-  s.date              = '2010-10-31'
+  s.version           = '1.0.0.beta.6'
+  s.date              = '2010-11-01'
   s.rubyforge_project = 'polymer'
 
   # You may safely edit the section below.

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: polymer
 version: !ruby/object:Gem::Version 
+  hash: 62196367
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
   - beta
-  - 5
-  version: 1.0.0.beta.5
+  - 6
+  version: 1.0.0.beta.6
 platform: ruby
 authors: 
 - Anthony Williams
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 +01:00
+date: 2010-11-01 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,6 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 2
         - 13
@@ -41,6 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 39
         segments: 
         - 0
         - 14
@@ -56,6 +59,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 62196421
         segments: 
         - 2
         - 0
@@ -73,6 +77,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 53
         segments: 
         - 0
         - 8
@@ -88,6 +93,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 35
         segments: 
         - 3
         - 0
@@ -103,6 +109,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 0
         - 7
@@ -182,6 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -190,6 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3