restfully 0.8.2 → 0.8.3

data/lib/restfully/collection.rb

@@ -43,6 +43,7 @@ module Restfully
           res = HTTP::Response.new(session, 200, {
             'Content-Type' => self_link.types[0]
           }, item_media_type.io)
+
           @items[hash] = Resource.new(session, res, req).load
         end
         block.call @items[hash]

data/lib/restfully/media_type/application_vnd_bonfire_xml.rb

@@ -70,6 +70,8 @@ module Restfully
               end
             end
             if element.attributes["href"]
+              h["id"] ||= element.attributes["id"] if element.attributes["id"]
+              h["name"] ||= element.attributes["name"] if element.attributes["name"]
               h["link"] ||= []
               h["link"].push({
                 "href" => element.attributes["href"],
@@ -191,7 +193,7 @@ module Restfully
       end
       
       def complete?
-        if property.reject{|k,v| k==HIDDEN_TYPE_KEY}.empty? && links.find(&:self?)
+        if property.reject{|k,v| [HIDDEN_TYPE_KEY, "id", "name"].include?(k)}.empty? && links.find(&:self?)
           false
         else
           true

data/lib/restfully/resource.rb

@@ -24,7 +24,7 @@ module Restfully
     #   resource["uid"]
     #   => "rennes"
     def [](key)
-      unless collection?
+      if !media_type.property(key) && !collection?
         expand
       end
       media_type.property(key)
@@ -195,19 +195,15 @@ module Restfully
     # Build the resource after loading.
     def build
       metaclass = class << self; self; end
-      # only build once
-      # if @associations.empty?
-        extend Collection if collection?
-
-        response.links.each do |link|
-          metaclass.send(:define_method, link.id.to_sym) do |*args|
-            session.get(link.href, :head => {
-              'Accept' => link.type
-            }).load(*args)
-          end
-
+      extend Collection if collection?
+        
+      response.links.each do |link|
+        metaclass.send(:define_method, link.id.to_sym) do |*args|
+          session.get(link.href, :head => {
+            'Accept' => link.type
+          }).load(*args)
         end
-      # end
+      end
       self
     end
 

data/lib/restfully/session.rb

@@ -43,7 +43,7 @@ module Restfully
       end
 
       # Read configuration from file:
-      config_file = @config.delete(:configuration_file) || ENV['RESTFULLY_CONFIG']
+      config_file = ENV['RESTFULLY_CONFIG'] || @config.delete(:configuration_file)
       config_file = File.expand_path(config_file) if config_file
       if config_file && File.file?(config_file) && File.readable?(config_file)
         @logger.info "Using configuration file located at #{config_file}."

data/lib/restfully/version.rb

@@ -1,3 +1,3 @@
 module Restfully
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: restfully
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 +02:00
+date: 2011-06-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -265,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Consume RESTful APIs effortlessly