toast 0.7.5 → 0.8.0

data/config/routes.rb

@@ -11,10 +11,10 @@ Rails.application.routes.draw do
     model.toast_configs.each do |tc|
       # once per namespace
       next if namespaces.include? tc.namespace
-        
+
       namespaces << tc.namespace
-      
-      match("#{tc.namespace}/#{resource_name}(/:id(/:subresource(/:scope)))" => 'toast#catch_all',
+
+      match("#{tc.namespace}/#{resource_name}(/:id(/:subresource))" => 'toast#catch_all',
             :constraints => { :id => /\d+/ },
             :resource => resource_name,
             :as => resource_name,

data/lib/toast/active_record_extensions.rb

@@ -4,13 +4,13 @@ require 'toast/config_dsl'
 module Toast
   module ActiveRecordExtensions
 
-    # Configuration DSL    
+    # Configuration DSL
     def acts_as_resource &block
 
-      @toast_configs ||= Array.new 
-      
+      @toast_configs ||= Array.new
+
       @toast_configs << Toast::ConfigDSL::Base.new(self)
-                  
+
       Blockenspiel.invoke( block, @toast_configs.last)
 
       # add class methods
@@ -23,12 +23,12 @@ module Toast
         def toast_configs
           @toast_configs
         end
-        
+
         # get a config by media type or first one if none matches
         def toast_config media_type
-          @toast_configs.find do |tc| 
-            tc.media_type == media_type || tc.in_collection.media_type == media_type 
-          end || @toast_configs.first 
+          @toast_configs.find do |tc|
+            tc.media_type == media_type || tc.in_collection.media_type == media_type
+          end || @toast_configs.first
         end
       end
 
@@ -40,36 +40,26 @@ module Toast
             self.class.to_s.pluralize.underscore + "/" +
             self.id.to_s
         end
-        
+
         # Like ActiveRecord::Base.attributes, but result Hash includes
         # only attributes from the list _attr_names_ plus the
         # associations _assoc_names_ as links and the 'self' link
         def represent attr_names, assoc_names, base_uri, media_type
           props = {}
 
-          attr_names.each do |name| 
+          attr_names.each do |name|
             unless self.respond_to?(name) && self.method(name).arity == 0
               raise "Toast Error: Connot find instance method '#{self.class}##{name}' of arity 0"
             end
             props[name] = self.send(name)
           end
-          
-          assoc_names.each do |name| 
+
+          assoc_names.each do |name|
             props[name] = "#{base_uri}#{self.uri_path}/#{name}"
-            
-            # collections (scopes) actiing on associacions:    
-            
-            reflect = self.class.reflect_on_association(name.to_sym)            
-            if reflect.collection?
-              reflect.klass.toast_config(media_type).collections.each do |collection_name|
-                next if collection_name == "all"
-                props[name+":"+collection_name] = "#{base_uri}#{self.uri_path}/#{name}/#{collection_name}"
-              end
-            end
           end
-          
+
           props["self"] = base_uri + self.uri_path
-          
+
           props
         end
       end

data/lib/toast/collection.rb

@@ -3,22 +3,18 @@ module Toast
 
     attr_reader :model
 
-    def initialize model_or_relation, subresource_name, params, config_in, config_out
+    def initialize model, subresource_name, params, config_in, config_out
 
       subresource_name ||= "all"
 
       unless config_out.collections.include? subresource_name
         if subresource_name == "all"
-          ToastController.logger.debug "\n\tToast Debug: you may want to declare 'collections :all' in model '#{model_or_relation}' to enable delivery of the collection '/#{model_or_relation.to_s.underscore.pluralize}'\n"
+          ToastController.logger.debug "\n\tToast Debug: you may want to declare 'collections :all' in model '#{model}' to enable delivery of the collection '/#{model.to_s.underscore.pluralize}'\n"
         end
         raise ResourceNotFound
       end
 
-      @target_model = (model_or_relation.klass rescue false) ?
-                       model_or_relation.klass :
-                       model_or_relation
-
-      @model_or_relation = model_or_relation
+      @model = model
       @collection = subresource_name
       @params = params
       @format = params[:format]
@@ -28,8 +24,8 @@ module Toast
 
     def get
 
-      unless @model_or_relation.respond_to?(@collection)
-        raise "Toast Error: Cannot find class method '#{@collection}' of model '#{@model_or_relation}', which is configured in 'acts_as_resource > collections'."
+      unless @model.respond_to?(@collection)
+        raise "Toast Error: Cannot find class method '#{@collection}' of model '#{@model}', which is configured in 'acts_as_resource > collections'."
       end
 
       # FIXME: This is a lot of hallooballoo to check if the #send
@@ -37,26 +33,26 @@ module Toast
       #        message is not helpful to find the error.
 
       records = if @config_out.pass_params_to.include?(@collection)
-                  if @target_model.method(@collection).arity**2 != 1
-                    raise "Toast Error: Class method '#{@collection}' of model '#{@target_model}' must accept one parameter, as configured by 'acts_as_resource > pass_params_to'."
+                  if @model.method(@collection).arity**2 != 1
+                    raise "Toast Error: Class method '#{@collection}' of model '#{@model}' must accept one parameter, as configured by 'acts_as_resource > pass_params_to'."
                   end
                   # fetch results
-                  @model_or_relation.send(@collection, @params)
+                  @model.send(@collection, @params)
 
                 else
 
-                  if @target_model.method(@collection).arity > 0
-                    raise "Toast Error: Class method '#{@collection}' of model '#{@model_or_relation}' must not accept any parameter, as configured by 'acts_as_resource'"
+                  if @model.method(@collection).arity > 0
+                    raise "Toast Error: Class method '#{@collection}' of model '#{@model}' must not accept any parameter, as configured by 'acts_as_resource'"
                   end
                   # fetch results
-                  @model_or_relation.send(@collection)
+                  @model.send(@collection)
                 end
 
       case @format
       when "html"
         {
-          :template => "resources/#{@target_model.to_s.pluralize.underscore}",
-          :locals => { @target_model.to_s.pluralize.underscore.to_sym => records }
+          :template => "resources/#{@model.to_s.pluralize.underscore}",
+          :locals => { @model.to_s.pluralize.underscore.to_sym => records }
         }
       when "json"
         {
@@ -103,15 +99,7 @@ module Toast
 
       begin
 
-        if @collection != "all"
-          # post on scope?
-          record = @model_or_relation.new payload
-          hook = @config_in.before_scoped_create[@collection]
-          record.send(hook, @model_or_relation.proxy_association.owner) if hook
-          record.save!
-        else
-          record = @model_or_relation.create! payload
-        end
+        record = @model.create! payload
 
         {
           :json => record.represent( @config_out.exposed_attributes,

data/lib/toast/config_dsl.rb

@@ -14,7 +14,6 @@ module Toast
         @deletable = false
         @postable = false
         @pass_params_to = []
-        @before_scoped_create = {}
         @in_collection = ConfigDSL::InCollection.new model, self
         @media_type = "application/json"
 
@@ -77,17 +76,6 @@ module Toast
         self.pass_params_to = arg
       end
 
-      def before_scoped_create= arg
-        for key in arg.keys
-          @before_scoped_create[key.to_s] = arg[key].to_sym
-        end
-      end
-
-      def before_scoped_create arg={}
-        return(@before_scoped_create) if arg.empty?
-        self.before_scoped_create = arg
-      end
-
       def collections= collections=[]
         @collections = ConfigDSL.sanitize(collections, "collections")
       end
@@ -143,7 +131,7 @@ module Toast
       def writables *arg
         self.writables = 42
       end
-      
+
       def writables= arg
         puts
         puts "Toast Config Warning (#{model.class}): Defining \"writables\" in collection definition has no effect."

data/lib/toast/engine.rb

@@ -4,7 +4,6 @@ require 'toast/collection'
 require 'toast/association'
 require 'toast/record'
 require 'toast/single'
-require 'toast/scoped_association'
 
 require 'action_dispatch/http/request'
 require 'rack/accept_media_types'

data/lib/toast/record.rb

@@ -34,11 +34,14 @@ module Toast
         raise PayloadFormatError
       end
 
-      # ignore all exposed readable, but not writable fields
-      (@config_in.readables - @config_in.writables + ["self"]).each do |rof|
+      # ignore:
+      # * all exposed readable, but not writable fields
+      # * all associations
+      # * self
+      ((@config_in.readables - @config_in.writables) + @config_in.exposed_associations + ["self"]).each do |rof|
         payload.delete(rof)
       end
-      
+
       # set the virtual attributes
       (@config_in.writables - @record.attribute_names -  @config_in.exposed_associations).each do |vattr|
 
@@ -48,10 +51,10 @@ module Toast
 
         @record.send("#{vattr}=", payload.delete(vattr))
       end
-      
+
       # mass-update for the rest
       @record.update_attributes payload
-      {        
+      {
         :json => @record.represent( @config_out.exposed_attributes,
                                     @config_out.exposed_associations,
                                     @base_uri,

data/lib/toast/resource.rb

@@ -23,13 +23,13 @@ module Toast
       id = params[:id]
       subresource_name = params[:subresource]
       format = params[:format]
-      scope = params[:scope]
+
       begin
-        
+
         # determine model
         model = get_class_by_resource_name resource_name
-        
-        # determine config for representation 
+
+        # determine config for representation
         #  config_in: cosumed representation
         #  config_out: produced representation
         config_out = model.toast_config request.accept_media_types.prefered
@@ -37,9 +37,9 @@ module Toast
 
         #  ... or in case of an association request
         config_assoc_src = model.toast_config request.headers["Assoc-source-type"] # ?
-        
+
         # base URI for returned object
-        base_uri = request.base_url + request.script_name + 
+        base_uri = request.base_url + request.script_name +
           (config_out.namespace ? "/" + config_out.namespace : "")
 
         # decide which sub resource type
@@ -52,24 +52,21 @@ module Toast
               elsif (config_assoc_src && config_assoc_src.exposed_associations.include?(subresource_name))
 
                 # determine associated model
-                assoc_model = 
+                assoc_model =
                   model.reflect_on_all_associations.detect{|a| a.name.to_s == subresource_name}.klass
-                
-                # determine config for representation of assoc. model                
+
+                # determine config for representation of assoc. model
                 assoc_config_out = assoc_model.toast_config request.accept_media_types.prefered
                 assoc_config_in = assoc_model.toast_config request.media_type
-                                
+
                 # change base URI to associated record
-                base_uri = request.base_url + request.script_name + 
+                base_uri = request.base_url + request.script_name +
                   (assoc_config_out.namespace ? "/" + assoc_config_out.namespace : "")
 
-                if scope.nil?
-                  Toast::Association.new(model, id, subresource_name, format, config_assoc_src, 
-                                         assoc_model, assoc_config_in, assoc_config_out)
-                else 
-                  Toast::ScopedAssociation.new(model, id, subresource_name, scope, params.clone,
-                                               assoc_config_in, assoc_config_out)                                               
-                end
+
+                Toast::Association.new(model, id, subresource_name, format, config_assoc_src,
+                                       assoc_model, assoc_config_in, assoc_config_out)
+
               else
                 raise ResourceNotFound
               end
@@ -77,7 +74,7 @@ module Toast
         # set base to be prepended to URIs
         rsc.base_uri = base_uri
 
-        
+
 
         rsc
       rescue NameError
@@ -115,7 +112,7 @@ module Toast
           self.delete
         end
       when "GET"
-        self.get        
+        self.get
       else
         raise MethodNotAllowed
       end

data/lib/toast/version.rb

@@ -1,3 +1,3 @@
 module Toast
-  VERSION = '0.7.5'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: toast
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
-  - 5
-  version: 0.7.5
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - "robokopp (Robert Anni\xC3\xA9s)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-26 00:00:00 Z
+date: 2012-08-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -102,7 +102,6 @@ files:
 - lib/toast/record.rb
 - lib/toast/resource.rb
 - lib/toast/single.rb
-- lib/toast/scoped_association.rb
 - README.md
 homepage: https://github.com/robokopp/toast
 licenses: []

data/lib/toast/scoped_association.rb

@@ -1,23 +0,0 @@
-module Toast
-  class ScopedAssociation < Resource
-    # delegeates everything to Toast::Collection, where the model is replaced
-    # by the Relation this association creates 
-
-    def initialize(model, id, association_name, scope_name,  params, 
-                   config_in, config_out)
-                   
-      record = model.find(id)
-      assoc_model = record.class
-      
-      @collection = Toast::Collection.new(record.send(association_name), 
-                                          scope_name,
-                                          params,
-                                          config_in,
-                                          config_out)
-
-    end
-
-    delegate :get, :put, :post, :delete, :base_uri, :base_uri=, :to => :@collection
-
-  end
-end