css_inliner 0.3.1 → 0.3.2

data/README.rdoc

@@ -71,16 +71,6 @@ 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.1 / 2012-07-17
-* [BUG FIX]Fix an error which occurs when parsing non-XHTML documents
-* Change homepage: Gitorious -> GitHub
-* Reimplement some tests which have pended
-
-=== 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="...">
@@ -88,6 +78,19 @@ and
  <style type="text/css"> ... </style>
 will be removed in process.
 
+= History
+== 0.3.2 / 2013-01-01
+* Expand dimensions(top, right, bottom, left) and properties of borders(style, width, color) when inlining
+
+== 0.3.1 / 2012-07-17
+* [BUG FIX]Fix an error which occurs when parsing non-XHTML documents
+* Change homepage: Gitorious -> GitHub
+* Reimplement some tests which have pended
+
+== 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
+
 = LICENSE
-CSS Inliner is copyright (c) 2011, 2012 KITAITI Makoto.
+CSS Inliner is copyright (c) 2011, 2012, 2013 KITAITI Makoto.
 Distribued under the MIT license, see LISENCE file for the term.

data/css_inliner.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "yard"
   s.add_development_dependency "pry"
   s.add_development_dependency "pry-doc"
+  s.add_development_dependency "guard-test"
 end

data/lib/css_inliner/csspool.rb

@@ -3,13 +3,15 @@ require 'csspool'
 module CSSPool
   module CSS
     class << self
-      # Update declarations in base with ones in other
+      # Update declarations in +base+ with ones in +other+
       # @param [Array<Declaration>] base updated array of declarations
       # @param [Array<Declaration>] other array of declarations
-      # @return [Array<Declaration>] base itself
+      # @return [Array<Declaration>] +base+ itself
       def update_declarations(base, other)
-        other.each do |other_decl|
+        other_decls = other.map {|decl| decl.expand_border.map(&:expand_dimension)}.flatten
+        other_decls.each do |other_decl|
           base_decls = base.find_all {|base_decl| base_decl.property == other_decl.property}
+          base_decls = base_decls.map {|decl| decl.expand_border.map(&:expand_dimension)}.flatten
           if base_decls.empty?
             base << other_decl
           else
@@ -33,18 +35,29 @@ module CSSPool
     end
 
     class Declaration
+      class InvalidExpressionError < StandardError; end
       class InvalidExpressionCountError < StandardError; end
 
+      COLOR_NAMES = %w[aliceblue antiquewhite aqua aquamarine azure beige bisque black blanchedalmond blue blueviolet brown burlywood cadetblue chartreuse chocolate coral cornflowerblue cornsilk crimson cyan darkblue darkcyan darkgoldenrod darkgray darkgreen darkgrey darkkhaki darkmagenta darkolivegreen darkorange darkorchid darkred darksalmon darkseagreen darkslateblue darkslategray darkslategrey darkturquoise darkviolet deeppink deepskyblue dimgray dimgrey dodgerblue firebrick floralwhite forestgreen fuchsia gainsboro ghostwhite gold goldenrod gray green greenyellow grey honeydew hotpink indianred indigo ivory khaki lavender lavenderblush lawngreen lemonchiffon lightblue lightcoral lightcyan lightgoldenrodyellow lightgray lightgreen lightgrey lightpink lightsalmon lightseagreen lightskyblue lightslategray lightslategrey lightsteelblue lightyellow lime limegreen linen magenta maroon mediumaquamarine mediumblue mediumorchid mediumpurple mediumseagreen mediumslateblue mediumspringgreen mediumturquoise mediumvioletred midnightblue mintcream mistyrose moccasin navajowhite navy oldlace olive olivedrab orange orangered orchid palegoldenrod palegreen paleturquoise palevioletred papayawhip peachpuff peru pink plum powderblue purple red rosybrown royalblue saddlebrown salmon sandybrown seagreen seashell sienna silver skyblue slateblue slategray slategrey snow springgreen steelblue tan teal thistle tomato turquoise violet wheat white whitesmoke yellow yellowgreen]
+
+      BORDER_STYLES = %w[none hidden solid double groove ridge inset outset dashed dotted]
+      BORDER_WIDTH_KEYWORDS = %w[thin medium thick]
+      BORDER_COLOR_KEYWORDS = %w[transparent]
+
       DIMENSIONS = %w[top right bottom left]
-      # property => property of [top, right, bottom, left]
+
       PROPERTY_EXPANSION = {}
+      PROPERTY_EXPANSION['border'] = %w[border-style border-width border-color]
+      DIMENSIONS.each do |dim|
+        PROPERTY_EXPANSION["border-#{dim}"] = %w[style width color].map {|subprop| "border-#{dim}-#{subprop}"}
+      end
       %w[margin padding].each do |prop|
         PROPERTY_EXPANSION[prop] = DIMENSIONS.map {|dim| "#{prop}-#{dim}"}
       end
-      %w[color style width].each do |subprop|
+      %w[style width color].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],
@@ -67,9 +80,29 @@ module CSSPool
         dup.update other
       end
 
+      # @todo consider transparent and so on
+      # @return [Array<Declaration>] array of declaration expanded to style, width and color
+      def expand_border
+        expanded_properties = PROPERTY_EXPANSION[property]
+        return [self] unless expanded_properties
+        raise InvalidExpressionCountError, "has #{expressions.length} expressions" if expressions.length > expanded_properties.length
+
+        decls = []
+        expanded_properties.each do |prop|
+          expressions.each do |exp|
+            if prop.end_with? find_property(exp)
+              decls << Declaration.new(prop, [exp], important, rule_set)
+            end
+          end
+        end
+
+        decls
+      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]
@@ -77,9 +110,28 @@ module CSSPool
 
         expanded_properties.map.with_index {|prop, i|
           expression = expressions[expansion_map[i]]
-          Declaration.new(prop, expression, important, rule_set)
+          Declaration.new(prop, [expression], important, rule_set)
         }
       end
+
+      private
+
+      def find_property(expression)
+        case expression
+        when Terms::Number
+          'width'
+        when Terms::Hash, Terms::Rgb
+          'color'
+        when Terms::Ident
+          if BORDER_STYLES.include? expression.to_s
+            'style'
+          elsif BORDER_WIDTH_KEYWORDS.include? expression.to_s
+            'width'
+          elsif (COLOR_NAMES + BORDER_COLOR_KEYWORDS).include? expression.to_s
+            'color'
+          end
+        end
+      end
     end
   end
 

data/lib/css_inliner/version.rb

@@ -1,3 +1,3 @@
 module CSSInliner
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/test/test_css_inliner.rb

@@ -60,7 +60,7 @@ EOC
     <title>With Style Attribute</title>
     <link rel="stylesheet" type="text/css" href="./style.css">
     <style type="text/css">
-      p {font-style: oblique;}
+      p {font-style: oblique; border: dotted;}
     </style>
   </head>
   <body>
@@ -76,7 +76,7 @@ EOC
     inlined = process(html, css)
     doc = Nokogiri.HTML(inlined)
     style = doc.search('p').first['style'].strip.gsub(/ +/, '')
-    assert_equal 'color:blue;font-style:oblique;', style
+    assert_equal 'color:blue;font-style:oblique;border-top-style:dotted;border-right-style:dotted;border-bottom-style:dotted;border-left-style:dotted;', style
   end
 
   def test_process_with_inline_style_and_style_elem

data/test/test_csspool.rb

@@ -36,7 +36,192 @@ EOC
     assert_equal 'color: blue !important;', base.to_css.strip
   end
 
-  def test_non_dimension_expandable
+  def test_complex_border
+    complex_border = CSSPool.CSS <<EOC
+p {
+  border: red 1px;
+}
+div {
+  border-top: blue solid thin;
+}
+EOC
+    expected = CSSPool.CSS <<EOC
+p {
+  border-top-width: 1px;
+  border-right-width: 1px;
+  border-bottom-width: 1px;
+  border-left-width: 1px;
+  border-top-color: red;
+  border-right-color: red;
+  border-bottom-color: red;
+  border-left-color: red;
+}
+div {
+  border-top-width: thin;
+  border-top-color: blue;
+  border-top-style: solid;
+}
+EOC
+    assert_equal expected.rule_sets.map {|rs| rs.declarations}.flatten.map(&:to_s).sort,
+    complex_border.rule_sets.map {|rs| rs.declarations.map {|decl| decl.expand_border.map(&:expand_dimension)}}.flatten.map(&:to_s).sort
+  end
+
+  def test_non_expandable_border
+    non_expandable = CSSPool.CSS <<EOC
+p {
+  border-top-width: 12em;
+}
+EOC
+    expected = CSSPool.CSS <<EOC
+p {
+  border-top-width: 12em;
+}
+EOC
+    assert_equal expected.rule_sets.first.declarations.to_s,
+                 non_expandable.rule_sets.first.declarations.first.expand_border.to_s
+  end
+
+  def test_expand_border_with_three_expressions
+    non_expanded = CSSPool.CSS <<EOC
+p {
+  border: black dotted 1px;
+}
+EOC
+    expected = CSSPool.CSS <<EOC
+p {
+  border-color: black;
+  border-style: dotted;
+  border-width: 1px;
+}
+EOC
+    assert_equal expected.rule_sets.map {|rs| rs.declarations}.flatten.map(&:to_s).sort,
+                 non_expanded.rule_sets.map {|rs| rs.declarations.map(&:expand_border)}.flatten.map(&:to_s).sort
+  end
+
+  def test_expand_border_with_two_expressions
+    non_expanded = CSSPool.CSS <<EOC
+p {
+  border: #FFFFFF thin;
+}
+EOC
+    expected = CSSPool.CSS <<EOC
+p {
+  border-color: #FFFFFF;
+  border-width: thin;
+}
+EOC
+    assert_equal expected.rule_sets.map {|rs| rs.declarations}.flatten.map(&:to_s).sort,
+                 non_expanded.rule_sets.map {|rs| rs.declarations.map(&:expand_border)}.flatten.map(&:to_s).sort
+  end
+
+  def test_expand_border_with_one_expression
+    non_expanded = CSSPool.CSS <<EOC
+p {
+  border: rgb(100%, 0%, 0%);
+}
+EOC
+    expected = CSSPool.CSS <<EOC
+p {
+  border-color: rgb(100%, 0%, 0%);
+}
+EOC
+    assert_equal expected.rule_sets.map {|rs| rs.declarations}.flatten.map(&:to_s).sort,
+                 non_expanded.rule_sets.map {|rs| rs.declarations.map(&:expand_border)}.flatten.map(&:to_s).sort
+  end
+
+  def test_expand_five_dimension_border_width
+    five_border_dimensions = CSSPool.CSS <<EOC
+p {
+  border-width: 12em 3em 1em 5em 3em;
+}
+EOC
+    assert_raise CSSPool::CSS::Declaration::InvalidExpressionCountError do
+      five_border_dimensions.rule_sets.first.declarations.first.expand_border
+    end
+  end
+
+  def test_expand_four_dimension_border_width
+    four_dimension_border_width = CSSPool.CSS <<EOC
+p {
+  border-width: 1em 2em 3em 4em
+}
+EOC
+    expected = CSSPool.CSS <<EOC
+p {
+  border-top-width: 1em;
+  border-right-width: 2em;
+  border-bottom-width: 3em;
+  border-left-width: 4em;
+}
+EOC
+    assert_equal expected.rule_sets.first.declarations.to_s,
+                 four_dimension_border_width.rule_sets.first.declarations.first.expand_dimension.to_s
+  end
+
+  def test_expand_three_dimension_border_width
+    three_dimension_border_width = CSSPool.CSS <<EOC
+p {
+  border-width: 1em 2em 3em;
+}
+EOC
+    expected = CSSPool.CSS <<EOC
+p {
+  border-top-width: 1em;
+  border-right-width: 2em;
+  border-bottom-width: 3em;
+  border-left-width: 2em;
+}
+EOC
+    assert_equal expected.rule_sets.first.declarations.to_s,
+                 three_dimension_border_width.rule_sets.first.declarations.first.expand_dimension.to_s
+  end
+
+  def test_expand_two_dimension_border_width
+    two_dimension_border_width = CSSPool.CSS <<EOC
+p {
+  border-width: 1em 2em;
+}
+EOC
+    expected = CSSPool.CSS <<EOC
+p {
+  border-top-width: 1em;
+  border-right-width: 2em;
+  border-bottom-width: 1em;
+  border-left-width: 2em;
+}
+EOC
+    assert_equal expected.rule_sets.first.declarations.to_s,
+                 two_dimension_border_width.rule_sets.first.declarations.first.expand_dimension.to_s
+  end
+
+  def test_expand_one_dimension_border_width
+    one_dimension_border_width = CSSPool.CSS <<EOC
+p {
+  border-width: 1em;
+}
+EOC
+    expected = CSSPool.CSS <<EOC
+p {
+  border-top-width: 1em;
+  border-right-width: 1em;
+  border-bottom-width: 1em;
+  border-left-width: 1em;
+}
+EOC
+    assert_equal expected.rule_sets.first.declarations.to_s,
+                 one_dimension_border_width.rule_sets.first.declarations.first.expand_border.to_s
+  end
+
+  def test_expand_border_with_invalid_property
+    no_dimension_border_width = CSSPool.CSS <<EOC
+p {
+  border: zero;
+}
+EOC
+    assert_empty no_dimension_border_width.rule_sets.first.declarations.first.expand_border
+  end
+
+  def test_non_expandable_dimension
     no_dimension = CSSPool.CSS <<EOC
 p {
   color: blue;
@@ -47,7 +232,6 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_inliner
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &7998240 !ruby/object:Gem::Requirement
+  requirement: &6872660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *7998240
+  version_requirements: *6872660
 - !ruby/object:Gem::Dependency
   name: csspool
-  requirement: &7997400 !ruby/object:Gem::Requirement
+  requirement: &6871840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *7997400
+  version_requirements: *6871840
 - !ruby/object:Gem::Dependency
   name: bsearch
-  requirement: &7996520 !ruby/object:Gem::Requirement
+  requirement: &6871340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7996520
+  version_requirements: *6871340
 - !ruby/object:Gem::Dependency
   name: test-unit-full
-  requirement: &7442420 !ruby/object:Gem::Requirement
+  requirement: &6870620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7442420
+  version_requirements: *6870620
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &7439740 !ruby/object:Gem::Requirement
+  requirement: &6870040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7439740
+  version_requirements: *6870040
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &7438740 !ruby/object:Gem::Requirement
+  requirement: &6869360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7438740
+  version_requirements: *6869360
 - !ruby/object:Gem::Dependency
   name: pry-doc
-  requirement: &7437580 !ruby/object:Gem::Requirement
+  requirement: &6868680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7437580
+  version_requirements: *6868680
+- !ruby/object:Gem::Dependency
+  name: guard-test
+  requirement: &6868120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *6868120
 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:
@@ -171,9 +182,7 @@ files:
 - test/fixtures/sample2/images/wrench_orange.png
 - test/fixtures/sample2/images/zoom.png
 - test/fixtures/sample2/index.html
-- test/fixtures/sample2/index.html~
 - test/fixtures/sample2/index.inlined.html
-- test/fixtures/sample2/index.inlined.html~
 - test/fixtures/sample2/js/darkfish.js
 - test/fixtures/sample2/js/jquery.js
 - test/fixtures/sample2/js/quicksearch.js
@@ -261,7 +270,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3751475647972594840
+      hash: -4258511309440831495
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -270,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3751475647972594840
+      hash: -4258511309440831495
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.8