jcontroller 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22c4aaa4a7e3d6508cdfbfd704f751a684a228df
-  data.tar.gz: 91bf54f58ab80341995d6e5313ba1224956c772b
+  metadata.gz: dd4eddc629591228381b3f2e89830d0b4dfad727
+  data.tar.gz: e9e32d5f448c8d123120da86e1ccb90b05024675
 SHA512:
-  metadata.gz: 3bd0f42b2f358a68c6a5a9b7bee0ada5e31a6aed48522e0cd9d78a09246b84ad189e9083ad89d6dfdf40317255d0f910ca2565b48786321ef103388f6cb29570
-  data.tar.gz: 2e9d1744c7b07e75ca7c03a944a517ea565148dac4c2d68767302ae9ae73877f8131614abd4a112ca19b187263f13d790a24ddda7f2fe12181708c7b3186d1c5
+  metadata.gz: 75409726a27d522e8f362def93c1bec0bb4b970dc0e049f91172ce3657f54e95105b4295631b8478771d53fc44499059c7120d29fa4d49aebdb40dbadf8c5ae6
+  data.tar.gz: 96cdec26675bc6f59096186803ffb9ce266c9befb065e7c2e1e1082b5ae7d00c525c22496059601ba46348900ce3ba9e989e9a61cabc90aba28b1e2897eee437

data/lib/jcontroller/controller_helpers.rb

@@ -52,9 +52,11 @@ module Jcontroller
     end
 
     def jcontroller_params(action)
-      with_format :js do
-        if lookup_context.template_exists? action.params_template_path
-          view_context.render(:template => action.params_template_path)
+      if formats.first == :html
+        with_format :js do
+          if lookup_context.template_exists? action.params_template_path
+            view_context.render(:template => action.params_template_path)
+          end
         end
       end
     end

data/lib/jcontroller/version.rb

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

data/spec/fake_app/app/assets/javascripts/application.js

@@ -4,9 +4,9 @@
 //= require_tree .
 
 test_append_selector = '#test_append';
-test_append = function(controller_namespace, filter, params) {
+test_append = function(controller_namespace, filter, format, params) {
     var $div = $(document.createElement('div'));
-    $div.attr("filter", controller_namespace + "/" + 'html' + "/" + filter);
+    $div.attr("filter", controller_namespace + "/" + format + "/" + filter);
     $div.append(params.s);
     $(test_append_selector).append($div);
 };
@@ -16,7 +16,7 @@ create_routes = function(controller_path, extend) {
         $.each(filters, function(index, filter) {
             hash[format][filter] = function(params, state) {
                 if (this.params.s === params.s && this.state.action_name === state.action_name) {
-                    test_append(controller_path, filter, this.params);
+                    test_append(controller_path, filter, format, this.params);
                 }
             }
         });
@@ -26,6 +26,9 @@ create_routes = function(controller_path, extend) {
     hash.html.state = function() {
         $(test_append_selector).html(JSON.stringify(this.state));
     };
+    hash.js.parameters_template = function() {
+        test_append(controller_path, 'parameters_template', "js", this.params);
+    };
     set_basic_filters('html', ["before", "after", "index", "redirect", "redirect_simple",
         "manually_execute", "manual_parameters", "parameters_template"]);
     set_basic_filters('js', ["before", "after", "index"]);

data/spec/fake_app/app/controllers.rb

@@ -11,11 +11,10 @@ class UsersController < ApplicationController
   end
 
   def parameters_template
-    @parameter_string = "parameter template"
+    @parameter_string = "parameter template #{formats.first}"
   end
 
   def stopped
-    Jcontroller.ajax = !params[:ajax_off]
     js false
   end
   def redirect

data/spec/fake_app/app/views/users/parameters_template.html.erb

@@ -0,0 +1 @@
+<%= link_to "ajax link", parameters_template_users_path, remote: true, onclick: "$(test_append_selector).empty();" %>

data/spec/fake_app/app/views/users/parameters_template.js.jbuilder

@@ -0,0 +1 @@
+json.s @parameter_string

data/spec/fake_app/app/views/users/parameters_template_params.js.jbuilder

@@ -1 +1 @@
-json.s @parameter_string
+json.s @parameter_string + "_params"

data/spec/features/jcontroller_spec.rb

@@ -9,12 +9,14 @@ feature 'invoke correct filter', :js => true do
     "#{controller_namespace}/#{format}/#{filter}"
   end
 
-  def filters(controller_namespace, action, parent_namespaces=%w[application])
-    controller_namespaces = parent_namespaces + [controller_namespace]
+  def filters(controller_namespace, action, options={})
+    options = options.reverse_merge({ :parent_namespaces => %w[application], :format => "html" })
+
+    controller_namespaces = options[:parent_namespaces] + [controller_namespace]
     filters = []
-    filters += controller_namespaces.map {|controller_namespace| filter_namespace(controller_namespace, "before") }
-    filters += controller_namespaces.map {|controller_namespace| filter_namespace(controller_namespace, action) }
-    filters + controller_namespaces.map {|controller_namespace| filter_namespace(controller_namespace, "after") }.reverse
+    filters += controller_namespaces.map {|controller_namespace| filter_namespace(controller_namespace, "before", options[:format]) }
+    filters += controller_namespaces.map {|controller_namespace| filter_namespace(controller_namespace, action, options[:format]) }
+    filters + controller_namespaces.map {|controller_namespace| filter_namespace(controller_namespace, "after", options[:format]) }.reverse
   end
 
   def test_elements(filters, parameters="")
@@ -59,7 +61,7 @@ feature 'invoke correct filter', :js => true do
   end
   scenario 'with superclassed controller' do
     visit superusers_path
-    test_elements filters('superusers', "index", %w[application users])
+    test_elements filters('superusers', "index", { :parent_namespaces => %w[application users]})
   end
   scenario 'with empty parent controller' do
     visit empty_parents_path
@@ -106,12 +108,20 @@ feature 'invoke correct filter', :js => true do
   end
   scenario 'with parameters template' do
     visit parameters_template_users_path
-    test_elements filters('users', "parameters_template"), "parameter template"
+    test_elements filters('users', "parameters_template"), "parameter template html_params"
   end
 
   context "with ajax" do
+    before :each do
+      Jcontroller.ajax = true
+    end
+    after :each do
+      Jcontroller.ajax = nil
+    end
+
     scenario "ajax off" do
-      visit stopped_users_path(ajax_off: true)
+      Jcontroller.ajax = nil
+      visit stopped_users_path
       click_link "ajax link"
       wait_for_ajax
       test_no_elements
@@ -121,7 +131,14 @@ feature 'invoke correct filter', :js => true do
       visit stopped_users_path
       click_link "ajax link"
       wait_for_ajax
-      test_elements filters('users', "index"), "ajax parameter"
+      test_elements filters('users', "index", { :format => "js"}), "ajax parameter"
+    end
+
+    scenario "with _params template existing" do
+      visit parameters_template_users_path
+      click_link "ajax link"
+      wait_for_ajax
+      test_elements filters('users', "parameters_template", { :format => "js"}), "parameter template js"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jcontroller
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Steve Chung
@@ -182,6 +182,7 @@ files:
 - spec/fake_app/app/views/users/manually_execute.html.erb
 - spec/fake_app/app/views/users/no_action.html.erb
 - spec/fake_app/app/views/users/parameters_template.html.erb
+- spec/fake_app/app/views/users/parameters_template.js.jbuilder
 - spec/fake_app/app/views/users/parameters_template_params.js.jbuilder
 - spec/fake_app/app/views/users/redirect_params.js.jbuilder
 - spec/fake_app/app/views/users/state.html.erb
@@ -237,6 +238,7 @@ test_files:
 - spec/fake_app/app/views/users/manually_execute.html.erb
 - spec/fake_app/app/views/users/no_action.html.erb
 - spec/fake_app/app/views/users/parameters_template.html.erb
+- spec/fake_app/app/views/users/parameters_template.js.jbuilder
 - spec/fake_app/app/views/users/parameters_template_params.js.jbuilder
 - spec/fake_app/app/views/users/redirect_params.js.jbuilder
 - spec/fake_app/app/views/users/state.html.erb