toast 0.5.0 → 0.5.2

data/lib/toast/association.rb

@@ -1,6 +1,6 @@
 module Toast
   class Association < Resource
-    
+
     attr_reader :model
 
     def initialize model, id, subresource_name, format
@@ -16,13 +16,13 @@ module Toast
 
       @associate_model = Resource.get_class_by_resource_name subresource_name
       @associate_model.uri_base = @model.uri_base
-      
+
     end
 
     def get
       result = @record.send(@assoc)
 
-      if result.is_a? Array 
+      if result.is_a? Array
         {
           :json => result.map{|r|
             r.exposed_attributes(:in_collection => true).
@@ -41,7 +41,7 @@ module Toast
     end
 
     def put payload
-      raise MethodNotAllowed 
+      raise MethodNotAllowed
     end
 
     def post payload
@@ -51,7 +51,7 @@ module Toast
         raise UnsupportedMediaType
       end
 
-      begin 
+      begin
         payload = ActiveSupport::JSON.decode(payload)
       rescue
         raise PayloadFormatError
@@ -59,7 +59,7 @@ module Toast
 
       unless payload.is_a? Hash
         raise PayloadFormatError
-      end 
+      end
 
 
       # silently ignore all exposed readable, but not writable fields
@@ -67,16 +67,16 @@ module Toast
         payload.delete(rof)
       end
 
-      
+
       begin
         record = @record.send(@assoc).create! payload
-      
+
         {
           :json => record.exposed_attributes.merge( uri_fields(record) ),
           :location => self.base_uri + record.uri_fullpath,
           :status => :created
         }
-      
+
       rescue ActiveRecord::RecordInvalid => e
         # model validation failed
         raise PayloadInvalid.new(e.message)

data/lib/toast/{root_collection.rb → collection.rb}

@@ -1,12 +1,12 @@
 module Toast
-  class RootCollection < Resource
-    
+  class Collection < Resource
+
     attr_reader :model
-    
+
     def initialize model, subresource_name, params
-      
+
       subresource_name ||= "all"
-      
+
       unless model.toast_config.collections.include? subresource_name
         raise ResourceNotFound
       end
@@ -18,8 +18,8 @@ module Toast
     end
 
     def get
-       
-      records = if @model.toast_config.pass_params_to.include?(@collection) 
+
+      records = if @model.toast_config.pass_params_to.include?(@collection)
                   @model.send(@collection, @params)
                 else
                   @model.send(@collection)
@@ -29,9 +29,9 @@ module Toast
       when "html"
         {
           :template => "resources/#{model.to_s.pluralize.underscore}",
-          :locals => { model.to_s.pluralize.underscore.to_sym => records } 
+          :locals => { model.to_s.pluralize.underscore.to_sym => records }
         }
-      when "json"        
+      when "json"
         {
           :json => records.map{|r|
             r.exposed_attributes(:in_collection => true).
@@ -59,7 +59,7 @@ module Toast
         raise UnsupportedMediaType
       end
 
-      begin 
+      begin
         payload = ActiveSupport::JSON.decode(payload)
       rescue
         raise PayloadFormatError
@@ -72,16 +72,16 @@ module Toast
       (@model.toast_config.readables - @model.toast_config.writables + ["uri"]).each do |rof|
         payload.delete(rof)
       end
-      
+
       begin
-        record = @model.create! payload              
+        record = @model.create! payload
 
         {
           :json => record.exposed_attributes.merge( uri_fields(record) ),
           :location => self.base_uri + record.uri_fullpath,
           :status => :created
         }
-        
+
       rescue ActiveRecord::RecordInvalid => e
         # model validation failed
         raise PayloadInvalid.new(e.message)

data/lib/toast/engine.rb

@@ -1,6 +1,6 @@
 require 'toast/active_record_extensions.rb'
 require 'toast/resource.rb'
-require 'toast/root_collection'
+require 'toast/collection'
 require 'toast/association'
 require 'toast/record'
 require 'toast/single'

data/lib/toast/record.rb

@@ -1,10 +1,10 @@
 module Toast
   class Record < Resource
 
-    attr_reader :model    
-    
+    attr_reader :model
+
     def initialize model, id, format
-      @model = model      
+      @model = model
       @record = model.find(id) rescue raise(ResourceNotFound.new)
       @format = format
     end
@@ -16,18 +16,18 @@ module Toast
     # get, put, delete, post return a Hash that can be used as
     # argument for ActionController#render
 
-    def put payload       
-      
+    def put payload
+
       if self.media_type != @model.toast_config.media_type
         raise UnsupportedMediaType
       end
 
-      begin 
+      begin
         payload = ActiveSupport::JSON.decode(payload)
       rescue
         raise PayloadFormatError
       end
-      
+
       unless payload.is_a? Hash
         raise PayloadFormatError
       end
@@ -37,14 +37,14 @@ module Toast
         payload.delete(rof)
       end
 
-      # set the virtual attributes 
+      # set the virtual attributes
       (payload.keys.to_set - @record.attribute_names.to_set).each do |vattr|
-        @record.send("#{vattr}=", payload.delete(vattr))             
-      end 
-      
-      # mass-update for the rest 
+        @record.send("#{vattr}=", payload.delete(vattr))
+      end
+
+      # mass-update for the rest
       @record.update_attributes payload
-      { 
+      {
         :json => @record.exposed_attributes.merge( uri_fields(@record) ),
         :status => :ok,
         :location => self.base_uri + @record.uri_fullpath
@@ -58,12 +58,12 @@ module Toast
           :template => "resources/#{model.to_s.underscore}",
           :locals => { model.to_s.underscore.to_sym => @record } # full record, view should filter
         }
-      when "json"       
+      when "json"
         {
-          :json => @record.exposed_attributes.merge( uri_fields(@record) ), 
+          :json => @record.exposed_attributes.merge( uri_fields(@record) ),
           :status => :ok
         }
-      else 
+      else
         raise ResourceNotFound
       end
     end
@@ -77,6 +77,6 @@ module Toast
         :status => :ok
       }
     end
-    
+
   end
 end

data/lib/toast/resource.rb

@@ -7,7 +7,7 @@ module Toast
   class UnsupportedMediaType < Exception; end
 
   # Represents a resource. There are following resource types as sub classes:
-  # Record, RootCollection, Association, Single
+  # Record, Collection, Association, Single
   class Resource
 
     attr_accessor :media_type, :base_uri
@@ -30,7 +30,7 @@ module Toast
         rsc = if id.nil? and model.toast_config.singles.include?(subresource_name)
                 Toast::Single.new(model, subresource_name, params.clone)
               elsif id.nil?
-                Toast::RootCollection.new(model, subresource_name, params.clone)
+                Toast::Collection.new(model, subresource_name, params.clone)
               elsif subresource_name.nil?
                 Toast::Record.new(model, id, format)
               elsif model.toast_config.exposed_associations.include? subresource_name
@@ -40,7 +40,7 @@ module Toast
               end
 
         rsc.media_type = request.media_type
-        rsc.base_uri = request.base_url
+        rsc.base_uri = request.base_url + request.script_name
 
         rsc
       rescue NameError

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Robert Annies
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-20 00:00:00 +01:00
+date: 2012-03-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,11 +48,11 @@ files:
 - lib/toast.rb
 - lib/toast/active_record_extensions.rb
 - lib/toast/association.rb
+- lib/toast/collection.rb
 - lib/toast/config_dsl.rb
 - lib/toast/engine.rb
 - lib/toast/record.rb
 - lib/toast/resource.rb
-- lib/toast/root_collection.rb
 - lib/toast/single.rb
 - README.md
 has_rdoc: true