adequate_exposure 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82a9cfe00dccb013cca09b85f68073902bb5928d
-  data.tar.gz: 15ec7db35c84401f82a3d8bab5af8079ccf5ea81
+  metadata.gz: 626c4da5b880bf6134c02ee44d83f44df6f57b75
+  data.tar.gz: 1ec2a29a65c9e16811bea76d76ac33a3b149715a
 SHA512:
-  metadata.gz: 8ade244f9a2785594a66b5ba042b2639a15157eb39f72234f3e2133d21a27bffe2dcecf3d61a6a79d9768b4a0d6ab5605cd3336600c3d49e848767708385c22a
-  data.tar.gz: 84260440dbd08e8444ce307994f4c564e97b76efc48a5e554d349a5018ba8c3d7d4ec0cf7801d860876cd306ba014ef1b5c2ff0f396b3ded2fdbe1faaedd7660
+  metadata.gz: e3ceb0f0b2246cacb2dee1ee1e3fb6d89e94b034566c5a60233bff3324255b2d484079d68e6aebe62ad797fea0d4016ab5f377600fc7720579728e2748d0813e
+  data.tar.gz: df20c7691859271f41aaed077b00f3d4a12e589213919a8bf774ccc1e7a962044267b253054682fcf41f3992f7b62fa5bfc43332081e66c3c29215edaec29125

data/README.md

@@ -36,11 +36,12 @@ expressed with the following pseudocode:
 
 ```ruby
 def fetch(scope, id)
-  id ? decorate(find(id, scope)) : decorate(build(scope))
+  instance = id ? find(id, scope) : build(scope)
+  decorate(instance)
 end
 
 def id
-  params[:thing_id] || params[:id]
+  params[:id] || params[:thing_id]
 end
 
 def find(id, scope)
@@ -48,7 +49,7 @@ def find(id, scope)
 end
 
 def build(scope)
-  scope.new # Thing.new
+  scope.new(build_params) # Thing.new(thing_params)
 end
 
 def scope
@@ -59,6 +60,14 @@ def model
   exposure_name.classify.constantize # :thing -> Thing
 end
 
+def build_params
+  if respond_to?(:thing_params, true) && !request.get?
+    thing_params
+  else
+    {}
+  end
+end
+
 def decorate(thing)
   thing
 end

data/lib/adequate_exposure/exposure.rb

@@ -54,8 +54,9 @@ module AdequateExposure
         ->{ model }
       end
 
-      normalize_non_proc_option :build do |params_method_name|
-        ->(scope){ scope.new(send(params_method_name)) }
+      normalize_non_proc_option :build_params do |value|
+        options[:build_params_method] = value
+        nil
       end
 
       normalize_non_proc_option :scope do |custom_scope|
@@ -75,7 +76,12 @@ module AdequateExposure
       option_value = options[name]
       return if Proc === option_value
       if option_value.present?
-        merge_lambda_option name, yield(option_value)
+        normalized_value = yield(option_value)
+        if normalized_value
+          merge_lambda_option name, normalized_value
+        else
+          options.delete name
+        end
       end
     end
 

data/lib/adequate_exposure/flow.rb

@@ -11,7 +11,7 @@ module AdequateExposure
       options.fetch(:name)
     end
 
-    %i[fetch find build scope model id decorate].each do |method_name|
+    %i[fetch find build build_params scope model id decorate].each do |method_name|
       define_method method_name do |*args|
         ivar_name = "@#{method_name}"
         return instance_variable_get(ivar_name) if instance_variable_defined?(ivar_name)
@@ -43,17 +43,15 @@ module AdequateExposure
     end
 
     def default_build(scope)
-      scope.new(exposure_params)
+      scope.new(build_params)
     end
 
     def default_decorate(instance)
       instance
     end
 
-    def exposure_params
-      params_method_name = "#{name}_params"
-
-      if controller.respond_to?(params_method_name, true)
+    def default_build_params
+      if controller.respond_to?(params_method_name, true) && !get_request?
         controller.send(params_method_name)
       else
         {}
@@ -62,6 +60,14 @@ module AdequateExposure
 
     private
 
+    def get_request?
+      controller.request.get?
+    end
+
+    def params_method_name
+      options.fetch(:build_params_method){ "#{name}_params" }
+    end
+
     def handle_action(name, *args)
       if options.key?(name)
         handle_custom_action(name, *args)

data/lib/adequate_exposure/version.rb

@@ -1,3 +1,3 @@
 module AdequateExposure
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/controller_spec.rb

@@ -18,10 +18,14 @@ describe AdequateExposure::Controller do
     end
   end
 
+  let(:request){ double("Request") }
   let(:controller){ controller_klass.new }
+  before{ allow(controller).to receive(:request){ request } }
 
-  def expose(*args, &block)
-    controller_klass.expose(*args, &block)
+  %i[expose expose!].each do |method_name|
+    define_method method_name do |*args, &block|
+      controller_klass.send method_name, *args, &block
+    end
   end
 
   context "getter/setter methods" do
@@ -46,7 +50,7 @@ describe AdequateExposure::Controller do
   context ".expose!" do
     it "supports eager expose" do
       expect(controller_klass).to receive(:before_action).with(:thing)
-      controller_klass.expose! :thing
+      expose! :thing
     end
   end
 
@@ -106,21 +110,34 @@ describe AdequateExposure::Controller do
 
       after{ expect(controller.thing).to eq(thing) }
 
-      it "builds a new instance with empty hash when strong parameters method is not available" do
-        expose :thing
-        expect(Thing).to receive(:new).with({}).and_return(thing)
+      context "params method is not available" do
+        it "builds a new instance with empty hash" do
+          expose :thing
+          expect(Thing).to receive(:new).with({}).and_return(thing)
+        end
       end
 
-      it "builds a new instance with attributes when strong parameters method is available" do
-        expose :thing
-        expect(Thing).to receive(:new).with(foo: :bar).and_return(thing)
-        expect(controller).to receive(:thing_params).and_return(foo: :bar)
-      end
-
-      it "allows to specify strong parameters method name with a symbol passed to build option" do
-        expose :thing, build: :custom_params_method_name
-        expect(Thing).to receive(:new).with(foo: :bar).and_return(thing)
-        expect(controller).to receive(:custom_params_method_name).and_return(foo: :bar)
+      context "params method is available" do
+        it "ignores params on get request" do
+          expose :thing
+          expect(request).to receive(:get?).and_return(true)
+          expect(controller).not_to receive(:thing_params)
+          expect(Thing).to receive(:new).with({}).and_return(thing)
+        end
+
+        it "uses params method on non-get request" do
+          expose :thing
+          expect(request).to receive(:get?).and_return(false)
+          expect(Thing).to receive(:new).with(foo: :bar).and_return(thing)
+          expect(controller).to receive(:thing_params).and_return(foo: :bar)
+        end
+
+        it "can use custom params method name" do
+          expose :thing, build_params: :custom_params_method_name
+          expect(request).to receive(:get?).and_return(false)
+          expect(Thing).to receive(:new).with(foo: :bar).and_return(thing)
+          expect(controller).to receive(:custom_params_method_name).and_return(foo: :bar)
+        end
       end
     end
 
@@ -139,6 +156,10 @@ describe AdequateExposure::Controller do
       it "finds Thing if id param if provided" do
         controller.params.merge! id: 10
       end
+
+      it "prefers :thing_id to :id" do
+        controller.params.merge! id: 15, thing_id: 10
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adequate_exposure
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Pavel Pravosud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties