purzelrakete-boomloop 0.0.5 → 0.0.9

data/History.txt

@@ -1,2 +1,5 @@
+0.0.6, 05.06.2008
+* Everything working much better
+
 0.0.1, 06.05.2008. 
-* First checkin
+* First checkin

data/bin/boomloop

@@ -33,8 +33,8 @@ error(parser) unless options.secret && options.key
 
 # negotiate the tokens
 client =  Boomloop::Authentication::Client.new("api", Boomloop::Authentication::Store::YAMLStore.new)
-request_token = client.consume(options.key, options.secret) rescue error("Invalid. Check your credentials at #{ Boomloop::Resources::Base.api_base }/oauth/applications.")
-puts "\nalmost ready! go to #{ request_token.authorize_url.gsub(/\/\/oauth/, '/oauth') }\n\n   press enter when you're done... <waiting>\n"
+request_token = client.consume(options.key, options.secret) rescue error("Invalid. Check your credentials at #{ Boomloop::Resources::Base.boomloop_base }/oauth/applications.")
+puts "\nalmost ready! go to #{ request_token.authorize_url }\n\n   press enter when you're done... <waiting>\n"
 
 while !@access_token && gets        
   @access_token = client.activate rescue nil

data/lib/boomloop.rb

@@ -9,8 +9,17 @@ module Boomloop
   class ApiError < ::StandardError; end
   class AuthorizationError < ApiError; end
   class ValidationError < ApiError; end
+  class RedirectError < ApiError; end
 end
 
-Dir.glob(File.dirname(__FILE__) + "/**/*.rb").each do |file|
-  require file
-end
+$:.unshift File.dirname(__FILE__)
+
+require 'boomloop/authentication/client'
+require 'boomloop/authentication/credentials'
+require 'boomloop/authentication/store/base'
+require 'boomloop/authentication/store/yaml_store'
+require 'boomloop/resources/base'
+require 'boomloop/resources/event'
+require 'boomloop/resources/event_series'
+require 'boomloop/resources/place'
+require 'boomloop/resources/ticket_category'

data/lib/{authentication → boomloop/authentication}/client.rb

@@ -63,8 +63,8 @@ module Boomloop
         connection.get(url, options.merge({ "X-Consumer-Key" => self.consumer.key }))
       end
       
-      def post(url, params = "")
-        connection.post(url, params, { "X-Consumer-Key" => self.consumer.key })
+      def post(url, params = "", headers = {})
+        connection.post(url, params, { "X-Consumer-Key" => self.consumer.key, 'Accept'=>'application/xml', 'Content-Type' => 'application/xml' }.merge(headers))
       end
             
       def raise_error_if_not_authenticated(credentials)

data/lib/{resources → boomloop/resources}/base.rb

@@ -5,19 +5,6 @@ module Boomloop
         attr_accessor :client
       end
       
-      def self.api_base
-        @@api_base ||= (ENV["BOOMLOOP_API_URL"] ? ENV["BOOMLOOP_API_URL"].gsub(/\/$/, "") : 'http://api.boomloop.com' )
-      end
-      
-      def self.client
-        @@client ||= init
-      end
-      
-      # get oauth token
-      def self.init
-        self.client =  Boomloop::Authentication::Client.new("api", Boomloop::Authentication::Store::YAMLStore.new)
-      end
-      
       def save
         returned = self.class.create(self)
         self.instance_variable_set("@table", returned.to_hash)
@@ -28,12 +15,33 @@ module Boomloop
         links = to_hash.keys.select { |key| key =~ /resource-url$/ }
       end
       
+      def valid?
+        self.errors.blank?
+      end
+      
       def to_hash
         instance_variable_get("@table")
       end
       
-      def to_xml
-        self.to_hash.to_xml
+      def to_xml(options = {})
+        self.to_hash.to_xml(options)
+      end
+      
+      def self.api_base
+        @@api_base ||= (ENV["BOOMLOOP_API_URL"] ? ENV["BOOMLOOP_API_URL"].gsub(/\/$/, "") : 'http://api.boomloop.com' )
+      end
+      
+      def self.boomloop_base
+        @@boomloop_base ||= self.api_base.gsub /(^http:\/\/)(api.)(.*)/, '\1' + '\3'
+      end
+      
+      def self.client
+        @@client ||= init
+      end
+      
+      # get oauth token
+      def self.init
+        self.client =  Boomloop::Authentication::Client.new("api", Boomloop::Authentication::Store::YAMLStore.new)
       end
       
       def self.singular
@@ -45,6 +53,12 @@ module Boomloop
       end
       
       # REST methods
+      def self.show(url)
+        res = client.get(url)
+        attrs = from_response(res)
+        self.new(attrs[self.singular])
+      end
+      
       def self.index(params = {})
         url = "#{ api_base }/#{ self.plural }"
         url += "?#{ params.to_query }" unless params.empty?
@@ -53,24 +67,33 @@ module Boomloop
         construct_resource_collection(attrs)
       end
       
-      def self.show(url)
-        res = client.get(url)
+      def self.create(resource)
+        resource = resource.kind_of?(self) ? resource : self.new(resource)
+        
+        url = "#{ api_base }/#{ self.plural }"
+        res = client.post(url, resource.to_xml(:root => singular.to_sym))
         attrs = from_response(res)
         self.new(attrs[self.singular])
       end
       
-      def self.create(resource)
-        url = "#{ api_base }/#{ self.plural }"
-        res = client.post(url, resource.to_hash.to_query)
-        self.new(from_response(res)[self.singular])
+      def self.follow_redirect(response)
+        res = client.get(response.location)
+        from_response(res, response)
       end
       
-      def self.from_response(response)        
+      def self.from_response(response, old_response=nil)
         xml = response.body
         
         case response.code.to_i
+        when 422
+          @result = { self.singular => Hash.from_xml(xml) }
         when 401
           raise Boomloop::AuthorizationError.new
+        when 301
+          raise Boomloop::RedirectError.new("Redirect URL seem to be the same as the original. I do not follow!") if 
+            old_response and old_response.location and response.location and response.location == old_response.location
+          
+          follow_redirect(response)
         when 200...299
           begin  
             @result = Hash.from_xml(xml)
@@ -81,8 +104,8 @@ module Boomloop
           raise Boomloop::ValidationError.new("There was a problem with your request: \n\n #{ response }") if @result["errors"]
         else
           raise Boomloop::ApiError.new("boomloop responded with #{ response.class } (#{ response.code }): #{ response.body }")
-        end      
-
+        end
+        
         @result
       end
       
@@ -94,14 +117,6 @@ module Boomloop
         when Hash : self.new(collection[self.singular])
         end
       end
-      
-      def self.transitive_create(resource)
-        if resource.child_resources
-          child_resources.each { |child| transitive_create(child) }
-        else
-          create(resource)
-        end
-      end
     end
   end
 end

data/test/boomloop_resource_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-context "a boomloop resource" do
+context "A boomloop resource" do
   
   setup do
     Boomloop::Authentication::Client.class_eval { def raise_error_if_not_authenticated(*args); end }
@@ -101,19 +101,32 @@ context "a boomloop resource" do
     
   specify "should be savable when calling .save on a Monster instance" do
     intended_resource_url = "#{ Boomloop::Resources::Base.api_base }/monsters/samuel"
-    intended_attributes = { :size => :laughable, :affect => :mordant, :name => "samuel" }
+    intended_attributes = { :affect => :mordant, :name => "samuel", :size => :laughable }
+    intended_ingoing_xml = <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<monster>
+  <name>samuel</name>
+  <size type="symbol">laughable</size>
+  <affect type="symbol">mordant</affect>
+</monster>
+    XML
+    
+    intended_return_xml = <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<monster>
+  <name>samuel</name>
+  <affect type="symbol">mordant</affect>
+  <size type="symbol">laughable</size>
+  <resource-url>#{ Boomloop::Resources::Base.api_base }/monsters/samuel</resource-url>
+</monster>
+    XML
+    
     response = mock()
     response.expects(:code).returns 201
-    response.expects(:body).returns(<<-XML)
-      <monster>
-        <resource_url>#{ intended_resource_url }</resource_url>
-        <size>laughable</size>
-        <affect>mordant</affect>
-        <name>samuel</name>
-      </monster>
-    XML
+    response.expects(:body).returns(intended_return_xml)
+    
+    @client.expects(:post).with("#{ Boomloop::Resources::Base.api_base }/monsters", intended_ingoing_xml).at_least_once.returns(response)
     
-    @client.expects(:post).with("#{ Boomloop::Resources::Base.api_base }/monsters", intended_attributes.to_query).at_least_once.returns(response)
     monster = Boomloop::Resources::Monster.new(intended_attributes)
     monster.save
     monster.resource_url.should.equal intended_resource_url
@@ -146,4 +159,104 @@ context "a boomloop resource" do
       Boomloop::Resources::Monster.show("#{ Boomloop::Resources::Base.api_base }/monsters/fred")
     end
   end
+  
+  specify "should follow and return the new resource XML if redirected via 301 on create and resource is a duplicate" do
+    intended_resource_url = "#{ Boomloop::Resources::Base.api_base }/monsters/samuel"
+    intended_attributes = { :size => :huge, :affect => :sanguine, :name => "samuel" }
+    
+    response = mock()
+    response.expects(:code).returns 301
+    response.expects(:location).returns intended_resource_url
+    response.expects(:body).returns(<<-XML)
+      <duplicates>
+        <resource_url>#{ intended_resource_url }</resource_url>
+      </duplicates>
+    XML
+    
+    intended_response = mock()
+    intended_response.expects(:code).returns 200
+    intended_response.expects(:body).returns(<<-XML)
+      <monster>
+        <resource_url>#{ intended_resource_url }</resource_url>
+        <size>huge</size>
+        <affect>sanguine</affect>
+        <name>samuel</name>
+      </monster>
+    XML
+    
+    @client.expects(:post).with("#{ Boomloop::Resources::Base.api_base }/monsters", intended_attributes.to_xml(:root => :monster)).at_least_once.returns(response)    
+    @client.expects(:get).with(intended_resource_url).at_least_once.returns(intended_response)
+    
+    monster = Boomloop::Resources::Monster.new(intended_attributes)
+    monster.save
+    monster.resource_url.should.equal intended_resource_url
+  end
+  
+  specify "should follow and return the new resource XML if redirected via 301 on show" do
+    called_resource_url = "#{ Boomloop::Resources::Base.api_base }/monsters/fred"
+    intended_resource_url = "#{ Boomloop::Resources::Base.api_base }/monsters/samuel"
+    
+    response = mock()
+    response.expects(:code).returns 301
+    response.expects(:location).returns intended_resource_url
+    response.expects(:body).returns(<<-XML)
+      <duplicates>
+        <resource_url>#{ intended_resource_url }</resource_url>
+      </duplicates>
+    XML
+    
+    second_response = mock()
+    second_response.expects(:code).returns 200
+    second_response.expects(:body).returns(<<-XML)
+      <monster>
+        <resource_url>#{ intended_resource_url }</resource_url>
+        <size>huge</size>
+        <affect>sanguine</affect>
+        <name>samuel</name>
+      </monster>
+    XML
+    
+    @client.expects(:get).with(any_of(equals(called_resource_url), equals(intended_resource_url))).at_least_once.returns(response, second_response)
+    monster = Boomloop::Resources::Monster.show(called_resource_url)
+  end
+  
+  specify "should raise an exception if response redirects to own resource_url" do
+    intended_resource_url = "#{ Boomloop::Resources::Base.api_base }/monsters/samuel"
+    
+    response = mock()
+    response.expects(:code).at_least_once.returns 301
+    response.expects(:location).at_least_once.returns intended_resource_url
+    response.expects(:body).at_least_once.returns(<<-XML)
+      <duplicates>
+        <resource_url>#{ intended_resource_url }</resource_url>
+      </duplicates>
+    XML
+    
+    @client.expects(:get).with(intended_resource_url).times(2).returns(response)
+    should.raise Boomloop::RedirectError do
+      Boomloop::Resources::Monster.show(intended_resource_url)
+    end
+  end
+  
+  specify "should have errors if boomloop API returns errors" do
+    monster_attributes = { :title => "Foo" }
+    
+    response = mock
+    response.expects(:code).returns 422
+    response.expects(:body).returns(<<-XML)
+      <errors>
+        <error>Location boomloop braucht eine Location.</error>
+        <error>Start date trying to parse nil date, bad stuff.</error>
+        <error>Location boomloop braucht eine Location.</error>
+        <error>Start hour Zeit bitte in HH:MM Format.</error>
+        <error>Beschreibung Hast Du keine Informationen zu diesem Event?</error>
+        <error>trying to parse nil date, bad stuff.</error>
+      </errors>
+    XML
+    
+    @client.expects(:post).with("#{ Boomloop::Resources::Base.api_base }/monsters", monster_attributes.to_xml(:root => :monster)).returns(response)
+    
+    monster = Boomloop::Resources::Monster.create(monster_attributes)
+    monster.should.not.be.valid
+  end
 end

data/test/mocks/monster.rb

@@ -1,3 +1,5 @@
+require 'boomloop/resources/base'
+
 module Boomloop
   module Resources
     class Monster < Base

data/test/test_helper.rb

@@ -5,4 +5,5 @@ require 'mocha'
 current_dir = File.dirname(__FILE__)
 
 require current_dir + '/../lib/boomloop'
-require current_dir + '/mocks/monster'
+require current_dir + '/mocks/monster'
+require current_dir + '/mocks/planet'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: purzelrakete-boomloop
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.9
 platform: ruby
 authors: 
 - Rany Keddo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-27 00:00:00 -07:00
+date: 2008-06-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,17 +31,17 @@ extra_rdoc_files:
 - History.txt
 - README.txt
 files: 
-- lib/authentication/client.rb
-- lib/authentication/credentials.rb
-- lib/authentication/store/base.rb
-- lib/authentication/store/yaml_store.rb
+- lib/boomloop/authentication/client.rb
+- lib/boomloop/authentication/credentials.rb
+- lib/boomloop/authentication/store/base.rb
+- lib/boomloop/authentication/store/yaml_store.rb
 - lib/boomloop.rb
-- lib/resources/base.rb
-- lib/resources/event.rb
-- lib/resources/event_series.rb
-- lib/resources/place.rb
-- lib/resources/ticket_category.rb
-- lib/version.rb
+- lib/boomloop/resources/base.rb
+- lib/boomloop/resources/event.rb
+- lib/boomloop/resources/event_series.rb
+- lib/boomloop/resources/place.rb
+- lib/boomloop/resources/ticket_category.rb
+- lib/boomloop/version.rb
 - bin/boomloop
 - History.txt
 - README.txt