resourcey 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08220e7540269d7c02a3058371dbc684b12769b2
-  data.tar.gz: ff2a774f66ebce7bf4b0126dcea60d57a9c7c0fa
+  metadata.gz: e697438e59653bcf3efda698e3afd006d29db62a
+  data.tar.gz: 44a960c0bfab303b27fa22488bd8d3fc5023c770
 SHA512:
-  metadata.gz: 1ac82cee0ce23c84eec113fc7a949cb6c5b0167ae549ee9d939416ca8a28eca76feedf0a847ca02e8a5ddd0e88e438f1261e9e466ebdef25e7372a699cabca6b
-  data.tar.gz: 8920071fe981a532febb3248a650ec750ab89de5b7b7a95cfc63e17f090e63b0670efdfa1482d4e94ce656256a8de8247225d087d83eae4d5b6d33fd6f365877
+  metadata.gz: 2eacaec8204b1b7bd4806d4b4872976bfe446157354a81dd317541eff58f5104ebf55a665ba5d928e80f7763eb18d54ab5c44b2b528d5c044d4a12118db41914
+  data.tar.gz: b97a0ad88136ef25c949404c3b595506a3fecff77ef5df96c1ee3c3bd267bf0e21ed739aa517616a3f9a58ea2bd65b3246b7bc6c4fcb9d07ea26082e809e8bc5

data/lib/resourcey/config.rb

@@ -3,21 +3,11 @@ require 'action_controller'
 module Resourcey
   class Config
     attr_accessor :default_paginator
-    attr_reader :controller_parent
+    attr_accessor :controller_parent
 
     def initialize
       self.default_paginator = :paged
-      self.controller_parent = ActionController::Base
-    end
-
-    def controller_parent=(value)
-      return @controller_parent = value if value.class == Class
-
-      begin
-        @controller_parent = value.to_s.constantize
-      rescue
-        raise Errors::RuntimeError.new("#{value} is not a valid class name")
-      end
+      self.controller_parent = 'action_controller/base'
     end
   end
 

data/lib/resourcey/controller.rb

@@ -1,13 +1,14 @@
 require 'resourcey/controller_modules'
 
 module Resourcey
-  class Controller < Resourcey.config.controller_parent
+  class Controller < Resourcey.config.controller_parent.classify.constantize
     include Resourcey::ControllerFiltering
     include Resourcey::ControllerPagination
     include Resourcey::ControllerModel
+    include Resourcey::ControllerCollectionScope
 
     def index
-      render json: serialized_collection(paginated_resources)
+      render json: serialized_collection(scoped_resources)
     end
 
     def show

data/lib/resourcey/controller_collection_scope.rb

@@ -0,0 +1,20 @@
+module Resourcey
+  module ControllerCollectionScope
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :scoping_method
+    end
+
+    def scoped_resources
+      return paginated_resources if self.scoping_method.nil?
+      self.scoping_method.call paginated_resources
+    end
+
+    module ClassMethods
+      def collection_scope(&block)
+        self.scoping_method = block
+      end
+    end
+  end
+end

data/lib/resourcey/controller_model.rb

@@ -7,8 +7,8 @@ module Resourcey
     end
 
     module ClassMethods
-      def use_model(model)
-        self.controller_model = model
+      def use_model(model_or_name)
+        self.controller_model = model_or_name.to_s.classify.constantize
       end
     end
   end

data/lib/resourcey/controller_modules.rb

@@ -1,3 +1,4 @@
 require 'resourcey/controller_filtering'
 require 'resourcey/controller_pagination'
 require 'resourcey/controller_model'
+require 'resourcey/controller_collection_scope'

data/lib/resourcey/errors.rb

@@ -5,6 +5,5 @@ module Resourcey
     class NotImplemented < BaseError; end
     class ClassNotFound < BaseError; end
     class OptionNotAllowed < BaseError; end
-    class RuntimeError < BaseError; end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resourcey
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - polakowski
@@ -90,6 +90,7 @@ files:
 - lib/resourcey.rb
 - lib/resourcey/config.rb
 - lib/resourcey/controller.rb
+- lib/resourcey/controller_collection_scope.rb
 - lib/resourcey/controller_filtering.rb
 - lib/resourcey/controller_model.rb
 - lib/resourcey/controller_modules.rb