almodovar 0.6.0 → 0.6.1

data/lib/almodovar.rb

@@ -11,6 +11,7 @@ require 'almodovar/http_accessor'
 require 'almodovar/resource'
 require 'almodovar/resource_collection'
 require 'almodovar/single_resource'
+require 'almodovar/errors'
 require 'almodovar/to_xml'
 require 'almodovar/resource_presenter'
 require 'almodovar/resource_presenter/collection'

data/lib/almodovar/errors.rb

@@ -0,0 +1,3 @@
+module Almodovar
+  class HttpError < Exception; end
+end

data/lib/almodovar/http_accessor.rb

@@ -3,6 +3,7 @@ module Almodovar
     def xml
       @xml ||= begin
         response = http.get(url_with_params)
+        check_errors(response)
         Nokogiri::XML.parse(response.body).root
       end
     end
@@ -16,11 +17,17 @@ module Almodovar
     
     def http
       @http ||= Patron::Session.new.tap do |session|
-        session.username = @auth.username
-        session.password = @auth.password
-        session.auth_type = :digest
+        if @auth
+          session.username = @auth.username
+          session.password = @auth.password
+          session.auth_type = :digest
+        end
       end
     end
+    
+    def check_errors(response)
+      raise(Almodovar::HttpError, "Status code: #{response.status}") if response.status >= 400
+    end
   end
   
 end

data/lib/almodovar/resource_collection.rb

@@ -14,7 +14,8 @@ module Almodovar
     def create(attrs = {})
       raise ArgumentError.new("You must specify one only root element which is the type of resource (e.g. `:project => { :name => 'Wadus' }` instead of just `:name => 'Wadus'`)") if attrs.size > 1
       root, body = attrs.first
-      response = http.post(url_with_params, body.to_xml(:root => root, :convert_links => true), :content_type => "application/xml")
+      response = http.post(url_with_params, body.to_xml(:root => root, :convert_links => true), "Content-Type" => "application/xml")
+      check_errors(response)
       Resource.new(nil, @auth, Nokogiri::XML.parse(response.body).root)
     end
     

data/lib/almodovar/resource_presenter/collection.rb

@@ -2,17 +2,48 @@ module Almodovar
   
   class ResourcePresenter::Collection
     
-    def initialize(resource_class, resources_args = [])
+    def initialize(resource_class, resources_args = [], options = {})
       @resource_class = resource_class
       @resources = resources_args.map { |arg| @resource_class.new(arg) }
+      
+      @total = options[:total_entries]
+      @next = options[:next_link]
+      @prev = options[:prev_link]
     end
     
     def to_xml(options = {})
-      @resources.to_xml(options.merge({:root => resource_type.pluralize}))
+      # Most of the following code is borrowed from ActiveSupport's Array#to_xml.
+      # We cannot use Array#to_xml because we need to add a few custom tags for
+      # pagination.
+      require 'active_support/builder' unless defined?(Builder)
+
+      options = options.dup
+      options[:indent]  ||= 2
+      options[:builder] ||= ::Builder::XmlMarkup.new(:indent => options[:indent])
+
+      xml = options[:builder]
+
+      xml.instruct! unless options[:skip_instruct]
+      xml.tag! resource_type.pluralize.dasherize, :type => 'array' do
+        xml.tag!('total-entries', @total) if @total
+        xml.link :rel => 'next', :href => @next if @next
+        xml.link :rel => 'prev', :href => @prev if @prev
+        @resources.each { |value| value.to_xml(options.merge(:root => resource_type.singularize, :skip_instruct => true)) }
+      end
     end
     
     def as_json(options = {})
-      { 'entries' => @resources.map { |resource| resource.as_json(options) }}
+      ActiveSupport::OrderedHash.new.tap do |message|
+        message[:total_entries] = @total if @total
+        message[:next_link] = @next if @next
+        message[:prev_link] = @prev if @prev
+        message[:entries] = @resources.map { |resource| resource.as_json(options) }
+      end
+    end
+    
+    def to_json(options = {})
+      require 'yajl'
+      Yajl::Encoder.encode(as_json(options), :pretty => true) + "\n"
     end
     
     def resource_type

data/lib/almodovar/single_resource.rb

@@ -16,11 +16,12 @@ module Almodovar
       raise ArgumentError.new("You must specify one only root element which is the type of resource (e.g. `:project => { :name => 'Wadus' }` instead of just `:name => 'Wadus'`)") if attrs.size > 1
       root, body = attrs.first
       response = http.put(@url, body.to_xml(:root => root), :content_type => "application/xml")
+      check_errors(response)
       @xml = Nokogiri::XML.parse(response.body).root
     end
   
     def delete
-      http.delete(@url)
+      check_errors(http.delete(@url))
     end
   
     def url

data/lib/almodovar/to_xml.rb

@@ -1,9 +1,9 @@
 module Almodovar
   module ArrayToXml
-    def to_xml_with_links(options = {})
-      return to_xml_without_links(options) unless options[:convert_links]
+    def to_xml_with_links(options = {}, &block)
+      return to_xml_without_links(options, &block) unless options[:convert_links]
       options[:builder].tag!(:link, :rel => options[:root]) do |xml|
-        to_xml_without_links options.merge(:builder => xml)
+        to_xml_without_links options.merge(:builder => xml), &block
       end
     end
   end

metadata

@@ -1,118 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: almodovar
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 0.6.1
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
 platform: ruby
-authors: 
+authors:
 - BeBanjo S.L.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-07 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: patron
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: ballsbreaking@bebanjo.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - README.rdoc
 - lib/almodovar/digest_auth.rb
+- lib/almodovar/errors.rb
 - lib/almodovar/http_accessor.rb
 - lib/almodovar/resource.rb
 - lib/almodovar/resource_collection.rb
@@ -122,40 +126,30 @@ files:
 - lib/almodovar/single_resource.rb
 - lib/almodovar/to_xml.rb
 - lib/almodovar.rb
-has_rdoc: true
 homepage: http://wiki.github.com/bebanjo/almodovar/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: BeBanjo API client
 test_files: []
-