css_image_embedder 0.2.0 → 0.3.0

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+= Version 0.3.0
+* Removed Rails 2.3 compatibility
+* Removed Rails 3.0 compatibility
+* Removed Rails 3.1 compatibility
+* Removed Ruby 1.8 compatibility
+* Removed non-rails app support
+* Huge refactoring
+* Docs are now in yard
+* Easier asset pipeline integration
+
 = Version 0.1.1
 * Fixed compressed (one line) embeds
 

data/Manifest

@@ -3,24 +3,23 @@ Gemfile
 LICENCE
 README.md
 Rakefile
-css_image_embedder.gemspec
 init.rb
 lib/css_image_embedder.rb
 lib/css_image_embedder/compressor.rb
-lib/css_image_embedder/converter.rb
 lib/css_image_embedder/engine.rb
-lib/css_image_embedder/exception.rb
-lib/css_image_embedder/helper.rb
-spec/css_image_embedder_spec.rb
-spec/files/bg.png
-spec/files/bg_base64.png
-spec/files/big_converted.css
-spec/files/file_sources_invalid.css
-spec/files/oneliner.css
-spec/files/oneliner_converted.css
-spec/files/std.css
-spec/files/std_converted.css
-spec/files/too_big.css
-spec/files/too_big.jpg
+lib/css_image_embedder/image.rb
+spec/app/assets/images/bg.png
+spec/app/assets/images/bg_base64.png
+spec/app/assets/images/too_big.jpg
+spec/app/assets/stylesheets/big_converted.css
+spec/app/assets/stylesheets/file_sources_invalid.css
+spec/app/assets/stylesheets/oneliner.css
+spec/app/assets/stylesheets/oneliner_converted.css
+spec/app/assets/stylesheets/std.css
+spec/app/assets/stylesheets/std_converted.css
+spec/app/assets/stylesheets/too_big.css
+spec/compressor_spec.rb
+spec/engine_spec.rb
+spec/image_spec.rb
 spec/spec_helper.rb
 Manifest

data/README.md

@@ -8,55 +8,25 @@ Css Image Embedder puts your background files directly into corresponding CSS fi
 
 # USAGE
 
-## Rails 3.0
-
-Add gem to your gemfile:
-
-    gem 'css_image_embedder'
-
-and then you will gain a helper method called `image_embed_stylesheet_link_tag`. Use it instead of `stylesheet_link_tag` (params are the same). This helper method will not destroy (or modify) your original CSS files. It only changes cached CSS file, so if you do not use:
-
-    :cache => "/path/cached_stylesheets.css"
-
-method will act the same way as `stylesheet_link_tag`. Also - you will not see any effect in development environment (except when you turn caching on).
-
-## Rails 3.1
+## Ruby on Rails 3.1 and 3.2
 
 In environments/production.rb:
 
-    config.assets.css_compressor = CssImageEmbedder::Compressor.new(File.join(Rails.root, 'public'))
+    config.assets.css_compressor = CssImageEmbedder::Compressor.new
 
 ## Disadvantages
 
 Css Image Embedder has one major disadvantage. Files converted into base64 are approximately 30% bigger then normal, so when you embed them into CSS file, the total size of CSS with backgrounds will not be equal to sum of CSS file and backgrounds files. However, if you use gzip compression on your server - it will compress CSS file and the total size will be approximately equal. So just turn gzip compression on :)
-## Example
-
-### Rails 3.0 (and probably 2.3.7 ;) )
 
-Suppose we have two backgrounds: `bg1.png` and `bg2.jpg` and two CSS files (each for background declaration): `first.css` and `second.css`. 
-
-The background declarations will be normal. You don't need to do anything special in your CSS files. So lets take `first.css`:
-
-    #first { background: #fff url(/images/bg1.png) no-repeat;}
-
-and second stylesheet:
-
-    #second { background: #fff url(/images/bg2.png) no-repeat;}
-
-Now lets just use them in our layout:
+## Example
 
-    image_embed_stylesheet_link_tag(
-      "first", "second",
-      :cache => "cached_stylesheet"
-    )
-    
-This will produce nice `cached_stylesheet` with both background images embedded directly into cached CSS file.
+We set up CssImageEmbedder::Compressor as a css compressor and... thats all :)
 
-### Rails 3.1
+    config.assets.css_compressor = CssImageEmbedder::Compressor.new
 
-We set up CssImageEmbedder::Compressor as a css compressor and... thats all :)
+## Tests
 
-    config.assets.css_compressor = CssImageEmbedder::Compressor.new(File.join(Rails.root, 'public'))
+    bundle exec rspec spec/
 
 ## Note on Patches/Pull Requests
  
@@ -69,4 +39,4 @@ We set up CssImageEmbedder::Compressor as a css compressor and... thats all :)
 
 ## Copyright
 
-Copyright (c) 2011 Maciej Mensfeld. See LICENSE for details.
+Copyright (c) 2013 Maciej Mensfeld. See LICENSE for details.

data/Rakefile

@@ -3,12 +3,12 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('css_image_embedder', '0.2.0') do |p|
+Echoe.new('css_image_embedder', '0.3.0') do |p|
   p.description    = "Css Image Embedder puts your background files directly into corresponding CSS file. Thanks to that - your server needs to handle fewer requests and the page layout renders smoothly (whole stylesheet at once)."
   p.url            = "https://github.com/mensfeld/Css-Image-Embedder"
   p.author         = "Maciej Mensfeld"
   p.email          = "maciej@mensfeld.pl"
   p.ignore_pattern = ["tmp/*", "script/*"]
-  p.development_dependencies = ["rspec >=2.0.0", "rails"]
+  p.development_dependencies = ["rspec >=2.0.0"]
   p.dependencies = ["sass"]
 end

data/css_image_embedder.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{css_image_embedder}
-  s.version = "0.2.0"
+  s.name = "css_image_embedder"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Maciej Mensfeld}]
-  s.date = %q{2011-08-14}
-  s.description = %q{Css Image Embedder puts your background files directly into corresponding CSS file. Thanks to that - your server needs to handle fewer requests and the page layout renders smoothly (whole stylesheet at once).}
-  s.email = %q{maciej@mensfeld.pl}
-  s.extra_rdoc_files = [%q{CHANGELOG.rdoc}, %q{README.md}, %q{lib/css_image_embedder.rb}, %q{lib/css_image_embedder/compressor.rb}, %q{lib/css_image_embedder/converter.rb}, %q{lib/css_image_embedder/engine.rb}, %q{lib/css_image_embedder/exception.rb}, %q{lib/css_image_embedder/helper.rb}]
-  s.files = [%q{CHANGELOG.rdoc}, %q{Gemfile}, %q{LICENCE}, %q{README.md}, %q{Rakefile}, %q{css_image_embedder.gemspec}, %q{init.rb}, %q{lib/css_image_embedder.rb}, %q{lib/css_image_embedder/compressor.rb}, %q{lib/css_image_embedder/converter.rb}, %q{lib/css_image_embedder/engine.rb}, %q{lib/css_image_embedder/exception.rb}, %q{lib/css_image_embedder/helper.rb}, %q{spec/css_image_embedder_spec.rb}, %q{spec/files/bg.png}, %q{spec/files/bg_base64.png}, %q{spec/files/big_converted.css}, %q{spec/files/file_sources_invalid.css}, %q{spec/files/oneliner.css}, %q{spec/files/oneliner_converted.css}, %q{spec/files/std.css}, %q{spec/files/std_converted.css}, %q{spec/files/too_big.css}, %q{spec/files/too_big.jpg}, %q{spec/spec_helper.rb}, %q{Manifest}]
-  s.homepage = %q{https://github.com/mensfeld/Css-Image-Embedder}
-  s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Css_image_embedder}, %q{--main}, %q{README.md}]
-  s.require_paths = [%q{lib}]
-  s.rubyforge_project = %q{css_image_embedder}
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{Css Image Embedder puts your background files directly into corresponding CSS file. Thanks to that - your server needs to handle fewer requests and the page layout renders smoothly (whole stylesheet at once).}
+  s.authors = ["Maciej Mensfeld"]
+  s.date = "2013-05-25"
+  s.description = "Css Image Embedder puts your background files directly into corresponding CSS file. Thanks to that - your server needs to handle fewer requests and the page layout renders smoothly (whole stylesheet at once)."
+  s.email = "maciej@mensfeld.pl"
+  s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.md", "lib/css_image_embedder.rb", "lib/css_image_embedder/compressor.rb", "lib/css_image_embedder/engine.rb", "lib/css_image_embedder/image.rb"]
+  s.files = ["CHANGELOG.rdoc", "Gemfile", "LICENCE", "README.md", "Rakefile", "init.rb", "lib/css_image_embedder.rb", "lib/css_image_embedder/compressor.rb", "lib/css_image_embedder/engine.rb", "lib/css_image_embedder/image.rb", "spec/app/assets/images/bg.png", "spec/app/assets/images/bg_base64.png", "spec/app/assets/images/too_big.jpg", "spec/app/assets/stylesheets/big_converted.css", "spec/app/assets/stylesheets/file_sources_invalid.css", "spec/app/assets/stylesheets/oneliner.css", "spec/app/assets/stylesheets/oneliner_converted.css", "spec/app/assets/stylesheets/std.css", "spec/app/assets/stylesheets/std_converted.css", "spec/app/assets/stylesheets/too_big.css", "spec/compressor_spec.rb", "spec/engine_spec.rb", "spec/image_spec.rb", "spec/spec_helper.rb", "Manifest", "css_image_embedder.gemspec"]
+  s.homepage = "https://github.com/mensfeld/Css-Image-Embedder"
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Css_image_embedder", "--main", "README.md"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "css_image_embedder"
+  s.rubygems_version = "1.8.24"
+  s.summary = "Css Image Embedder puts your background files directly into corresponding CSS file. Thanks to that - your server needs to handle fewer requests and the page layout renders smoothly (whole stylesheet at once)."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -24,15 +24,12 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sass>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_development_dependency(%q<rails>, [">= 0"])
     else
       s.add_dependency(%q<sass>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_dependency(%q<rails>, [">= 0"])
     end
   else
     s.add_dependency(%q<sass>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.0.0"])
-    s.add_dependency(%q<rails>, [">= 0"])
   end
 end

data/lib/css_image_embedder.rb

@@ -1,7 +1,5 @@
 path = File.expand_path(File.dirname(__FILE__))
 
-require "#{path}/css_image_embedder/exception"
-require "#{path}/css_image_embedder/helper"
+require "#{path}/css_image_embedder/image"
 require "#{path}/css_image_embedder/engine"
-require "#{path}/css_image_embedder/converter"
 require "#{path}/css_image_embedder/compressor"

data/lib/css_image_embedder/compressor.rb

@@ -6,16 +6,18 @@ require 'sass'
 module CssImageEmbedder
   class Compressor
 
-    # img_root - root of imgs position ( public/ in Rails)
-    # img_max_size - maximum file size (in kb) - bigger will not be embedded
-    def initialize(img_root, img_max_size = 32)
-      @img_root = img_root
-      @img_max_size = img_max_size
+    # @param [Integer] max image size that will be embedded (in KB)
+    # @return [CssImageEmbedder::Compressor] compressor instance
+    def initialize(img_max_size = 32)
+      @engine = CssImageEmbedder::Engine.new(img_max_size)
     end
 
+    # Compress given CSS/SCSS file and embed into it images
+    # @params [String] CSS/SCSS input
+    # @return [String] CSS file content with embedded images
     def compress(string)
-      engine = Sass::Engine.new(string, :syntax => :scss, :style => :compressed)
-      CssImageEmbedder::Engine.new(@img_root, @img_max_size).compress(engine.render)
+      sass = Sass::Engine.new(string, syntax: :scss, style: :compressed)
+      @engine.compress(sass.render)
     end
   end
-end
+end

data/lib/css_image_embedder/engine.rb

@@ -1,78 +1,48 @@
-require 'base64'
-
-# Css image embedder engine - used to embed images into CSS
+# Css image embedder engine - used to embed images into CSS files
 module CssImageEmbedder
   class Engine
 
-    # img_root - root of imgs position ( public/ in Rails)
-    # img_max_size - maximum file size (in kb) - bigger will not be embedded
-    def initialize(img_root, img_max_size = 32)
-      @img_root = img_root
-      @img_max_size = img_max_size*1024
+    EXTRACT_REGEXP = /url\(.+?\)/i
+
+    # @param [String] root of imgs position - this needs to be an absolute
+    #   path, so we need to join it with Rails.root if we use Rails
+    # @param [Integer] maximum file size (in kb) - bigger will not be embedded
+    # @return [CssImageEmbedder::Engine] instance
+    # @example
+    #   CssImageEmbedder::Engine.new(ASSET_IMAGE_LIMIT)
+    #   CssImageEmbedder::Engine.new
+    def initialize(img_max_size = 32)
+      @image_root = File.join(Rails.root, 'app')
+      @image_max_size = img_max_size*1024
     end
 
-    def compress(string)
-      if elements = pull(string)
-        source = string
-        elements.each do |el|
-          file_base64 = File.join(@img_root, el[:converted_path])
-          file_ext = el[:converted_path].split('.').last
-          begin
-            next if File.size?(file_base64) > @img_max_size
-            file_base64 = self.class.file_to_base64(file_base64)
-            source.gsub!(el[:original_url], "url(data:image/#{file_ext.downcase};base64,#{file_base64})")
-          rescue
-            next
-          end
+    # @param [String] content of a CSS file in which we want to embed pictures
+    # @return [String] content of a CSS file with embedded pictures
+    # @example
+    #   engine.compress(@css_content)
+    def compress(css)
+      images(css).each do |image|
+        begin
+          next if File.size?(image.file_path) > @image_max_size
+          css.gsub!(image.css_url, "url(data:image/#{image.ext};base64,#{image.to_base64})")
+        rescue
+          next
         end
-        @result = source
-      else
-        @result = string
       end
+      css
     end
 
-    # Convert to base64 without new lines
-    def self.file_to_base64(path)
-      str = File.open(path, 'r') { |file| file.read }
-      Base64.encode64(str).gsub("\n", '')
-    end
-
-
     private
-    
-    # Pulls out files paths from url(smthng)
-    # Returns an array containing:
-    # - original path  (./images/smthng.png)
-    # - converted path (/images/smthng.png)
-    # - original url   (url(./images/smthng.png))
-    def pull(css)
-      # Whole urls including  stuff around (url('/images/smthng.png') )
-      whole_urls = css.scan(/url\(.+?\)/i)
-      return nil if whole_urls.count == 0
 
-      img_bg_paths = []
-      whole_urls.each do |url|
-        img_bg_paths << url.scan(/url\(\s*["']?([^"']+)["']?\s*\)/i)[0][0]
-      end
-      img_bg_paths_original = img_bg_paths.clone
-
-      img_bg_paths.collect! do |img|
-        img = img.gsub('./', '/')
-        img = "/#{img}" if img[0] != '/'
-        img
-      end
-
-      result = []
-      img_bg_paths.each_with_index do |el, i|
-        result <<
-          {:original_path =>img_bg_paths_original[i],
-          :converted_path => el,
-          :original_url => whole_urls[i]
-          }
-      end
-      result.uniq!
-      result
+    # Extracts all the images paths from input CSS string. It extracts
+    # CSS urls with a regular expression
+    # 
+    # @param [String] CSS input content (css file content)
+    # @return [Array<CssImageEmbedder::Image>] returns all the images that
+    #   were used in given css file.
+    def images(css)
+      css.scan(EXTRACT_REGEXP).collect { |img| Image.new(img, @image_root) }
     end
 
   end
-end
+end

data/lib/css_image_embedder/image.rb

@@ -0,0 +1,57 @@
+require 'base64'
+
+# Image model that represents single image that we want to embed
+module CssImageEmbedder
+  class Image
+
+    # Regular expression used to extract only the url itself
+    URL_REGEXP = /url\(\s*["']?([^"']+)["']?\s*\)/i
+
+    # @param [String] original css url ("url('./something/etc')")
+    # @param [String] file root
+    # @return [CssImageEmbedder::Image] image instance
+    def initialize(css_url, root)
+      @css_url = css_url
+      @root = root
+      @url = css_url.scan(URL_REGEXP)[0][0]
+    end
+
+    # @return [String] original CSS url string
+    def css_url
+      @css_url
+    end
+
+    # @return [String] pure url (without CSS stuff)
+    # @example
+    #   image.url #=> './something/picture.png'
+    def url
+      @url
+    end
+
+    # @return [String] absolute path to a given picture
+    # @example
+    #   image.file_path #=> '/var/www/app/assets/images/picture.jpg'
+    def file_path
+      path = url.gsub('./', '/')
+      path = "/#{path}" if path[0] != '/'
+      File.join(@root, path.gsub('assets/', 'assets/images/'))
+    end
+
+    # @return [String] downcased file extension
+    # @example
+    #   image.ext #=> 'jpg'
+    def ext
+      splitted = file_path.split('.')
+      splitted.length > 1 ? splitted.last.downcase : ''
+    end
+
+    # @return [String] bse64 converted picture
+    # @example
+    #   image.to_base64 #=> base64 content
+    def to_base64
+      str = File.open(file_path, 'r') { |file| file.read }
+      Base64.encode64(str).gsub("\n", '')
+    end
+
+  end
+end

data/spec/app/assets/stylesheets/std.css

@@ -0,0 +1,6 @@
+#test {
+  background: url('assets/bg.png');
+}
+#test { background: url('assets/bg.png') no-repeat; }
+#test { background: url('assets/bg.png') repeat-x; }
+#test { background: black url('assets/bg.png') repeat-x; }

data/spec/app/assets/stylesheets/too_big.css

@@ -0,0 +1,6 @@
+#test {
+  background: url('assets/too_big.jpg');
+}
+#test { background: url('assets/too_big.jpg') no-repeat; }
+#test { background: url('assets/too_big.jpg') repeat-x; }
+#test { background: black url('assets/too_big.jpg') repeat-x; }

data/spec/compressor_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe CssImageEmbedder::Compressor do
+
+  subject { CssImageEmbedder::Compressor.new }
+
+  context "when we have a CSS file withount anything special" do
+    context "and it is in multiply lines" do
+      it "should compress it" do
+        css = '
+          #test  { background: #ffffff; }
+          #test2 { background: #000000; }
+        '
+        subject.compress(css).should == "#test{background:#ffffff}#test2{background:#000000}\n"
+      end
+    end
+  end
+
+  context "when we have CSS file without any strange stuff" do
+    it "should convert std css file and embed pictures into it" do
+      sass = Sass::Engine.new(css_content("std_converted"), syntax: :scss, style: :compressed)
+      subject.compress(css_content("std")).should == sass.render
+    end
+  end
+
+end

data/spec/engine_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe CssImageEmbedder::Engine do
+
+  subject { CssImageEmbedder::Engine.new }
+
+  context "when we have CSS file without any strange stuff" do
+    it "should convert std css file and embed pictures into it" do
+      subject.compress(css_content('std')).should === css_content("std_converted")
+    end
+  end
+
+  context "when we provide too big background" do
+    it "should not embed it by default" do
+      subject.compress(css_content('too_big')).should === css_content("too_big")
+    end
+
+    context "but when limit is bigger" do
+      subject { CssImageEmbedder::Engine.new(100*1024) }
+
+      it "should embed it" do
+        subject.compress(css_content('too_big')).should === css_content("big_converted")
+      end
+    end
+  end
+
+  context "when we provide css file where paths don't point to valid files" do
+    it "should leave original css file structure" do
+      subject.compress(css_content('file_sources_invalid')).should === css_content("file_sources_invalid")
+    end
+  end
+
+end

data/spec/image_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe CssImageEmbedder::Image do
+
+  let(:url){ '/assets/dir/bg.png' }
+  let(:css_url){ "url('#{url}')" }
+
+  subject { CssImageEmbedder::Image.new(css_url, Rails.root) }
+
+  describe '#css_url' do
+    it 'should be the same as base css url' do
+      subject.css_url.should == css_url
+    end
+  end
+
+  describe '#url' do
+    it 'should extract only the url' do
+      subject.url.should == url
+    end
+  end
+
+  describe '#ext' do
+    context 'when there is an extension' do
+      it 'should return it' do
+        subject.ext.should == 'png'
+      end
+    end
+
+    context 'when there is no extension' do
+      before { subject.instance_variable_set('@url', '') }
+
+      it 'should return empty string' do
+        subject.ext.should == ''
+      end
+    end
+  end
+
+  describe '#file_path' do
+    context 'when this is an http absolute path' do
+      it 'should return valid file path' do
+        subject.file_path.should == "#{Rails.root}/assets/images/dir/bg.png"
+      end
+    end
+
+    context 'when this is an http local path' do
+      before { subject.instance_variable_set('@url', ".#{subject.url}") }
+
+      it 'should return valid file path' do
+        subject.file_path.should == "#{Rails.root}/assets/images/dir/bg.png"
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -2,8 +2,34 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
-require 'rails'
 require 'fileutils'
 require 'action_view'
 
+class Rails
+  def self.root
+    File.expand_path(File.dirname(__FILE__))
+  end
+
+  def self.app
+    File.join(root, 'app')
+  end
+end
+
+def file_content(f)
+  file = File.new("#{f}", "r")
+  content = ''
+  while (line = file.gets)
+    content+=line
+  end
+  content
+end
+
+def css_content(name)
+  file_content("#{Rails.app}/assets/stylesheets/#{name}.css")
+end
+
+def files_equal?(f1, f2)
+  file_content(f1) == file_content(f2)
+end
+
 require 'css_image_embedder'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_image_embedder
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-14 00:00:00.000000000Z
+date: 2013-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &23530700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23530700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23530160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,18 +37,12 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *23530160
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &23529740 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *23529740
+        version: 2.0.0
 description: Css Image Embedder puts your background files directly into corresponding
   CSS file. Thanks to that - your server needs to handle fewer requests and the page
   layout renders smoothly (whole stylesheet at once).
@@ -55,37 +54,35 @@ extra_rdoc_files:
 - README.md
 - lib/css_image_embedder.rb
 - lib/css_image_embedder/compressor.rb
-- lib/css_image_embedder/converter.rb
 - lib/css_image_embedder/engine.rb
-- lib/css_image_embedder/exception.rb
-- lib/css_image_embedder/helper.rb
+- lib/css_image_embedder/image.rb
 files:
 - CHANGELOG.rdoc
 - Gemfile
 - LICENCE
 - README.md
 - Rakefile
-- css_image_embedder.gemspec
 - init.rb
 - lib/css_image_embedder.rb
 - lib/css_image_embedder/compressor.rb
-- lib/css_image_embedder/converter.rb
 - lib/css_image_embedder/engine.rb
-- lib/css_image_embedder/exception.rb
-- lib/css_image_embedder/helper.rb
-- spec/css_image_embedder_spec.rb
-- spec/files/bg.png
-- spec/files/bg_base64.png
-- spec/files/big_converted.css
-- spec/files/file_sources_invalid.css
-- spec/files/oneliner.css
-- spec/files/oneliner_converted.css
-- spec/files/std.css
-- spec/files/std_converted.css
-- spec/files/too_big.css
-- spec/files/too_big.jpg
+- lib/css_image_embedder/image.rb
+- spec/app/assets/images/bg.png
+- spec/app/assets/images/bg_base64.png
+- spec/app/assets/images/too_big.jpg
+- spec/app/assets/stylesheets/big_converted.css
+- spec/app/assets/stylesheets/file_sources_invalid.css
+- spec/app/assets/stylesheets/oneliner.css
+- spec/app/assets/stylesheets/oneliner_converted.css
+- spec/app/assets/stylesheets/std.css
+- spec/app/assets/stylesheets/std_converted.css
+- spec/app/assets/stylesheets/too_big.css
+- spec/compressor_spec.rb
+- spec/engine_spec.rb
+- spec/image_spec.rb
 - spec/spec_helper.rb
 - Manifest
+- css_image_embedder.gemspec
 homepage: https://github.com/mensfeld/Css-Image-Embedder
 licenses: []
 post_install_message: 
@@ -112,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubyforge_project: css_image_embedder
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Css Image Embedder puts your background files directly into corresponding

data/lib/css_image_embedder/converter.rb

@@ -1,65 +0,0 @@
-# coding: utf-8
-
-# Converts CSS files - it will embed any img file attached as background
-# background: url(...)... --> (base64) -->  url(data:image/png;base64,...)
-# By default will embed only images smaller then 32kb
-
-module CssImageEmbedder
-
-  class Converter
-    # IE does not accept embed files bigger then 32kb
-    DEFAULT_MAX_IMG_SIZE = 32
-
-    attr_reader :result
-
-    def initialize(*sources)
-      options = sources.extract_options!.stringify_keys
-      source  = options.delete("source")
-      @file_path = options.delete("path")
-      @root_path = options.delete("root")
-      @overwrite = options.delete("overwrite") || false
-      @result = nil
-
-      @img_max_size = options.delete("img_max_size") || DEFAULT_MAX_IMG_SIZE
-
-      if @file_path
-        raise CssNotFound unless File.exists?(@file_path)
-        @source = File.open(@file_path, 'r') { |file| file.read }
-      else
-        raise CssStringNotProvided unless source
-        @source = source
-        @overwrite = false
-      end
-
-      raise RootPathNotProvided unless @root_path
-    end
-
-    # Performe converting
-    def convert
-      @result = CssImageEmbedder::Engine.new(@root_path, @img_max_size).compress(@source)
-    end
-
-    # Saves converted result to file
-    def save(filename = nil)
-      if @file_path && @overwrite && filename.nil?
-        p = @file_path
-      else
-        p = filename
-      end
-      f = File.new(p, "w")
-      f.write(@result)
-      f.close
-    end
-
-    # Force overwrite
-    def save!(filename = nil)
-      @overwrite = true
-      save(filename)
-    end
-
-    def self.file_to_base64(file)
-      CssImageEmbedder::Engine.file_to_base64(file)
-    end
-
-  end
-end

data/lib/css_image_embedder/exception.rb

@@ -1,9 +0,0 @@
-
-# CSS file does not exist
-class CssNotFound < StandardError; end
-
-# CSS string not provided
-class CssStringNotProvided < StandardError; end
-
-# Root path not provided
-class RootPathNotProvided < StandardError; end

data/lib/css_image_embedder/helper.rb

@@ -1,46 +0,0 @@
-# Helper methods for ActionView::Base in Rails
-module CssImageEmbedder
-  
-  module Helper
-
-    if Rails.version.to_s.include?('3.0')
-      # Basicly it's just stylesheet_link_tag with one small difference ;)
-      # Will not test it - Rails guys already did it
-      def image_embed_stylesheet_link_tag(*sources)
-        options = sources.extract_options!.stringify_keys
-        concat  = options.delete("concat")
-        cache   = concat || options.delete("cache")
-        recursive = options.delete("recursive")
-        root = options.delete("root") || File.join(Rails.root, 'public')
-        env = options.delete("env") || Rails.env
-
-        if concat || (config.perform_caching && cache)
-          joined_stylesheet_name = (cache == true ? "all" : cache) + ".css"
-          joined_stylesheet_path = File.join(joined_stylesheet_name[/^#{File::SEPARATOR}/] ? config.assets_dir : config.stylesheets_dir, joined_stylesheet_name)
-
-          unless config.perform_caching && File.exists?(joined_stylesheet_path)
-            write_asset_file_contents(joined_stylesheet_path, compute_stylesheet_paths(sources, recursive))
-            # here's the magic ;)
-            css = CssImageEmbedder::Converter.new(
-              :path => joined_stylesheet_path,
-              :overwrite => true,
-              :root => root)
-            css.convert
-            css.save!
-          end
-          stylesheet_tag(joined_stylesheet_name, options)
-        else
-          sources = expand_stylesheet_sources(sources, recursive)
-          # When we use SASS and test env - will not work - and will raise
-          # exception - that css files does not exist. We make a workaround
-          # by not checking sources in test env
-          ensure_stylesheet_sources!(sources) if cache && env != 'test'
-          sources.collect { |source| stylesheet_tag(source, options) }.join("\n").html_safe
-        end
-      end
-    end
-  end # Helper
-  
-end # Base64CssEmbedder
-
-ActionView::Base.send :include, CssImageEmbedder::Helper

data/spec/css_image_embedder_spec.rb

@@ -1,168 +0,0 @@
-require 'spec_helper'
-
-ROOT = File.expand_path(File.dirname(__FILE__))
-FILES_ROOT = File.join(ROOT, 'files')
-
-def file_content(f)
-  file = File.new("#{f}", "r")
-  content = ''
-  while (line = file.gets)
-    content+=line
-  end
-  content
-end
-
-def files_equal?(f1, f2)
-  file_content(f1) == file_content(f2)
-end
-
-describe CssImageEmbedder::Converter do
-
-  subject { CssImageEmbedder::Converter }
-
-  # Should clear all css files created in test
-  after(:all) do
-    FileUtils.rm("#{ROOT}/std.css")
-  end
-
-  context "when we have CSS file without any strange stuff" do
-    it "should convert std css file and embed pictures into it" do
-      converter = subject.new(
-        :path => "#{FILES_ROOT}/std.css",
-        :overwrite => true, 
-        :root => ROOT
-      )
-      converter.convert
-      converter.result.should === file_content("#{FILES_ROOT}/std_converted.css")
-    end
-
-    context "and allow to overwrite" do
-      it "should embed backgrounds and overwrite source file" do
-        # Copy std.css to check if it will be overwritten
-        FileUtils.cp("#{FILES_ROOT}/std.css", "#{ROOT}/std.css")
-        converter = subject.new(
-          :path => "#{ROOT}/std.css",
-          :overwrite => true,
-          :root => ROOT
-        )
-        converter.convert
-        converter.save
-        converter.result.should == file_content("#{ROOT}/std.css")
-        converter.result.should == file_content("#{FILES_ROOT}/std_converted.css")
-      end
-    end
-
-  end
-
-  context "when we provide too big background" do
-    it "should not embed it by default" do
-      converter = subject.new(
-        :path => "#{FILES_ROOT}/too_big.css",
-        :overwrite => true,
-        :root => ROOT
-      )
-      converter.convert
-      converter.result.should === file_content("#{FILES_ROOT}/too_big.css")
-    end
-
-    context "but limit is bigger" do
-      it "should embed it" do
-      converter = subject.new(
-        :path => "#{FILES_ROOT}/too_big.css",
-        :overwrite => true,
-        :root => ROOT,
-        :img_max_size => 100*1024
-      )
-      converter.convert
-      converter.result.should === file_content("#{FILES_ROOT}/big_converted.css")
-      end
-    end
-  end
-
-  context "when we provide css file where paths don't point to valid files" do
-    it "should leave original css file structure" do
-      converter = subject.new(
-        :path => "#{FILES_ROOT}/file_sources_invalid.css",
-        :root => ROOT
-      )
-      converter.convert
-      converter.result.should == file_content("#{FILES_ROOT}/file_sources_invalid.css")
-    end
-  end
-
-  context "when we don't provide root path" do
-    it "should raise RootPathNotProvided" do
-      lambda {
-        subject.new(
-          :path => "#{FILES_ROOT}/std_converted.css"
-        )
-      }.should raise_exception(RootPathNotProvided)
-    end
-  end
-
-  context "when we provide invalid source css file" do
-    it "should raise Exceptions::CssNotFound" do
-      lambda {
-        subject.new(
-          :path => "#{FILES_ROOT}no_file.css"
-        )
-      }.should raise_exception(CssNotFound)
-    end
-
-    context "but we provide string containing css" do
-      it "should convert it from string" do
-        converter = subject.new(
-          :source => file_content("#{FILES_ROOT}/std.css"),
-          :root => ROOT
-        )
-        converter.convert
-        converter.result.should == file_content("#{FILES_ROOT}/std_converted.css")
-      end
-    end
-
-    context "when we try to convert file to base64" do
-      it "should convert it" do
-        subject.file_to_base64("#{FILES_ROOT}/bg.png").should == file_content("#{FILES_ROOT}/bg_base64.png").gsub("\n", '')
-      end
-    end
-
-    context "when we provide huge one liner" do
-      it "should convert it without hesitation" do
-        converter = subject.new(
-          :path => "#{FILES_ROOT}/oneliner.css",
-          :root => ROOT
-        )
-        converter.convert
-        converter.result.should == file_content("#{FILES_ROOT}/oneliner_converted.css")
-      end
-    end
-  end
-  
-end
-
-describe CssImageEmbedder::Compressor do
-
-  subject { CssImageEmbedder::Compressor }
-
-  context "when we have a CSS file withount anything special" do
-    context "and it is in multiply lines" do
-      it "should compress it" do
-        s = subject.new(ROOT)
-        css = '
-          #test  { background: #ffffff; }
-          #test2 { background: #000000; }
-        '
-        s.compress(css).should == "#test{background:#ffffff}#test2{background:#000000}\n"
-      end
-    end
-  end
-
-  context "when we have CSS file without any strange stuff" do
-    it "should convert std css file and embed pictures into it" do
-      s = subject.new(ROOT)
-      sass = Sass::Engine.new(file_content("#{FILES_ROOT}/std_converted.css"), :syntax => :scss, :style => :compressed)
-      s.compress(file_content("#{FILES_ROOT}/std.css")).should=== sass.render
-    end
-  end
-  
-end

data/spec/files/std.css

@@ -1,6 +0,0 @@
-#test {
-  background: url('files/bg.png');
-}
-#test { background: url('files/bg.png') no-repeat; }
-#test { background: url('files/bg.png') repeat-x; }
-#test { background: black url('files/bg.png') repeat-x; }

data/spec/files/too_big.css

@@ -1,6 +0,0 @@
-#test {
-  background: url('files/too_big.jpg');
-}
-#test { background: url('files/too_big.jpg') no-repeat; }
-#test { background: url('files/too_big.jpg') repeat-x; }
-#test { background: black url('files/too_big.jpg') repeat-x; }