poke_js 0.1.6 → 0.1.7

data/app/assets/javascripts/poke_js.js

@@ -18,42 +18,47 @@ POKE = {
         return $.extend(found_namespace, definition);
     },
 
-    get_action_namespace: function(controller, format) {
-        var levels = controller.split('/');
-        levels.push(format);
-
-        var current_namespace = APP;
+    traverse_namespace: function(namespace, levels) {
+        if (!$.isArray(levels)) levels = [levels.controller, levels.format, levels.action];
+        levels = POKE.formatted_levels(levels);
 
+        var current_level = namespace;
+        var level;
         for (var i=0;i<levels.length;i++) {
-            var level = levels[i];
-            if (POKE.blank(current_namespace[level]))
-                return false;
-            current_namespace = current_namespace[level];
+            level = levels[i];
+            current_level = current_level[level];
+            if (typeof current_level === "undefined") return undefined;
         }
-        return current_namespace;
+        return current_level;
     },
-
-    exec_all: function(controller, format, action) {
-        POKE.exec("application", format);
-        POKE.exec("application", format, action);
-        POKE.exec(controller, format);
-        POKE.exec(controller, format, action);
+    formatted_levels: function(levels) {
+        var formatted_levels = [];
+        var level;
+        for (var i=0;i<levels.length;i++) {
+            level = levels[i];
+            formatted_levels = formatted_levels.concat(level.split('/'));
+        }
+        return formatted_levels;
     },
-    exec: function(controller, format, action) {
-        var action_namespace = POKE.get_action_namespace(controller, format)
 
-        if ($.type(action_namespace) === "object") {
-            action = (action === undefined) ? "init" : action;
-            var funct = action_namespace[action],
-                params = action_namespace[action + "_params"];
+    create_namespace: function(namespace) {
+        var current_level = window;
+        $.each(namespace.split("."), function(index, level) {
+            if (!$.isPlainObject(current_level[level])) current_level[level] = {};
+            current_level = current_level[level];
+        });
+    },
 
-            if ($.isFunction(funct))
-                funct(params);
-        }
+    exec_all: function(params) {
+        POKE.exec("application", params.format, "before", params);
+        POKE.exec(params.controller, params.format, "before", params);
+        POKE.exec(params.controller, params.format, params.action, params);
+        POKE.exec(params.controller, params.format, "after", params);
+        POKE.exec("application", params.format, "after", params);
     },
-    init: function() {
-        var $body = $('body');
-        POKE.exec_all(POKE.controller, "html", POKE.action);
+    exec: function(controller, format, action, params) {
+        var action_namespace = APP.traverse_namespace([controller, format, action]);
+        if ($.isFunction(action_namespace)) action_namespace(params);
     }
 };
 
@@ -67,8 +72,9 @@ if (POKE.blank(window["APP"])) {
         },
         define: function(namespace_string, definition) {
             return POKE.define(APP.namespace_string(namespace_string), definition);
+        },
+        traverse_namespace: function(levels) {
+            return POKE.traverse_namespace(APP, levels);
         }
     };
-}
-$(POKE.init);
-$(document).on('page:change', POKE.init);
+}

data/app/views/layouts/application.js.erb

@@ -1,6 +1,5 @@
 (function() {
-    <% controller, action = poke_js_template %>
-    POKE.define('POKE', { controller: "<%=controller%>", action: "<%=action%>", method: "<%=request.method%>", path: "<%=request.env['PATH_INFO']%>" });
-    APP.<%= controller.gsub("/", ".") %>.js.<%= action %>_params = <%= yield %>;
-    POKE.exec_all('<%= poke_js_template[0] %>', 'js', '<%= poke_js_template[1] %>');
+    POKE.create_namespace('<%= poke_js_params %>');
+    <%= poke_js_params %> = <%= define_poke_js_params { yield } %>;
+    POKE.exec_all(<%= poke_js_params %>);
 })();

data/lib/poke_js.rb

@@ -1,4 +1,5 @@
 require "poke_js/view_helpers"
+require "poke_js/controller"
 
 module PokeJs
   if defined?(Rails) && defined?(Rails::Engine)

data/lib/poke_js/controller.rb

@@ -0,0 +1,38 @@
+module PokeJs
+  module Controller
+    extend ActiveSupport::Concern
+    included do
+      helper_method :poke_js_template
+      helper_method :extract_template
+    end
+
+    def poke_js_template
+      extract_template(@poke_js_template)
+    end
+
+    protected
+    def extract_template(template)
+      extracted_template = [controller_path, action_name]
+      if template
+        array = if template.class == Array
+                  template
+                else
+                  split = template.to_s.split('/')
+                  template_controller = split[0..-2]
+                  unless template_controller.empty?
+                    template_controller = [template_controller.join('/')]
+                  end
+                  template_controller + [split.last]
+                end
+        if array.size == 1
+          extracted_template[1] = array.first
+        else
+          extracted_template = array
+        end
+      end
+      extracted_template
+    end
+  end
+end
+
+::ActionController::Base.send :include, PokeJs::Controller

data/lib/poke_js/version.rb

@@ -1,3 +1,3 @@
 module PokeJs
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/poke_js/view_helpers.rb

@@ -9,15 +9,37 @@ module PokeJs
       result
     end
 
-    def poke_js_template
-      extract_template(@poke_js_template)
-    end
-
     def with_template(template)
       old_template = @poke_js_template
       @poke_js_template = template
-      yield
+      result = yield
       @poke_js_template = old_template
+      result
+    end
+
+    def poke_js_params(template=@poke_js_template)
+      controller, action = extract_template(template)
+      raw "APP.#{controller.gsub("/", ".")}.#{request.format.symbol}.#{action}_params"
+    end
+
+    def define_poke_js_params(template=@poke_js_template)
+      controller, action = extract_template(template)
+
+      params  =  { controller: controller, action: action, method: request.method, path: request.env['PATH_INFO'], format: request.format.symbol }
+      if self.respond_to? :add_params
+        params.reverse_merge! add_params
+      end
+      javascript = params.to_json
+      if block_given?
+        if yield
+          javascript = "$.extend(#{yield}, #{javascript});"
+        end
+      end
+      raw javascript
+    end
+
+    def head_poke
+      raw "#{source_poke}\n#{poke}"
     end
 
     def poke(template=@poke_js_template, format=formats.first)
@@ -25,18 +47,34 @@ module PokeJs
       poke_lambda = -> do
         if format == :html
           with_format(:js) do
-            if lookup_context.template_exists? "#{controller}/#{action}_params"
-              #defined in application.js.erb
-              poke_string = %Q/POKE.define('POKE', { controller: "#{controller}", action: "#{action}", method: "#{request.method}", path: "#{request.env['PATH_INFO']}" });/
-              javascript_tag do
-                raw %Q/APP.#{controller.gsub("/", ".")}.html.#{action}_params = #{ render :template => "#{controller}/#{action}_params" };#{poke_string}/
-              end
+            javascript_tag do
+              raw %Q/
+                  POKE.create_namespace('#{poke_js_params}');
+                  #{poke_js_params} = #{ define_poke_js_params do
+                    if lookup_context.template_exists? "#{controller}/#{action}_params"
+                      render(template: "#{controller}/#{action}_params")
+                    end
+                  end };
+                  #{
+                  if @source_poke
+                    %Q/$(function() { POKE.exec_all(#{poke_js_params}); });/
+                  else
+                    %Q/
+                      POKE.define('POKE', {
+                      params: #{poke_js_params},
+                          init: function() { POKE.exec_all(POKE.params); },
+                      });
+                      $(POKE.init);
+                    /
+                  end
+                  }
+                  /
             end
           end
         elsif format == :js
           content_for :head do
             javascript_tag do
-              "$(function(){#{render :template => "#{controller}/#{action}", :formats => [:js], :layout => "layouts/application"}});".html_safe
+              raw "$(function(){#{render template: "#{controller}/#{action}", formats: [:js], layout: "layouts/application"}});"
             end
           end
         end
@@ -49,27 +87,14 @@ module PokeJs
       end
     end
 
-    private
-    def extract_template(template)
-      extracted_template = [controller_path, action_name]
-      if template
-        array = if template.class == Array
-                  template
-                else
-                  split = template.to_s.split('/')
-                  template_controller = split[0..-2]
-                  unless template_controller.empty?
-                    template_controller = [template_controller.join('/')]
-                  end
-                  template_controller + [split.last]
-                end
-        if array.size == 1
-          extracted_template[1] = array.first
-        else
-          extracted_template = array
-        end
+    def source_poke
+      source_template = flash[:source_template]
+      if source_template
+        @source_poke = true
+        result = poke source_template
+        @source_poke = false
+        result
       end
-      extracted_template
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poke_js
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,6 +59,7 @@ files:
 - app/assets/javascripts/poke_js.js
 - app/views/layouts/application.js.erb
 - lib/poke_js.rb
+- lib/poke_js/controller.rb
 - lib/poke_js/version.rb
 - lib/poke_js/view_helpers.rb
 - poke_js.gemspec