simplificator-rwebthumb 0.3.1 → 0.3.2

data/lib/rwebthumb/base.rb

@@ -11,6 +11,7 @@ module Simplificator
       VALID_SIZES = [:small, :medium, :medium2, :large, :full, :excerpt, :effect, :custom, :zip]
 
       attr_reader :api_key
+      attr_reader :api_endpoint
       # Constructor
       #  api_key: the Webthumb api key, not nil and not blank
       #
@@ -46,7 +47,7 @@ module Simplificator
             raise WebthumbException.new("Unsupported content type #{response.content_type}")
           end
         else
-          raise CommunicationException('Response code was not HTTP OK')
+          raise CommunicationException.new('Response code was not HTTP OK')
         end
       end
 
@@ -56,6 +57,7 @@ module Simplificator
         root = REXML::Element.new('webthumb')
         api = root.add_element('apikey')
         api.text = @api_key
+        root.add_element('version').text='3'
         root
       end
 

data/lib/rwebthumb/job.rb

@@ -10,21 +10,21 @@ module Simplificator
       STATUS_PICKUP = 200
 
       # Factory method to build a Job object from a REXML xml element
-      def self.from_thumbnail_xml(api_key, xml)
+      def self.from_thumbnail_xml(api_key, api_endpoint, xml)
         job_element = REXML::XPath.first(xml, '/webthumb/jobs/job')
         return nil if job_element.nil?
 
         submission_datetime = self.parse_webthumb_datetime(job_element.attributes['time'])
-        Job.new(api_key, job_element.text, job_element.attributes['url'], submission_datetime, job_element.attributes['estimate'].to_i, job_element.attributes['cost'].to_i)
+        Job.new(api_key, api_endpoint, job_element.text, job_element.attributes['url'], submission_datetime, job_element.attributes['estimate'].to_i, job_element.attributes['cost'].to_i)
       end
       # Factory method to create a Job object from a status XML.
       # this does not set all attributes of the Job (url, duration_estimate, cost) since the API of webthumb does not
       # return the same information on job creation and status requests.
-      def self.from_status_xml(api_key, xml)
+      def self.from_status_xml(api_key, api_endpoint, xml)
         status_element = REXML::XPath.first(xml, '/webthumb/jobStatus/status')
         submission_datetime = self.parse_webthumb_datetime(status_element.attributes['submissionTime'])
-        job = Job.new(api_key, status_element.attributes['id'], nil, submission_datetime, 5, nil,
-          status_element.text == 'Complete' ? STATUS_PICKUP : STATUS_PROCESSING)
+        job = Job.new(api_key, api_endpoint, status_element.attributes['id'], nil, submission_datetime, 5, nil,
+          status_element.text.downcase == 'complete' ? STATUS_PICKUP : STATUS_PROCESSING)
       end
       # Constructor.
       # *api_key: webthumb API key. Required by all the operations which query the server
@@ -34,8 +34,8 @@ module Simplificator
       # *duration_estimate: integer value indicating estimated job duration in seconds
       # *cost: integer value indicating how many credit this request costet. Optional
       # *status: one of the STATUS_XXX constants defined in Base. Defaults to STATUS_PROCESSING
-      def initialize(api_key, job_id, url, submission_datetime, duration_estimate, cost, status = STATUS_PROCESSING)
-        super(api_key)
+      def initialize(api_key, api_endpoint, job_id, url, submission_datetime, duration_estimate, cost, status = STATUS_PROCESSING)
+        super(api_key, api_endpoint)
         @job_id = job_id
         @url = url
         @submission_datetime = submission_datetime
@@ -50,15 +50,16 @@ module Simplificator
       # A call to this method updates the @status attribute.
       def check_status
         response = do_request(build_status_xml())
-        @status = REXML::XPath.first(response, '/webthumb/jobStatus/status').text == 'Complete' ? STATUS_PICKUP : STATUS_PROCESSING
+        status_elem = REXML::XPath.first(response,'/webthumb/jobStatus/status')
+        @status = status_elem.text.downcase == 'complete' ? STATUS_PICKUP : STATUS_PROCESSING
       
         if pickup?
-          @completion_time = response.attributes['completionTime']
           
-          if REXML::XPath.first(response,'/webthumb/jobStatus/status')
-            @pickup_url = REXML::XPath.first(response,'/webthumb/jobStatus/status').attributes['pickup']
-            @browser_width = (REXML::XPath.first(response,'/webthumb/jobStatus/status').attributes['browserWidth'] || "0").to_i
-            @browser_height = (REXML::XPath.first(response,'/webthumb/jobStatus/status').attributes['browserHeight'] || "0").to_i          
+          if status_elem
+            @completion_time = status_elem.attributes['completionTime']
+            @pickup_url = status_elem.attributes['pickup']
+            @browser_width = (status_elem.attributes['browserWidth'] || "0").to_i
+            @browser_height = (status_elem.attributes['browserHeight'] || "0").to_i          
           end
         end
         @status
@@ -139,7 +140,8 @@ module Simplificator
       end
 
       def to_s
-        "Job: #{@job_id} / Status: #{@status} / Submission Time #{@submission_time} / Duration Estimate #{@duration_estimate}"
+        extra = @pickup_url ? " / Completion Time: #{@completion_time} / Pickup Url: #{@pickup_url}" : ''
+        "Job: #{@job_id} / Status: #{@status} / Submission Time #{@submission_datetime} / Duration Estimate #{@duration_estimate}#{extra}"
       end
     end
   end

data/lib/rwebthumb/webthumb.rb

@@ -31,7 +31,7 @@ module Simplificator
       # defined in Base.rb for valid values
       #
       def thumbnail(options = {})
-        Job.from_thumbnail_xml(@api_key, do_request(build_thumbnail_xml(options)))
+        Job.from_thumbnail_xml(@api_key, @api_endpoint, do_request(build_thumbnail_xml(options)))
       end
       
       # Request the job status from server.
@@ -41,7 +41,7 @@ module Simplificator
       # the requested URL, the duration estimation and the cost values when checking the status. I hope this will change someday.
       def job_status(job_id)
         raise WebthumbException.new('Job id is required') if job_id == nil || job_id == ''
-        Job.from_status_xml(@api_key, do_request(build_job_status_xml(job_id)))
+        Job.from_status_xml(@api_key, @api_endpoint, do_request(build_job_status_xml(job_id)))
       end
       
       # Check your credit status on the webthumbs server

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: simplificator-rwebthumb
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.1
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Simplificator GmbH
@@ -10,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-03 00:00:00 Z
+date: 2008-09-03 00:00:00 +02:00
+default_executable: 
 dependencies: []
 
 description: "rwebthumb provides a ruby interface for the webthumb.bluga.net. "
@@ -33,6 +38,7 @@ files:
 - lib/rwebthumb/easythumb.rb
 - README
 - init.rb
+has_rdoc: true
 homepage: http://simplificator.com/
 licenses: []
 
@@ -42,21 +48,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: rwebthumb provides a ruby interface for the webthumb.bluga.net