websnap 0.1.3 → 0.1.4

data/README.md

@@ -20,7 +20,7 @@ Create snapshot of webpage. Uses [wkhtmltoimage](http://github.com/antialize/wkh
     
     # WebSnap.new takes the HTML and any options for wkhtmltoimage
     # run `wkhtmltoimage -H` for a full list of options
-    snap = WebSnap.new('http://google.com', :format => 'png')
+    snap = WebSnap::Snapper.new('http://google.com', :format => 'png')
 
     # Get the binary image data
     png = snap.to_bytes
@@ -29,8 +29,8 @@ Create snapshot of webpage. Uses [wkhtmltoimage](http://github.com/antialize/wkh
     file = snap.to_file('/path/to/save/png')
     
     # WebSnap.new can optionally accept a URL or a File.
-    kit = WebSnap.new('http://google.com')
-    kit = WebSnap.new(File.new('/path/to/html'))
+    kit = WebSnap::Snapper.new('http://google.com')
+    kit = WebSnap::Snapper.new(File.new('/path/to/html'))
 
 ## Attributions
 

data/Rakefile

@@ -4,7 +4,7 @@ require 'echoe'
 require 'rake'
 require 'rspec/core/rake_task'
 
-Echoe.new("websnap", "0.1.3") do |p|
+Echoe.new("websnap", "0.1.4") do |p|
   p.author = "Francis Chong"
   p.description = "Create snapshot of webpage"
   p.url = "http://github.com/siuying/websnap"

data/lib/websnap/websnap.rb

@@ -22,10 +22,6 @@ module WebSnap
       @stylesheets = []
 
       default_options = {
-        :'crop-h' => '768',
-        :'crop-w' => '1024',
-        :'crop-x' => '0',
-        :'crop-y' => '0',
         :'format' => 'jpg'
       }
       @options = normalize_options(default_options.merge(options))
@@ -56,10 +52,30 @@ module WebSnap
       return result
     end
   
-    def to_file(path)
+    def to_file(path, image_path=nil)
+      append_stylesheets
+      path = File.expand_path(path)
+
+      @source = Source.new(@source.to_s.gsub(/images\//, image_path)) unless image_path.nil?
       File.open(path,'w') {|file| file << self.to_bytes}
     end
   
+    def append_stylesheets
+      raise ImproperSourceError.new('Stylesheets may only be added to an HTML source') if stylesheets.any? && !@source.html?
+
+      stylesheets.each do |stylesheet|
+        if @source.to_s.match(/<\/head>/)
+          @source = Source.new(@source.to_s.gsub(/(<\/head>)/, style_tag_for(stylesheet)+'\1'))
+        else
+          @source.to_s.insert(0, style_tag_for(stylesheet))
+        end
+      end
+    end
+  
+    def style_tag_for(stylesheet)
+      "<style>#{File.read(stylesheet)}</style>"
+    end
+  
     protected
   
       def wkhtmltoimage

data/spec/spec_helper.rb

@@ -4,5 +4,5 @@ $LOAD_PATH.unshift(File.join(SPEC_ROOT, '..', 'lib'))
 
 require 'websnap'
 require 'rubygems'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 require 'mocha'

data/spec/websnap_spec.rb

@@ -29,7 +29,7 @@ describe WebSnap::Snapper do
 
     it "should provide default options" do
       websnap = WebSnap::Snapper.new('<h1>Oh Hai</h1>')
-      ['--crop-w', '--crop-h', '--scale-w', '--scale-h', '--format'].each do |option|
+      ['--crop-w', '--crop-h', '--crop-x', '--crop-y', '--format'].each do |option|
         websnap.options.should have_key(option)
       end
     end

data/websnap.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{websnap}
-  s.version = "0.1.3"
+  s.name = "websnap"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Chong"]
-  s.date = %q{2011-05-05}
-  s.description = %q{Create snapshot of webpage}
-  s.email = %q{}
+  s.date = "2011-11-24"
+  s.description = "Create snapshot of webpage"
+  s.email = ""
   s.executables = ["wkhtmltoimage-linux-i386-0.10.0", "wkhtmltoimage-osx-i386-0.10.0", "wkhtmltoimage-proxy"]
   s.extra_rdoc_files = ["LICENSE", "README.md", "bin/wkhtmltoimage-linux-i386-0.10.0", "bin/wkhtmltoimage-osx-i386-0.10.0", "bin/wkhtmltoimage-proxy", "lib/websnap.rb", "lib/websnap/source.rb", "lib/websnap/websnap.rb"]
   s.files = ["LICENSE", "Manifest", "README.md", "Rakefile", "bin/wkhtmltoimage-linux-i386-0.10.0", "bin/wkhtmltoimage-osx-i386-0.10.0", "bin/wkhtmltoimage-proxy", "lib/websnap.rb", "lib/websnap/source.rb", "lib/websnap/websnap.rb", "spec/fixtures/google.html", "spec/source_spec.rb", "spec/spec_helper.rb", "spec/websnap_spec.rb", "websnap.gemspec"]
-  s.homepage = %q{http://github.com/siuying/websnap}
+  s.homepage = "http://github.com/siuying/websnap"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Websnap", "--main", "README.md"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{websnap}
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Create snapshot of webpage}
+  s.rubyforge_project = "websnap"
+  s.rubygems_version = "1.8.10"
+  s.summary = "Create snapshot of webpage"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,74 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: websnap
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.1.4
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Francis Chong
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-05 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70282342064160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: echoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70282342064160
+- !ruby/object:Gem::Dependency
+  name: echoe
+  requirement: &70282342062620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70282342062620
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70282342083920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70282342083920
 description: Create snapshot of webpage
-email: ""
-executables: 
+email: ''
+executables:
 - wkhtmltoimage-linux-i386-0.10.0
 - wkhtmltoimage-osx-i386-0.10.0
 - wkhtmltoimage-proxy
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
 - bin/wkhtmltoimage-linux-i386-0.10.0
@@ -77,7 +60,7 @@ extra_rdoc_files:
 - lib/websnap.rb
 - lib/websnap/source.rb
 - lib/websnap/websnap.rb
-files: 
+files:
 - LICENSE
 - Manifest
 - README.md
@@ -93,45 +76,34 @@ files:
 - spec/spec_helper.rb
 - spec/websnap_spec.rb
 - websnap.gemspec
-has_rdoc: true
 homepage: http://github.com/siuying/websnap
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Websnap
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 11
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: websnap
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Create snapshot of webpage
 test_files: []
-