decent_exposure 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b2623237fcd46b98cc5ccff366d581a22ca4d90
-  data.tar.gz: 4c2dafb2461a01d1cdce0ebe3f97ee62788cf202
+  metadata.gz: d0b3584786f08fa92a4a19b425f21c2916edf332
+  data.tar.gz: 99b35c17b658c58bba300b4079e1a038eafabe3d
 SHA512:
-  metadata.gz: 8f9d1123d826932b420c528986513af7d1dfa01f21d64569dd0fdcd64d0cef5d7208b30e9039e67843ebc313a8f82ee99a11ee249778827e657bb59bb482d7c2
-  data.tar.gz: b35b0c987f0c647dbd10c3a01e9161859281165be3e3857e81647328fbe48c09c01ed898c8569a2a210054e584f6624d8b7c09c99a8c180cd3ecbd7a1d81ec88
+  metadata.gz: 940f770c0a27c186bd9ec2d5e7a9540e8dbc007074520d2d107d96bc7690a3ad66bcaf4d5b174541283669b999727f87ba9e8661ee07c7d6fd65eb4bdd70be3a
+  data.tar.gz: c196f21d5c6b6edfd9be8c246f31bfaba9d484f9826792f330e0743d9534a316a7cfce96885857702dc8c82a96ad41d8de02727df735303c9e8f7397bde7370c

data/README.md

@@ -298,6 +298,20 @@ expose(:environment) { Rails.env }
 This block is evaluated and the memoized result is returned whenever you call
 `environment`.
 
+#### Using the Default decent_exposure Goodness
+
+If you don't want to go too far off the beaten path, the value of the default
+exposure can be easily obtained inside of your custom block. The block will
+receive a proxy object that you can use to lazily evaluate 
+the default decent_exposure logic. For example:
+
+```ruby
+expose(:articles) {|default| default.limit(10) }
+```
+
+This allows you to customize your exposures, without having to redo all of
+the built-in logic decent_exposure gives you out of the box.
+
 ### Custom strategies
 
 For the times when custom behavior is needed for resource finding,

data/lib/decent_exposure.rb

@@ -1,4 +1,5 @@
 require 'decent_exposure/expose'
+require 'decent_exposure/error'
 
 ActiveSupport.on_load(:action_controller) do
   extend DecentExposure::Expose

data/lib/decent_exposure/active_record_strategy.rb

@@ -4,6 +4,11 @@ require 'active_support/core_ext/module/delegation'
 module DecentExposure
   class ActiveRecordStrategy < Strategy
     delegate :plural?, :parameter, :to => :inflector
+    delegate :get?, :delete?,      :to => :request
+
+    def singular?
+      !plural?
+    end
 
     def collection
       inflector.plural.to_sym
@@ -38,7 +43,7 @@ module DecentExposure
     end
 
     def collection_resource
-      return scope if scope.respond_to?(:each)
+      return scope if scope.respond_to?(:proxy_association) || scope.respond_to?(:each)
       scope.send(scope_method)
     end
 

data/lib/decent_exposure/active_record_with_eager_attributes_strategy.rb

@@ -1,31 +1,8 @@
 require 'decent_exposure/active_record_strategy'
+require 'decent_exposure/strategies/assign_from_params'
 
 module DecentExposure
   class ActiveRecordWithEagerAttributesStrategy < ActiveRecordStrategy
-    delegate :get?,    :to => :request
-    delegate :delete?, :to => :request
-
-    def singular?
-      !plural?
-    end
-
-    def attributes
-      params[options[:param_key] || inflector.param_key] || {}
-    end
-
-    def assign_attributes?
-      return false unless attributes && singular?
-      (!get? && !delete?) || new_record?
-    end
-
-    def new_record?
-      !id
-    end
-
-    def resource
-      super.tap do |r|
-        r.attributes = attributes if assign_attributes?
-      end
-    end
+    include Strategies::AssignFromParams
   end
 end

data/lib/decent_exposure/error.rb

@@ -0,0 +1,4 @@
+module DecentExposure
+  # Public: A generic Error class for decent_exposure
+  class Error < ::StandardError; end
+end

data/lib/decent_exposure/expose.rb

@@ -12,6 +12,8 @@ module DecentExposure
           @_resources ||= {}
         end
         hide_action :_resources
+
+        protected_instance_variables.push("@_resources")
       end
     end
 
@@ -41,17 +43,23 @@ module DecentExposure
 
       _exposures[name] = exposure = Strategizer.new(name, options, &block).strategy
 
+      define_exposure_methods(name, exposure)
+    end
+
+    private
+
+    def define_exposure_methods(name, exposure)
       define_method(name) do
         return _resources[name] if _resources.has_key?(name)
         _resources[name] = exposure.call(self)
       end
+      helper_method name
+      hide_action name
 
       define_method("#{name}=") do |value|
         _resources[name] = value
       end
-
-      helper_method name
-      hide_action name
+      hide_action "#{name}="
     end
   end
 end

data/lib/decent_exposure/strategies/assign_from_method.rb

@@ -0,0 +1,20 @@
+module DecentExposure
+  module Strategies
+    module AssignFromMethod
+      def attributes
+        return @attributes if defined?(@attributes)
+        @attributes = controller.send(options[:attributes]) if options[:attributes]
+      end
+
+      def assign_attributes?
+        singular? && !get? && !delete? && attributes.present?
+      end
+
+      def resource
+        super.tap do |r|
+          r.attributes = attributes if assign_attributes?
+        end
+      end
+    end
+  end
+end

data/lib/decent_exposure/strategies/assign_from_params.rb

@@ -0,0 +1,24 @@
+module DecentExposure
+  module Strategies
+    module AssignFromParams
+      def attributes
+        params[options[:param_key] || inflector.param_key] || {}
+      end
+
+      def assign_attributes?
+        return false unless attributes && singular?
+        (!get? && !delete?) || new_record?
+      end
+
+      def new_record?
+        !id
+      end
+
+      def resource
+        r = super
+        r.attributes = attributes if assign_attributes?
+        r
+      end
+    end
+  end
+end

data/lib/decent_exposure/strategizer.rb

@@ -14,25 +14,17 @@ module DecentExposure
     end
 
     def strategy
-      [block_strategy, exposure_strategy].detect(&applicable)
-    end
-
-    def model
-      options[:model] || name
+      block_strategy || exposure_strategy
     end
 
     private
 
-    def applicable
-      lambda { |s| s }
-    end
-
     def exposure_strategy
       Exposure.new(name, exposure_strategy_class, options)
     end
 
     def block_strategy
-      BlockStrategy.new(block) if block
+      BlockStrategy.new(block, exposure_strategy) if block
     end
 
     def exposure_strategy_class
@@ -40,9 +32,23 @@ module DecentExposure
     end
   end
 
-  BlockStrategy = Struct.new(:block) do
+  BlockStrategy = Struct.new(:block, :exposure_strategy) do
     def call(controller)
-      controller.instance_eval(&block)
+      default = ExposureProxy.new(exposure_strategy, controller)
+      controller.instance_exec(default, &block)
+    end
+  end
+
+  class ExposureProxy
+    instance_methods.each { |m| undef_method m unless m =~ /(^__|^send$|^object_id$)/ }
+
+    def initialize(exposure, controller)
+      @exposure, @controller = exposure, controller
+    end
+
+    def method_missing(*args)
+      @target ||= @exposure.call(@controller)
+      @target.send(*args)
     end
   end
 end

data/lib/decent_exposure/strong_parameters_strategy.rb

@@ -1,27 +1,8 @@
 require 'decent_exposure/active_record_strategy'
+require 'decent_exposure/strategies/assign_from_method'
 
 module DecentExposure
   class StrongParametersStrategy < ActiveRecordStrategy
-    delegate :get?,    :to => :request
-    delegate :delete?, :to => :request
-
-    def singular?
-      !plural?
-    end
-
-    def attributes
-      return @attributes if defined?(@attributes)
-      @attributes = controller.send(options[:attributes]) if options[:attributes]
-    end
-
-    def assign_attributes?
-      singular? && !get? && !delete? && attributes.present?
-    end
-
-    def resource
-      super.tap do |r|
-        r.attributes = attributes if assign_attributes?
-      end
-    end
+    include Strategies::AssignFromMethod
   end
 end

data/lib/decent_exposure/version.rb

@@ -1,3 +1,3 @@
 module DecentExposure #:nodoc
-  VERSION = "2.2.1"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decent_exposure
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Stephen Caudill
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -83,9 +83,12 @@ files:
 - lib/decent_exposure/active_record_with_eager_attributes_strategy.rb
 - lib/decent_exposure/configuration.rb
 - lib/decent_exposure/constant_resolver.rb
+- lib/decent_exposure/error.rb
 - lib/decent_exposure/expose.rb
 - lib/decent_exposure/exposure.rb
 - lib/decent_exposure/inflector.rb
+- lib/decent_exposure/strategies/assign_from_method.rb
+- lib/decent_exposure/strategies/assign_from_params.rb
 - lib/decent_exposure/strategizer.rb
 - lib/decent_exposure/strategy.rb
 - lib/decent_exposure/strong_parameters_strategy.rb