jcontroller 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dc0dec2d86a61f9e4f6d4a0c1522ad298ba5252
-  data.tar.gz: feda08b748ad215642d79e191635e4f92b4c6cb2
+  metadata.gz: 71f242c9fa89f7ab7099f36a7c85fba048b261d2
+  data.tar.gz: 0eecd3dd80aa5d2becd5269871efe2b6a4acbbcc
 SHA512:
-  metadata.gz: 44b2653eba12e626f017460ae7287f2e1e3340cd07b631763e43cd99730c6689bb1951b510fa7e422796d07d3456f64642b030cec80c9a06de23a11a019781c9
-  data.tar.gz: ee1bce67790d5a99b7cfae9870daf6985f85885635b810e9f0a493c68115df10cb337fa055946aac14539d532dc16b175ad86964d96fb772ecc83ff1241843da
+  metadata.gz: 61bd4f0bc8c0addeb21d76cf01b62d8d9d361b414a847d277429bf42fb8493b53e9046e5e4d7223d9a24ee8023eceaed13a72fb6cc0f26af93757ae807d4606d
+  data.tar.gz: 9ce23184dfd20b0bbfad2791f2acf0a9cb16828b1eac4f458d5a29b3f94f34f5431769fe0475e7d935117c4c05d32e96c7a9a7b8c9a9d0b73075cebf04b4c0f2

data/README.md

@@ -2,7 +2,7 @@
 Rails controller based javascript to keep your javascript outside of your views.
 
 Based off [Paul Irish's DOM-based Routing](http://www.paulirish.com/2009/markup-based-unobtrusive-comprehensive-dom-ready-execution/)
-(or Garber-Irish Implementation). __Works with turbolinks__
+(or Garber-Irish Implementation). __Works with turbolinks__.
 
 ## How it works
 ```javascript
@@ -16,9 +16,9 @@ Jcontroller.create('users', {
 No other code is needed.
 
 ## Installation
-Add `gem 'dom_routes'` to your application's `Gemfile` and run the `bundle` command, then add this to your `app/assets/javascripts/application.js`
+Add `gem 'jcontroller'` to your application's `Gemfile` and run the `bundle` command, then add this to your `app/assets/javascripts/application.js`
 
-    //= require dom_routes
+    //= require jcontroller
     
 ## Controllers
 ### Namespaces
@@ -69,17 +69,20 @@ Jcontroller.create('users', {
 ```
 ## Parameters
 ### Access
-Parameters are accessed from `this.params`:
+Parameters are accessed from `this.params` or as the first parameter:
 ```javascript
 Jcontroller.create('users', {
     html: {
-        index: function() {
+        index: function(params, state) {
+            //this.params === params
             console.log(this.params);
+            //this.state === state
+            console.log(this.state);
         }
     }
 });
 ```
-The request state (controller_path, action_name, jcontroller, etc.) are also given in `this.state`.
+The request state (controller_path, action_name, jcontroller, etc.) are also given in `this.state` or the second parameter.
 
 ### Manual
 Use the `js` method with the `params` option.
@@ -127,7 +130,7 @@ Execute all filters and actions related to a action:
 ```
 
 ### Manually filter in Javascript
-You can use the given state to stop execution of functions:
+You can use the given [state](#access) to stop execution of functions:
 ```javascript
 Jcontroller.create('application', {
     html: {

data/app/assets/javascripts/jcontroller.js

@@ -26,15 +26,15 @@ var Jcontroller = {
                         }
                     },
                     execute_post_order_filter: function(filter) {
-                        if (Jcontroller.present(this.parent())) this.parent().execute_post_order_filter(filter);
+                        if (Jcontroller.present(this.parent())) { this.parent().execute_post_order_filter(filter); }
                         this.execute_filter(this[this.format][filter]);
                     },
                     execute_pre_order_filter: function(filter) {
                         this.execute_filter(this[this.format][filter]);
-                        if (Jcontroller.present(this.parent())) this.parent().execute_pre_order_filter(filter);
+                        if (Jcontroller.present(this.parent())) { this.parent().execute_pre_order_filter(filter); }
                     },
                     execute_filter: function(filter) {
-                        if ($.isFunction(filter)) { $.proxy(filter, this)(); }
+                        if ($.isFunction(filter)) { $.proxy(filter, this)(this.params, this.state); }
                     }
                 },
                 definition

data/lib/jcontroller/version.rb

@@ -1,3 +1,3 @@
 module Jcontroller
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

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

@@ -14,8 +14,10 @@ test_append = function(controller_namespace, filter, params) {
 create_routes = function(controller_path, extend) {
     var set_basic_filters = function(format, filters) {
         $.each(filters, function(index, filter) {
-            hash[format][filter] = function() {
-                test_append(controller_path, filter, this.params);
+            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);
+                }
             }
         });
     };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jcontroller
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Steve Chung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-15 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails