amd 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81d9d3b46ec76a90a0f536aabdf166b59fce2d49
-  data.tar.gz: 5bf2dd78b7858241ae9fb4c699d84bcf185a376a
+  metadata.gz: 1db2e59efa1f2538a86201b136fc8c575100b6df
+  data.tar.gz: 0849658743dddb48715249e9aa1c52503cef28c3
 SHA512:
-  metadata.gz: 3af80de1ff07b0d78e954dc6d90c6ac27d492f78382fd1d634fb587e43af3da1232d0c48888fdc552989adfbc6dba3ea8fcc402bfbb26f8401d1a1b4df517424
-  data.tar.gz: e171ba68e1479ce1ccffaa90840394fa282756e22eb742a73f5b4040b75325710a3bff92577d3a0c66b9b848ae14da8699217101333d7b581fb0ad5b6cca6438
+  metadata.gz: 056b367c07e907de24feab815421565d597818f148362272fc4f80747a2df573c08871315cc5a5ba76e8548bd53369b1837e86ee2fe28675902028251cfa310c
+  data.tar.gz: 823a90c77f55805050914d6de102b012304aa7dcc9ae3b11050dd9bd5fa55f58047b0b3ae24a557324a04da91345f933a4e051bc329e4077dfd08cbd743a9fae

data/app/assets/javascripts/amd/amd.js.coffee.erb

@@ -1,5 +1,6 @@
-window.__amd_table__ = {}
-window.modules       = {}
+window.__amd_table__     = {}
+window.modules           = {}
+window.mod_to_load_count = 0
 
 # Guess the js module to load from the action name
 window.guess_module = ->
@@ -24,7 +25,7 @@ window.fetch_js = (url, callback) ->
   body        = document.getElementsByTagName('body')[0]
   script      = document.createElement 'script'
   script.type = 'text/javascript'
-  script.src  = "<%= AMD::Engine.amd_dir %>/" + url
+  script.src  = "/<%= AMD::Engine.amd_dir %>/" + url
 
   # Then bind the event to the callback function.
   # There are several events for cross browser compatibility.
@@ -35,10 +36,13 @@ window.fetch_js = (url, callback) ->
   body.appendChild script
 
 
+# Define an AMD module as the given name with an array containing
+# the name of its dependencies and with a given function as its
+# actual body.
 window.define = (name, deps, fn) ->
   console.group('Define ' + name)
 
-  modules_to_inject = []
+
   window.modules[name] = {
     name: name,
     deps: deps,
@@ -53,21 +57,54 @@ window.define = (name, deps, fn) ->
     if m == undefined
       m = require(dep)
 
-    modules_to_inject.push m if m != undefined
-    # end each
+    # modules_to_inject.push m if m != undefined
+    # # end each
+
+  # modules_to_inject.reverse().each (x) ->
+  #   gmod = window.modules[x]
+  #   if gmod != undefined
+  #     fetched_modules = gmod.fn
+  window.mod_to_load_count = window.mod_to_load_count - 1
+
+  if window.mod_to_load_count == 0
+    $('body').trigger('dependencies_loaded')
 
   console.groupEnd('Define ' + name);
-  fn.apply(fn, modules_to_inject)
+  #return fn.apply(fn, fetched_modules)
 
+# Require the module file by it's name
 window.require = (module_name) ->
-  path = to_module_path(module_name)
+  path                     = to_module_path(module_name)
+  window.mod_to_load_count = window.mod_to_load_count + 1
+
+  if window.mod_to_load_count == 1
+    # We are at the main module require block
+    $('body').on 'dependencies_loaded', ->
+      window.run_module module_name
+
 
   if path != undefined
-    m = fetch_js path, ->
-      console.log('Module "' + module_name +"' loaded")
+    fetch_js path, ->
+      console.log('Module "' +module_name+ "' loaded")
+
+    return module_name
 
-    return m
   return undefined
 
+# Call the function of the given module name by it's name
+window.run_module = (name) ->
+  mod = window.modules[name]
+  fn_to_inject = []
+
+  if mod == undefined
+    throw 'No module found for "' +name+ '".'
+
+  if mod.deps.length != 0
+    mod.deps.each (dep) ->
+      fn_to_inject.push window.run_module(dep)
+
+  return mod.fn.apply(mod.fn, fn_to_inject)
+
+
 $ ->
   guess_module()

data/lib/amd.rb

@@ -1,4 +1,6 @@
+
 require 'amd/engine'
+require 'amd/controller_helper'
 
 module AMD
   # Your code goes here...

data/lib/amd/engine.rb

@@ -3,7 +3,7 @@ module AMD
     isolate_namespace AMD
 
     initializer 'amd.configuration.assets' do |app|
-      app.config.assets.precompile = %w( *.amd.js* amd.js.coffee ) + app.config.assets.precompile
+      app.config.assets.precompile = %w( *.amd.js* *.amd.js.coffee ) + app.config.assets.precompile
     end
 
     def setup
@@ -14,7 +14,8 @@ module AMD
     @@amd_dir = 'amd'
 
     def self.amd_module(controller)
-      "#{controller.controller_path}/amd/#{controller.controller_name}/#{controller.action_name}"
+      mod_path = controller.controller_path.split('/')[0..-2].join('/')
+      "#{mod_path}/#{controller.controller_name}/#{controller.action_name}"
     end
   end
 end

data/lib/amd/version.rb

@@ -1,3 +1,3 @@
 module AMD
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amd
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sameer Rahmani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-17 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails