flok 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6d0bf2af8dafa5f4e70828c942096912a6515a2
-  data.tar.gz: 7799b952d8fee6d672dd3adbbeffab4a555443b7
+  metadata.gz: 3406b13f8cf50a7c88224afaf47441a6ca0d128f
+  data.tar.gz: 8c4d7feb578ab38b1a9f4a60760cfec5fd00a268
 SHA512:
-  metadata.gz: a14b3378b0add68d5920b472c20fe1994d93967d9b916065eaddb0dccd87d4fbbcb4a4b00d0110cf7200309780afb6f9281761ec9aa0d96b356f3295f23985e4
-  data.tar.gz: 8737ab63f4acc6d9c6a7587545560f09f0797e99a4a179f4c77757c6a89759a68a15e2c50b83be610e284c70071ce895ce921767edb53fb24b9e86a0c373cabc
+  metadata.gz: 50461e1bb7cbf544067d8746d0163620c25573dfc12dffc941c8f2f380610721f11b866427aa08a7f4c1c3e2fa80ac1e1a982b4e86dca1fdb02ef5fb4dc9b949
+  data.tar.gz: 8c43c4cd297e7b7bc5f37c5ee34b2c9e1ed9ae73562e459863aaf69dfe5fd4e7d0e51a73b734f104d2a46940ed8ce9feb1fb499b6cfe2e985f4bc27f8faed892

data/app/drivers/chrome/README.md

@@ -64,9 +64,19 @@ var TestController = function() {
 $(document).ready(function() {
   regController("__test__", TestController);
 });
-
 ```
 
+### DOM helpers
+```html
+<!-- This will place the contents of context.foo into the divider -->
+<div data-puts="foo"></div>
+
+<!-- You can also use an attribute, just place it before the variable -->
+<img data-puts="src foo" />
+
+<!-- You can send events via the emit tag -->
+<button data-emit='button_clicked'>Click me</button>
+
 ### ERB Compliation
 The final `chrome.js` file is run through an `ERB` compiler that contains the variables:
   * `@debug` - True if `FLOK_ENV=DEBUG`

data/app/drivers/chrome/Rakefile

@@ -47,7 +47,7 @@ task :spec do
     f.spec_js_init << "./spec/config/**/*.js"
     f.spec_js << "./spec/spec/**/*_spec.js"
     f.app_js << File.join(ENV['BUILD_PATH'], './chrome.js')
-    f.app_js << File.join(ENV['BUILD_PATH'], '../application.js')
+    #f.app_js << File.join(ENV['BUILD_PATH'], '../application.js')
   end
 
   recipe.bake
@@ -62,7 +62,7 @@ task :spec do
   sh2("boojs #{f.path}") do |stdin, stdout|
     loop do
       begin
-        Timeout::timeout(5) do
+        Timeout::timeout(10) do
           res = stdout.readline
           $stderr.puts "\t"+res
           if res =~ /__SUCCESS/

data/app/drivers/chrome/spec/spec/controller_debug_spec.js

@@ -2,7 +2,7 @@
 
 QUnit.test("when if_controller_init is called with a view that has the debug flag on, it uses the DebugController", function(assert) {
   //Setup prototypes html
-  $("body").append("<div id='prototypes'></div>")
+  $("body").html("<div id='prototypes'></div>")
   if_init_view("my_test_view", {}, 1, ["main", "content"]);
 
   //Create a controller that belongs to a debug view (it has data-debug='1')

data/app/drivers/chrome/spec/spec/dom_helpers_spec.js

@@ -0,0 +1,91 @@
+//Testing the DOM binding like data-puts to make sure they work
+
+QUnit.test("When the DOM bind data-puts is used with 'foo' in a controller that has a context containing foo, foo is put inside the HTML with the binding", function(assert) {
+  $("body").html("                                            \
+    <div id='prototypes'>                                     \
+      <div class='view' data-name='my_test_view2'>            \
+        <h1 id='check' data-puts='foo'></h1>                  \
+      </div>                                                  \
+    </div>                                                    \
+    <div id='root'>                                           \
+    </div>                                                    \
+  ")      
+
+  //Create a view
+  if_init_view("my_test_view2", {}, 4, ["main"]);
+
+  //Bind a controller to that view with a context
+  //A DebugController will automatically be bound
+  if_controller_init(3, 4, "my_test_controller2", {foo: "hello world"});
+
+  //Attach that controller
+  if_attach_view(4, 0);
+
+  //Check h1
+  var $h1 = $("#root h1");
+  var html = $h1.html();
+  assert.equal(html, "hello world", "html is equal to hello world, got: " + html);
+});
+
+QUnit.test("When the DOM bind data-puts is used with 'src foo' in a controller that has a context containing foo, foo is put inside the src tag with the binding", function(assert) {
+  $("body").html("                                            \
+    <div id='prototypes'>                                     \
+      <div class='view' data-name='my_test_view2'>            \
+        <img id='check' data-puts='src foo'></h1>                  \
+      </div>                                                  \
+    </div>                                                    \
+    <div id='root'>                                           \
+    </div>                                                    \
+  ")      
+
+  //Create a view
+  if_init_view("my_test_view2", {}, 4, ["main"]);
+
+  //Bind a controller to that view with a context
+  //A FlokController will automatically be bound
+  var src = "http://upload.wikimedia.org/wikipedia/commons/d/d9/Test.png"
+  if_controller_init(3, 4, "my_test_controller2", {foo: src});
+
+  //Attach that controller
+  if_attach_view(4, 0);
+
+  //Check img
+  var $img = $("#root img");
+  var _src = $img.attr("src");
+  assert.equal(_src, src, "src is supposed to be a URL: " + src + ", but instead got: " + _src);
+});
+
+QUnit.test("When a button is clicked with the data-emit tag, it will signal the flok controller", function(assert) {
+  $("body").html("                                            \
+    <div id='prototypes'>                                     \
+      <div class='view' data-name='my_test_view'>            \
+      <button id='trigger_button_clicked' data-emit='button_clicked'>Click Me</button> \
+      </div>                                                  \
+    </div>                                                    \
+    <div id='root'>                                           \
+    </div>                                                    \
+  ")      
+
+  //Create an instance of our prototype view
+  if_init_view("my_test_view", {}, 4, ["main"]);
+
+  //Bind a generic FlokController to our view and set the bp to 3
+  //It's generic because __test__ does not exist
+  if_controller_init(3, 4, "__test__", {});
+
+  //Attach that view's controller to the root spot
+  if_attach_view(4, 0);
+
+  //Grab the view's button
+  var $button = $("#root #trigger_button_clicked");
+
+  //Intercept click event
+  window.int_dispatch = function(q) {
+    assert.equal(JSON.stringify(q), JSON.stringify([3, "int_event", 3, "button_clicked", {}]));
+  }
+
+  //Trigger button
+  $button.trigger("click");
+
+  window.int_dispatch = null;
+});

data/app/drivers/chrome/spec/spec/vars_spec.js

@@ -1,28 +1,28 @@
 //Tests various control variables, like context
 
-  QUnit.test("Controller does receive context on explicit init", function(assert) {
-    var done = assert.async();
+QUnit.test("Controller does receive context on explicit init", function(assert) {
+  var done = assert.async();
 
-    //Create a test controller
-    var TestController = function() {
-      this.base = FlokController; this.base(); self = this;
+  //Create a test controller
+  var TestController = function() {
+    this.base = FlokController; this.base(); self = this;
 
-      self.init = function() {
-        assert.equal(this.context.hello, "world", "Matches");
-        done();
-      }
+    self.init = function() {
+      assert.equal(this.context.hello, "world", "Matches");
+      done();
     }
+  }
 
-    //Insert some HTML
-    $("body").html("              \
-      <div id='root'>             \
-        <div id='test'></div>     \
-      </div>                      \
-    ");
+  //Insert some HTML
+  $("body").html("              \
+    <div id='root'>             \
+      <div id='test'></div>     \
+    </div>                      \
+  ");
 
-    //Call the controllers init with a forged selector
-    $sel = $("#test");
-    var c = new TestController();
-    c.__initialize__(0, $sel, {hello: 'world'});
-    c.init();
-  });
+  //Call the controllers init with a forged selector
+  $sel = $("#test");
+  var c = new TestController();
+  c.__initialize__(0, $sel, {hello: 'world'});
+  c.init();
+});

data/app/drivers/chrome/src/controller.js

@@ -35,8 +35,16 @@ FlokController = function() {
 
     //Set the HTML
     this.$sel("[data-puts]").each(function() {
-      var name = $(this).attr("data-puts");
-      $(this).html(self.context[name]);
+      //Retreive the args, seperated by spaces
+      var args = $(this).attr("data-puts");
+      args = args.split(" ");
+
+      //  2 args => set the attribute named args[0] to the value of context[args[1]]
+      if (args.length == 1) {
+        $(this).html(self.context[args[0]]);
+      } else if (args.length == 2) {
+        $(this).attr(args[0], self.context[args[1]]);
+      }
     });
   }
 

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flok
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -245,6 +245,7 @@ files:
 - app/drivers/chrome/spec/init/qunit.js
 - app/drivers/chrome/spec/spec/controller_debug_spec.js
 - app/drivers/chrome/spec/spec/debug_spec.js
+- app/drivers/chrome/spec/spec/dom_helpers_spec.js
 - app/drivers/chrome/spec/spec/sel_scope_spec.js
 - app/drivers/chrome/spec/spec/vars_spec.js
 - app/drivers/chrome/src/bench.js