make_restful 0.0.1.pre1 → 0.1.0

data/lib/make_restful/class_methods.rb

@@ -1,34 +1,48 @@
 module MakeRestful::ClassMethods
 
-  def authorize_resource!
-    before_filter do
-      @resource = @resource.authorize(auth_token)
-      @resource.params = params if resource.respond_to?(:params=)
-      @instance = @resource.find(params[:id]) if params[:id] && @resource.respond_to?(:find)
-    end
+  def resource_name
+    resource_class.name.gsub(/(.*::)?(.*)/,"\\2").underscore.pluralize
+  end
+
+  def instance_name
+    resource_name.singularize
   end
 
   private
 
   def resource(klass)
-    before_filter do
-      resource.params = params.except(:action, :controller, :id) if resource.respond_to?(:params=)
+
+    before_filter :load_resource
+    before_filter :load_collection, on: [:index]
+    before_filter :load_instance, on: [:show, :destroy, :update]
+
+    begin
       klass = klass.to_s.camelize.constantize
-      @resource ||= klass
-      @instance = resource.find(params[:id]) if params[:id] && @resource.respond_to?(:find)
+    rescue NameError
+      klass = false
+    end
+
+    if klass
+      self.resource_class = klass
     end
+
+  end
+
+  def find_by(key)
+    self.finder = key.to_sym
   end
 
   def allow_methods(*methods)
-    self.send :define_method, :allowed_methods do
-      methods.flatten
-    end
+    self.allowed_methods = methods.flatten
   end
 
   def allow_formats(*formats)
-    self.send :define_method, :allowed_formats do
-      formats.flatten
-    end
+    self.allowed_formats = formats.flatten
+  end
+
+  def paginates!(opts={})
+    opts.reverse_merge!({ per_page: 25 })
+    self.pagination = opts
   end
 
 end

data/lib/make_restful/controller_additions/oauth_resource.rb

@@ -0,0 +1,20 @@
+module MakeRestful::ControllerAdditions::OauthResource
+  require 'oauth_resource'
+  extend ActiveSupport::Concern
+
+  included do ; end
+
+  module ClassMethods
+
+    def authorize_resource!(token, opts={})
+      skip_before_filter :load_instance, :load_collection
+      before_filter(opts) do
+        @resource = @resource.authorize(send(token))
+        load_instance if params[:action] =~ /show|destroy|update/
+        load_collection if params[:action] =~ /index/
+      end
+    end
+
+  end
+
+end

data/lib/make_restful/controller_additions.rb

@@ -0,0 +1,6 @@
+module MakeRestful::ControllerAdditions
+  extend ActiveSupport::Autoload
+
+  autoload :OauthResource
+
+end

data/lib/make_restful/version.rb

@@ -1,3 +1,3 @@
 module MakeRestful
-  VERSION = "0.0.1.pre1"
+  VERSION = "0.1.0"
 end

data/lib/make_restful.rb

@@ -5,12 +5,16 @@ module MakeRestful
   extend ActiveSupport::Autoload
 
   autoload :ClassMethods
+  autoload :ControllerAdditions
 
   included do
 
-    resource name.underscore.gsub(/(.*\/)?(.*)_controller/,'\2').singularize
+    cattr_accessor :allowed_methods, :allowed_formats, :finder, :pagination, :resource_class
+
+    resource name.underscore.gsub(/(.*)_controller/,'\1').singularize
     allow_formats :json, :jsonp, :xml
     allow_methods :index, :get, :put, :post, :delete
+    find_by :id
 
     ####################################
     ## RESTful Methods
@@ -20,36 +24,53 @@ module MakeRestful
 
   # GET /resources
   def index
-    head :not_supported and return unless allow_method? :index, :list
-    @response = resource.all
+    head :method_not_allowed and return unless allow_method? :index, :list
+    @response = { :"#{self.class.resource_name}" => @collection }
+    @response.merge!(
+      {
+        current_page: results.current_page,
+        per_page: results.per_page,
+        total_entries: results.total_entries,
+      }
+    ) if self.class.pagination && !params.has_key?(:all)
+
+    if @collection.empty?
+      @response = { error: 'no results found' }
+      @status = :not_found
+    end
+
     render_formats
   end
 
   # POST /resources
   def create
-    head :not_supported and return unless allow_method? :post, :create
-    @response = resource.create
+    head :method_not_allowed and return unless allow_method? :post, :create
+    @response = @resource.create
     render_formats
   end
 
   # PUT /resources/:id
   def show
-    head :not_supported and return unless allow_method? :get, :show
-    @response = instance
+    head :method_not_allowed and return unless allow_method? :get, :show
+    @response = @instance
+    unless @response
+      @response = { error: 'record_not_found' }
+      @status = :not_found
+    end
     render_formats
   end
 
   # PUT /resources/:id
   def update
-    head :not_supported and return unless allow_method? :put, :patch, :update
-    @response = instance.update_attributes(params[resource.to_s.underscore])
+    head :method_not_allowed and return unless allow_method? :put, :patch, :update
+    @response = @instance.update_attributes(params[@resource.to_s.underscore])
     render_formats
   end
 
   # DELETE /resources/:id
   def destroy
-    head :not_supported and return unless allow_method? :delete, :destroy
-    @response = instance.destroy
+    head :method_not_allowed and return unless allow_method? :delete, :destroy
+    @response = @instance.destroy
     render_formats
   end
 
@@ -57,7 +78,7 @@ module MakeRestful
   def spec
     @response = {
       supports: self.class.supported_methods,
-      specification: ( resource.specification if resource.respond_to?(:specification) ) || "No Specification"
+      specification: ( @resource.specification if @resource.respond_to?(:specification) ) || "No Specification"
     }
     render_formats
   end
@@ -68,9 +89,9 @@ module MakeRestful
 
   def render_formats
     respond_to do |format|
-      format.json { render json: @response, callback: ( params[:callback] if allow_format? :jsonp )} if allow_format? :json, :jsonp
-      format.xml { render xml: @response } if allow_format? :xml
-      format.html
+      format.json { render json: @response, status: @status, callback: ( params[:callback] if allow_format? :jsonp )} if allow_format? :json, :jsonp
+      format.xml { render xml: @response, status: @status } if allow_format? :xml
+      format.html { render status: @status } if allow_format? :html
     end
   end
 
@@ -86,13 +107,34 @@ module MakeRestful
     true if methods.map(&:to_sym).select { |i| allowed_methods.map(&:to_sym).include? i }.present?
   end
 
-  # The Instance
-  def instance
-    @instance
+  def load_resource
+    @resource = self.class.resource_class
+    @resource.params = params.except(:action, :controller, :id) if @resource.respond_to?(:params=)
+  end
+
+  def load_collection
+    @collection = if self.class.pagination && !params.has_key?(:all)
+      @resource.paginate page: params[:page], per_page: (params[:per_page] || self.class.pagination[:per_page] || 25)
+    else
+      @resource.all
+    end
+    eval("@#{self.class.resource_name} = @collection")
+  end
+
+  def load_instance
+    @instance = eval "@#{self.class.instance_name} = #{@resource.send(:"find_by_#{self.class.finder}", params[:id])}" if params[:id] && @resource.respond_to?(:find)
   end
 
   def resource
     @resource
   end
 
+  def instance
+    @instance
+  end
+
+  def collection
+    @collection
+  end
+
 end

data/make_restful.gemspec

@@ -17,4 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_dependency "activesupport"
+  gem.add_dependency "will_paginate"
+
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: make_restful
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre1
-  prerelease: 6
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Jason Waldrip
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! ' Enables rest on a resource '
 email:
 - jason@waldrip.net
@@ -41,6 +57,8 @@ files:
 - Rakefile
 - lib/make_restful.rb
 - lib/make_restful/class_methods.rb
+- lib/make_restful/controller_additions.rb
+- lib/make_restful/controller_additions/oauth_resource.rb
 - lib/make_restful/version.rb
 - make_restful.gemspec
 homepage: http://github.com/jwaldrip/make_restful
@@ -58,9 +76,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23