@@ -4,13 +4,9 @@ A Ruby wrapper for the webthumb API from http://webthumb.bluga.net and a generator for the easythumb API -= dependencies - * tzinfo:http://tzinfo.rubyforge.org (install: sudo gem install tzinfo) - = Installation sudo gem update --system (in case you are not yet on version 1.2.0 or higher) sudo gem sources -a http://gems.github.com (only once) -sudo gem install tzinfo sudo gem install simplificator-rwebthumb @@ -30,9 +26,9 @@ job = wt.thumbnail(:url => 'http://simplificator.com') # if thumb is not ready yet job.fetch(:large) -# you can check the status of a job +# you can check the status of a job job.check_status() - + # or fetch the thumbnail when it is complete job.fetch_when_complete(:large) README @@ -1,5 +1,5 @@ -require 'tzinfo' +require 'time' require 'rwebthumb/base' require 'rwebthumb/job' require 'rwebthumb/webthumb' -require 'rwebthumb/easythumb' \ No newline at end of file +require 'rwebthumb/easythumb' lib/rwebthumb.rb @@ -1,6 +1,6 @@ module Simplificator module Webthumb - # + # # # # @@ -9,14 +9,11 @@ module Simplificator VALID_OUTPUT_TYPES = [:jpg, :png] # Valid values for size element in fetch requests VALID_SIZES = [:small, :medium, :medium2, :large, :full, :excerpt, :effect, :custom, :zip] - - # Timezone to convert from MST (Webthumb) to UTC - MST_TIMEZONE = TZInfo::Timezone.get('MST') - + attr_reader :api_key # Constructor # api_key: the Webthumb api key, not nil and not blank - # + # def initialize(api_key, api_endpoint = 'http://webthumb.bluga.net/api.php') raise WebthumbException.new('Need an not nil and not blank api_key') if api_key == nil || api_key == '' @api_key = api_key @@ -24,13 +21,13 @@ module Simplificator @api_uri = URI.parse(@api_endpoint) end - # Parse the datetime string and returns a DateTime object in UTC time + # Parse the datetime string and returns a DateTime object in UTC time # Webthumb returns the time in MST (Mountain Standard Time) which is some 7 hours # behind UTC def self.parse_webthumb_datetime(s) - MST_TIMEZONE.local_to_utc(DateTime.strptime(s, '%Y-%m-%d %H:%M:%S')) + Time.parse("#{s} MST").getutc end - + def do_request(xml) request = Net::HTTP::Post.new(@api_uri.path) request.body = xml.to_s @@ -45,11 +42,11 @@ module Simplificator else raise WebthumbException.new("usupported content type #{response.content_type}. Body was: \n#{response.body}") end - else + else raise CommunicationException('Response code was not HTTP OK') end end - + # builds the root node for webthumb requtes def build_root_node() root = REXML::Element.new('webthumb') @@ -57,12 +54,12 @@ module Simplificator api.text = @api_key root end - + protected # # add a XML element if value is present. # can be used to create XML for webthumb requests from ruby options hash. - # + # # root: the root XML element where element is added to # options: the hash where value is taken from # key: the key to lookup the value in options @@ -78,4 +75,4 @@ module Simplificator class CommunicationException < RuntimeError end end -end \ No newline at end of file +end lib/rwebthumb/base.rb @@ -4,15 +4,15 @@ class BaseTest < Test::Unit::TestCase assert_raises(WebthumbException) { Base.new('') } assert_raises(WebthumbException) { Base.new(nil) } end - + def test_parse_webthumb_date [['2000-1-1 14:00:00', '2000-1-1 07:00:00'], ['2000-1-1 07:00:00', '2000-1-1 00:00:00'], ['2000-8-1 07:44:2', '2000-8-1 00:44:02']].each do |item| - utc = DateTime.strptime(item[0], '%Y-%m-%d %H:%M:%S') + utc = Time.parse("#{item[0]} UTC") mst = Base.parse_webthumb_datetime(item[1]) assert_equal(utc, mst) end end - + def test_build_root_node() root = Base.new('1234').build_root_node() assert_not_nil(root) @@ -20,4 +20,4 @@ class BaseTest < Test::Unit::TestCase assert_not_nil(REXML::XPath.first(root, '/apikey')) assert_equal('1234', REXML::XPath.first(root, '/apikey').text) end -end \ No newline at end of file +end test/base_test.rb @@ -12,24 +12,24 @@ class JobTest < Test::Unit::TestCase @job = Job.from_thumbnail_xml('1234', job_xml) end def test_from_thumbnail_xml - + assert_equal('1234', @job.api_key) assert_equal(20, @job.duration_estimate) - assert_equal(DateTime.strptime('2008-02-27 19:49:48', '%Y-%m-%d %H:%M:%S'), @job.submission_datetime) + assert_equal(Time.parse('2008-02-27 19:49:48 UTC'), @job.submission_datetime) assert_equal('http://blog.joshuaeichorn.com', @job.url) assert_equal(1, @job.cost) assert_equal('wt47c5f71c37c3a', @job.job_id) end - - + + def test_build_fetch() xml = @job.send(:build_fetch_xml) assert_equal('small', REXML::XPath.first(xml, 'fetch/size').text) assert_equal('wt47c5f71c37c3a', REXML::XPath.first(xml, 'fetch/job').text) end - + def test_build_status_xml() xml = @job.send(:build_status_xml) assert_equal('wt47c5f71c37c3a', REXML::XPath.first(xml, 'status/job').text) end -end \ No newline at end of file +end test/job_test.rb ac749daad528026c99a86fe7222abdd49877e0f9 Ryan McGeary ryanongit@mcgeary.org http://github.com/simplificator/rwebthumb/commit/ba6aaca09a6749538c507982342138ddd69d7f4f ba6aaca09a6749538c507982342138ddd69d7f4f 2009-06-10T13:20:13-07:00 2009-06-10T13:20:13-07:00 Removed dependency on tzinfo 1865fa1d37bed1aa12640d276532451ab782c2c3 Ryan McGeary ryanongit@mcgeary.org