morgoth-alexa 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/alexa.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{alexa}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wojciech Wnętrzak"]
-  s.date = %q{2009-07-03}
+  s.date = %q{2009-07-06}
   s.email = %q{w.wnetrzak@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/alexa/url_info.rb

@@ -7,8 +7,8 @@ module Alexa
       :rank_by_country, :rank_by_city, :usage_statistics
 
     def initialize(options = {} )
-      @access_key_id = options[:access_key_id] or raise ArgumentError.new("you must specify acces_key_id")
-      @secret_access_key = options[:secret_access_key] or raise ArgumentError.new("you must specify secret_acces_key")
+      @access_key_id = options[:access_key_id] or raise ArgumentError.new("you must specify access_key_id")
+      @secret_access_key = options[:secret_access_key] or raise ArgumentError.new("you must specify secret_access_key")
       @host = options[:host] or raise ArgumentError.new("you must specify host")
       @response_group = options[:response_group] || RESPONSE_GROUP
     end
@@ -18,7 +18,10 @@ module Alexa
       timestamp = ( Time::now ).utc.strftime("%Y-%m-%dT%H:%M:%S.000Z")
       signature = generate_signature(secret_access_key, action, timestamp)
       url = generate_url(action, access_key_id, signature, timestamp, response_group, host)
-      @xml_response = Net::HTTP.get(url)
+      response = Net::HTTP.start(url.host) do |http|
+        http.get url.request_uri
+      end
+      @xml_response = handle_response(response).body
     end
 
     def parse_xml(xml)
@@ -45,6 +48,24 @@ module Alexa
 
     private
 
+    def handle_response(response)
+      case response.code.to_i
+      when 200...300
+        response
+      when 300...600
+        if response.body.nil?
+          raise StandardError.new(response)
+        else
+          @xml_response = response.body
+          xml = XmlSimple.xml_in(response.body, 'ForceArray' => false)
+          message = xml['Errors']['Error']['Message']
+          raise StandardError.new(message)
+        end
+      else
+        raise StandardError.new("Unknown code: #{respnse.code}")
+      end
+    end
+
     def generate_signature(secret_acces_key, action, timestamp)
       Base64.encode64( OpenSSL::HMAC.digest( OpenSSL::Digest::Digest.new( "sha1" ), secret_access_key, action + timestamp)).strip
     end

data/test/alexa_test.rb

@@ -123,6 +123,12 @@ class AlexaTest < Test::Unit::TestCase
       end
 
     end
+
+    should "not raise error when response is OK" do
+      assert_nothing_raised do
+        @alexa.send :handle_response, Net::HTTPOK.new("1.1", "200", "OK")
+      end
+    end
   end
 
   should "Raise argumment error if keys or host are not present" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: morgoth-alexa
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - "Wojciech Wn\xC4\x99trzak"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-03 00:00:00 -07:00
+date: 2009-07-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency