action_controller-parents 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b65eaacaa3167066442862b1ddf2edf7b58bff93
-  data.tar.gz: 5e406910b949644849e180f97193ec5ec9c7a55a
+  metadata.gz: 9955a18a42cd44581214f13676cb0ca148311877
+  data.tar.gz: 18f2101a9eaef3bdda29dcde745ae5c766aaac67
 SHA512:
-  metadata.gz: 54e3bdff2ac724499270869e2e315240e2cd1a82a16433744f7757d099118ef7d66696ab93e8f7993729bbb57b0edbf2b565e993910bb28d1daeda23ee8e6b3d
-  data.tar.gz: f5003c8598a8a21b824e1a81b006acaeca8ae40d10c8703f614859576226d127d63400286b44d8415c3cc2e3e4edb8c3d6315f087bb03e2f98e50b68b90ab7ea
+  metadata.gz: e93d6c25fb728d824831b31d15eab756ea205d11599653734dcf5056561599c4eb9be0be387ac98185a5225cbd8ad7655c50bcc8e92e89080d710fa82b59fb05
+  data.tar.gz: b733a9c41bdc93db5ab24916061eaaf41d65f7652fd240dc26d8b79e813b8aacb123d04dbb28bae52e6d1e8d6ca5600b3731d3c5c91eb78a970048d28e0d0668

data/benchmarks/parent_resource.rb

@@ -0,0 +1,26 @@
+require 'bundler'
+Bundler.require
+
+require 'benchmark'
+require 'action_controller/parents'
+
+class Model
+  class << self
+    def find(id)
+    end
+  end
+end
+class Group < Model; end
+class Event < Model; end
+
+finder = ActionController::Parents::Finder.new(Group, Event)
+
+n = 100_000
+params =  { stuff: { x: 1, y: 2 }, data: 'bla', event_id: 1 }
+Benchmark.bm(20) do |x|
+  x.report("parent_resource")   {
+    n.times do
+      finder.parent_resource(params)
+    end
+  }
+end

data/gemfiles/activesupport_3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    action_controller-parents (0.2.1)
+    action_controller-parents (0.2.2)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/activesupport_4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    action_controller-parents (0.2.1)
+    action_controller-parents (0.2.2)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/activesupport_4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    action_controller-parents (0.2.1)
+    action_controller-parents (0.2.2)
       activesupport (>= 3.0.0)
 
 GEM

data/lib/action_controller/parents.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/string/conversions'
 module ActionController
   # To be included in a controller.
   #
-  # Creates a `parent_resource` method, which will call `find_by_id!` using an id
+  # Creates a `parent_resource` method, which will call `find` using an id
   # found in the params hash.
   #
   # @example Organization and Group as parents
@@ -29,15 +29,9 @@ module ActionController
     private
 
     def initialize(*resource_classes)
-      @finder = Finder.new(resource_classes)
-    end
-
-    def included(base)
-      finder = @finder
-      base.class_eval do
-        define_method :parent_resource do
-          finder.parent_resource(params)
-        end
+      finder = Finder.new(resource_classes)
+      define_method :parent_resource do
+        finder.parent_resource(params)
       end
     end
   end # Parents

data/lib/action_controller/parents/finder.rb

@@ -14,25 +14,35 @@ module ActionController
       # @param [Class<ActiveRecord::Base>] parent_resource_classes
       def initialize(*parent_resource_classes)
         @parent_resource_classes = parent_resource_classes.flatten
-        @parent_resource_classes.each do |c|
-          unless c.respond_to?(FIND_METHOD)
-            fail NoFindMethodError,
-              "Parent resource #{c.name} doesn't respond to #{FIND_METHOD.inspect}"
-          end
-        end
+        assert_responds_to_find_method(@parent_resource_classes)
         setup_primary_keys
       end
 
-      def parent_resource(hsh)
-        key = matched_key(hsh)
+      # Finds the parent resources from the ActionController params hash
+      # @params [Hash] params
+      # @return [ActiveRecord::Base, nil]
+      def parent_resource(params)
+        key = find_primary_key(params)
         return nil unless key
-        class_by_key(key).public_send(FIND_METHOD, hsh[key])
+        class_by_key(key).public_send(FIND_METHOD, params.fetch(key))
       end
 
       private
 
-      def matched_key(hsh)
-        hsh.keys.detect { |key| valid_primary_key?(key) }
+      def assert_responds_to_find_method(classes)
+        res = classes.find { |c| !c.respond_to?(FIND_METHOD) }
+        unless res.nil?
+          fail NoFindMethodError,
+            "Parent resource #{res} doesn't respond to #{FIND_METHOD.inspect}"
+        end
+      end
+
+      # Looks for the primary key of any of the parent resources in the params
+      # hash
+      # @params [Hash] params
+      # @return [String, nil]
+      def find_primary_key(params)
+        params.keys.detect { |key| valid_primary_key?(key) }
       end
 
       def valid_primary_key?(key)

data/lib/action_controller/parents/version.rb

@@ -1,5 +1,5 @@
 module ActionController
   class Parents < Module
-    VERSION = "0.2.1".freeze
+    VERSION = '0.2.2'.freeze
   end
 end

data/spec/unit/action_controller-parents/finder_spec.rb

@@ -1,13 +1,16 @@
 require 'spec_helper'
 
 describe ActionController::Parents::Finder do
-  let(:nested_resource) { described_class.new(parent_resources) }
+  let(:finder) { described_class.new(parent_resources) }
   let(:parent_resources) { [] }
 
   it "doesn't allow classes which don't respond to :find method" do
     expect {
       described_class.new(String)
-    }.to raise_error(ActionController::Parents::NoFindMethodError)
+    }.to raise_error(
+      ActionController::Parents::NoFindMethodError,
+      "Parent resource String doesn't respond to :find",
+    )
   end
 
   describe '#parent_resource' do
@@ -28,7 +31,7 @@ describe ActionController::Parents::Finder do
   end
 
   describe '#primary_keys' do
-    subject { nested_resource.primary_keys }
+    subject { finder.primary_keys }
     let(:parent_resources) { [DummyModel] }
 
     it 'sets the keys based on the parent resources' do
@@ -55,7 +58,7 @@ describe ActionController::Parents::Finder do
     end
 
     describe '#primary_keys' do
-      subject { nested_resource.primary_keys }
+      subject { finder.primary_keys }
       let(:parent_resources) { [DummyModel, Nested::NestedDummyModel] }
 
       it 'sets the keys based on the parent resources' do

data/spec/unit/action_controller-parents_spec.rb

@@ -2,24 +2,29 @@ require 'spec_helper'
 
 describe ActionController::Parents do
   describe 'when included' do
-    let(:dummy) { @controller_class.new }
+    let(:controller) { @controller_class.new }
 
     before(:each) do
       @controller_class = Class.new do
-        include ActionController::Parents.new
+        include ActionController::Parents.new(DummyModel)
+        attr_accessor :params
       end
     end
 
-    it "create the #parent_resource" do
-      expect(dummy).to respond_to(:parent_resource)
+    it "create the #parent_resource method" do
+      expect(controller).to respond_to(:parent_resource)
     end
 
     describe '#parent_resource' do
       it 'deletegates to an instance of Finder' do
-        args = []
-        allow(dummy).to receive(:params) { args }
-        expect_any_instance_of(described_class::Finder).to receive(:parent_resource).with(args)
-        dummy.parent_resource
+        controller.params = { data: 'bla' }
+        expect_any_instance_of(described_class::Finder).to receive(:parent_resource).with(controller.params)
+        controller.parent_resource
+      end
+
+      it 'returns the result' do
+        controller.params = { dummy_model_id: 1 }
+        expect(controller.parent_resource).to be_a(DummyModel)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_controller-parents
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Maarten Claes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,7 @@ files:
 - README.md
 - Rakefile
 - action_controller-parents.gemspec
+- benchmarks/parent_resource.rb
 - gemfiles/activesupport_3.gemfile
 - gemfiles/activesupport_3.gemfile.lock
 - gemfiles/activesupport_4.2.gemfile