websnap 0.1.2 → 0.1.3

data/Rakefile

@@ -2,9 +2,9 @@ require 'rubygems'
 require 'echoe'
 
 require 'rake'
-#require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
-Echoe.new("websnap", "0.1.2") do |p|
+Echoe.new("websnap", "0.1.3") do |p|
   p.author = "Francis Chong"
   p.description = "Create snapshot of webpage"
   p.url = "http://github.com/siuying/websnap"
@@ -12,3 +12,6 @@ Echoe.new("websnap", "0.1.2") do |p|
   p.development_dependencies = ["rspec", "echoe", "mocha"]
   p.runtime_dependencies = []
 end
+
+RSpec::Core::RakeTask.new('spec') do |t|
+end

data/lib/websnap/source.rb

@@ -1,4 +1,4 @@
-class WebSnap
+module WebSnap
   
   class Source
         

data/lib/websnap/websnap.rb

@@ -1,93 +1,95 @@
-class WebSnap
+module WebSnap
+  class Snapper
   
-  class NoExecutableError < StandardError
-    def initialize
-      super('Could not locate wkhtmltoimage-proxy executable')
+    class NoExecutableError < StandardError
+      def initialize
+        super('Could not locate wkhtmltoimage-proxy executable')
+      end
     end
-  end
   
-  class ImproperSourceError < StandardError
-    def initialize(msg)
-      super("Improper Source: #{msg}")
+    class ImproperSourceError < StandardError
+      def initialize(msg)
+        super("Improper Source: #{msg}")
+      end
     end
-  end
   
-  attr_accessor :source, :stylesheets
-  attr_reader :options
+    attr_accessor :source, :stylesheets
+    attr_reader :options
   
-  def initialize(url_file_or_html, options={})
-    @source = Source.new(url_file_or_html)
+    def initialize(url_file_or_html, options={})
+      @source = Source.new(url_file_or_html)
     
-    @stylesheets = []
+      @stylesheets = []
 
-    default_options = {
-      :'crop-h' => '768',
-      :'crop-w' => '1024',
-      :'crop-x' => '0',
-      :'crop-y' => '0',
-      :'format' => 'png'
-    }
-    @options = normalize_options(default_options.merge(options))
+      default_options = {
+        :'crop-h' => '768',
+        :'crop-w' => '1024',
+        :'crop-x' => '0',
+        :'crop-y' => '0',
+        :'format' => 'jpg'
+      }
+      @options = normalize_options(default_options.merge(options))
     
-    raise NoExecutableError.new if wkhtmltoimage.nil? || wkhtmltoimage == ''
-  end
+      raise NoExecutableError.new if wkhtmltoimage.nil? || wkhtmltoimage == ''
+    end
   
-  def command
-    args = [wkhtmltoimage]
-    args += @options.to_a.flatten.compact
+    def command
+      args = [wkhtmltoimage]
+      args += @options.to_a.flatten.compact
     
-    if @source.html?
-      args << '-' # Get HTML from stdin
-    else
-      args << @source.to_s
-    end
+      if @source.html?
+        args << '-' # Get HTML from stdin
+      else
+        args << @source.to_s
+      end
     
-    args << '-' # Read PDF from stdout
-    args.join(' ')
-  end
+      args << '-' # Read PDF from stdout
+      args.join(' ')
+    end
   
-  def to_bytes
-    img = IO.popen(command, "w+")
-    img.puts(@source.to_s) if @source.html?
-    img.close_write
-    result = img.gets(nil)
-    img.close_read
-    return result
-  end
+    def to_bytes
+      img = IO.popen(command, "w+")
+      img.puts(@source.to_s) if @source.html?
+      img.close_write
+      result = img.gets(nil)
+      img.close_read
+      return result
+    end
   
-  def to_file(path)
-    File.open(path,'w') {|file| file << self.to_bytes}
-  end
+    def to_file(path)
+      File.open(path,'w') {|file| file << self.to_bytes}
+    end
   
-  protected
+    protected
   
-    def wkhtmltoimage
-      @wkhtmltoimage ||= `which wkhtmltoimage-proxy`.chomp
-    end
+      def wkhtmltoimage
+        @wkhtmltoimage ||= `which wkhtmltoimage-proxy`.chomp
+      end
   
-    def normalize_options(options)
-      normalized_options = {}
-      options.each do |key, value|
-        next if !value
-        normalized_key = "--#{normalize_arg key}"
-        normalized_options[normalized_key] = normalize_value(value)
+      def normalize_options(options)
+        normalized_options = {}
+        options.each do |key, value|
+          next if !value
+          normalized_key = "--#{normalize_arg key}"
+          normalized_options[normalized_key] = normalize_value(value)
+        end
+        normalized_options
       end
-      normalized_options
-    end
     
-    def normalize_arg(arg)
-      arg.to_s.downcase.gsub(/[^a-z0-9]/,'-')
-    end
+      def normalize_arg(arg)
+        arg.to_s.downcase.gsub(/[^a-z0-9]/,'-')
+      end
     
-    def normalize_value(value)
-      case value
-      when TrueClass
-        nil
-      when String
-        value.match(/\s/) ? "\"#{value}\"" : value
-      else
-        value
+      def normalize_value(value)
+        case value
+        when TrueClass
+          nil
+        when String
+          value.match(/\s/) ? "\"#{value}\"" : value
+        else
+          value
+        end
       end
-    end
   
+  end
 end

data/spec/websnap_spec.rb

@@ -1,34 +1,34 @@
 require 'spec_helper'
 
-describe WebSnap do
+describe WebSnap::Snapper do
   
   context "initialization" do
     it "should accept HTML as the source" do
-      websnap = WebSnap.new('<h1>Oh Hai</h1>')
+      websnap = WebSnap::Snapper.new('<h1>Oh Hai</h1>')
       websnap.source.should be_html
       websnap.source.to_s.should == '<h1>Oh Hai</h1>'
     end
     
     it "should accept a URL as the source" do
-      websnap = WebSnap.new('http://google.com')
+      websnap = WebSnap::Snapper.new('http://google.com')
       websnap.source.should be_url
       websnap.source.to_s.should == 'http://google.com'
     end
     
     it "should accept a File as the source" do
       file_path = File.join(SPEC_ROOT,'fixtures','google.html')
-      websnap = WebSnap.new(File.new(file_path))
+      websnap = WebSnap::Snapper.new(File.new(file_path))
       websnap.source.should be_file
       websnap.source.to_s.should == file_path
     end
     
     it "should parse the options into a cmd line friedly format" do
-      websnap = WebSnap.new('html', :'crop-w' => '800', :'crop-h' => '600')
+      websnap = WebSnap::Snapper.new('html', :'crop-w' => '800', :'crop-h' => '600')
       websnap.options.should have_key('--crop-w')
     end
 
     it "should provide default options" do
-      websnap = WebSnap.new('<h1>Oh Hai</h1>')
+      websnap = WebSnap::Snapper.new('<h1>Oh Hai</h1>')
       ['--crop-w', '--crop-h', '--scale-w', '--scale-h', '--format'].each do |option|
         websnap.options.should have_key(option)
       end
@@ -37,30 +37,30 @@ describe WebSnap do
   
   context "command" do
     it "should contstruct the correct command" do
-      websnap = WebSnap.new('html', :'encoding' => 'Big5')
+      websnap = WebSnap::Snapper.new('html', :'encoding' => 'Big5')
       websnap.command.should include('--encoding Big5')
     end
 
     it "read the source from stdin if it is html" do
-      websnap = WebSnap.new('html')
+      websnap = WebSnap::Snapper.new('html')
       websnap.command.should match(/ - -$/)
     end
     
     it "specify the URL to the source if it is a url" do
-      websnap = WebSnap.new('http://google.com')
+      websnap = WebSnap::Snapper.new('http://google.com')
       websnap.command.should match(/ http:\/\/google\.com -$/)
     end
     
     it "should specify the path to the source if it is a file" do
       file_path = File.join(SPEC_ROOT,'fixtures','google.html')
-      websnap = WebSnap.new(File.new(file_path))
+      websnap = WebSnap::Snapper.new(File.new(file_path))
       websnap.command.should match(/ #{file_path} -$/)
     end
   end
   
   context "#to_bytes" do
     it "should generate a PDF of the HTML" do
-      websnap = WebSnap.new('html')
+      websnap = WebSnap::Snapper.new('html')
       websnap.expects(:to_bytes).returns('PNG')
       png = websnap.to_bytes
       png.should match(/PNG/)
@@ -78,7 +78,7 @@ describe WebSnap do
     end
     
     it "should create a file with the PNG as content" do
-      websnap = WebSnap.new('html')
+      websnap = WebSnap::Snapper.new('html')
       websnap.expects(:to_bytes).returns('PNG')
 
       file = websnap.to_file(@file_path)

data/websnap.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{websnap}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Chong"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: websnap
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Francis Chong