jsus 0.3.0 → 0.3.1

data/CHANGELOG

@@ -1,4 +1,7 @@
 = Jsus Changelog
+== Version 0.3.1
+* Added wildcard support for Jsus::Middleware
+
 == Version 0.3.0
 * Added Jsus::Middleware for rack middleware stuff. Yay!
 

data/Rakefile

@@ -37,6 +37,7 @@ require 'cucumber'
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = %w{--exclude compression\.feature} if RUBY_PLATFORM =~ /java/
 end
 
 task :default => [:spec, :features]

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/jsus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsus}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Abramov"]
-  s.date = %q{2011-05-17}
+  s.date = %q{2011-05-19}
   s.default_executable = %q{jsus}
   s.description = %q{Javascript packager and dependency resolver}
   s.email = %q{markizko@gmail.com}

data/lib/jsus/middleware.rb

@@ -19,15 +19,15 @@ module Jsus
   #
   # Examples:
   #
-  # GET /javascripts/jsus/Mootools.Core+Mootools.More
+  # GET /javascripts/jsus/require/Mootools.Core+Mootools.More
   #     merges packages named Mootools.Core and Mootools.More with all the
   #     dependencies and outputs the result.
   #
-  # GET /javascripts/jsus/Mootools.More~Mootools.Core
+  # GET /javascripts/jsus/require/Mootools.More~Mootools.Core
   #     returns package Mootools.More with all the dependencies MINUS any of
   #     Mootools.Core dependencies.
   #
-  # GET /javascripts/jsus/Mootools.Core:Class+Mootools.More:Fx
+  # GET /javascripts/jsus/require/Mootools.Core:Class+Mootools.More:Fx
   #     same thing but for source files providing Mootools.Core/Class and
   #     Mootools.More/Fx
   #
@@ -128,9 +128,16 @@ module Jsus
         package.include_dependencies!
         package.linked_external_dependencies.to_a + package.source_files.to_a
       elsif source_file = pool.lookup(source_file_or_package)
-        pool.lookup_dependencies(source_file) << source_file
+        pool.lookup_dependencies(source_file).to_a << source_file
       else
-        []
+        # Try using arg as mask
+        mask = source_file_or_package.to_s
+        if !(mask =~ /^\s*$/) && !(source_files = pool.provides_tree.glob(mask)).empty?
+          source_files.map {|source| get_associated_files(source) }.flatten
+        else
+          # No dice
+          []
+        end
       end
     end # get_associated_files
 

data/spec/jsus/middleware_spec.rb

@@ -177,6 +177,34 @@ describe Jsus::Middleware do
         body.index("script: Color.js").should > body.index("script: Core.js")
       end
     end
+
+
+    describe "using wildcard /javascripts/jsus/require/Package:Input.*.js" do
+      let(:path) { "/javascripts/jsus/require/Package:Input.*.js" }
+
+      it "should be successful" do
+        get(path).should be_successful
+      end
+
+      it "should respond with type text/javascript" do
+        get(path).content_type.should == "text/javascript"
+      end
+
+      it "should respond with generated content" do
+        get(path).body.should include("script: Input.Color.js")
+      end
+
+      it "should include dependencies by default" do
+        get(path).body.should include("script: Color.js")
+        get(path).body.should include("script: Core.js")
+      end
+
+      it "should preserve correct order" do
+        body = get(path).body
+        body.index("script: Color.js").should < body.index("script: Input.Color.js")
+        body.index("script: Color.js").should > body.index("script: Core.js")
+      end
+    end
   end
 
   describe "for invalid paths" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jsus
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Mark Abramov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 +04:00
+date: 2011-05-19 00:00:00 +04:00
 default_executable: jsus
 dependencies: 
 - !ruby/object:Gem::Dependency