jcontroller 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5a65c45169a29498afb0d1fa3152be24a82fc07
-  data.tar.gz: 2d0ddb08cfe971e85e0231e1c0c1584ad6857b50
+  metadata.gz: 22c4aaa4a7e3d6508cdfbfd704f751a684a228df
+  data.tar.gz: 91bf54f58ab80341995d6e5313ba1224956c772b
 SHA512:
-  metadata.gz: e398e233d3536d856247931d313df6deacca0f1e2782121c591aeebb86391b2e0e0c36c7cf581fb2a45622989a1c3ba9fe1e0a03f5674587954f563d32b27211
-  data.tar.gz: be60e2c9a7d95c1b37b8240ed2d37d12326ed960936cfed019bb8f5d173d17dae88d422d3d79ad79cf6f26a6c3e907a88972b5b3a8a59f0a7d528b8f76e93a62
+  metadata.gz: 3bd0f42b2f358a68c6a5a9b7bee0ada5e31a6aed48522e0cd9d78a09246b84ad189e9083ad89d6dfdf40317255d0f910ca2565b48786321ef103388f6cb29570
+  data.tar.gz: 2e9d1744c7b07e75ca7c03a944a517ea565148dac4c2d68767302ae9ae73877f8131614abd4a112ca19b187263f13d790a24ddda7f2fe12181708c7b3186d1c5

data/app/assets/javascripts/jcontroller.js

@@ -19,22 +19,24 @@ var Jcontroller = {
                     },
 
                     execute_action: function() {
-                        if ($.isPlainObject(this[this.format])) {
-                            this.execute_post_order_filter('before');
-                            this.execute_post_order_filter(this.action_name);
-                            this.execute_pre_order_filter('after');
-                        }
+                        this.execute_post_order_filter('before');
+                        this.execute_post_order_filter(this.action_name);
+                        this.execute_pre_order_filter('after');
                     },
                     execute_post_order_filter: function(filter) {
                         if (Jcontroller.present(this.parent())) { this.parent().execute_post_order_filter(filter); }
-                        this.execute_filter(this[this.format][filter]);
+                        this.execute_filter(filter);
                     },
                     execute_pre_order_filter: function(filter) {
-                        this.execute_filter(this[this.format][filter]);
+                        this.execute_filter(filter);
                         if (Jcontroller.present(this.parent())) { this.parent().execute_pre_order_filter(filter); }
                     },
                     execute_filter: function(filter) {
-                        if ($.isFunction(filter)) { $.proxy(filter, this)(this.params, this.state); }
+                        var f = this[this.format];
+                        if (!$.isPlainObject(f)) { return; }
+                        f = f[filter];
+                        if (!$.isFunction(f)) { return; }
+                        $.proxy(f, this)(this.params, this.state);
                     }
                 },
                 definition

data/lib/jcontroller/version.rb

@@ -1,3 +1,3 @@
 module Jcontroller
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/spec/fake_app/app/assets/javascripts/jcontrollers/empty_parents_jcontroller.js

@@ -0,0 +1,2 @@
+Jcontroller.create('empty');
+create_routes('empty_parents', { parent_path: "empty" });

data/spec/fake_app/app/controllers.rb

@@ -43,6 +43,11 @@ class SuperusersController < UsersController
   end
 end
 
+class EmptyParentsController < ApplicationController
+  def index
+  end
+end
+
 module Admin
   class UsersController < ApplicationController
     def index

data/spec/fake_app/routes.rb

@@ -14,6 +14,7 @@ FakeApp::Application.routes.draw do
     end
   end
   resources :superusers, :only => %w[index]
+  resources :empty_parents, :only => %w[index]
 
   namespace :admin do
     resources :users, :only => %w[index]

data/spec/features/jcontroller_spec.rb

@@ -61,6 +61,10 @@ feature 'invoke correct filter', :js => true do
     visit superusers_path
     test_elements filters('superusers', "index", %w[application users])
   end
+  scenario 'with empty parent controller' do
+    visit empty_parents_path
+    test_elements filters('empty_parents', "index")
+  end
 
   scenario 'with no action defined' do
     visit no_action_users_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jcontroller
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Steve Chung
@@ -165,11 +165,13 @@ files:
 - spec/fake_app/app/assets/javascripts/application.js
 - spec/fake_app/app/assets/javascripts/jcontrollers/admin/admins_jcontroller.js
 - spec/fake_app/app/assets/javascripts/jcontrollers/application_jcontroller.js
+- spec/fake_app/app/assets/javascripts/jcontrollers/empty_parents_jcontroller.js
 - spec/fake_app/app/assets/javascripts/jcontrollers/superusers_jcontroller.js
 - spec/fake_app/app/assets/javascripts/jcontrollers/users_jcontroller.js
 - spec/fake_app/app/controllers.rb
 - spec/fake_app/app/helpers.rb
 - spec/fake_app/app/views/admin/users/index.html.erb
+- spec/fake_app/app/views/empty_parents/index.html.erb
 - spec/fake_app/app/views/layouts/application.html.erb
 - spec/fake_app/app/views/superusers/index.html.erb
 - spec/fake_app/app/views/users/action_and_parameters.html.erb
@@ -218,11 +220,13 @@ test_files:
 - spec/fake_app/app/assets/javascripts/application.js
 - spec/fake_app/app/assets/javascripts/jcontrollers/admin/admins_jcontroller.js
 - spec/fake_app/app/assets/javascripts/jcontrollers/application_jcontroller.js
+- spec/fake_app/app/assets/javascripts/jcontrollers/empty_parents_jcontroller.js
 - spec/fake_app/app/assets/javascripts/jcontrollers/superusers_jcontroller.js
 - spec/fake_app/app/assets/javascripts/jcontrollers/users_jcontroller.js
 - spec/fake_app/app/controllers.rb
 - spec/fake_app/app/helpers.rb
 - spec/fake_app/app/views/admin/users/index.html.erb
+- spec/fake_app/app/views/empty_parents/index.html.erb
 - spec/fake_app/app/views/layouts/application.html.erb
 - spec/fake_app/app/views/superusers/index.html.erb
 - spec/fake_app/app/views/users/action_and_parameters.html.erb