modulr 0.6.0 → 0.7.0

data/README.markdown

@@ -55,6 +55,7 @@ Options are as follows:
         --global-export[=GLOBAL_VAR] If GLOBAL_VAR is specified and only one module is being processed, exports it to the GLOBAL_VAR global variable.
                                      If GLOBAL_VAR is specified and multiple modules are being processed, exports each one of them as a property of GLOBAL_VAR.
                                      If GLOBAL_VAR isn't specified, exports the module to global variables corresponding to their identifier.
+        --main-module=MAIN_MODULE    Set the identifier of the main module (available through `require.main`).
         --sync                       Load all dependencies synchronously.
         --dependency-graph[=OUTPUT]  Create a dependency graph of the module.
     -h, --help                       Show this message.

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/bin/modulrize

@@ -31,10 +31,14 @@ opts = OptionParser.new do |opts|
     options[:minify] = minify
   end
   
-  opts.on('--global-export[=GLOBAL_VAR]', 'If GLOBAL_VAR is specified and only one module is being processed, exports it to the GLOBAL_VAR global variable.', 'If GLOBAL_VAR is specified and multiple modules are being processed, exports each one of them as a property of GLOBAL_VAR.', 'If GLOBAL_VAR isn\'t specified, exports the module to global variables corresponding to their identifier.') do |global|
+  opts.on('--global-export[=GLOBAL_VAR]', 'If GLOBAL_VAR is specified and only one module is being processed, export it to the GLOBAL_VAR global variable.', 'If GLOBAL_VAR is specified and multiple modules are being processed, export each one of them as a property of GLOBAL_VAR.', 'If GLOBAL_VAR isn\'t specified, export the module to global variables corresponding to their identifier.') do |global|
     options[:global] = global || true
   end
   
+  opts.on('--main-module=MAIN_MODULE', 'Set the identifier of the main module (available through `require.main`).') do |main_module|
+    options[:main_module] = main_module
+  end
+  
   opts.on('--sync', 'Load all dependencies synchronously.') do |global|
     options[:sync] = true
   end

data/lib/modulr/collector.rb

@@ -3,12 +3,23 @@ module Modulr
     attr_reader :modules, :top_level_modules
     
     def initialize(options = {})
+      @options = options
       @root = options[:root]
       @lazy_eval = options[:lazy_eval]
       @modules = []
       @top_level_modules = []
     end
     
+    def to_js(buffer = '')
+      buffer << globals
+      buffer << "\n(function() {"
+      buffer << lib
+      buffer << transport
+      reorder_top_level_modules
+      buffer << requires
+      buffer << "})();\n"
+    end
+    
     def parse_file(path)
       parse_files(path)
     end
@@ -20,66 +31,69 @@ module Modulr
       end
     end
     
-    def reset
-      modules.clear
-      top_level_modules.clear
-    end
-    private :reset
-    
-    def module_from_path(path)
-      identifier = File.basename(path, '.js')
-      root = @root || File.dirname(path)
-      JSModule.new(identifier, root, path)
-    end
-    private :module_from_path
-    
-    def add_module_from_path(path)
-      js_module = module_from_path(path)
-      top_level_modules << js_module
-      collect_dependencies(js_module)
-      js_module
-    end
-    private :add_module_from_path
-    
-    def to_js(buffer = '')
-      buffer << globals
-      buffer << "\n(function() {"
-      buffer << lib
-      buffer << transport
-      buffer << requires
-      buffer << "})();\n"
-    end
+    private
     
-    def lib
-      src = File.read(PATH_TO_MODULR_JS)
-      "#{src}\nvar require = modulr.require, module = require.main;\n"
-    end
-    private :lib
+      def reset
+        modules.clear
+        top_level_modules.clear
+      end
+      
+      def main_module?
+        !!main_module
+      end
+
+      def main_module
+        if mm_id = @options[:main_module]
+          @top_level_modules.find { |m| m.id == mm_id }
+        end
+      end
+
+      def reorder_top_level_modules
+        if mm = main_module
+          index = top_level_modules.index(mm)
+          top_level_modules[index] = top_level_modules[0]
+          top_level_modules[0] = mm
+        end
+      end
+      
+      def module_from_path(path)
+        identifier = File.basename(path, '.js')
+        root = @root || File.dirname(path)
+        JSModule.new(identifier, root, path)
+      end
+      
+      def add_module_from_path(path)
+        js_module = module_from_path(path)
+        top_level_modules << js_module
+        collect_dependencies(js_module)
+        js_module
+      end
+
+      def lib
+        src = File.read(PATH_TO_MODULR_JS)
+        "#{src}\nvar require = modulr.require, module = require.main;\n"
+      end
     
-    def requires
-      top_level_modules.map { |m| m.ensure }.join("\n")
-    end
-    private :requires
+      def requires
+        top_level_modules.map { |m| m.ensure }.join("\n")
+      end
     
-    def globals
-      ''
-    end
-    private :globals
+      def globals
+        ''
+      end
     
-    def transport
-      pairs = modules.map do |m|
-        if lazy_eval_module?(m)
-          value = m.escaped_src
-        else
-          value = m.factory
+      def transport
+        pairs = modules.map do |m|
+          if lazy_eval_module?(m)
+            value = m.escaped_src
+          else
+            value = m.factory
+          end
+          "\n'#{m.id}': #{value}"        
         end
-        "\n'#{m.id}': #{value}"        
+        "require.define({#{pairs.join(', ')}\n});"
       end
-      "require.define({#{pairs.join(', ')}\n});"
-    end
-    private :transport
     
-    private
       def collect_dependencies(js_module)
         js_module.dependencies.each do |dependency|
           unless modules.include?(dependency)

data/lib/modulr/global_export_collector.rb

@@ -1,53 +1,51 @@
 module Modulr
   class GlobalExportCollector < SyncCollector
     
-    def initialize(options = {})
-      @global = options[:global]
-      super
-    end
-    
-    def globals
-      if @global == true
-        top_level_modules.map { |m| define_global(m.id) }.join
-      else
-        define_global(@global)
+    private
+      def global_var_name
+        @options[:global]
+      end
+      
+      def use_module_id_as_var_name?
+        @options[:global] == true
+      end
+      
+      def globals
+        if use_module_id_as_var_name?
+          top_level_modules.map { |m| define_global_var(m.id) }.join
+        else
+          define_global_var(global_var_name)
+        end
       end
-    end
-    private :globals
     
-    def define_global(global)
-      if global.include?('.')
-        props = global.split('.')
-        str = props.shift
-        results = "var #{str};"
-        props.each do |prop|
-          results << "\n#{str} = #{str} || {};"
-          str << ".#{prop}"
+      def define_global_var(var_name)
+        if var_name.include?('.')
+          props = var_name.split('.')
+          str = props.shift
+          results = "var #{str};"
+          props.each do |prop|
+            results << "\n#{str} = #{str} || {};"
+            str << ".#{prop}"
+          end
+          "#{results}\n#{str};\n"
+        else
+          "var #{var_name};\n"
         end
-        "#{results}\n#{str};\n"
-      else
-        "var #{global};\n"
       end
-    end
-    private :define_global
     
-    def requires
-      if @global == true
-        top_level_modules.map do |m|
-          "\n  #{m.id} = require('#{m.id}');"
-        end.join
-      else
-        if top_level_modules.size == 1 #export to named global
-          "\n  #{@global} = require('#{top_level_modules.first.id}');"
+      def requires
+        if use_module_id_as_var_name?
+          top_level_modules.map { |m| "\n  #{m.id} = require('#{m.id}');" }.join
+        elsif top_level_modules.size == 1
+          #export to named global
+          "\n  #{global_var_name} = require('#{top_level_modules.first.id}');"
         else
           #export to props of named global
-          top_level_modules.inject("\n#{@global} = {};") do |str, m|
-            str << "\n  #{@global}.#{m.id} = require('#{m.id}');"
+          top_level_modules.inject("\n#{global_var_name} = {};") do |str, m|
+            str << "\n  #{global_var_name}.#{m.id} = require('#{m.id}');"
           end
         end
       end
-    end
-    private :requires
     
   end
 end

data/lib/modulr/sync_collector.rb

@@ -5,15 +5,18 @@ module Modulr
       modules << js_module unless modules.include?(js_module)
     end
     
-    def lib
-      File.read(PATH_TO_MODULR_SYNC_JS)
-    end
-    private :lib
-    
-    def requires
-      top_level_modules.map { |m| "\n  require('#{m.id}');" }.join
-    end
-    private :requires
-    
+    private
+      def lib
+        output = File.read(PATH_TO_MODULR_SYNC_JS)
+        if top_level_modules.size > 1 && !main_module?
+          output << "\nvar module = {};\n"
+          output << "\nrequire.main = module;\n"
+        end
+        output
+      end
+      
+      def requires
+        top_level_modules.map { |m| "\n  require('#{m.id}');" }.join
+      end
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Tobie Langel
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 +02:00
+date: 2010-11-01 00:00:00 +01:00
 default_executable: modulrize
 dependencies: 
 - !ruby/object:Gem::Dependency