jim 0.2.3 → 0.3.0.pre

data/test/fixtures/sammy-0.5.0/test/test_sammy_event_context.js

@@ -1,6 +1,6 @@
 (function($) {
     with(QUnit) {
-      
+
       var test_app = new Sammy.Application(function() {
         this.silence_404 = true;
         this.element_selector = '#main';
@@ -25,7 +25,7 @@
       .should('set params', function() {
         deepEqual(this.context.params, new Sammy.Object({test: 'hooray'}));
       });
-      
+
 
       context('Sammy', 'EventContext', 'redirect', {
         before: function() {
@@ -62,7 +62,7 @@
           context.notFound();
         });
       });
-      
+
       context('Sammy', 'EventContext', 'partial', {
         before: function() {
           this.app     = test_app;
@@ -78,8 +78,8 @@
       })
       .should('not run through template() if Sammy.Template is not present', function() {
         var contents = '';
-        this.context.partial('fixtures/partial.template', {name: 'TEMPLATE!', class_name: 'test_template'}, function(data) { 
-          contents = data; 
+        this.context.partial('fixtures/partial.template', {name: 'TEMPLATE!', class_name: 'test_template'}, function(data) {
+          contents = data;
         });
         soon(function () {
           equal(contents, '<div class="<%= class_name %>"><%= name %></div>');
@@ -90,8 +90,8 @@
         var app = new Sammy.Application(function() { this.element_selector = '#main'; });
         app.use(Sammy.Template);
         this.context = new app.context_prototype(app);
-        this.context.partial('fixtures/partial.template', {name: 'TEMPLATE!', class_name: 'test_template'}, function(data) { 
-          contents = data; 
+        this.context.partial('fixtures/partial.template', {name: 'TEMPLATE!', class_name: 'test_template'}, function(data) {
+          contents = data;
         });
         soon(function () {
           equal(contents, '<div class="test_template">TEMPLATE!</div>');
@@ -102,7 +102,7 @@
             app = new Sammy.Application(function() { this.element_selector = '#main'; }),
             data = [{name: 'one', class_name: 'it-1'}, {name: 'two', class_name: 'it-2'}],
             expected = '<div class="it-1">one</div><div class="it-2">two</div>';
-                        
+
         app.use(Sammy.Template);
         this.context = new app.context_prototype(app);
         this.context.partial('fixtures/partial.template', data);
@@ -121,13 +121,13 @@
         app.use(Sammy.Cache);
         app.clearCache();
         this.context = new app.context_prototype(app);
-        this.context.partial('fixtures/partial.html', function(data) { 
-          contents = data; 
+        this.context.partial('fixtures/partial.html', function(data) {
+          contents = data;
         });
         soon(function () {
           equal(contents, '<div class="test_partial">PARTIAL</div>');
           equal(app.cache('partial:fixtures/partial.html'), '<div class="test_partial">PARTIAL</div>');
-          this.context.partial('fixtures/partial.html', function(data) { 
+          this.context.partial('fixtures/partial.html', function(data) {
             contents = data;
           });
           equal(contents, '<div class="test_partial">PARTIAL</div>');
@@ -141,7 +141,7 @@
         app.clearCache();
         app.cache_partials = false;
         this.context = new app.context_prototype(app);
-        this.context.partial('fixtures/partial.html', function(data) { 
+        this.context.partial('fixtures/partial.html', function(data) {
           contents = data;
         });
         soon(function () {
@@ -166,7 +166,7 @@
           changed = true;
         });
         test_app.run();
-        this.context.partial('fixtures/partial.html', function(data) { 
+        this.context.partial('fixtures/partial.html', function(data) {
           changed = false;
         });
         soon(function() {
@@ -176,10 +176,10 @@
       })
       .should('use default engine if provided and template doesnt match an engine', function() {
         var contents = '';
-        var app = new Sammy.Application(function() { 
-          this.element_selector = '#main'; 
+        var app = new Sammy.Application(function() {
+          this.element_selector = '#main';
           this.template_engine  = 'template';
-          
+
           this.helper('template',  function(template, data) {
             return "!!!" + template.toString() + "!!!";
           });
@@ -192,8 +192,8 @@
       })
       .should('use default engine as a method if template doesnt match an engine', function() {
         var contents = '';
-        var app = new Sammy.Application(function() { 
-          this.element_selector = '#main'; 
+        var app = new Sammy.Application(function() {
+          this.element_selector = '#main';
           this.template_engine  = function(template, data) {
             return "!!!" + template.toString() + "!!!";
           };
@@ -204,7 +204,7 @@
           equal(app.$element().text(), '!!!NOENGINE!!!');
         });
       });
-      
+
       context('Sammy', 'EventContext', 'trigger', {
         before: function() {
           this.context = test_context;
@@ -247,6 +247,6 @@
           deepEqual(passed_data, test_data);
         });
       });
-      
+
     };
-})(jQuery);
+})(jQuery);

data/test/fixtures/sammy-0.5.0/test/test_sammy_location_proxy.js

@@ -1,6 +1,6 @@
 (function($) {
   with(QUnit) {
-    
+
     context('Sammy', 'HashLocationProxy', {
       before: function() {
         this.app = new Sammy.Application;
@@ -45,7 +45,7 @@
       }
     });
 
-    
+
     context('Sammy', 'DataLocationProxy', {
       before: function() {
         this.app = new Sammy.Application(function() {
@@ -88,4 +88,4 @@
     });
 
   }
-})(jQuery);
+})(jQuery);

data/test/fixtures/sammy-0.5.0/test/test_sammy_plugins.js

@@ -49,15 +49,15 @@
          this.app.store('cache').clear('mycache');
          ok(!this.app.cache('mycache'))
        });
-       
-      
+
+
        context('Sammy', 'Template', {
          before: function() {
            this.app = new Sammy.Application(function() {
              this.use(Sammy.Template);
            });
            this.context = new this.app.context_prototype(this.app, 'get', '#/', {});
-           
+
            this.alias_app = new Sammy.Application(function() {
              this.use(Sammy.Template, 'tpl');
            });
@@ -85,8 +85,8 @@
          ok($.isFunction(this.alias_context.tpl));
          ok(this.alias_context.tpl.toString().match(/srender/));
        });
-    
-    
+
+
        context('Sammy.NestedParams', 'parsing', {
          before: function () {
            this.app = new Sammy.Application(function() {
@@ -105,7 +105,7 @@
          $('#nested_params_test_form').submit();
          soon(function() {
            ok(app.form_params);
-           equal(app.form_params['author'], 'Thoreau');        
+           equal(app.form_params['author'], 'Thoreau');
            app.unload();
          }, this, 1, 2);
        })
@@ -129,7 +129,7 @@
            equal(app.form_params['poll']['name'], 'Which beverage do you like best?');
            equal(app.form_params['poll']['priority'], '10');
            app.unload();
-         }, this, 1, 3);      
+         }, this, 1, 3);
        })
        .should('parse nested hashes', function() {
          var app = this.app;
@@ -164,7 +164,7 @@
            equal(app.form_params['woods']['trees'][0]['name'], 'Spruce');
            equal(app.form_params['woods']['trees'][1]['name'], 'Maple');
            app.unload();
-         }, this, 1, 3);            
+         }, this, 1, 3);
        })
        .should('parse arrays in nested hashes in nested arrays', function() {
          var app = this.app;
@@ -175,7 +175,7 @@
            equal(app.form_params['pages'][0]['words'][0], 'Woods');
            equal(app.form_params['pages'][1]['words'][0], 'Money');
            app.unload();
-         }, this, 1, 3);      
+         }, this, 1, 3);
        })
        .should('parse complex hashes in nested arrays in nested hashes', function() {
          var app = this.app;
@@ -200,7 +200,7 @@
            app.unload();
          }, this, 1, 2);
        });
-       
+
        context('Sammy.NestedParams', 'bad fields', {
          before: function () {
            this.app = new Sammy.Application(function() {
@@ -214,8 +214,8 @@
            app._parseFormParams($('#bad_nested_params_form'));
          });
        });
-       
-       
+
+
        // Pretty much a copy of the Template tests
        context('Sammy', 'Mustache', {
           before: function() {
@@ -252,7 +252,7 @@
           ok($.isFunction(this.alias_context.ms));
           ok(this.alias_context.ms.toString().match(/Mustache/));
         });
-      
+
       context('Sammy', 'JSON', {
         before: function() {
           this.app = new Sammy.Application(function() {
@@ -274,8 +274,8 @@
       .should('stringify JSON if object is an object', function() {
         equal(this.context.json({test: "123"}),"{\"test\":\"123\"}");
       });
-      
-      
+
+
       context('Sammy', 'Haml', {
         before: function() {
           this.app = new Sammy.Application(function() {
@@ -291,6 +291,6 @@
         var template = ".mytemplate= title";
         deepEqual(this.context.haml(template, {title: "HAML!!"}), "<div class=\"mytemplate\">HAML!!\n</div>");
       });
-      
+
     };
-})(jQuery);
+})(jQuery);

data/test/fixtures/sammy-0.5.0/test/test_sammy_storage.js

@@ -87,7 +87,7 @@
             equal(fired, 'bar');
             $('#main').unbind('set-test_store.foo');
           });
-        }) 
+        })
         .should('fetch value or run callback', function() {
           ok(!this.store.get('foo'));
           this.store.fetch('foo', function() {
@@ -108,7 +108,7 @@
         });
       }
     });
-  
+
       context('Sammy.Storage', {
         before: function() {
           this.app = new Sammy.Application(function() {
@@ -123,7 +123,7 @@
       .should('add the store method to event contexts', function() {
         ok($.isFunction(this.context.store));
       });
-    
+
       context('Sammy.Storage', 'store', {
         before: function() {
           var store = null;
@@ -172,4 +172,4 @@
         ok(!this.store.get('foo'));
       });
   };
-})(jQuery);
+})(jQuery);

data/test/helper.rb

@@ -57,4 +57,19 @@ class Test::Unit::TestCase
     assert !File.readable?(full_path), "Expected #{full_path} to not be a readable file"
   end
 
+  # stolen from the thor specs
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+
+    result
+  end
+  alias :silence :capture
+
 end

data/test/test_jim_bundler.rb

@@ -11,142 +11,182 @@ class TestJimBundler < Test::Unit::TestCase
       Jim::Installer.new(fixture_path('infoincomments.js'), File.join(root, 'tmp', 'lib')).install
       @bundler = Jim::Bundler.new(fixture('jimfile'), Jim::Index.new(@directories))
     end
-    
+
     context "initialize" do
-      
+
       should "load jimfile data if jimfile is a Pathname" do
         @bundler = Jim::Bundler.new(Pathname.new(fixture_path('jimfile')), Jim::Index.new(@directories))
         assert @bundler
         assert_equal fixture('jimfile'), @bundler.jimfile
       end
-      
+
       should "load jimfile data as a string" do
         assert @bundler
         assert_equal fixture('jimfile'), @bundler.jimfile
       end
-      
+
       should "parse options out of jimfile" do
-        assert_equal 'test/tmp/public/javascripts/bundled.js', @bundler.options[:bundled_path]
-        assert_equal 'test/tmp/public/javascripts/vendor', @bundler.options[:vendor_dir]
+        assert_equal 'test/tmp/', @bundler.bundle_dir.to_s
+        assert_equal 'test/tmp/public/javascripts/vendor', @bundler.options[:vendor_dir].to_s
       end
-      
+
       should "set index and include vendor dir" do
         assert @bundler.index.is_a?(Jim::Index)
         assert_equal [@bundler.options[:vendor_dir]] + @directories, @bundler.index.directories
-      end      
-    end        
-    
+      end
+
+      should "parse old jimfile" do
+        @bundler = Jim::Bundler.new(Pathname.new(fixture_path('old_jimfile')), Jim::Index.new(@directories))
+        assert @bundler
+        assert_equal fixture('old_jimfile'), @bundler.jimfile
+        assert_equal 'test/tmp/public/javascripts', @bundler.bundle_dir.to_s
+        assert_equal 'test/tmp/public/javascripts/vendor', @bundler.options[:vendor_dir].to_s
+        assert @bundler.bundles['default']
+      end
+    end
+
     context "resolve!" do
-      
+
       should "find projects listed in the jimfile and set paths" do
         assert @bundler.paths.empty?
         @bundler.resolve!
-        assert @bundler.paths
-        assert_equal 3, @bundler.paths.length
-        @bundler.paths.each do |path, name, version|
+        assert @bundler.paths.is_a?(Hash)
+        assert @bundler.paths['default']
+        assert_equal 3, @bundler.paths['default'].length
+        @bundler.paths['default'].each do |path, name, version|
           assert path.is_a?(Pathname)
           assert name.is_a?(String)
         end
       end
-      
+
       should "set paths in same order as in jimfile" do
         @bundler.resolve!
-        assert_equal Pathname.new(fixture_path('jquery-1.4.1.js')), @bundler.paths[0][0]
+        assert_equal Pathname.new(fixture_path('jquery-1.4.1.js')), @bundler.paths['default'][0][0]
       end
-      
+
       should "raise error if file can not be found" do
         FileUtils.rm_rf(tmp_path) if File.directory?(tmp_path)
         assert_raise(Jim::Bundler::MissingFile) {
           @bundler.resolve!
         }
       end
-    
+
     end
-    
+
     context "vendor!" do
-      
+
       should "copy files in jimfile to path specified" do
         vendor_dir = Pathname.new(tmp_path) + 'vendor'
         @bundler.vendor!(vendor_dir)
         assert_readable vendor_dir + 'myproject-1.2.2.js'
         assert !File.readable?(vendor_dir + 'localfile.js'), "shouldnt vendor local files"
       end
-      
+
     end
-    
+
     context "bundle!" do
-      
+
       should "concatenate file into a string" do
-        @bundler.options = {}
-        bundle = @bundler.bundle!
+        @bundler.bundle_dir = nil
+        bundle = @bundler.bundle!("default")
         assert bundle.is_a?(String)
-        assert_match(/jQuery/, bundle)
+        assert_match(/jQuery/, bundle, "Bundle should include jQuery")
       end
-      
+
       should "raise error if file cant be found" do
         FileUtils.rm_rf(tmp_path) if File.directory?(tmp_path)
         assert_raise(Jim::Bundler::MissingFile) {
           @bundler.bundle!
         }
       end
-      
+
       should "write to file specified in options" do
-        bundle_path = @bundler.options[:bundled_path]
+        bundle_dir = @bundler.bundle_dir
+        assert @bundler.bundle!
+        assert bundle = File.read(bundle_dir + 'default.js')
+        assert_match(/jQuery/, bundle, "Bundle should include jQuery")
+      end
+
+      should "write all files if path is given" do
+        bundle_dir = @bundler.bundle_dir
         assert @bundler.bundle!
-        assert bundle = File.read(bundle_path)
-        assert_match(/jQuery/, bundle)
-      end
-      
-      should "write to file if path is given" do
-        bundle_path = File.join(tmp_path, 'app.js')
-        assert @bundler.bundle!(bundle_path)
-        assert bundle = File.read(bundle_path)
-        assert_match(/jQuery/, bundle)
-      end
-      
-      should "write to IO if IO is given" do
-        bundle_path = File.join(tmp_path, 'app.js')
-        assert @bundler.bundle!(File.open(bundle_path, 'w'))
-        assert bundle = File.read(bundle_path)
-        assert_match(/jQuery/, bundle)
-      end
-      
+        assert bundle = File.read(bundle_dir + 'default.js')
+        assert_match(/jQuery/, bundle, "Bundle should include jQuery")
+        assert bundle = File.read(bundle_dir + 'base.js')
+        assert_match(/jQuery/, bundle, "Bundle should include jQuery")
+      end
+
+      should "write specific bundle if given" do
+        bundle_dir = @bundler.bundle_dir
+        assert @bundler.bundle!("base")
+        assert bundle = File.read(bundle_dir + 'base.js')
+        assert_match(/jQuery/, bundle, "Bundle should include jQuery")
+      end
+
+      should "raise error if no bundle path or bundle name is specified" do
+        @bundler.bundle_dir = nil
+        assert_raise(Jim::Bundler::InvalidBundle) {
+          @bundler.bundle!
+        }
+      end
+
+      should "return array of paths" do
+        bundle_dir = @bundler.bundle_dir
+        assert paths = @bundler.bundle!
+        assert paths.is_a?(Array)
+        assert_contains paths, bundle_dir + 'base.js'
+        assert_contains paths, bundle_dir + 'default.js'
+      end
+
     end
-    
+
     context "compress!" do
       setup do
-        @bundler.stubs(:compress_js).returns(@bundler.bundle!(false))
+        @bundler.stubs(:compress_js).returns("jQuery")
       end
-      
+
       should "run through google compressor" do
-        @bundler.options = {}
-        bundle = @bundler.compress!
+        @bundler.bundle_dir = nil
+        bundle = @bundler.compress!("default")
         assert bundle.is_a?(String)
-        assert_match(/jQuery/, bundle)
+        assert_match(/jQuery/, bundle, "Bundle should include jQuery")
       end
-      
-      should "write to file specified in options" do
-        bundle_path = @bundler.options[:compressed_path]
+
+      should "write to dir specified in options" do
+        bundle_path = @bundler.bundle_dir
         assert @bundler.compress!
-        assert bundle = File.read(bundle_path)
-        assert_match(/jQuery/, bundle)        
-      end
-      
-      should "write to file if path is given" do
-        bundle_path = File.join(tmp_path, 'app.js')
-        assert @bundler.compress!(bundle_path)
-        assert bundle = File.read(bundle_path)
-        assert_match(/jQuery/, bundle)        
-      end
-      
-      should "write to IO if IO is given" do
-        bundle_path = File.join(tmp_path, 'app.js')
-        assert @bundler.compress!(File.open(bundle_path, 'w'))
-        assert bundle = File.read(bundle_path)
-        assert_match(/jQuery/, bundle)
-      end
-      
+        assert bundle = File.read(bundle_path + 'default.min.js')
+        assert_match(/jQuery/, bundle, "Bundle should include jQuery")
+        assert bundle = File.read(bundle_path + 'base.min.js')
+        assert_match(/jQuery/, bundle, "Bundle should include jQuery")
+      end
+
+      should "write specific bundle if given" do
+        bundle_path = @bundler.bundle_dir
+        assert @bundler.compress!("base")
+        assert bundle = File.read(bundle_path + 'base.min.js')
+        assert_match(/jQuery/, bundle, "Bundle should include jQuery")
+        assert !File.readable?(bundle_path + 'default.min.js')
+      end
+
+      should "use compressed_suffix option" do
+        @bundler.options[:compressed_suffix] = '-min'
+        bundle_path = @bundler.bundle_dir
+        assert @bundler.compress!("base")
+        assert bundle = File.read(bundle_path + 'base-min.js')
+        assert_match(/jQuery/, bundle, "Bundle should include jQuery")
+      end
+    end
+
+    context "jimfile_to_json" do
+      should "convert back to JSON string" do
+        json = @bundler.jimfile_to_json
+        assert json
+        assert json.is_a?(String)
+        assert_match(/^\{/, json)
+      end
     end
+
   end
 
 end