includejs 1.0.0 → 1.0.1

data/lib/includejs/version.rb

@@ -1,3 +1,3 @@
 module Includejs
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/javascripts/includejs_spec.coffee

@@ -14,6 +14,11 @@ describe "include", ->
     included: (klass) ->
       klass.baz = "Baz!!"
 
+  FuBarModule =
+    sayHi: ->
+      "Hello!"
+    fu: 'Bar!'
+
   it "includes functions from the module into a class", ->
     class Foo
       constructor: ->
@@ -57,7 +62,7 @@ describe "include", ->
   it "works with plain objects as well", ->
     foo = {}
     include(foo, BazModule)
-    
+
     expect(foo.sayHi()).toEqual("Hello undefined!")
 
     foo.name = "Mark"
@@ -65,4 +70,13 @@ describe "include", ->
 
     x = (fn) -> fn()
 
-    expect(x(foo.sayHi)).toEqual("Hello Mark!")
+    expect(x(foo.sayHi)).toEqual("Hello Mark!")
+
+  it "handles variables just fine", ->
+    class Foo
+      constructor: ->
+        include(@, FuBarModule)
+
+    foo = new Foo()
+    expect(foo.sayHi()).toEqual("Hello!")
+    expect(foo.fu).toEqual("Bar!")

data/src/includejs.js.coffee

@@ -4,15 +4,54 @@ Includejs
 https://github.com/markbates/includejs
 ###
 @include = (klass, modules...) =>
+  ###
+  Since we can't assume there are any other
+  libraries available to us, let's create our
+  own simple binding function to bind the 
+  module's functions to the original object.
+  ###
   __binder = (fn, me) ->
     return ->
       return fn.apply(me, arguments)
+
+  ###
+  Since we can't assume there are any other
+  libraries available to us, let's create our
+  own function to check whether an object is a
+  function or not.
+  ###
+  __isFunction = (fn) ->
+   !!(fn and fn.constructor and fn.call and fn.apply)
   
+  ###
+  Loop through all of the modules that are passed in.
+  ###
   for mod in modules
-
+    ###
+    If the module has a 'included' function
+    then let's call it and pass it the object
+    that's including the module.
+    ###
     if mod.included?
       mod.included(klass)
     
     for key, value of mod
+      ###
+      As long as the 'key' is not the 'included' or
+      'include' function, then let's include it in the
+      original object and bind it together.
+      ###
       unless key in ["included", "include"]
-        klass[key] = __binder(value, klass)
+        klass[key] = 
+          if __isFunction(value)
+            ###
+            If the value is a function then let's
+            bind it to the current object.
+            ###
+            __binder(value, klass)
+          else
+            ###
+            The value isn't a function, so let's just
+            set it and forget it.
+            ###
+            value

data/vendor/assets/javascripts/includejs.js

@@ -11,16 +11,43 @@ https://github.com/markbates/includejs
     __slice = [].slice;
 
   this.include = function() {
-    var key, klass, mod, modules, value, __binder, _i, _len, _results;
+    var key, klass, mod, modules, value, __binder, __isFunction, _i, _len, _results;
     klass = arguments[0], modules = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+    /*
+      Since we can't assume there are any other
+      libraries available to us, let's create our
+      own simple binding function to bind the 
+      module's functions to the original object.
+    */
+
     __binder = function(fn, me) {
       return function() {
         return fn.apply(me, arguments);
       };
     };
+    /*
+      Since we can't assume there are any other
+      libraries available to us, let's create our
+      own function to check whether an object is a
+      function or not.
+    */
+
+    __isFunction = function(fn) {
+      return !!(fn && fn.constructor && fn.call && fn.apply);
+    };
+    /*
+      Loop through all of the modules that are passed in.
+    */
+
     _results = [];
     for (_i = 0, _len = modules.length; _i < _len; _i++) {
       mod = modules[_i];
+      /*
+          If the module has a 'included' function
+          then let's call it and pass it the object
+          that's including the module.
+      */
+
       if (mod.included != null) {
         mod.included(klass);
       }
@@ -29,8 +56,30 @@ https://github.com/markbates/includejs
         _results1 = [];
         for (key in mod) {
           value = mod[key];
+          /*
+                As long as the 'key' is not the 'included' or
+                'include' function, then let's include it in the
+                original object and bind it together.
+          */
+
           if (key !== "included" && key !== "include") {
-            _results1.push(klass[key] = __binder(value, klass));
+            _results1.push(klass[key] = (function() {
+              if (__isFunction(value)) {
+                /*
+                            If the value is a function then let's
+                            bind it to the current object.
+                */
+
+                return __binder(value, klass);
+              } else {
+                /*
+                            The value isn't a function, so let's just
+                            set it and forget it.
+                */
+
+                return value;
+              }
+            })());
           } else {
             _results1.push(void 0);
           }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: includejs
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70170748893700 !ruby/object:Gem::Requirement
+  requirement: &70206983152540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170748893700
+  version_requirements: *70206983152540
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70170748892260 !ruby/object:Gem::Requirement
+  requirement: &70206983150860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170748892260
+  version_requirements: *70206983150860
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70170748891440 !ruby/object:Gem::Requirement
+  requirement: &70206983148580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170748891440
+  version_requirements: *70206983148580
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
-  requirement: &70170748888760 !ruby/object:Gem::Requirement
+  requirement: &70206983163960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170748888760
+  version_requirements: *70206983163960
 - !ruby/object:Gem::Dependency
   name: guard-jasmine-headless-webkit
-  requirement: &70170748902560 !ruby/object:Gem::Requirement
+  requirement: &70206983163240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170748902560
+  version_requirements: *70206983163240
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &70170748899440 !ruby/object:Gem::Requirement
+  requirement: &70206983162020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170748899440
+  version_requirements: *70206983162020
 - !ruby/object:Gem::Dependency
   name: jasmine-headless-webkit
-  requirement: &70170748896620 !ruby/object:Gem::Requirement
+  requirement: &70206983160040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170748896620
+  version_requirements: *70206983160040
 description: Adds the ability to include Modules into JavaScript objects
 email:
 - mark@markbates.com