purzelrakete-restful 0.2.11 → 0.2.12

data/CHANGES.markdown

@@ -7,6 +7,6 @@
 * fixed issue where configurations where overwriting each other. 
 * added hash#to_restful
 
-19. Aug 2009 - 0.2.11
+19. Aug 2009 - 0.2.12
 
-* added ability to publish :wallet-restful-url (explicitly collapsed)
+* added ability to publish :wallet-restful-url (explicitly collapsed)

data/lib/restful/converters/active_record.rb

@@ -24,10 +24,9 @@ module Restful
           convert_to_simple_attribute(key, value, config, published, model)
         end.compact
         
-        # has_many, has_one
+        # has_many, has_one, belongs_to
         resource.values += model.class.reflections.keys.map do |key|
           explicit_link = !!explicit_links.include?(key)
-
           if config.published?(key.to_sym) || explicit_link
             
             nested_config = config.nested(key.to_sym)
@@ -38,7 +37,6 @@ module Restful
                 Restful.collection(key, resources, extended_type)
               end
             elsif has_one?(model, key) or belongs_to?(model, key)
-
               if config.expanded?(key, nested) && !explicit_link
                 convert_to_collection(model, key, nested_config, published) do |key, resources, extended_type|
                   returning(resources.first) do |res|
@@ -67,10 +65,10 @@ module Restful
         
         # public methods
         resource.values += (model.public_methods - Restful::Rails.tools.simple_attributes_on(model).keys.map(&:to_s)).map do |method_name|
-
+        
           explicit_link = !!explicit_links.include?(method_name.to_sym)          
           
-          if (config.published?(method_name.to_sym) && !published.include?(method_name.to_sym)) || explicit_link
+          if !published.include?(method_name.to_sym) && (config.published?(method_name.to_sym) || explicit_link)
             value = model.send(method_name.to_sym)
               sanitized_method_name = method_name.tr("!?", "").tr("_", "-").to_sym
               

data/lib/restful/rails/active_record/configuration.rb

@@ -91,7 +91,7 @@ module Restful
           end
           
           # FIXME: read Restful::Serializers::Base.serializers. Load order problems?
-          [:xml, :json, :atom_like].each do |format|
+          [:atom_like, :hash, :json, :params, :xml].each do |format|
             define_method("to_restful_#{ format }") do |*args|
               self.to_restful(*args).serialize(format)
             end            

data/lib/restful/rails/active_record/metadata_tools.rb

@@ -54,14 +54,16 @@ module Restful
           end
           
           def self.dereference(url)
-            regexp = Regexp.new("#{ Restful::Rails.api_hostname }\/(.*)\/(.*)")
-            m, resource, params = *url.match(regexp)
-            resource = if resource && params
-              clazz = resource.try(:singularize).try(:camelize).try(:constantize)
-              clazz.find_by_restful(params) if clazz 
-            end
+            if url
+              regexp = Regexp.new("#{ Restful::Rails.api_hostname }\/(.*)\/(.*)")
+              m, resource, params = *url.match(regexp)
+              resource = if resource && params
+                clazz = resource.try(:singularize).try(:camelize).try(:constantize)
+                clazz.find_by_restful(params) if clazz 
+              end
 
-            resource ? resource.id : 0
+              resource.id if resource
+            end
           end
           
           # retruns non association / collection attributes. 

data/restful.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "restful"
-  s.version = "0.2.11"
+  s.version = "0.2.12"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Bornkessel", "Rany Keddo"] 
   s.date = "2009-08-11"
@@ -14,4 +14,4 @@ Gem::Specification.new do |s|
   s.requirements = %w{ brianmario-yajl-ruby }
   s.rubygems_version = "1.3.1"
   s.summary = "api niceness. "
-end
+end

data/test/converters/active_record_converter_test.rb

@@ -18,13 +18,16 @@ context "active record converter" do
   end
   
   specify "should publish link and not resource when :oldest_pet_restful_url, where oldest_pet is a defined method" do
-    Person.restful_publish(:oldest_pet_restful_url)  
-    @person.to_restful.links.should.not.be.empty
+    Person.restful_publish(:oldest_pet_restful_url)
+    @person.to_restful.links.size.should.== 1
+    @person.to_restful.links.first.name.should.== "oldest-pet-restful-url"
   end
   
   specify "should publish link and not a nested resource with :wallet_restful_url" do
     Person.restful_publish(:wallet_restful_url)  
-    @person.to_restful.links.should.not.be.empty
+    @person.to_restful.links.size.should.== 1
+    @person.to_restful.links.first.name.should.== "wallet-restful-url"
+    @person.to_restful.links.first.value.should.== @wallet.restful_url
   end
   
   specify "should be able to force expansion. force expanded attributes can never be collapsed. " do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: purzelrakete-restful
 version: !ruby/object:Gem::Version 
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors: 
 - Daniel Bornkessel