make_restful 0.1.6 → 0.1.8

data/lib/make_restful/class_methods.rb

@@ -20,24 +20,24 @@ module MakeRestful::ClassMethods
 
   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]
 
-    self.resource_class = klass.to_s.classify.constantize
-
-  end
-
-  def find_by(key)
-    self.finder = key.to_sym
   end
 
-  def collection(&block)
-    self.collection_loader = block if block_given?
+  def collection(options={}, &block)
+    options.assert_valid_keys(:for)
+    key = options[:for].try(:to_sym) || :default
+    self.collection_loader[key] = block if block_given?
   end
 
-  def instance(&block)
-    self.collection_loader = block if block_given?
+  def instance(options={}, &block)
+    options.assert_valid_keys(:for)
+    key = options[:for].try(:to_sym) || :default
+    self.instance_loader[key] = block if block_given?
   end
 
   def actions(*actions)

data/lib/make_restful/loaders.rb

@@ -23,11 +23,7 @@ module MakeRestful::Loaders
     end
 
     instance do
-      if finder && @resource.respond_to?(:where)
-        @resource.where(finder.to_sym => finder_value).first
-      else
-        @resource.find(finder_value)
-      end
+      @resource.find(params[:id])
     end
 
   end
@@ -48,7 +44,9 @@ module MakeRestful::Loaders
   end
 
   def load_collection
-    @collection = instance_eval(&collection_loader)
+    loader = collection_loader[params[:action].to_sym] || collection_loader[:default]
+
+    @collection = instance_eval(&loader)
 
     unless @collection.present?
       @response = { error: 'no results found' }
@@ -59,15 +57,14 @@ module MakeRestful::Loaders
     eval("@#{resource_name} = @collection")
   end
 
-  def load_instance(opts={})
-    finder = opts[:finder] || send(:finder)
-    finder_value = params[finder]
+  def load_instance
+    loader = instance_loader[params[:action].to_sym] || instance_loader[:default]
 
-    @instance = instance_eval(&instance_loader)
+    @instance = instance_eval(&loader)
     eval "@#{instance_name} = @instance"
 
     unless @instance
-      @response = { error: "Could not find record with #{finder}: #{finder_value}"  }
+      @response = { error: "Record Not Found"  }
       @status = :not_found
       render(load_template: false) and return
     end

data/lib/make_restful/version.rb

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

data/lib/make_restful.rb

@@ -9,33 +9,34 @@ module MakeRestful
   autoload :RestMethods
   autoload :Rendering
   autoload :Callbacks
-  autoload :Sugar
   autoload :PermissibleSet
   autoload :PermissibleActions
 
   extend  Callbacks
   include RestMethods
   include Rendering
-  include Sugar
 
   delegate :allow_method?, :allow_format?, :resource_name, :instance_name, to: :klass
 
   included do
+
     class_attribute :json_root_node, :collection_loader, :instance_loader, instance_writer: false
 
+    self.instance_loader = {}
+    self.collection_loader = {}
+
     extend ClassMethods
 
-    class_attribute :allowed_actions, :allowed_formats, :finder, :pagination, :resource_class, instance_writer: false
+    class_attribute :allowed_actions, :allowed_formats, :pagination, :resource_class, instance_writer: false
     attr_reader :resource, :instance, :collection
 
     self.allowed_actions = PermissibleActions.new(self)
     self.allowed_formats = PermissibleSet.new([:json, :jsonp, :xml])
 
-    private :klass, :allowed_actions, :allowed_formats, :pagination, :resource_class, :finder, :allow_method?, :allow_format?, :allowed_actions?, :allowed_formats?, :finder?, :pagination?, :resource_class?
+    private :klass, :allowed_actions, :allowed_formats, :pagination, :resource_class, :allow_method?, :allow_format?, :allowed_actions?, :allowed_formats?, :pagination?, :resource_class?
     helper_method :resource, :instance, :collection
 
     resource name.underscore.gsub(/(.*)_controller/,'\1').singularize rescue nil
-    find_by :id
 
     include Loaders
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: make_restful
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -79,7 +79,6 @@ files:
 - lib/make_restful/permissible_set.rb
 - lib/make_restful/rendering.rb
 - lib/make_restful/rest_methods.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/sugar.rb

@@ -1,22 +0,0 @@
-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)
-    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