adequate_exposure 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b88489e2058c7c2fba7667cdc33d64f165b110c
-  data.tar.gz: c20dc0f0cc013ff4eccdd7545e1a07ee94fc46c7
+  metadata.gz: c8ab37daff9fc8399d3a3064a25281e230c8dbad
+  data.tar.gz: 6a904e6c25efc1ba0d761f56a29410ed6f6523ab
 SHA512:
-  metadata.gz: dd4ff215f7602dd2ce22f1029047d379b8e25180ae8483e1dc963d7a9ea669fe1a3b3e788e8f12d0685e906338d8b748aeac482ce5abfab6c5313bb149ffefbd
-  data.tar.gz: d5b6b9e3a051f099dd1fa8e30d81cf3a92dc96089f1c664e1a20b77c12065c7d351247cd13ad8546559324e88dd7917ca121da0203d8b154b382ad8cb029278f
+  metadata.gz: ef93b26d40c676dd4b0b7431dfb91fa1968012965d12b84974704c656c8e028e69f59deda1d150d83a45368a8942a2d9306536c7a9cf537bd126ea1c4e2695cb
+  data.tar.gz: 1cc709f6e906d563cfbfe3fd3ea23e1fe318e3ea9970d4f7bd78d26ab05b00d783489b0eaa0778085d3aedc8c5936e269f6b1962db49c2e4edb7420234a991d7

data/README.md

@@ -109,8 +109,14 @@ Or if you (like me) absolutely hate parens in side-effect methods:
 expose :thing, ->{ get_thing_some_way_or_another }
 ```
 
-There is another shortcut that allows you to redefine the entire fetch block with
-less code:
+or even shorter
+
+```ruby
+expose :thing, :get_thing_some_way_or_another
+```
+
+There is another shortcut that allows you to redefine the entire fetch block
+with less code:
 
 ```ruby
 expose :comments, from: :post
@@ -137,8 +143,8 @@ But nothing is stopping you from throwing in any arbitrary code:
 expose :thing, id: ->{ 42 }
 ```
 
-Passing lambdas might not always be fun, so here are a couple of shortcuts that could
-help make life easier.
+Passing lambdas might not always be fun, so here are a couple of shortcuts that
+could help make life easier.
 
 ```ruby
 expose :thing, id: :custom_thing_id
@@ -178,8 +184,8 @@ expose :thing, find_by: :slug
 
 ### `build`
 
-When an ID is not present, Adequate Exposure tries to build an object for you. By
-default, it behaves like this:
+When an ID is not present, Adequate Exposure tries to build an object for you.
+By default, it behaves like this:
 
 ```ruby
 expose :thing, build: ->(thing_params, scope){ scope.new(thing_params) }
@@ -189,8 +195,9 @@ expose :thing, build: ->(thing_params, scope){ scope.new(thing_params) }
 
 These options are responsible for calulating params before passing them to the
 build step. The default behavior was modeled with Strong Parameters in mind and
-is somewhat smart: it calls the `thing_params` controller method if it's available
-and the request method it not `GET`. In all other cases it produces an empty hash.
+is somewhat smart: it calls the `thing_params` controller method if it's
+available and the request method is not `GET`. In all other cases it produces
+an empty hash.
 
 You can easily specify which controller method you want it to call instead of
 `thing_params`, or just provide your own logic:
@@ -255,7 +262,7 @@ expose :thing, decorate: ->(thing){ ThingDecorator.new(thing) }
 
 ## `exposure_config`
 
-You can pre-save some configuration using `exposure_config` method reuse it
+You can pre-save some configuration with `exposure_config` method to reuse it
 later.
 
 ```ruby

data/adequate_exposure.gemspec

@@ -1,5 +1,4 @@
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "adequate_exposure/version"
+require File.expand_path("../lib/adequate_exposure/version", __FILE__)
 
 Gem::Specification.new do |spec|
   spec.name         = "adequate_exposure"

data/lib/adequate_exposure/exposure.rb

@@ -41,6 +41,7 @@ module AdequateExposure
     end
 
     def normalize_options
+      normalize_fetch_option
       normalize_with_option
       normalize_id_option
       normalize_model_option
@@ -51,6 +52,12 @@ module AdequateExposure
       normalize_find_by_option
     end
 
+    def normalize_fetch_option
+      normalize_non_proc_option :fetch do |method_name|
+        ->{ send(method_name) }
+      end
+    end
+
     def normalize_find_by_option
       if find_by = options.delete(:find_by)
         merge_lambda_option :find, ->(id, scope){ scope.find_by!(find_by => id) }

data/lib/adequate_exposure/flow.rb

@@ -1,14 +1,11 @@
 module AdequateExposure
   class Flow
-    attr_reader :controller, :options
-    delegate :params, to: :controller
+    attr_reader :controller, :options, :name
 
     def initialize(controller, options)
-      @controller, @options = controller, options.with_indifferent_access
-    end
-
-    def name
-      options.fetch(:name)
+      @controller = controller
+      @options = options
+      @name = options.fetch(:name)
     end
 
     %w[fetch find build build_params scope model id decorate].each do |method_name|
@@ -28,7 +25,12 @@ module AdequateExposure
     end
 
     def default_id
-      params["#{name}_id"] || params[:id]
+      params_id_key_candidates.each do |key|
+        value = params[key]
+        return value if value.present?
+      end
+
+      nil
     end
 
     def default_scope(model)
@@ -61,6 +63,8 @@ module AdequateExposure
 
     private
 
+    delegate :params, to: :controller
+
     def get_request?
       controller.request.get?
     end
@@ -87,5 +91,13 @@ module AdequateExposure
         fail ArgumentError, "Can't handle #{name.inspect} => #{value.inspect} option"
       end
     end
+
+    def params_id_key_candidates
+      [ "#{model.name.underscore}_id", "#{name}_id", "id" ].uniq
+    end
+
+    def model_param_key
+      model.name.underscore
+    end
   end
 end

data/lib/adequate_exposure/version.rb

@@ -1,3 +1,3 @@
 module AdequateExposure
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/controller_spec.rb

@@ -71,6 +71,7 @@ describe AdequateExposure::Controller do
         exposure_config :sluggable, find_by: :slug
         exposure_config :weird_id_name, id: :check_this_out
         exposure_config :another_id_name, id: :whee
+        exposure_config :multi, find_by: :slug, id: :check_this_out
         controller.params.merge! check_this_out: "foo", whee: "wut"
       end
 
@@ -90,6 +91,16 @@ describe AdequateExposure::Controller do
         expose :thing, with: [:another_id_name, :weird_id_name]
         expect(Thing).to receive(:find).with("wut").and_return(thing)
       end
+
+      it "can apply multiple options in a config" do
+        expose :thing, with: :multi
+        expect(Thing).to receive(:find_by!).with(slug: "foo").and_return(thing)
+      end
+
+      it "applies multiple configs with multiple options in a correct order" do
+        expose :thing, with: [:another_id_name, :multi]
+        expect(Thing).to receive(:find_by!).with(slug: "wut").and_return(thing)
+      end
     end
   end
 
@@ -131,6 +142,14 @@ describe AdequateExposure::Controller do
     end
   end
 
+  context "passing fetch block as a symbol" do
+    it "is equivalent to passing a block alling controller method" do
+      expose :thing, :calculate_thing_in_controller
+      expect(controller).to receive(:calculate_thing_in_controller).and_return(42)
+      expect(controller.thing).to eq(42)
+    end
+  end
+
   context "redefine fetch" do
     before do
       expose :thing, fetch: ->{ compute_thing }
@@ -187,22 +206,21 @@ describe AdequateExposure::Controller do
 
     context "find" do
       before do
-        expose :thing
-        expect(Thing).to receive(:find).with(10)
+        expose :thing, model: :different_thing
+        expect(DifferentThing).to receive(:find).with(10)
       end
 
       after{ controller.thing }
 
-      it "finds Thing if thing_id param is provided" do
-        controller.params.merge! thing_id: 10
+      it "checks params[:different_thing_id] first" do
+        controller.params.merge! different_thing_id: 10, thing_id: 11, id: 12
       end
-
-      it "finds Thing if id param if provided" do
-        controller.params.merge! id: 10
+      it "checks params[:thing_id] second" do
+        controller.params.merge! thing_id: 10, id: 11
       end
 
-      it "prefers :thing_id to :id" do
-        controller.params.merge! id: 15, thing_id: 10
+      it "checks params[:id] in the end" do
+        controller.params.merge! id: 10
       end
     end
   end

data/spec/support/rails_app.rb

@@ -24,11 +24,11 @@ end
 class Bird
 end
 
-class ApplicationConroller < ActionController::Base
+class ApplicationController < ActionController::Base
   include Rails.application.routes.url_helpers
 end
 
-class BirdsController < ApplicationConroller
+class BirdsController < ApplicationController
   expose :bird
 
   def show

metadata

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