controller_setter_pattern 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56f77be87b831737dd8d2dde96ac059a77c224b2
-  data.tar.gz: cded750410e8995f62f6885c12d086dd1036800f
+  metadata.gz: 7f49555840cc0afe1e637c6f3a370847a1542613
+  data.tar.gz: 84ad014cc62bbbedbe39f1755e269dbb09d9c129
 SHA512:
-  metadata.gz: eccec7b8481594659362b55b4cf91ee1778d998bb88334041d366bdab9e2e753d9637ea4c58b0fe74677fb17d9c91025b74e3da519a7d57789916484179133d1
-  data.tar.gz: adfa269ee3f7bde2a8bdd351cd26cb0393a390abfc3e833a2e4312a37e322834e3a50ebb787c5eb64d64b130a918de7c70f05153a50baa6d2c27b74490a9b749
+  metadata.gz: 4210d5c2f3f7977e77d10c1f4fc93390d7d23785f0a38f332f6e47e96153793e1675f4483c78e026203bfbc922d038f3381ebca1653baa950c24230d8f0ead55
+  data.tar.gz: cd47bc1346719a2934c5cb377d92b41a5afa56c7c0cbc3ffe3422195085bcc5fb64b276c209448e1c9eb914a0689cb6ab906fdfa19f10c8fee5e4c87fc2249a5

data/Gemfile

@@ -2,6 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails', '~> 4.2.1'
+gem 'rails', '~> 4.2.5'
 
-gem 'codeclimate-test-reporter', '~> 0.4.7', group: :test
+gem 'codeclimate-test-reporter', '~> 0.4.8', group: :test

data/controller_setter_pattern.gemspec

@@ -17,13 +17,13 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'rspec', '~> 3.2.0'
-  s.add_development_dependency 'rspec-rails', '~> 3.2.1'
+  s.add_development_dependency 'rspec', '~> 3.4.0'
+  s.add_development_dependency 'rspec-rails', '~> 3.4.0'
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'database_cleaner', '~> 1.4.1'
+  s.add_development_dependency 'database_cleaner', '~> 1.5.1'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'actionpack', '~> 4.2.1'
-  s.add_development_dependency 'activesupport', '~> 4.2.1'
+  s.add_development_dependency 'actionpack', '~> 4.2.5'
+  s.add_development_dependency 'activesupport', '~> 4.2.5'
   s.add_development_dependency 'factory_girl_rails', '~> 4.5.0'
-  s.add_development_dependency 'faker', '~> 1.4.3'
+  s.add_development_dependency 'faker', '~> 1.6.1'
 end

data/lib/controller_setter_pattern/action_controller.rb

@@ -19,53 +19,71 @@ module ControllerSetterPattern
       end
 
       private
-        def _normalize_finder_params(finder_params)
-          finder_params = [finder_params] unless finder_params.is_a?(Array)
-          finder_params = finder_params.compact.uniq
-          finder_params.clear if finder_params.one? && finder_params.join.eql?('id')
-          finder_params
-        end
 
-        def _insert_setters(setters, options, callback_options)
-          setters.each do |setter|
-            before_action callback_options do |controller|
-              resource = _get_resource(setter, options[:model], options[:ancestor])
+      def _normalize_finder_params(finder_params)
+        finder_params = [finder_params] unless finder_params.is_a?(Array)
+        finder_params = finder_params.compact.uniq
+        finder_params.clear if finder_params.one? && finder_params.join.eql?('id')
+        finder_params
+      end
+
+      def _insert_setters(setters, options, callback_options)
+        setters.each do |setter|
+          before_action callback_options do |controller|
+            resource = _get_resource(setter, options[:model], options[:ancestor])
+            if _is_class_model_or_association_method?(resource)
               Array(options[:scope]).each { |s| resource = resource.send(s) } unless options[:scope].nil?
               values_for_find = _get_values_for_finder_params(setter, options[:finder_params])
               resource = resource.send(options[:finder_method], *values_for_find)
-              controller.instance_variable_set("@#{setter}".to_sym, resource)
             end
+            controller.instance_variable_set("@#{setter}".to_sym, resource)
           end
         end
+      end
     end
 
     private
-      def _get_resource(setter, model, ancestor)
-        if !ancestor.nil?
-          _get_ancestor_resource(setter, model, ancestor)
-        else
-          (!model.nil? && model.descends_from_active_record?) ? model : setter.to_s.camelize.constantize
-        end
+
+    def _get_resource(setter, model, ancestor)
+      if !ancestor.nil?
+        _get_ancestor_resource(setter, model, ancestor)
+      else
+        (!model.nil? && model.descends_from_active_record?) ? model : setter.to_s.camelize.constantize
       end
+    end
 
-      def _get_ancestor_resource(setter, model, ancestor)
-        if instance_variable_defined?("@#{ancestor}")
-          resource = instance_variable_get("@#{ancestor}")
-        else
-          model_class = ancestor.to_s.camelize.constantize
-          resource = model_class.find(params["#{model_class.name.underscore}_id".to_sym])
-        end
-        reflection_name = (model || setter).to_s.underscore.pluralize.to_sym
-        resource = resource.send(reflection_name) if resource.respond_to?(reflection_name)
+    def _get_ancestor_resource(setter, model, ancestor)
+      if instance_variable_defined?("@#{ancestor}")
+        resource = instance_variable_get("@#{ancestor}")
+      else
+        model_class = ancestor.to_s.camelize.constantize
+        resource = model_class.find(params["#{model_class.name.underscore}_id".to_sym])
       end
 
-      def _get_values_for_finder_params(setter, finder_params)
-        if finder_params.empty?
-          values_for_find = params["#{setter}_id".to_sym] || params[:id]
-        else
-          defaults = finder_params.inject({}) { |h, v| h.merge(v.to_s => nil) }
-          values_for_find = defaults.merge(params.permit(finder_params)).values
-        end
+      reflection = _get_reflection(resource.class, model || setter)
+      unless reflection.nil?
+        reflection_method = reflection.options[:as] || reflection.name
+        resource = resource.send(reflection_method) if resource.respond_to?(reflection_method)
       end
+    end
+
+    def _get_reflection(klass, assoc_class)
+      singular_name = assoc_class.to_s.underscore.singularize.to_sym
+      plural_name = assoc_class.to_s.underscore.pluralize.to_sym
+      klass.reflect_on_association(singular_name) || klass.reflect_on_association(plural_name)
+    end
+
+    def _is_class_model_or_association_method?(resource)
+      resource.is_a?(Class) || resource.class.ancestors.include?(ActiveRecord::Associations::CollectionProxy)
+    end
+
+    def _get_values_for_finder_params(setter, finder_params)
+      if finder_params.empty?
+        values_for_find = params["#{setter}_id".to_sym] || params[:id]
+      else
+        defaults = finder_params.inject({}) { |h, v| h.merge(v.to_s => nil) }
+        values_for_find = defaults.merge(params.permit(finder_params)).values
+      end
+    end
   end
 end

data/lib/controller_setter_pattern/version.rb

@@ -1,6 +1,6 @@
 module ControllerSetterPattern #:nodoc:
   MAJOR = 0
   MINOR = 1
-  PATCH = 1
+  PATCH = 2
   VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
 end

data/spec/controller_setter_pattern_spec.rb

@@ -68,4 +68,15 @@ describe OrdersController, type: :controller do
     xhr :get, :order_by_customer_date, customer_id: customer.id, order_date: customer.orders.last.order_date.to_date
     expect(assigns(:order)).to be_a(Order)
   end
+end
+
+describe AccountsController, type: :controller do
+  let(:supplier) { FactoryGirl.create(:supplier) }
+
+  context 'with ancestor' do
+    it 'finds an instance' do
+      get :show, supplier_id: supplier.id, id: supplier.account.id
+      expect(assigns(:account)).to be_a(Account)
+    end
+  end
 end

data/spec/factories.rb

@@ -22,4 +22,13 @@ FactoryGirl.define do
     customer
     order_date { Faker::Date.forward(90) }
   end
+
+  factory :supplier do
+    name { Faker::Company.name }
+    account { FactoryGirl.create(:account) }
+  end
+
+  factory :account do
+    account_number { Faker::Number.number(10) }
+  end
 end

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ require 'codeclimate-test-reporter'
 
 formatters = [SimpleCov::Formatter::HTMLFormatter]
 formatters << CodeClimate::TestReporter::Formatter if ENV['CODECLIMATE_REPO_TOKEN']
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[*formatters]
+SimpleCov.formatters = formatters
 SimpleCov.start
 
 require 'controller_setter_pattern'

data/spec/support/controllers.rb

@@ -45,4 +45,13 @@ class OrdersController < ActionController::Base
   def order_by_customer_date
     render json: @order
   end
+end
+
+class AccountsController < ActionController::Base
+  set :supplier
+  set :account, ancestor: :supplier
+
+  def show
+    render json: @account
+  end
 end

data/spec/support/models.rb

@@ -24,4 +24,12 @@ end
 
 class Order < ActiveRecord::Base
   belongs_to :customer
+end
+
+class Supplier < ActiveRecord::Base
+  has_one :account
+end
+
+class Account < ActiveRecord::Base
+  belongs_to :supplier
 end

data/spec/support/routes.rb

@@ -8,4 +8,6 @@ Rails.application.routes.draw do
   get 'customers/:customer_id/orders/:id' => 'orders#show'
   get 'customers/:customer_id/orders/:id/edit' => 'orders#edit', as: :edit
   get 'order_by_customer_date' => 'orders#order_by_customer_date'
+
+  get 'suppliers/:supplier_id/accounts/:id' => 'accounts#show'
 end

data/spec/support/schema.rb

@@ -20,4 +20,15 @@ ActiveRecord::Schema.define do
     t.datetime :order_date
     t.timestamps null: false
   end
+
+  create_table :suppliers, force: true do |t|
+    t.string :name
+    t.timestamps null: false
+  end
+
+  create_table :accounts, force: true do |t|
+    t.belongs_to :supplier, index: true
+    t.string :account_number
+    t.timestamps null: false
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: controller_setter_pattern
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Rodrigo Casara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.6.1
 description: Pattern for assign instance variables in controllers for use in views,
   etc.
 email:
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Pattern for assign instance variables in controllers for use in views, etc.