purzelrakete-restful 0.2.5 → 0.2.6

data/README.markdown

@@ -36,6 +36,13 @@ restful_publish :name, :pets, :restful_options => { :force_expanded => [:pets, :
 # Pet
 restful_publish :name, :person # expands person per default because it is on the second level. Does not expand person.pets.first.person, since this is higher than second level.
 
+Options
+=======
+
+You can add includes to your call like this: 
+
+pet.to_restful_json :include => :owner. 
+
 Rails-like
 ==========
 

data/lib/restful/apimodel/resource.rb

@@ -16,15 +16,15 @@ module Restful
       end
       
       def links
-        values.select { |attribute| attribute.type == :link }
+        self.values.select { |attribute| attribute.type == :link }
       end
       
       def simple_attributes
-        values.select { |attribute| attribute.type == :simple_attribute }        
+        self.values.select { |attribute| attribute.type == :simple_attribute }        
       end
       
       def collections
-        values.select { |attribute| attribute.type == :collection }
+        self.values.select { |attribute| attribute.type == :collection }
       end
       
       # invoke serialization

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

@@ -36,6 +36,13 @@ module Restful
           #  by passing in something like @pet.to_restful(:name, :species).
           #
           def to_restful(config = nil)
+            add_to_whitelist = []
+
+            if config && config.is_a?(Hash) && config.keys.size == 1 && includes = config[:include] 
+              add_to_whitelist = [*includes]
+              config = nil
+            end
+            
             config ||= self.class.restful_config if self.class.respond_to?(:restful_config)
             config ||= []
             
@@ -48,6 +55,8 @@ module Restful
               config.restful_options.merge! self.class.restful_config.restful_options
             end
             
+            config.whitelisted += add_to_whitelist
+            
             # array
             if self.is_a?(Array)
               elements = self.map do |el|

data/restful.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "restful"
-  s.version = "0.2.5"
+  s.version = "0.2.6"
   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"

data/test/rails/configuration_test.rb

@@ -27,10 +27,6 @@ context "Configuration" do
     config.nested(:two).whitelisted.should.== [:a,:b]
   end
   
-  specify "should set restful options when set in to_restful method" do
-    
-  end
-
   specify "should know which attributes are published" do
     config = Restful.cfg(:one, :two => [:a, :b])
     config.published?(:two).should.== true

data/test/rails/restful_publish_test.rb

@@ -17,6 +17,16 @@ context "restful publish" do
     Person.restful_publish(:name, :pets => [:name, :species])
     Person.restful_config.restful_options.should.==({})
   end
+  
+  specify "should include attributes when publishe parameter is passed to to_restful" do
+    Person.restful_publish(:name)
+    Pet.restful_publish(:name)
+    
+    @person = Person.create
+    @pet = @person.pets.create(:name => "Mietze")
+
+    @pet.to_restful(:include => :owner).values.map(&:name).should.include :owner
+  end
 end
 
 context "api publishing with nesting" do

metadata

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