make_restful 0.1.8 → 0.1.9

data/lib/make_restful/class_methods.rb

@@ -19,13 +19,7 @@ module MakeRestful::ClassMethods
   end
 
   def resource(klass)
-
     self.resource_class = klass.to_s.classify.constantize
-
-    before_filter :load_resource
-    before_filter :load_collection, only: [:index]
-    before_filter :load_instance, only: [:show, :destroy, :update]
-
   end
 
   def collection(options={}, &block)
@@ -60,9 +54,4 @@ module MakeRestful::ClassMethods
     
   end
 
-  def paginates!(opts={})
-    opts.assert_valid_keys :node
-    self.pagination = opts
-  end
-
 end

data/lib/make_restful/loaders.rb

@@ -3,23 +3,12 @@ module MakeRestful::Loaders
 
   included do
 
-    before_filter :verify_method!
-    before_filter :verify_format!
+    before_filter :verify_method!, :verify_format!, :load_resource
+    before_filter :load_collection, unless: ->(c){ c.params[:id].present? || c.params[:action] == 'new' || request.method.upcase != 'GET' }
+    before_filter :load_instance, if: ->(c){ c.params[:id].present? }
 
     collection do
-      if pagination && !params.has_key?(:all)
-        paginated_collection = @resource.paginate page: params[:page], per_page: (params[:per_page] || pagination[:per_page] || 25)
-        { resource_name.to_sym => paginated_collection,
-          pagination: {
-              current_page:   paginated_collection.current_page,
-              per_page:       paginated_collection.per_page,
-              total_entries:  paginated_collection.total_entries,
-              total_pages:    paginated_collection.total_pages
-          }
-        }
-      else
-        @resource.all
-      end
+      @resource.all
     end
 
     instance do
@@ -46,24 +35,22 @@ module MakeRestful::Loaders
   def load_collection
     loader = collection_loader[params[:action].to_sym] || collection_loader[:default]
 
-    @collection = instance_eval(&loader)
+    self.collection = instance_eval(&loader)
 
     unless @collection.present?
       @response = { error: 'no results found' }
       @status = :not_found
       render(load_template: false) and return
     end
-
-    eval("@#{resource_name} = @collection")
   end
 
   def load_instance
     loader = instance_loader[params[:action].to_sym] || instance_loader[:default]
 
-    @instance = instance_eval(&loader)
+    self.instance = instance_eval(&loader)
     eval "@#{instance_name} = @instance"
 
-    unless @instance
+    unless @instance.present?
       @response = { error: "Record Not Found"  }
       @status = :not_found
       render(load_template: false) and return
@@ -71,6 +58,16 @@ module MakeRestful::Loaders
 
   end
 
+  def instance= (instance)
+    @instance = instance
+    eval "@#{instance_name} = @instance"
+  end
+
+  def collection=(collection)
+    @collection = collection
+    eval("@#{resource_name} = @collection")
+  end
+
   def verify_method!
     return if allowed_actions.allowed?(params[:action]) || !%w{GET POST PUT PATCH}.include?(request.method)
     @response = { error: "Method not allowed" }

data/lib/make_restful/rendering.rb

@@ -1,31 +1,38 @@
 module MakeRestful::Rendering
+  extend ActiveSupport::Concern
 
   private
 
   ## Rendering
   def render(*args, &block)
-    options = args.last.is_a?(Hash) && args.last.extractable_options? ? args.last : {}
-    template_present = template_exists?([params[:controller], params[:action]].join('/'))
-    options[:load_template] = true if options[:load_template].nil?
-    cleaned_options = options.reject{ |k,v| [:load_template, :status].include?(k) }
+    options = args.extract_options!
 
-    super and return if (( template_present && options[:load_template]) || cleaned_options.present? )
+    if handle_errors
+      options[:load_template] = false
+    end
+
+    template_present = template_exists? [params[:controller], params[:action]].join('/')
+
+    options[:status] ||= @status
+
+    load_template = options.delete(:load_template) == true
+
+    super(*args, options, &block) and return if ( template_present && load_template ) || options.except(:status).present?
 
     # Set the response from the chain
     response = if @response.present?
                  @response
                elsif @instance.present?
-                @instance
+                 @instance
                elsif @collection.present?
                  wrap_collection
                end
 
     respond_to do |format|
-      format.json { super json: response, status: @status, callback: ( params[:callback] if allowed_formats.allowed? :jsonp )}
-      format.xml  { super xml:  response, status: @status }
+      format.json { super json: response, status: options[:status], callback: ( params[:callback] if allowed_formats.allowed? :jsonp )}
+      format.xml  { super xml:  response, status: options[:status] }
       format.any  do
-        head @status and return if @status
-        super
+        super(*args, options, &block)
       end
     end
   end
@@ -55,4 +62,11 @@ module MakeRestful::Rendering
     response
   end
 
+  def handle_errors
+    if @instance.try(:errors).present?
+      @status = :unprocessable_entity
+      @response = { errors: @instance.errors  }
+    end
+  end
+
 end

data/lib/make_restful/rest_methods.rb

@@ -12,7 +12,7 @@ module MakeRestful::RestMethods
   # POST /resources
   # Verified by :create
   def create
-    @instance = @resource.create(params[@resource.model_name.downcase])
+    self.instance = @resource.create(params[@resource.model_name.param_key])
   end
 
   # GET /resources/:id
@@ -21,12 +21,12 @@ module MakeRestful::RestMethods
 
   # PUT /resources/:id
   def update
-    @instance.update_attributes(params[@resource.model_name.downcase])
+    self.instance.update_attributes(params[@resource.model_name.param_key])
   end
 
   # DELETE /resources/:id
   def destroy
-    @response = { success: @instance.destroy }
+    @response = { success: !!@instance.destroy }
   end
 
 end

data/lib/make_restful/version.rb

@@ -1,3 +1,3 @@
 module MakeRestful
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/make_restful.rb

@@ -8,11 +8,9 @@ module MakeRestful
   autoload :Loaders
   autoload :RestMethods
   autoload :Rendering
-  autoload :Callbacks
   autoload :PermissibleSet
   autoload :PermissibleActions
 
-  extend  Callbacks
   include RestMethods
   include Rendering
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: make_restful
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,7 +72,6 @@ files:
 - README.md
 - Rakefile
 - lib/make_restful.rb
-- lib/make_restful/callbacks.rb
 - lib/make_restful/class_methods.rb
 - lib/make_restful/loaders.rb
 - lib/make_restful/permissible_actions.rb

data/lib/make_restful/callbacks.rb

@@ -1,15 +0,0 @@
-module MakeRestful::Callbacks
-
-  def before_render(options={}, &block)
-
-  end
-
-  module ClassMethods
-
-    def render_callback(options={}, &block)
-
-    end
-
-  end
-
-end