make_restful 0.1.2 → 0.1.3

data/lib/make_restful.rb

@@ -8,12 +8,14 @@ module MakeRestful
   autoload :Loaders
   autoload :RestMethods
   autoload :Rendering
-  autoload :Specification
+  autoload :Callbacks
+  autoload :Sugar
 
+  extend  Callbacks
   include Loaders
   include RestMethods
   include Rendering
-  include Specification
+  include Sugar
 
   delegate :allow_method?, :allow_format?, to: :klass
 
@@ -24,7 +26,7 @@ module MakeRestful
 
     resource name.underscore.gsub(/(.*)_controller/,'\1').singularize
     self.allowed_formats = [:json, :jsonp, :xml]
-    self.allowed_methods = [:index, :get, :put, :post, :delete]
+    self.allowed_methods = [:index, :show, :update, :destroy, :create, :spec]
     self.finder = :id
 
   end

data/lib/make_restful/callbacks.rb

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

data/lib/make_restful/loaders.rb

@@ -4,7 +4,6 @@ module MakeRestful::Loaders
 
   def load_resource
     @resource = self.class.resource_class
-    @resource.params = params.except(:action, :controller, :id) if @resource.respond_to?(:params=)
   end
 
   def load_collection
@@ -25,6 +24,7 @@ module MakeRestful::Loaders
     if @collection.empty?
       @response = { error: 'no results found' }
       @status = :not_found
+      render(load_template: false) and return
     end
 
     eval("@#{self.class.resource_name} = @collection")
@@ -35,15 +35,17 @@ module MakeRestful::Loaders
     finder = opts[:finder] || self.class.finder
     finder_value = params[finder]
 
-    if finder && @resource.respond_to?(:find)
-      @instance = @resource.where(finder.to_sym => finder_value).first
-      eval "@#{self.class.instance_name} = @instance"
+    @instance = if finder && @resource.respond_to?(:where)
+       @resource.where(finder.to_sym => finder_value).first
+    else
+       @resource.find(finder_value)
     end
+    eval "@#{self.class.instance_name} = @instance"
 
     unless @instance
       @response = { error: "Could not find record with #{finder}: #{finder_value}"  }
       @status = :not_found
-      render_formats(load_template: false) and return
+      render(load_template: false) and return
     end
 
   end
@@ -52,21 +54,9 @@ module MakeRestful::Loaders
     return if allow_method? params[:action]
     @response = { error: "Method not allowed"}
     @status = :method_not_allowed
-    render
+    render(load_template: false)
   end
 
   alias :verify_action! :verify_method!
 
-  def method_missing(m, *args, &block)
-    if /load_instance_by_(?<finder>[a-z_]+)/ =~ m.to_s
-      load_instance(finder: finder.to_sym)
-    else
-      super
-    end
-  end
-
-  def respond_to_missing?(method_name, include_private = false)
-    true if /load_instance_by_(?<finder>[a-z_]+)/ =~ method_name.to_s
-  end
-
 end

data/lib/make_restful/rendering.rb

@@ -3,9 +3,12 @@ module MakeRestful::Rendering
   private
 
   ## Rendering
-  def render(options = {}, deprecated_status = nil, &block)
-
-    super and return if template_exists?([params[:controller], params[:action]].join('/')) && allow_format?(formats) unless options[:load_template] == false
+  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
+    cleaned_options = options.delete_if{ |k,v| [:load_template, :status].include?(k) }
+    super and return if (( template_present && options[:load_template]) || cleaned_options.present? ) && allow_format?(formats)
 
     # Set the response from the chain
     response = @response || @instance || @collection

data/lib/make_restful/sugar.rb

@@ -0,0 +1,20 @@
+module MakeRestful::Sugar
+  extend ActiveSupport::Concern
+
+  def method_missing(m, *args, &block)
+    if /load_instance_by_(?<finder>[a-z_]+)/ =~ m.to_s
+      load_instance(finder: finder.to_sym)
+    else
+      super
+    end
+  end
+
+  def respond_to_missing?(method_name, include_private = false)
+    if /load_instance_by_(?<finder>[a-z_]+)/ =~ method_name.to_s
+      true
+    else
+      false
+    end
+  end
+
+end

data/lib/make_restful/version.rb

@@ -1,3 +1,3 @@
 module MakeRestful
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: make_restful
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,12 +72,12 @@ 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/rendering.rb
 - lib/make_restful/rest_methods.rb
-- lib/make_restful/specification.rb
-- lib/make_restful/specification/builder.rb
+- lib/make_restful/sugar.rb
 - lib/make_restful/version.rb
 - make_restful.gemspec
 homepage: http://github.com/jwaldrip/make_restful

data/lib/make_restful/specification.rb

@@ -1,25 +0,0 @@
-module MakeRestful::Specification
-  extend ActiveSupport::Concern
-  extend ActiveSupport::Autoload
-
-  autoload :Builder
-  # autoload :MethodBuilder
-
-  def specification
-    nil
-  end
-
-  module ClassMethods
-
-    def specification(&block)
-
-      spec_result = MakeRestful::Specification::Builder.new(self, &block).freeze
-
-      define_method :specification do
-        spec_result.render
-      end
-    end
-
-  end
-
-end

data/lib/make_restful/specification/builder.rb

@@ -1,75 +0,0 @@
-class MakeRestful::Specification::Builder
-
-  attr_reader :_controller_, :_methods_, :_description_, :_formats_, :_attributes_, :_resource_, :_default_methods_, :_default_attributes_, :_default_formats_
-
-  private
-
-  def initialize(controller, &block)
-    @_controller_ = controller
-    @_methods_ = []
-    @_default_methods_ = default_supported_methods
-    @_methods_ = []
-    @_attributes_ = []
-    @_default_attributes_ = controller.resource_class.new.attributes.keys
-    @_default_formats_ = controller.allowed_formats
-    @_formats_ = []
-    @_description_ = "Api for #{controller.resource_name.titleize}"
-    @_resource_ = controller.instance_name
-    instance_eval(&block) if block_given?
-  end
-
-  def method(method, options={})
-    method = {
-      method:   method,
-      path:     options[:path],
-      returns:  options[:returns]
-    }
-    @_methods_ << method
-    method
-  end
-
-  def description(string)
-    @_description_ = string
-  end
-
-  def resource(string)
-    @_resource_ = string
-  end
-
-  def attribute(attr)
-    @_attributes_ << attr
-    attr
-  end
-
-  def attributes(*args)
-    @_attributes_ += args.flatten
-  end
-
-  def format(attr)
-    @_formats_ << attr
-    attr
-  end
-
-  def formats(*args)
-    @_formats_ += args
-  end
-
-  def default_supported_methods
-    method  :get,     path: "/",        returns: "collection" if _controller_.allow_method?(:list)    || _controller_.allow_method?(:index)
-    method  :post,    path: "/",        returns: "resource"   if _controller_.allow_method?(:create)  || _controller_.allow_method?(:post)
-    method  :get,     path: "/:id",     returns: "resource"   if _controller_.allow_method?(:show)    || _controller_.allow_method?(:get)
-    method  :put,     path: "/:id",     returns: "resource"   if _controller_.allow_method?(:update)  || _controller_.allow_method?(:put)
-    method  :delete,  path: "/:id",     returns: "success"    if _controller_.allow_method?(:destroy) || _controller_.allow_method?(:delete)
-  end
-
-  def render
-    {
-      resource:     _resource_,
-      formats:      _formats_.present? ? _formats_ : _default_formats_,
-      description:  _description_,
-      attributes:   _attributes_.present? ? _attributes_ : _default_attributes_,
-      methods:      _methods_.present? ? _methods_ : _default_methods_
-    }
-  end
-
-end