yabbie 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c31d73314e5756f24029458d3393b224d3b2dc9
-  data.tar.gz: 733328151866ab81c14461274aa5dbb3eab5609f
+  metadata.gz: b6b1986d94973af7ece20471e87f0efe50eb095a
+  data.tar.gz: 57a64488b764bdff9586feff71564dfbaaf3a31d
 SHA512:
-  metadata.gz: d44a6e2b4a26d0bbfc1d79a6ddfc46f9f88b1485f98d731105856e0e625dc8bf974bc704fc54f513675a08fdbdd945129fb8eaedad5f9e726762e3ecdaf33402
-  data.tar.gz: 6e5148ebf79e2dcff0c0bec8c67be5968e758b1b8aa059792e87fbaa39bdbd81063ab1698b09788142d7ae67a76d648738a6583732c4e38e065fe2c7e5b6d5dd
+  metadata.gz: 648c2b6840bddf5f5cb4e848047ec5210b3dedab84f9d7e9d0a2ea6397368a5431ff4930d6466267753060d59ff9f0d591cb1ac269bf5624be373795b9509fed
+  data.tar.gz: fbabf190c6c0c5eaff47bc093b0604789d5b40e63e00da5a02191c5d7f67d07564c5609b4f724c9e0622e43d395081f9719c5ee62cf91f2dcb0e1cbafd0a445f

data/.rspec

@@ -0,0 +1 @@
+--colour

data/lib/yabbie/configuration.rb

@@ -4,7 +4,7 @@ module Yabbie
   class Configuration
     attr_accessor :default_options
 
-    [:format, :tmpdir, :timeout, :config_file, :error_log_file, :width, :height, :prepend_command, :script].each do |m|
+    [:format, :tmpdir, :timeout, :config_file, :error_log_file, :width, :height, :prepend_command, :script, :slimerjs].each do |m|
       define_method("#{m}=") do |val|
         @default_options[m] = val
       end
@@ -20,13 +20,10 @@ module Yabbie
         height:          600,
         error_log_file:  Dir.tmpdir + "/log/yabbie_error.log",
         prepend_command: '',
-        script:          File.expand_path('../default.js', __FILE__)
+        script:          File.expand_path('../default.js', __FILE__),
+        slimerjs:        `which slimerjs`.chomp
       }
     end
-
-    def slimerjs
-      @slimerjs ||= `which slimerjs`.chomp
-    end
   end
 
   class << self

data/lib/yabbie/default.js

@@ -2,13 +2,15 @@ var webpage = require('webpage'),
     system  = require('system');
 
 var url     = system.args[1],
-    output  = system.args[2];
+    output  = system.args[2],
+    width   = system.args[3],
+    height  = system.args[4];
 
 var page = webpage.create();
 
 page.open(url)
   .then(function() {
-    page.viewportSize = { width: 650, height: 320 };
+    page.viewportSize = { width: width, height: height };
     page.render(output, { onlyViewport: true });
 
     slimer.exit();

data/lib/yabbie/exceptions.rb

@@ -1,7 +1,7 @@
 module Yabbie
   class NoExecutableError < StandardError
-    def initialize
-      msg = "No slimerjs executable found at #{Yabbie.configuration.slimerjs}\n"
+    def initialize(executable = nil)
+      msg = "No slimerjs executable found at #{executable}\n"
       msg << ">> Please install slimerjs"
       super(msg)
     end

data/lib/yabbie/slimer.rb

@@ -6,11 +6,11 @@ module Yabbie
     attr_accessor :source, :configuration
     attr_reader :options, :result, :error
 
-    def initialize(url_or_file, options = {})
+    def initialize(url_or_file, opts = {})
       @source  = Source.new(url_or_file)
-      @options = Yabbie.configuration.default_options.merge(options)
+      @options = Yabbie.configuration.default_options.merge(opts)
 
-      raise NoExecutableError.new unless File.exists?(Yabbie.configuration.slimerjs)
+      raise NoExecutableError.new(options[:slimerjs]) unless command?(options[:slimerjs])
     end
 
     def run
@@ -28,7 +28,7 @@ module Yabbie
     def cmd
       [
         prepend_command,
-        Yabbie.configuration.slimerjs,
+        slimerjs,
         command_config_file,
         command_error_log,
         script,
@@ -44,6 +44,9 @@ module Yabbie
     def render(path = nil)
       @outfile = File.expand_path(path) if path
       self.run
+
+      raise Yabbie::RenderingError.new(@error) if @error
+
       @outfile
     end
 
@@ -82,12 +85,16 @@ module Yabbie
       options[:prepend_command]
     end
 
+    def slimerjs
+      options[:slimerjs]
+    end
+
     def command_config_file
-      "--config=#{options[:config_file]}"
+      options[:config_file].empty? ? nil : "--config=#{options[:config_file]}"
     end
 
     def command_error_log
-      "--error-log-file=#{options[:error_log_file]}"
+      options[:error_log_file].empty? ? nil : "--error-log-file=#{options[:error_log_file]}"
     end
 
     def outfile
@@ -97,5 +104,9 @@ module Yabbie
         "#{options[:tmpdir]}/#{Digest::MD5.hexdigest((Time.now.to_i + rand(9001)).to_s)}.#{format}"
       end
     end
+
+    def command?(name)
+      !`which #{name}`.empty?
+    end
   end
 end

data/lib/yabbie/version.rb

@@ -1,3 +1,3 @@
 module Yabbie
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/spec_helper.rb

@@ -3,5 +3,10 @@ require 'pry'
 
 RSpec.configure do |config|
   config.order = 'random'
+
+  config.before do
+    allow_any_instance_of(Yabbie::Slimer).to receive(:`).and_return('/usr/bin/slimerjs')
+  end
+
 end
 

data/spec/yabbie/configuration_spec.rb

@@ -6,7 +6,8 @@ describe Yabbie::Configuration do
   describe 'accessors' do
     context 'when values are not provided' do
       it 'falls back to defaults' do
-        defaults = { format:          'png',
+        defaults = {
+          format:          'png',
           tmpdir:          Dir.tmpdir,
           timeout:         120000,
           config_file:     File.expand_path('../../../lib/yabbie/config.json', __FILE__),
@@ -14,7 +15,9 @@ describe Yabbie::Configuration do
           height:          600,
           error_log_file:  Dir.tmpdir + "/log/yabbie_error.log",
           prepend_command: '',
-          script:          'default.js' }
+          script:          File.expand_path('../../../lib/yabbie/default.js', __FILE__),
+          slimerjs:        `which slimerjs`.chomp
+        }
 
         expect(subject.default_options).to eq(defaults)
       end
@@ -64,13 +67,10 @@ describe Yabbie::Configuration do
       subject.script = 'config/cool_slimerjs_stuff.js'
       expect(subject.default_options[:script]).to eq('config/cool_slimerjs_stuff.js')
     end
-  end
-
-  describe '#slimerjs' do
-    it 'finds where slimerjs is installed' do
-      allow(subject).to receive(:`).with('which slimerjs').and_return('/usr/bin/slimerjs')
 
-      expect(subject.slimerjs).to eq('/usr/bin/slimerjs')
+    it 'defines accessor to slimerjs' do
+      subject.slimerjs = '/sbin/slimerjs-094'
+      expect(subject.default_options[:slimerjs]).to eq('/sbin/slimerjs-094')
     end
   end
 

data/spec/yabbie/slimer_spec.rb

@@ -11,26 +11,24 @@ describe Yabbie::Slimer do
       height:          10,
       format:          'pdf',
       tmpdir:          '/tmp',
-      timeout:         10
+      timeout:         10,
+      slimerjs:        '/usr/bin/slimerjs'
     }
   }
 
   subject { described_class.new('http://google.com', options) }
 
-  before(:each) do
-    # Assume slimerjs is installed
-    allow(File).to receive(:exists?).and_return(true)
-    allow(Yabbie.configuration).to receive(:slimerjs).and_return('/usr/bin/slimerjs')
+  before do
     allow(Digest::MD5).to receive(:hexdigest).and_return('md5')
   end
 
   describe 'initialization' do
     context 'when slimerjs is not present in the system' do
       it 'raises no executable error' do
-        allow(File).to receive(:exists?).and_return(false)
+        allow_any_instance_of(described_class).to receive(:`).and_return('')
 
         expect {
-          described_class.new('http://google.com')
+          described_class.new('http://google.com', options)
         }.to raise_error(Yabbie::NoExecutableError)
       end
     end

data/yabbie.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  spec.requirements  << 'slimerjs, v0.10 or greater'
+  spec.requirements  << 'slimerjs, v0.9.4 or greater'
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.3"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec", "~> 3.1"
   spec.add_development_dependency "pry-meta", "~> 0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabbie
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ricardo Bernardeli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: pry-meta
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -116,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- slimerjs, v0.10 or greater
+- slimerjs, v0.9.4 or greater
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
@@ -128,3 +129,4 @@ test_files:
 - spec/yabbie/configuration_spec.rb
 - spec/yabbie/slimer_spec.rb
 - spec/yabbie/source_spec.rb
+has_rdoc: