comb 0.0.3 → 0.0.4

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+test/output.js

data/comb.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Comb::VERSION
   s.authors     = ["Ryan Allen"]
   s.email       = ["ryan@yeahnah.org"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/ryan-allen/comb"
   s.summary     = %q{Assembler for modular client-side apps.}
   s.description = %q{Brings file-based module support to client-side JavaScript applications.}
 

data/lib/comb.rb

@@ -1,36 +1,78 @@
-require_relative "comb/version"
+require_relative 'comb/version'
 require 'time'
 
-module Comb
-  def self.assemble(path)
-    out = []
-    library_path = path
-    out << "// generated by comb on #{Time.now.utc.iso8601}"
-    out << <<-eos
-var modules = function() {
-  var registry = {}
-  return {
-    register: function(name, module) {
-      registry[name] = module
-    },
-    require: function(name) {
-      return registry[name]()
-    }
-  }
-}()
-var require = modules.require
+class Comb
+  def self.assemble(path_to_modules)
+    new(path_to_modules).assemble
+  end
+
+private
+
+  def initialize(path_to_modules)
+    # instance vars are just global vars in sheeps clothing
+    @path_to_modules = path_to_modules
+    @output = [] 
+    @timestamp = Time.new.utc.iso8601 # baaaaaaaaaaa
+  end
+
+public
+  
+  def assemble
+    mark_start_of_output
+    append_require_snippet
+    for_each_js_module do |name, code|
+      append_to_output(name, code)
+    end
+    mark_end_of_output
+    return_output
+  end
+
+private
+
+  def mark_start_of_output
+    @output << "// generated by comb on #{@timestamp}"
+  end
+
+  def append_require_snippet
+    @output << (<<-eos
+var require = function(module) {
+  return require.registry[module]()
+}
+require.registry = {}
+require.register = function(module, code) {
+  require.registry[module] = code
+}
     eos
-    Dir.glob(library_path + '/**/*.js').each do |path|
-      file = path.gsub(library_path, '').gsub(/^\//, '')
-      mod = file.gsub(/\.js$/, '')
-      out << <<-eos
-// #{file} => #{mod}
-modules.register('#{mod}', function() {
-#{File.open(path) { |f| f.read }.split("\n").collect { |line| "  #{line}" }.join("\n")}
+    ).chomp
+  end
+
+  def for_each_js_module
+    Dir.glob(@path_to_modules + '/**/*.js').each do |path| 
+      # get the module 'name' by removing the path and the extension
+      name = path.gsub(@path_to_modules, '').gsub(/^\//, '').gsub(/\.js$/, '')
+      code = File.open(path) { |f| f.read }
+      yield name, code
+    end
+  end
+
+  def append_to_output(name, code)
+      @output << (<<-eos
+require.register('#{name}', function() {
+#{indent_code(code)}
 })
       eos
-    end
-    out << "// end of comb output"
-    out.join("\n")
+      ).chomp
+  end
+
+  def indent_code(code)
+    code.split("\n").collect { |line| "  #{line}" }.join("\n")
+  end
+
+  def mark_end_of_output
+    @output << "// end of comb output at #{@timestamp}"
+  end
+
+  def return_output
+    @output.join("\n")
   end
 end

data/lib/comb/version.rb

@@ -1,3 +1,3 @@
-module Comb
-  VERSION = "0.0.3"
+class Comb
+  VERSION = '0.0.4'
 end

data/test/container.html

@@ -1,5 +1,5 @@
 <script type="text/javascript" src="output.js"></script>
 <script type="text/javascript">
   var app = require('app')
-  app.run()
+  app.run() // two alerts should fire
 </script>

data/test/js/app.js

@@ -1,8 +1,8 @@
-exports.run = function() {
-  var textbox = require('widgets/textbox')
-  var emailbox = require('widgets/emailbox')
-  var uri = require('utils/uri')
-  alert(uri.bestUri)
-  var bdays = require('utils/date')
-  bdays.whatsMyBday()
+return {
+  run: function() {
+    var uri = require('utils/uri')
+    var bdays = require('utils/date')
+    alert(uri.bestUri)
+    bdays.whatsMyBday() // calls alert itself
+  }
 }

data/test/js/utils/date.js

@@ -1,7 +1,9 @@
+// most useful date module in the history of mankind
+
 var myBday = '24/11/1982'
 
 var whatsMyBday = function() {
   alert(myBday)
 }
 
-exports.whatsMyBday = whatsMyBday
+return {whatsMyBday: whatsMyBday}

data/test/js/utils/uri.js

@@ -1 +1,5 @@
-exports.bestUri = 'yeahnah.org'
+// most useful uri library in the history of the universe 
+
+var bestUri = 'yeahnah.org'
+
+return {bestUri: bestUri}

data/test/output.js.example

@@ -0,0 +1,37 @@
+// generated by comb on 2011-12-29T00:05:24Z
+var require = function(module) {
+  return require.registry[module]()
+}
+require.registry = {}
+require.register = function(module, code) {
+  require.registry[module] = code
+}
+require.register('app', function() {
+  return {
+    run: function() {
+      var uri = require('utils/uri')
+      var bdays = require('utils/date')
+      alert(uri.bestUri)
+      bdays.whatsMyBday() // calls alert itself
+    }
+  }
+})
+require.register('utils/date', function() {
+  // most useful date module in the history of mankind
+  
+  var myBday = '24/11/1982'
+  
+  var whatsMyBday = function() {
+    alert(myBday)
+  }
+  
+  return {whatsMyBday: whatsMyBday}
+})
+require.register('utils/uri', function() {
+  // most useful uri library in the history of the universe 
+  
+  var bestUri = 'yeahnah.org'
+  
+  return {bestUri: bestUri}
+})
+// end of comb output at 2011-12-29T00:05:24Z

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comb
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000Z
+date: 2011-12-29 00:00:00.000000000Z
 dependencies: []
 description: Brings file-based module support to client-side JavaScript applications.
 email:
@@ -30,15 +30,10 @@ files:
 - test/README
 - test/container.html
 - test/js/app.js
-- test/js/controllers/articles.js
-- test/js/controllers/edit.js
 - test/js/utils/date.js
 - test/js/utils/uri.js
-- test/js/widgets/combos/megatable.js
-- test/js/widgets/emailbox.js
-- test/js/widgets/textbox.js
-- test/output.js
-homepage: ''
+- test/output.js.example
+homepage: https://github.com/ryan-allen/comb
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -66,11 +61,6 @@ test_files:
 - test/README
 - test/container.html
 - test/js/app.js
-- test/js/controllers/articles.js
-- test/js/controllers/edit.js
 - test/js/utils/date.js
 - test/js/utils/uri.js
-- test/js/widgets/combos/megatable.js
-- test/js/widgets/emailbox.js
-- test/js/widgets/textbox.js
-- test/output.js
+- test/output.js.example

data/test/js/controllers/articles.js

@@ -1 +0,0 @@
-// articles...

data/test/js/controllers/edit.js

@@ -1 +0,0 @@
-// edit controller

data/test/js/widgets/combos/megatable.js

@@ -1 +0,0 @@
-// lol mega table

data/test/js/widgets/emailbox.js

@@ -1 +0,0 @@
-// lol an email box, does nothing

data/test/js/widgets/textbox.js

@@ -1,4 +0,0 @@
-exports.name = 'textbox'
-exports.make = function() {
-  // macking an textbox
-}

data/test/output.js

@@ -1,78 +0,0 @@
-// generated by comb on 2011-12-28T03:11:08Z
-var modules = function() {
-  var registry = {}
-  return {
-    register: function(name, module) {
-      registry[name] = module
-    },
-    require: function(name) {
-      return registry[name]()
-    }
-  }
-}()
-var require = modules.require
-// app.js => app
-modules.register('app', function() {
-  var exports = {}
-  exports.run = function() {
-    var textbox = require('widgets/textbox')
-    var emailbox = require('widgets/emailbox')
-    var uri = require('utils/uri')
-    alert(uri.bestUri)
-    var bdays = require('utils/date')
-    bdays.whatsMyBday()
-  }
-  return exports
-})
-// controllers/articles.js => controllers/articles
-modules.register('controllers/articles', function() {
-  var exports = {}
-  // articles...
-  return exports
-})
-// controllers/edit.js => controllers/edit
-modules.register('controllers/edit', function() {
-  var exports = {}
-  // edit controller
-  return exports
-})
-// utils/date.js => utils/date
-modules.register('utils/date', function() {
-  var exports = {}
-  var myBday = '24/11/1982'
-  
-  var whatsMyBday = function() {
-    alert(myBday)
-  }
-  
-  exports.whatsMyBday = whatsMyBday
-  return exports
-})
-// utils/uri.js => utils/uri
-modules.register('utils/uri', function() {
-  var exports = {}
-  exports.bestUri = 'yeahnah.org'
-  return exports
-})
-// widgets/combos/megatable.js => widgets/combos/megatable
-modules.register('widgets/combos/megatable', function() {
-  var exports = {}
-  // lol mega table
-  return exports
-})
-// widgets/emailbox.js => widgets/emailbox
-modules.register('widgets/emailbox', function() {
-  var exports = {}
-  // lol an email box, does nothing
-  return exports
-})
-// widgets/textbox.js => widgets/textbox
-modules.register('widgets/textbox', function() {
-  var exports = {}
-  exports.name = 'textbox'
-  exports.make = function() {
-    // macking an textbox
-  }
-  return exports
-})
-// end of comb output