webshooter 0.0.1a → 0.0.2a

data/.gitignore

@@ -1 +1,2 @@
 *.png
+pkg/*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    webshooter (0.0.1a)
+    webshooter (0.0.2a)
 
 GEM
   remote: http://rubygems.org/

data/bin/webshooter.rb

@@ -1,18 +1,18 @@
 #!/usr/bin/env ruby
 
 
-require 'webshotr'
+require 'webshooter'
 
-module Webshotr
+module Webshooter
 	class CLI
 		#Ruby CLI tool - http://rubylearning.com/blog/2011/01/03/how-do-i-make-a-command-line-tool-in-ruby/
 		def self.execute(args)
 			url=args[0]
 			filename=args[1]
 			size=args[2]
-			webshotr=Webshotr.capture(url, filename, size )
+			webshotr=Webshooter.capture(url, filename, size )
 		end
 	end
 end
 
-Webshotr::CLI.execute(ARGV)
+Webshooter::CLI.execute(ARGV)

data/lib/webshooter/redirectfollower.rb

@@ -0,0 +1,58 @@
+# Inspired by http://railstips.org/blog/archives/2009/03/04/following-redirects-with-nethttp/
+# But needs some of this - http://www.ruby-forum.com/topic/142745
+
+require 'net/http'
+require 'net/https'
+
+module Webshooter
+  
+class RedirectFollower
+  class TooManyRedirects < StandardError; end
+  
+  attr_accessor :url, :body, :redirect_limit, :response
+  
+  def initialize(url, limit=5)
+    @url, @redirect_limit = url, limit
+  end
+  
+  def resolve
+    raise TooManyRedirects if redirect_limit < 0
+    
+    uri=URI.parse(url)
+    
+    http = Net::HTTP.new(uri.host, uri.port)
+
+    if uri.scheme == "https"
+      http.use_ssl = true
+      #http.verify_mode = OpenSSL::SSL::VERIFY_NONE # Not setting this explicitly will result in an error and the value being set anyway
+    end
+
+    if (uri.path=="")
+      request = Net::HTTP::Get.new("/")      
+    else
+      request = Net::HTTP::Get.new(uri.path)
+    end
+    self.response = http.start {|http| http.request(request) }
+
+    if response.kind_of?(Net::HTTPRedirection)      
+      self.url = redirect_url
+      self.redirect_limit -= 1
+
+      puts "redirect found, headed to #{url}"
+      resolve
+    end   
+    return url
+    
+  end
+
+  def redirect_url
+    if response['location'].nil?
+      response.body.match(/<a href=\"([^>]+)\">/i)[1]
+    else
+      response['location']
+    end
+  end
+end
+
+end
+

data/lib/webshooter/version.rb

@@ -1,3 +1,3 @@
 module Webshooter
-	VERSION = "0.0.1a"
+	VERSION = "0.0.2a"
 end

data/lib/webshooter/webshotprocessor.rb

@@ -3,6 +3,8 @@ require 'logger'
 require 'uri'
 
 require 'webshooter/newnsurlrequest'
+require 'webshooter/redirectfollower'
+
 OSX.require_framework 'WebKit'
 
 #Respond to URL not found....
@@ -52,7 +54,6 @@ class WebShotProcessor
       # Replace the window's content @webView with the web @webView
       @window.setContentView(@webView)
       @webView.release
-      puts "its not in the release"
     end
 
     def capture(uri, path, dimensions = "1024x768" )
@@ -61,14 +62,16 @@ class WebShotProcessor
       # Tell the frame to load the URL we want
       @webView.window.setContentSize(snapshot_dimension) 
       @webView.setFrameSize(snapshot_dimension)
+    
+      final_link = RedirectFollower.new(uri).resolve
       
-      myURI = URI.parse(uri)
+      myURI = URI.parse(final_link)
        
       #Allow all https certificates
       NewNSURLRequest.setAllowsAnyHTTPSCertificate_forHost(true,myURI.host)
       
       #puts "Getting ready for the loadRequest"+uri
-      @webView.mainFrame.loadRequest(NewNSURLRequest.requestWithURL(OSX::NSURL.URLWithString(uri)))
+      @webView.mainFrame.loadRequest(NewNSURLRequest.requestWithURL(OSX::NSURL.URLWithString(final_link)))
 
       #
       # Run the main event loop until the frame loads
@@ -82,12 +85,11 @@ class WebShotProcessor
       #OSX.CFRunLoopRun
       #puts "first loop enters here"
       
-      puts "its not in the after upon success"
          
       upon_success do |view| # Capture the content of the view as an image
 
         view.window.orderFront(nil)
-        view.window.display
+        #view.window.display
   
         #puts "-------------------------------------------------"
         #puts "We got success"

data/webshooter.gemspec

@@ -9,12 +9,13 @@ Gem::Specification.new do |s|
   s.email       = ["patrick.debois@jedi.be"]
   s.homepage    = "http://github.com/jedi4ever/webshooter/"
   s.summary     = %q{Create webshot using webkit on MacOSX}
-  s.description = %q{This library allows you to create webshots using webkit on MacOSX. A webshot is a screenshot taking inside the browser. The advantage of this library is that it is headless and gives you the real view not a parsed view}
+  s.description = %q{This library allows you to create webshots using webkit on MacOSX. A webshot is a screenshot taken inside the browser. The advantage of this library is that it is headless and gives you the real view not a parsed view}
 
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "webshooter"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
+  #s.add_dependency "responsalizr", "~>1.0.2"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1a
-  version: 0.0.1a
+  - 2a
+  version: 0.0.2a
 platform: ruby
 authors: 
 - Patrick Debois
@@ -31,7 +31,7 @@ dependencies:
   name: bundler
   prerelease: false
   type: :development
-description: This library allows you to create webshots using webkit on MacOSX. A webshot is a screenshot taking inside the browser. The advantage of this library is that it is headless and gives you the real view not a parsed view
+description: This library allows you to create webshots using webkit on MacOSX. A webshot is a screenshot taken inside the browser. The advantage of this library is that it is headless and gives you the real view not a parsed view
 email: 
 - patrick.debois@jedi.be
 executables: 
@@ -49,6 +49,7 @@ files:
 - bin/webshooter.rb
 - lib/webshooter.rb
 - lib/webshooter/newnsurlrequest.rb
+- lib/webshooter/redirectfollower.rb
 - lib/webshooter/version.rb
 - lib/webshooter/webshotprocessor.rb
 - trials/darkroom.orig.rb