action_controller-parents 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79452af569dbcdc97e9125ee05c1945c91beca47
-  data.tar.gz: f7b94173c6ed88d398eac01d98834e3e1cd68b76
+  metadata.gz: b65eaacaa3167066442862b1ddf2edf7b58bff93
+  data.tar.gz: 5e406910b949644849e180f97193ec5ec9c7a55a
 SHA512:
-  metadata.gz: eb2b1a2b65ab8ca9aabf7124161304f4b29454317ceba135ae8bf1a289884f5cbd02bf1b23cd8df2e67760b2e1cc4374cecc4abeda9c34fcd7802864b5a2cea6
-  data.tar.gz: c057ff86098d70d25af5fb1f1121514e3cf227ee00755eae7c42d13c76b9bec3ce1f9c93a31de08eefe26f93fbc46f538919560eaf22c65a4d74386b5a47e50f
+  metadata.gz: 54e3bdff2ac724499270869e2e315240e2cd1a82a16433744f7757d099118ef7d66696ab93e8f7993729bbb57b0edbf2b565e993910bb28d1daeda23ee8e6b3d
+  data.tar.gz: f5003c8598a8a21b824e1a81b006acaeca8ae40d10c8703f614859576226d127d63400286b44d8415c3cc2e3e4edb8c3d6315f087bb03e2f98e50b68b90ab7ea

data/.travis.yml

@@ -1,9 +1,12 @@
 language: ruby
+sudo: false
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0
 gemfile:
   - gemfiles/activesupport_3.gemfile
   - gemfiles/activesupport_4.gemfile
+  - gemfiles/activesupport_4.2.gemfile
 script: "bundle exec rake spec"

data/Appraisals

@@ -5,3 +5,7 @@ end
 appraise "activesupport-4" do
   gem "activesupport", "4.0.0"
 end
+
+appraise "activesupport-4.2" do
+  gem "activesupport", "4.2.0"
+end

data/Rakefile

@@ -9,5 +9,5 @@ task :default => :spec
 
 desc 'Run mutation tests'
 task :mutant do
-  system 'bundle exec mutant --include lib --require "action_controller/parent" --use rspec ::ActionController::Parent*'
+  system 'bundle exec mutant --include lib --require "action_controller/parents" --use rspec ActionController::Parents*'
 end

data/action_controller-parents.gemspec

@@ -18,11 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "mutant", "~> 0.3.5"
-  spec.add_development_dependency "appraisal", "1.0.0.beta2"
+  spec.add_development_dependency "appraisal", "2.0.2"
 
   spec.add_dependency "activesupport", ">= 3.0.0"
 end

data/gemfiles/activesupport_3.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "activesupport", "3.0.0"
 
-gemspec :path=>".././"
+gemspec :path => "../"

data/gemfiles/activesupport_3.gemfile.lock

@@ -1,74 +1,33 @@
 PATH
-  remote: ..
+  remote: ../
   specs:
-    action_controller-parents (0.1.1)
+    action_controller-parents (0.2.1)
       activesupport (>= 3.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    abstract_type (0.0.7)
     activesupport (3.0.0)
-    adamantium (0.2.0)
-      ice_nine (~> 0.11.0)
-      memoizable (~> 0.4.0)
-    anima (0.2.0)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.1)
-      equalizer (~> 0.0.8)
-    appraisal (1.0.0.beta2)
+    appraisal (2.0.2)
       bundler
       rake
       thor (>= 0.14.0)
-    ast (1.1.0)
-    atomic (1.1.14)
-    concord (0.1.4)
-      adamantium (~> 0.1)
-      equalizer (~> 0.0.7)
-    descendants_tracker (0.0.3)
     diff-lcs (1.2.5)
-    equalizer (0.0.9)
-    ice_nine (0.11.0)
-    inflecto (0.0.2)
-    memoizable (0.4.0)
-      thread_safe (~> 0.1.3)
-    mutant (0.3.5)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.1)
-      anima (~> 0.2.0)
-      concord (~> 0.1.4)
-      descendants_tracker (~> 0.0.1)
-      equalizer (~> 0.0.7)
-      ice_nine (~> 0.9)
-      inflecto (~> 0.0.2)
-      parser (~> 2.1.4)
-      procto (~> 0.0.2)
-      rspec (~> 2.14.1)
-      unparser (~> 0.1.8)
-    parser (2.1.4)
-      ast (~> 1.1)
-      slop (~> 3.4, >= 3.4.5)
-    procto (0.0.2)
-    rake (10.1.1)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
-    slop (3.4.7)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    unparser (0.1.9)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.1)
-      concord (~> 0.1.4)
-      equalizer (~> 0.0.7)
-      parser (~> 2.1.0)
-      procto (~> 0.0.2)
+    rake (10.4.2)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    thor (0.19.1)
 
 PLATFORMS
   ruby
@@ -76,8 +35,7 @@ PLATFORMS
 DEPENDENCIES
   action_controller-parents!
   activesupport (= 3.0.0)
-  appraisal (= 1.0.0.beta2)
-  bundler (~> 1.3)
-  mutant (~> 0.3.5)
+  appraisal (= 2.0.2)
+  bundler (~> 1.8)
   rake
   rspec

data/gemfiles/activesupport_4.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "4.2.0"
+
+gemspec :path => "../"

data/gemfiles/activesupport_4.2.gemfile.lock

@@ -0,0 +1,52 @@
+PATH
+  remote: ../
+  specs:
+    action_controller-parents (0.2.1)
+      activesupport (>= 3.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.0)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    appraisal (2.0.2)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    json (1.8.3)
+    minitest (5.7.0)
+    rake (10.4.2)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  action_controller-parents!
+  activesupport (= 4.2.0)
+  appraisal (= 2.0.2)
+  bundler (~> 1.8)
+  rake
+  rspec

data/gemfiles/activesupport_4.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "activesupport", "4.0.0"
 
-gemspec :path=>".././"
+gemspec :path => "../"

data/gemfiles/activesupport_4.gemfile.lock

@@ -1,83 +1,43 @@
 PATH
-  remote: ..
+  remote: ../
   specs:
-    action_controller-parents (0.1.1)
+    action_controller-parents (0.2.1)
       activesupport (>= 3.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    abstract_type (0.0.7)
     activesupport (4.0.0)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    adamantium (0.2.0)
-      ice_nine (~> 0.11.0)
-      memoizable (~> 0.4.0)
-    anima (0.2.0)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.1)
-      equalizer (~> 0.0.8)
-    appraisal (1.0.0.beta2)
+    appraisal (2.0.2)
       bundler
       rake
       thor (>= 0.14.0)
-    ast (1.1.0)
-    atomic (1.1.14)
-    concord (0.1.4)
-      adamantium (~> 0.1)
-      equalizer (~> 0.0.7)
-    descendants_tracker (0.0.3)
     diff-lcs (1.2.5)
-    equalizer (0.0.9)
-    i18n (0.6.9)
-    ice_nine (0.11.0)
-    inflecto (0.0.2)
-    memoizable (0.4.0)
-      thread_safe (~> 0.1.3)
+    i18n (0.7.0)
     minitest (4.7.5)
-    multi_json (1.8.4)
-    mutant (0.3.5)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.1)
-      anima (~> 0.2.0)
-      concord (~> 0.1.4)
-      descendants_tracker (~> 0.0.1)
-      equalizer (~> 0.0.7)
-      ice_nine (~> 0.9)
-      inflecto (~> 0.0.2)
-      parser (~> 2.1.4)
-      procto (~> 0.0.2)
-      rspec (~> 2.14.1)
-      unparser (~> 0.1.8)
-    parser (2.1.4)
-      ast (~> 1.1)
-      slop (~> 3.4, >= 3.4.5)
-    procto (0.0.2)
-    rake (10.1.1)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
-    slop (3.4.7)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
-    unparser (0.1.9)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.1)
-      concord (~> 0.1.4)
-      equalizer (~> 0.0.7)
-      parser (~> 2.1.0)
-      procto (~> 0.0.2)
+    multi_json (1.11.2)
+    rake (10.4.2)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (0.3.44)
 
 PLATFORMS
   ruby
@@ -85,8 +45,7 @@ PLATFORMS
 DEPENDENCIES
   action_controller-parents!
   activesupport (= 4.0.0)
-  appraisal (= 1.0.0.beta2)
-  bundler (~> 1.3)
-  mutant (~> 0.3.5)
+  appraisal (= 2.0.2)
+  bundler (~> 1.8)
   rake
   rspec

data/lib/action_controller/parents/finder.rb

@@ -1,5 +1,7 @@
 module ActionController
   class Parents
+    NoFindMethodError = Class.new(StandardError)
+
     # Used to find the parent resource
     #
     # @api private
@@ -7,34 +9,44 @@ module ActionController
     class Finder
       attr_reader :parent_resource_classes, :primary_keys
 
+      FIND_METHOD = :find
+
       # @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
         setup_primary_keys
       end
 
       def parent_resource(hsh)
         key = matched_key(hsh)
         return nil unless key
-        to_resource_class(key).find_by_id!(hsh[key])
+        class_by_key(key).public_send(FIND_METHOD, hsh[key])
       end
 
-      def to_resource_class(key)
-        key.to_s.sub(/_id$/, '').classify.constantize
-      end
+      private
 
       def matched_key(hsh)
         hsh.keys.detect { |key| valid_primary_key?(key) }
       end
 
       def valid_primary_key?(key)
-        primary_keys.include?(key.to_s)
+        !class_by_key(key).nil?
+      end
+
+      def class_by_key(key)
+        primary_keys[key.to_s]
       end
 
       def setup_primary_keys
-        @primary_keys = parent_resource_classes.map { |klass|
-          klass.to_s.underscore.concat('_id')
-        }
+        @primary_keys = parent_resource_classes.each_with_object({}) do |klass, hsh|
+          hsh[klass.to_s.foreign_key] = klass
+        end
       end
     end
   end

data/lib/action_controller/parents/version.rb

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

data/spec/spec_helper.rb

@@ -1,2 +1,3 @@
 require 'action_controller/parents'
 require_relative 'support/dummy_model'
+require_relative 'support/nested/nested_dummy_model'

data/spec/support/dummy_model.rb

@@ -1,5 +1,5 @@
 class DummyModel
-  def self.find_by_id!(id)
+  def self.find(id)
     DummyModel.new
   end
 end

data/spec/support/nested/nested_dummy_model.rb

@@ -0,0 +1,7 @@
+module Nested
+  class NestedDummyModel
+    def self.find(id)
+      NestedDummyModel.new
+    end
+  end
+end

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

@@ -4,12 +4,18 @@ describe ActionController::Parents::Finder do
   let(:nested_resource) { 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)
+  end
+
   describe '#parent_resource' do
     subject { described_class.new(DummyModel).parent_resource(params) }
     let(:params) { { :dummy_model_id => 1 } }
 
-    it 'calls find_by_id! on the found class' do
-      expect(DummyModel).to receive(:find_by_id!).with(1)
+    it 'calls :find method on the found class' do
+      expect(DummyModel).to receive(:find).with(1)
       subject
     end
 
@@ -21,21 +27,41 @@ describe ActionController::Parents::Finder do
     end
   end
 
-  describe '#to_resource_class' do
-    subject { described_class.new(DummyModel).to_resource_class(param_key) }
-    let(:param_key) { :dummy_model_id }
+  describe '#primary_keys' do
+    subject { nested_resource.primary_keys }
+    let(:parent_resources) { [DummyModel] }
 
-    it 'transforms the key to a class' do
-      expect(subject).to eq DummyModel
+    it 'sets the keys based on the parent resources' do
+      expect(subject).to eq({ "dummy_model_id" => DummyModel })
     end
   end
 
-  describe '#primary_keys' do
-    subject { nested_resource.primary_keys }
-    let(:parent_resources) { [String, Integer] }
+  describe "works with namespaced class" do
+    describe "#parent_resource" do
+      subject { described_class.new(Nested::NestedDummyModel).parent_resource(params) }
+      let(:params) { { :nested_dummy_model_id => 1 } }
 
-    it 'sets the keys based on the parent resources' do
-      expect(subject).to eq %w(string_id integer_id)
+      it 'calls :find method on the found class' do
+        expect(Nested::NestedDummyModel).to receive(:find).with(1)
+        subject
+      end
+
+      context 'when class not found' do
+        let(:params) { { :random_model_id => 1 } }
+        it 'returns nil' do
+          expect(subject).to be_nil
+        end
+      end
+    end
+
+    describe '#primary_keys' do
+      subject { nested_resource.primary_keys }
+      let(:parent_resources) { [DummyModel, Nested::NestedDummyModel] }
+
+      it 'sets the keys based on the parent resources' do
+        expect(subject).to eq({ "dummy_model_id" => DummyModel, "nested_dummy_model_id" => Nested::NestedDummyModel })
+      end
     end
+
   end
 end

metadata

@@ -1,97 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: action_controller-parents
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Maarten Claes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mutant
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: Easily access parent resources
@@ -101,10 +87,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - Appraisals
 - Gemfile
 - LICENSE.txt
@@ -113,6 +99,8 @@ files:
 - action_controller-parents.gemspec
 - gemfiles/activesupport_3.gemfile
 - gemfiles/activesupport_3.gemfile.lock
+- gemfiles/activesupport_4.2.gemfile
+- gemfiles/activesupport_4.2.gemfile.lock
 - gemfiles/activesupport_4.gemfile
 - gemfiles/activesupport_4.gemfile.lock
 - lib/action_controller/parents.rb
@@ -121,6 +109,7 @@ files:
 - lib/action_controller/parents/version.rb
 - spec/spec_helper.rb
 - spec/support/dummy_model.rb
+- spec/support/nested/nested_dummy_model.rb
 - spec/unit/action_controller-parents/finder_spec.rb
 - spec/unit/action_controller-parents/methods_spec.rb
 - spec/unit/action_controller-parents_spec.rb
@@ -134,23 +123,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Easily access parent resources
 test_files:
 - spec/spec_helper.rb
 - spec/support/dummy_model.rb
+- spec/support/nested/nested_dummy_model.rb
 - spec/unit/action_controller-parents/finder_spec.rb
 - spec/unit/action_controller-parents/methods_spec.rb
 - spec/unit/action_controller-parents_spec.rb