gatchaman 0.1.1 → 0.2.0

data/ChangeLog

@@ -5,3 +5,8 @@
 2013-01-11 maruyama shinpei <shinpeim@gmail.com>
 
 	* bin/gatchan prettify error message
+
+2013-01-14 maruyama shinepi <shinpeim@gmail.com>
+
+	* RADME.md add usage of Gatchaman class
+	* relaese version 0.1.1

data/README.md

@@ -10,11 +10,11 @@ Gatchaman is a gem to replace src values in HTML documents with data URI scheme
 
 ## Usage
 
-    $ gatchan input_file [-r document_root] [-c current_directory]
+    $ gatchan input_file [-r document_root] [-c current_directory] [--expand-js] [--expand-css]
 
 or
 
-    gatchaman = Gatchaman.new(document_root, current_directory)
+    gatchaman = Gatchaman.new(document_root: document_root, current_dir: current_directory, expand_js: true, expand_css: true)
     gatchaman.data_uri_schemize(html_string)
 
 ## Contributing
@@ -24,3 +24,7 @@ or
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Contributers
+
+wneko [js and css expand options]

data/bin/gatchan

@@ -8,13 +8,15 @@ def parse_options
 
   opt.on('-r document_root') {|v| options[:document_root] = v}
   opt.on('-c current_directory') {|v| options[:current_directory] = v}
+  opt.on('--expand-js')  { options[:expand_js]  = true}
+  opt.on('--expand-css') { options[:expand_css] = true}
   opt.parse!(ARGV)
 
   options
 end
 
 def help
-  warn "usage: #{$0} input_file [-r document_root] [-c current_directory]"
+  warn "usage: #{$0} input_file [-r document_root] [-c current_directory] [--expand-js] [--expand-css]"
   exit 1
 end
 

data/lib/gatchaman.rb

@@ -4,17 +4,30 @@ require "mime/types"
 require "open-uri"
 require "base64"
 class Gatchaman
-  def initialize(document_root, current_dir)
-    @document_root = chomp_last_slash(document_root)
-    @current_dir = chomp_last_slash(current_dir)
+  SCHEMIZE_TARGET_ELEMENTS = [
+    :img,
+    :audio,
+    :video
+  ].freeze
+  
+  def initialize(options = {})
+    @document_root = chomp_last_slash(options[:document_root])
+    @current_dir   = chomp_last_slash(options[:current_dir])
+
+    @expand_js  = options[:expand_js]  || false
+    @expand_css = options[:expand_css] || false
   end
 
   def data_uri_schemize(html_string)
     doc = Nokogiri::HTML::DocumentFragment.parse(html_string)
-    elements = doc.xpath("*[@src]")
-    elements.each do |elements|
-      elements[:src] = to_data_scheme(extract_path(elements[:src]))
+
+    doc.css(SCHEMIZE_TARGET_ELEMENTS.join(',')).each do |element|
+      element[:src] = to_data_scheme(extract_path(element[:src]))
     end
+
+    expand_js(doc)  if @expand_js
+    expand_css(doc) if @expand_css
+
     doc.to_s
   end
 
@@ -39,4 +52,40 @@ class Gatchaman
     base64 = Base64.encode64(image_binary).gsub(/\s/,'')
     "data:#{mime.to_s};base64,#{base64}"
   end
+  def inner_html_from_file(filename)
+    ["", open(extract_path(filename)).read.chomp, ""].join("\n")
+  end
+  def expand_js(doc)
+    doc.css('script').each do |element|
+      expand_js_element(element)
+    end
+    doc
+  end
+  def expand_css(doc)
+    doc.css('link[rel=stylesheet]').each do |element|
+      expand_css_element(element)
+    end
+    doc
+  end
+  def expand_js_element(element)
+    return if element[:src].nil? or element[:src].size == 0
+    element.inner_html += inner_html_from_file(element[:src])
+    [:src, :charset].each {|attr| element.delete(attr.to_s)}
+  end
+  def expand_css_element(element)
+    element.name = "style"
+    content = inner_html_from_file(element[:href])
+    content = expand_css_url(content)
+    element.inner_html = content
+    element.attributes.keys.each do |attr_name|
+      next if [:media, :type].include? attr_name.to_sym
+      element.delete(attr_name)
+    end
+  end
+  def expand_css_url(css_content)
+    css_content.gsub(/\burl\b\(([^)]+)\)/) do
+      data_scheme = to_data_scheme(extract_path($1))
+      "url(#{data_scheme})"
+    end
+  end
 end

data/lib/gatchaman/version.rb

@@ -1,3 +1,3 @@
 class Gatchaman
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/gatchaman_spec.rb

@@ -6,7 +6,7 @@ describe Gatchaman do
   describe "#data_uri_schemize" do
     let(:document_root) {File.dirname(File.dirname(__FILE__))}
     let(:current_dir) {File.dirname(__FILE__)}
-    let(:gatchaman){Gatchaman.new(document_root, current_dir)}
+    let(:gatchaman){Gatchaman.new(document_root: document_root, current_dir: current_dir, expand_js: true, expand_css: true)}
     let(:base64_encoded_resouce){
       "iVBORw0KGgoAAAANSUhEUgAAAAQAAAAGCAIAAABrW6giAAAACXBIWXMAA
        BYlAAAWJQFJUiTwAAABy2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPH
@@ -23,6 +23,8 @@ describe Gatchaman do
        bXBtZXRhPgrjpclbAAAAFUlEQVQIHWOUlJRkgAEmGANEk8MBABhmAFcTc
        YlpAAAAAElFTkSuQmCC".gsub(/[\s\n]/,'')
     }
+    let(:test_css_content) { open("#{current_dir}/resouces/test.css").read.chomp }
+    let(:test_js_content)  { open("#{current_dir}/resouces/test.js").read.chomp }
 
     it "絶対urlのsrcをdata schemeで置き換えてくれること" do
       gatchaman.should_receive(:open).with("http://example.com/img/test.png", "r:ASCII-8BIT").
@@ -40,5 +42,20 @@ describe Gatchaman do
       gatchaman.data_uri_schemize('<img src="/spec/resouces/test.png">').
         should == "<img src=\"data:image/png;base64,#{base64_encoded_resouce}\">"
     end
+
+    it "cssを展開してくれること" do
+      gatchaman.data_uri_schemize('<link rel="stylesheet" type="text/css" media="screen" href="resouces/test.css">').
+        should == %[<style type="text/css" media="screen">\n#{test_css_content}\n</style>]
+    end
+
+    it "css内部のurl参照を展開してくれること" do
+      gatchaman.data_uri_schemize('<link rel="stylesheet" type="text/css" media="screen" href="resouces/test_2.css">').
+        include?(base64_encoded_resouce).should be_true
+    end
+
+    it "jsを展開してくれること" do
+      gatchaman.data_uri_schemize('<script src="resouces/test.js" type="text/javascript" charset="utf-8"></script>').
+        should == %[<script type="text/javascript">\n#{test_js_content}\n</script>]
+    end
   end
 end

data/spec/resouces/test.css

@@ -0,0 +1,5 @@
+/* Here is Comment */
+
+body {
+  color: #f00;
+}

data/spec/resouces/test.js

@@ -0,0 +1,5 @@
+// Here is Comment
+
+!function() {
+  alert(1);
+}()

data/spec/resouces/test_2.css

@@ -0,0 +1,5 @@
+/* Here is Comment */
+
+body {
+  background: url(resouces/test.png);
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gatchaman
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -79,7 +79,10 @@ files:
 - lib/gatchaman.rb
 - lib/gatchaman/version.rb
 - spec/gatchaman_spec.rb
+- spec/resouces/test.css
+- spec/resouces/test.js
 - spec/resouces/test.png
+- spec/resouces/test_2.css
 - spec/spec_helper.rb
 homepage: https://github.com/Shinpeim/Gatchaman
 licenses: []
@@ -108,5 +111,8 @@ summary: Gatchaman is a gem to replace src values in HTML documents with data UR
   scheme
 test_files:
 - spec/gatchaman_spec.rb
+- spec/resouces/test.css
+- spec/resouces/test.js
 - spec/resouces/test.png
+- spec/resouces/test_2.css
 - spec/spec_helper.rb