Permalink
Browse files

* Updated CHANGELOG and README

  • Loading branch information...
1 parent 2df075b commit 4927e742d77a22b851726ae1f420677fe2f396b9 @sbecker committed Nov 4, 2007
Showing with 24 additions and 14 deletions.
  1. +15 −0 CHANGELOG
  2. +5 −10 README
  3. +4 −4 lib/synthesis/asset_package.rb
View
15 CHANGELOG
@@ -1,4 +1,19 @@
------------------------------------------------------------------------
+r52 | sbecker | 2007-11-04 01:38:21 -0400 (Sun, 04 Nov 2007) | 3 lines
+
+* Allow configuration of which environments the helpers should merge scripts with the Synthesis::AssetPackage.merge_environments variable.
+* Refactored tests so they can all run together, and not depend on what the RAILS_ENV constant is.
+* Only add file extension if it was explicitly passed in, fixes other helpers in rails.
+------------------------------------------------------------------------
+r51 | sbecker | 2007-10-26 16:24:48 -0400 (Fri, 26 Oct 2007) | 1 line
+
+* Updated jsmin.rb to latest version from 2007-07-20
+------------------------------------------------------------------------
+r50 | sbecker | 2007-10-23 23:16:07 -0400 (Tue, 23 Oct 2007) | 1 line
+
+Updated CHANGELOG
+
+------------------------------------------------------------------------
r49 | sbecker | 2007-10-23 23:13:27 -0400 (Tue, 23 Oct 2007) | 1 line
* Finally committed the subdirectory patch. (Thanks James Coglan!)
View
15 README
@@ -152,20 +152,15 @@ All options for stylesheet_link_tag still work, so if you want to specify a diff
So you want to run the tests eh? Ok, then listen:
-This plugin has a full suite of tests. But you've gotta follow a
-certain procedure. If you do, all tests should pass. You cant run
-them all at once (unfortunately) by running "rake" because the
-tests depend on ENV['RAILS_ENV'] being different, and as far as I
-know, this can't be changed in a running script once it is set. So,
-we run them separately. Observe:
+This plugin has a full suite of tests. But since they
+depend on rails, it has to be run in the context of a
+rails app, in the vendor/plugins directory. Observe:
> rails newtestapp
> cd newtestapp
> ./script/plugin install http://sbecker.net/shared/plugins/asset_packager
-> cd vendor/plugins/asset_packager/test/
-> ruby asset_packager_test.rb # all pass
-> ruby asset_package_helper_development_test.rb # all pass
-> ruby asset_package_helper_production_test.rb # all pass
+> cd vendor/plugins/asset_packager/
+> rake # all tests pass
== License
Copyright (c) 2006 Scott Becker - http://synthesis.sbecker.net
View
8 lib/synthesis/asset_package.rb
@@ -9,6 +9,10 @@ class AssetPackage
# singleton methods
class << self
+ def merge_environments
+ @@merge_environments || ["production"]
+ end
+
def parse_path(path)
/^(?:(.*)\/)?([^\/]+)$/.match(path).to_a
end
@@ -81,10 +85,6 @@ def create_yml
end
end
- def merge_environments
- @@merge_environments || ["production"]
- end
-
end
# instance methods

0 comments on commit 4927e74

Please sign in to comment.