css_inliner 0.2.1 → 0.3.0

data/README.rdoc

@@ -69,6 +69,11 @@ Note that this is <b>not stable at all</b>.
  CSSInliner.process html, '.', 'article' # => The first article element
  CSSInliner.process html, 'http://example.net/stylesheets' # Passed URI will be used as base directory when resolving relative URI of CSS
 
+== History
+=== 0.3.0 / 2012-05-28
+* Group external CSS files refered by <link> element by "title" attribute.
+* Work on progress: CSSPool::CSS::Declaration#expand_dimension
+
 == Note
 Note that
  <link rel="stylesheet" href="...">

data/css_inliner.gemspec

@@ -17,12 +17,13 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  s.has_rdoc = 'yard'
 
   s.add_runtime_dependency "nokogiri", '~> 1'
   s.add_runtime_dependency "csspool", '~> 3'
   s.add_runtime_dependency "bsearch"
 
-  s.add_development_dependency "test-unit", '~> 2'
+  s.add_development_dependency "test-unit-full"
   s.add_development_dependency "cover_me", '~> 1'
   s.add_development_dependency "yard"
   s.add_development_dependency "pry"

data/lib/css_inliner/csspool.rb

@@ -33,10 +33,29 @@ module CSSPool
     end
 
     class Declaration
+      class InvalidExpressionCountError < StandardError; end
+
+      DIMENSIONS = %w[top right bottom left]
+      # property => property of [top, right, bottom, left]
+      PROPERTY_EXPANSION = {}
+      %w[margin padding].each do |prop|
+        PROPERTY_EXPANSION[prop] = DIMENSIONS.map {|dim| "#{prop}-#{dim}"}
+      end
+      %w[color style width].each do |subprop|
+        PROPERTY_EXPANSION["border-#{subprop}"] = DIMENSIONS.map {|dim| "border-#{dim}-#{subprop}"}
+      end
+      # count of expressions => index of [top, right, bottom, left]
+      EXPANSION_INDICES = {
+        1 => [0, 0, 0, 0],
+        2 => [0, 1, 0, 1],
+        3 => [0, 1, 2, 1],
+        4 => [0, 1, 2, 3]
+      }
+
       # @param [Declaration] other
       # @return [Declaration] self
       def update(other)
-        raise ArgumentError('different property') unless property == other.property
+        raise ArgumentError, 'different property' unless property == other.property
         self.expressions = other.expressions if !important? or other.important?
         self
       end
@@ -47,6 +66,20 @@ module CSSPool
       def merge(other)
         dup.update other
       end
+
+      # @return [Array<Declaration>] array of declaration indicating four dimensions
+      def expand_dimension
+        expanded_properties = PROPERTY_EXPANSION[property]
+        return [self] unless expanded_properties
+
+        expansion_map = EXPANSION_INDICES[expressions.length]
+        raise InvalidExpressionCountError, "has #{expressions.length} properties" unless expansion_map
+
+        expanded_properties.each.with_index.map {|prop, i|
+          expression = expressions[expansion_map[i]]
+          Declaration.new(prop, expression, important, rule_set)
+        }
+      end
     end
   end
 

data/lib/css_inliner/extractor.rb

@@ -45,8 +45,17 @@ module CSSInliner
     end
 
     def extract_from_link(remove_link_element = true)
+      group = nil
       @document.css('link').inject([]) do |sources, link|
         next unless link['rel'] == 'stylesheet'
+        title = link['title']
+        if title
+          if group.nil?
+            group = title
+          elsif title != group
+            next sources
+          end
+        end
         begin
           # To do: detect file encoding before open it(read only @charset value)
           open(File.join(basedir, link['href']), 'r:BOM|UTF-8') {|f| sources << f.read}

data/lib/css_inliner/version.rb

@@ -1,3 +1,3 @@
 module CSSInliner
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/test/fixtures/sample1/group1-1.css

@@ -0,0 +1,3 @@
+#group1-1 {
+  color: black;
+}

data/test/fixtures/sample1/group1-2.css

@@ -0,0 +1,3 @@
+#group1-2 {
+  color: black;
+}

data/test/fixtures/sample1/group2-1.css

@@ -0,0 +1,3 @@
+#group2-1 {
+  color: black;
+}

data/test/helper.rb

@@ -1,6 +1,7 @@
 require 'cover_me'
 gem 'test-unit'
 require 'test/unit'
+require 'test/unit/notify'
 require 'css_inliner'
 
 class CSSInlinerTestCase < Test::Unit::TestCase

data/test/test_csspool.rb

@@ -0,0 +1,141 @@
+require_relative 'helper'
+
+class TestCSSPool < CSSInlinerTestCase
+  def setup
+    super
+
+    @css = CSSPool.CSS <<EOC
+p {
+  color: black;
+}
+p {
+  color: white;
+}
+p {
+  color: blue !important;
+}
+p {
+  color: red;
+}
+EOC
+  end
+
+  def test_update_basic
+    base = @css.rule_sets.first.declarations.first
+    other = @css.rule_sets.last.declarations.first
+    base.update other
+
+    assert_equal 'color: red;', base.to_css.strip
+  end
+
+  def test_udpate_with_important
+    base = @css.rule_sets[2].declarations.first
+    other = @css.rule_sets.first.declarations.first
+    base.update other
+
+    assert_equal 'color: blue !important;', base.to_css.strip
+  end
+
+  def test_non_dimension_expandable
+    no_dimension = CSSPool.CSS <<EOC
+p {
+  color: blue;
+}
+EOC
+    expected = CSSPool.CSS <<EOC
+p {
+  color: blue;
+}
+EOC
+
+    assert_equal expected.rule_sets.first.declarations.to_s,
+                 no_dimension.rule_sets.first.declarations.first.expand_dimension.to_s
+  end
+
+  def test_expand_five_dimensions
+    five_dimensions = CSSPool.CSS <<EOC
+p {
+  border-width: 1em 2em 3em 4em 5em;
+}
+EOC
+    assert_raise CSSPool::CSS::Declaration::InvalidExpressionCountError do
+      five_dimensions.rule_sets.first.declarations.first.expand_dimension
+    end
+  end
+
+  def test_expand_four_dimensions
+    four_dimensions = CSSPool.CSS <<EOC
+p {
+  margin: 1em 2em 3em 4em;
+}
+EOC
+    expected = CSSPool.CSS <<EOC
+p {
+  margin-top: 1em;
+  margin-right: 2em;
+  margin-bottom: 3em;
+  margin-left: 4em;
+}
+EOC
+
+    assert_equal expected.rule_sets.first.declarations.to_s,
+                 four_dimensions.rule_sets.first.declarations.first.expand_dimension.to_s
+  end
+
+  def test_expand_three_dimensions
+    three_dimensions = CSSPool.CSS <<EOC
+p {
+  padding: 1em 2em 3em;
+}
+EOC
+    expected = CSSPool.CSS <<EOC
+p {
+  padding-top: 1em;
+  padding-right: 2em;
+  padding-bottom: 3em;
+  padding-left: 2em;
+}
+EOC
+
+    assert_equal expected.rule_sets.first.declarations.to_s,
+                 three_dimensions.rule_sets.first.declarations.first.expand_dimension.to_s
+  end
+
+  def test_expand_two_dimensions
+    two_dimensions = CSSPool.CSS <<EOC
+p {
+  border-color: red blue;
+}
+EOC
+    expected = CSSPool.CSS <<EOC
+p {
+  border-top-color: red;
+  border-right-color: blue;
+  border-bottom-color: red;
+  border-left-color: blue;
+}
+EOC
+
+    assert_equal expected.rule_sets.first.declarations.to_s,
+                 two_dimensions.rule_sets.first.declarations.first.expand_dimension.to_s
+  end
+
+  def test_expand_one_dimension
+    one_dimension = CSSPool.CSS <<EOC
+p {
+  border-style: dotted;
+}
+EOC
+    expected = CSSPool.CSS <<EOC
+p {
+  border-top-style: dotted;
+  border-right-style: dotted;
+  border-bottom-style: dotted;
+  border-left-style: dotted;
+}
+EOC
+
+    assert_equal expected.rule_sets.first.declarations.to_s,
+                 one_dimension.rule_sets.first.declarations.first.expand_dimension.to_s
+  end
+end

data/test/test_extractor.rb

@@ -50,6 +50,33 @@ class TestExtractor < CSSInlinerTestCase
     assert_equal expected, @doc3.css('style').to_s
   end
 
+  def test_extract_from_grouped_files
+    doc = Nokogiri.HTML <<EOH
+<html>
+  <head>
+    <link rel="stylesheet" type="text/css" title="group1" href="group1-1.css">
+    <link rel="stylesheet" type="text/css" title="group1" href="group1-2.css">
+    <link rel="stylesheet" type="text/css" title="group2" href="group2-1.css">
+  </head>
+  <body>
+  </body>
+</html>
+EOH
+    expected = [
+'#group1-1 {
+  color: black;
+}
+',
+'#group1-2 {
+  color: black;
+}
+'
+]
+    extractor = Extractor.new(doc, @sample1_dir)
+
+    assert_equal expected, extractor.extract_from_link
+  end
+
   def test_integrate_basic
     sources = [
       '

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_inliner
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000Z
+date: 2012-05-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &11151600 !ruby/object:Gem::Requirement
+  requirement: &12120420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *11151600
+  version_requirements: *12120420
 - !ruby/object:Gem::Dependency
   name: csspool
-  requirement: &11150260 !ruby/object:Gem::Requirement
+  requirement: &12135420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *11150260
+  version_requirements: *12135420
 - !ruby/object:Gem::Dependency
   name: bsearch
-  requirement: &11149700 !ruby/object:Gem::Requirement
+  requirement: &12134440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11149700
+  version_requirements: *12134440
 - !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: &11148500 !ruby/object:Gem::Requirement
+  name: test-unit-full
+  requirement: &12142540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11148500
+  version_requirements: *12142540
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &11165460 !ruby/object:Gem::Requirement
+  requirement: &12139920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *11165460
+  version_requirements: *12139920
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &11164980 !ruby/object:Gem::Requirement
+  requirement: &12136920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11164980
+  version_requirements: *12136920
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &11164380 !ruby/object:Gem::Requirement
+  requirement: &12981720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11164380
+  version_requirements: *12981720
 - !ruby/object:Gem::Dependency
   name: pry-doc
-  requirement: &11163880 !ruby/object:Gem::Requirement
+  requirement: &12979580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11163880
+  version_requirements: *12979580
 description: ! "\n    inline CSS from external file(s) and/or style elment(s) in head
   element\n    into style attibute of HTML elements\n  "
 email:
@@ -126,6 +126,9 @@ files:
 - setup.rb
 - test/fixtures/sample1/CSSInliner.html
 - test/fixtures/sample1/created.rid
+- test/fixtures/sample1/group1-1.css
+- test/fixtures/sample1/group1-2.css
+- test/fixtures/sample1/group2-1.css
 - test/fixtures/sample1/images/brick.png
 - test/fixtures/sample1/images/brick_link.png
 - test/fixtures/sample1/images/bug.png
@@ -252,6 +255,7 @@ files:
 - test/fixtures/sample4/rdoc.css
 - test/helper.rb
 - test/test_css_inliner.rb
+- test/test_csspool.rb
 - test/test_extractor.rb
 homepage: http://gitorious.org/css_inliner
 licenses: []
@@ -267,7 +271,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4449711269837875918
+      hash: 4524569264957260771
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -276,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4449711269837875918
+      hash: 4524569264957260771
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.8
@@ -284,4 +288,4 @@ signing_key:
 specification_version: 3
 summary: inline CSS into HTML attribute of elements
 test_files: []
-has_rdoc: 
+has_rdoc: yard