jax 0.0.0.6 → 0.0.0.7

data/CHANGELOG

@@ -1,3 +1,11 @@
+* 0.0.0.7 *
+
+* Fixed a bug which could cause applications to fail in production (after running
+  `rake jax:package`). It was due to the packager adding helper files in the wrong
+  order.
+
+
+
 * 0.0.0.6 *
 
 * Introduced Jax.uptime, a running total of number of seconds since the Jax subsystem

data/lib/jax/generators/app/templates/public/javascripts/jax.js

@@ -1,5 +1,5 @@
 
-var Jax = { PRODUCTION: 1, VERSION: "0.0.0.6" };
+var Jax = { PRODUCTION: 1, VERSION: "0.0.0.7" };
 
 /* Called by Jax applications as of version 0.0.0.5 to alert the user to incomplete upgrades */
 Jax.doVersionCheck = function(targetVersion) {

data/lib/jax/packager/sprockets_template.rb

@@ -5,6 +5,7 @@ class Jax::Packager::SprocketsTemplate < Sprockets::SourceFile
   end
   
   def template
+    added_files.clear
     @template ||= begin
       template = [
         'Jax.environment = Jax.PRODUCTION;',
@@ -12,17 +13,34 @@ class Jax::Packager::SprocketsTemplate < Sprockets::SourceFile
         '//= provide "public/"',
         ''
       ]
-      Dir[Jax.root.join("app/**/*.js")].each do |jsfi|
-        if File.file?(jsfi)
-          relative_path = jsfi.sub(/^#{Regexp::escape Jax.root.to_s}[\/\\]?/, '')
-          template << "//= require \"#{relative_path}\""
-        end
-      end
+      # Need to verify that helpers come first
+      Dir[Jax.root.join("app/helpers/**/*.js")].each { |jsfi| try_to_add_file(template, jsfi) }
+      Dir[Jax.root.join("app/**/*.js")].each { |jsfi| try_to_add_file(template, jsfi) }
 
       template
     end
   end
   
+  def try_to_add_file(template, jsfi)
+    if File.file?(jsfi) && !already_added?(jsfi)
+      add_file(template, jsfi)
+    end
+  end
+  
+  def add_file(template, jsfi)
+    relative_path = jsfi.sub(/^#{Regexp::escape Jax.root.to_s}[\/\\]?/, '')
+    template << "//= require \"#{relative_path}\""
+    added_files << jsfi
+  end
+  
+  def already_added?(jsfi)
+    added_files.include?(jsfi)
+  end
+  
+  def added_files
+    @added_files ||= []
+  end
+  
   def source_lines
     # basically the same as super but with a string instead of a file
     # TODO would templating be a worthy addition to Sprockets itself?

data/lib/jax/version.rb

@@ -3,7 +3,7 @@ module Jax
     MAJOR = 0
     MINOR = 0
     TINY  = 0
-    PATCH = 6
+    PATCH = 7
 
     STRING = PATCH == 0 ? "#{MAJOR}.#{MINOR}.#{TINY}" : "#{MAJOR}.#{MINOR}.#{TINY}.#{PATCH}"
   end

data/src/constants.yml

@@ -1 +1 @@
-JAX_VERSION: 0.0.0.6
+JAX_VERSION: 0.0.0.7

metadata

@@ -2,7 +2,7 @@
 name: jax
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.0.6
+  version: 0.0.0.7
 platform: ruby
 authors: 
 - Colin MacKenzie IV
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-28 00:00:00 -04:00
+date: 2011-05-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -689,7 +689,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3001490309694748403
+      hash: -2961147787499847116
       segments: 
       - 0
       version: "0"
@@ -698,7 +698,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3001490309694748403
+      hash: -2961147787499847116
       segments: 
       - 0
       version: "0"