make_restful 0.1.3 → 0.1.4

data/lib/make_restful.rb

@@ -10,6 +10,8 @@ module MakeRestful
   autoload :Rendering
   autoload :Callbacks
   autoload :Sugar
+  autoload :PermissibleSet
+  autoload :PermissibleActions
 
   extend  Callbacks
   include Loaders
@@ -17,21 +19,23 @@ module MakeRestful
   include Rendering
   include Sugar
 
-  delegate :allow_method?, :allow_format?, to: :klass
+  delegate :allow_method?, :allow_format?, :resource_name, :instance_name, to: :klass
 
   included do
 
-    class_attribute :allowed_methods, :allowed_formats, :finder, :pagination, :resource_class
+    class_attribute :allowed_actions, :allowed_formats, :finder, :pagination, :resource_class, instance_writer: false
     attr_reader :resource, :instance, :collection
 
-    resource name.underscore.gsub(/(.*)_controller/,'\1').singularize
-    self.allowed_formats = [:json, :jsonp, :xml]
-    self.allowed_methods = [:index, :show, :update, :destroy, :create, :spec]
-    self.finder = :id
+    self.allowed_actions = PermissibleActions.new(self)
+    self.allowed_formats = PermissibleSet.new([:json, :jsonp, :xml])
 
-  end
+    private :klass, :allowed_actions, :allowed_formats, :pagination, :resource_class, :finder, :allow_method?, :allow_format?, :allowed_actions?, :allowed_formats?, :finder?, :pagination?, :resource_class?
+    helper_method :resource, :instance, :collection
+
+    resource name.underscore.gsub(/(.*)_controller/,'\1').singularize rescue nil
+    find_by :id
 
-  private
+  end
 
   def klass
     self.class

data/lib/make_restful/class_methods.rb

@@ -8,18 +8,6 @@ module MakeRestful::ClassMethods
     resource_name.singularize
   end
 
-  # Is a format allowed?
-  def allow_format?(*formats)
-    true if formats.flatten.map(&:to_sym).select { |i| allowed_formats.map(&:to_sym).include? i }.present?
-  end
-
-  # Is a method allowed?
-  def allow_method?(*methods)
-    true if methods.flatten.map(&:to_sym).select { |i| allowed_methods.map(&:to_sym).include? i }.present?
-  end
-
-  alias :allow_action? :allow_method?
-
   private
 
   def resource(klass)
@@ -29,15 +17,7 @@ module MakeRestful::ClassMethods
     before_filter :load_collection, only: [:index]
     before_filter :load_instance, only: [:show, :destroy, :update]
 
-    begin
-      klass = klass.to_s.camelize.constantize
-    rescue NameError
-      klass = false
-    end
-
-    if klass
-      self.resource_class = klass
-    end
+    self.resource_class = klass.to_s.classify.constantize
 
   end
 
@@ -45,25 +25,25 @@ module MakeRestful::ClassMethods
     self.finder = key.to_sym
   end
 
-  def allow_method(*methods)
-    self.allowed_methods += methods.flatten
-  end
-  alias :allow_methods :allow_method
+  def actions(*actions)
+    
+    options = actions.extract_options!
 
-  def allow_format(*formats)
-    self.allowed_formats += formats.flatten
+    self.allowed_actions.objects = actions if actions.present?
+    self.allowed_actions.only(options[:only])
+    self.allowed_actions.except(options[:except])
+    
   end
-  alias :allow_formats :allow_format
 
-  def deny_method(*methods)
-    self.allowed_methods -= methods
-  end
-  alias :deny_methods :deny_method
+  def formats(*formats)
+    
+    options = formats.extract_options!
 
-  def deny_format(*methods)
-    self.allowed_formats -= methods
+    self.allowed_formats.objects = formats if formats.present?
+    self.allowed_formats.only(options[:only])
+    self.allowed_formats.except(options[:except])
+    
   end
-  alias :deny_formats :deny_format
 
   def paginates!(opts={})
     opts.reverse_merge!({ per_page: 25 })

data/lib/make_restful/loaders.rb

@@ -3,13 +3,22 @@ module MakeRestful::Loaders
   private
 
   def load_resource
-    @resource = self.class.resource_class
+    if (@resource = resource_class)
+      nested_in_resources = params.select{ |param| /_id$/ =~ param }
+      @resource = @resource.where(nested_in_resources) if nested_in_resources.present?
+
+    else
+      @response = { error: 'error when loading resource' }
+      @status = :failed_dependency
+      render(load_template: false) and return
+
+    end
   end
 
   def load_collection
-    @collection = if self.class.pagination && !params.has_key?(:all)
-      paginated_collection = @resource.paginate page: params[:page], per_page: (params[:per_page] || self.class.pagination[:per_page] || 25)
-      { :"#{self.class.resource_name}" => collection,
+    @collection = 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,
@@ -27,12 +36,11 @@ module MakeRestful::Loaders
       render(load_template: false) and return
     end
 
-    eval("@#{self.class.resource_name} = @collection")
+    eval("@#{resource_name} = @collection")
   end
 
   def load_instance(opts={})
-
-    finder = opts[:finder] || self.class.finder
+    finder = opts[:finder] || send(:finder)
     finder_value = params[finder]
 
     @instance = if finder && @resource.respond_to?(:where)
@@ -40,7 +48,7 @@ module MakeRestful::Loaders
     else
        @resource.find(finder_value)
     end
-    eval "@#{self.class.instance_name} = @instance"
+    eval "@#{instance_name} = @instance"
 
     unless @instance
       @response = { error: "Could not find record with #{finder}: #{finder_value}"  }
@@ -51,8 +59,8 @@ module MakeRestful::Loaders
   end
 
   def verify_method!
-    return if allow_method? params[:action]
-    @response = { error: "Method not allowed"}
+    return if allowed_actions.allowed?(params[:action]) || !%w{GET POST PUT PATCH}.include?(request.method)
+    @response = { error: "Method not allowed" }
     @status = :method_not_allowed
     render(load_template: false)
   end

data/lib/make_restful/permissible_actions.rb

@@ -0,0 +1,12 @@
+class MakeRestful::PermissibleActions < MakeRestful::PermissibleSet
+
+  def initialize(controller)
+    @controller = controller
+    super([])
+  end
+
+  def available_objects
+    self.to_a.present? ? super : @controller.action_methods.map(&:to_sym)
+  end
+
+end

data/lib/make_restful/permissible_set.rb

@@ -0,0 +1,33 @@
+class MakeRestful::PermissibleSet < Set
+
+  def initialize(set=[])
+    @only = Set.new
+    @except = Set.new
+    super(set)
+  end
+
+  def objects=(*objects)
+    self.replace objects.flatten.compact
+  end
+
+  def available_objects
+    Set.new(self.to_a)
+  end
+
+  def only(*objects)
+    @only = objects.flatten.compact.map(&:to_sym)
+  end
+
+  def except(*objects)
+    @except += objects.flatten.compact.map(&:to_sym)
+  end
+
+  def allowed?(*objects)
+    true if objects.flatten.map(&:to_sym).select { |i| permissible_objects.include? i }.present?
+  end
+
+  def permissible_objects
+    Set.new(available_objects).intersection(@only.present? ? @only : available_objects).difference(@except)
+  end
+
+end

data/lib/make_restful/rendering.rb

@@ -6,17 +6,21 @@ module MakeRestful::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
-    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)
+    options[:load_template] = true if options[:load_template].nil?
+    cleaned_options = options.reject{ |k,v| [:load_template, :status].include?(k) }
+
+    super and return if (( template_present && options[:load_template]) || cleaned_options.present? ) && allowed_formats.allowed?(formats)
 
     # Set the response from the chain
     response = @response || @instance || @collection
 
     respond_to do |format|
-      format.json { super json: response, status: @status, callback: ( params[:callback] if allow_format? :jsonp )} if allow_format? :json, :jsonp
-      format.xml  { super xml:  response, status: @status } if allow_format? :xml
-      format.any  { super }
+      format.json { super json: response, status: @status, callback: ( params[:callback] if allowed_formats.allowed? :jsonp )} if allowed_formats.allowed? :json, :jsonp
+      format.xml  { super xml:  response, status: @status } if allowed_formats.allowed? :xml
+      format.any  do
+        head @status and return if @status
+        super
+      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
+    @instance = @resource.create(params[@resource.model_name.downcase])
   end
 
   # GET /resources/:id
@@ -21,7 +21,7 @@ module MakeRestful::RestMethods
 
   # PUT /resources/:id
   def update
-    @instance.update_attributes(params[@resource.to_s.underscore])
+    @instance.update_attributes(params[@resource.model_name.downcase])
   end
 
   # DELETE /resources/:id
@@ -29,9 +29,4 @@ module MakeRestful::RestMethods
     @response = { success: @instance.destroy }
   end
 
-  # OPTIONS /resources
-  def spec
-    @response = specification
-  end
-
 end

data/lib/make_restful/sugar.rb

@@ -1,6 +1,8 @@
 module MakeRestful::Sugar
   extend ActiveSupport::Concern
 
+  private
+
   def method_missing(m, *args, &block)
     if /load_instance_by_(?<finder>[a-z_]+)/ =~ m.to_s
       load_instance(finder: finder.to_sym)

data/lib/make_restful/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: make_restful
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -75,6 +75,8 @@ files:
 - lib/make_restful/callbacks.rb
 - lib/make_restful/class_methods.rb
 - lib/make_restful/loaders.rb
+- lib/make_restful/permissible_actions.rb
+- lib/make_restful/permissible_set.rb
 - lib/make_restful/rendering.rb
 - lib/make_restful/rest_methods.rb
 - lib/make_restful/sugar.rb