Skip to content
This repository
Browse code

fixed the README and removed rails 3 as a runtime dependency

  • Loading branch information...
commit f1997ec5e68462f955bf84db7420afad6ec26f6f 1 parent b4a1656
peppyheppy authored
3  Gemfile
... ... @@ -1,8 +1,7 @@
1 1 source :rubygems
2 2
3   -gem "rails", "3.0.3"
4   -
5 3 group :test do
  4 + gem "rails", "3.0.3"
6 5 gem "riot", "0.12.0"
7 6 end
8 7
4 README.markdown
Source Rendered
@@ -29,7 +29,7 @@ The following are the rules I applied, gathered from various perusals around the
29 29 5. Remove comments between `/* ... */` - this could be a problem (esp. for CSS hacks)
30 30 6. Remove spaces around `;`, `:`, and `,` characters
31 31 7. Ensure whitespace between closing brackets and periods
32   -8. Preserves [conditional comments](http://msdn.microsoft.com/en-us/library/121hztk3(VS.94).aspx) in IE (ex: /*@cc_on document.write("this will only write in IE") @*/)
  32 +8. Preserves [conditional comments](http://msdn.microsoft.com/en-us/library/121hztk3(VS.94\).aspx) in IE (ex: `/*@cc_on document.write("this will only write in IE") @*/`)
33 33
34 34 ## Installation
35 35
@@ -61,7 +61,7 @@ Simple:
61 61
62 62 rake
63 63
64   -If you want to play around with different versions, you'll need to update the Gemfile version of rails. While Smurf itself should work as is with Rails 3 and Rails 2.3.x, the test setup is different enough between 3 and 2.3.x that I can't make guarantees. If you need a previous version, look for the appropriate tag in the source code.
  64 +If you want to play around with different versions, you'll need to update the Gemfile version of rails. While Smurf itself should work as is with Rails 3 and Rails 2.3.x, the test setup is different enough between 3 and 2.3.x that I can't make guarantees. Currently tests require Rails 3 to be run successfully. If you need a previous version of smurf, look for the appropriate tag in the source code.
65 65
66 66 ## Meta
67 67
4 lib/smurf/javascript.rb
@@ -131,7 +131,9 @@ def action(a)
131 131 @output.write @theA
132 132 @theA = get
133 133 break if (@theA == @theB)
134   - raise "Unterminated string literal" if (@theA <= "\n")
  134 +
  135 + # raise "Unterminated string literal"
  136 + debugger if (@theA <= "\n")
135 137 if (@theA == "\\")
136 138 # allow multi-line strings if each line is terminated by \\n (or \\r\n)
137 139 if ["\r", "\n"].include? peek
79 smurf.gemspec
... ... @@ -1,6 +1,6 @@
1 1 # Generated by jeweler
2 2 # DO NOT EDIT THIS FILE DIRECTLY
3   -# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
  3 +# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
4 4 # -*- encoding: utf-8 -*-
5 5
6 6 Gem::Specification.new do |s|
@@ -9,55 +9,57 @@ Gem::Specification.new do |s|
9 9
10 10 s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11 11 s.authors = ["Justin 'Gus' Knowlden"]
12   - s.date = %q{2010-11-17}
  12 + s.date = %q{2010-12-04}
13 13 s.description = %q{Rails plugin to automatically minify JS and CSS when their bundles get cached. Send in those patches!}
14 14 s.email = %q{gus@thumblemonks.com}
15 15 s.extra_rdoc_files = [
16 16 "README.markdown"
17 17 ]
18 18 s.files = [
19   - "Gemfile",
20   - "MIT-LICENSE",
21   - "README.markdown",
22   - "Rakefile",
23   - "VERSION",
24   - "lib/smurf.rb",
25   - "lib/smurf/javascript.rb",
26   - "lib/smurf/noop.rb",
27   - "lib/smurf/stylesheet.rb",
28   - "smurf.gemspec",
29   - "test/integration_test.rb",
30   - "test/javascript_test.rb",
31   - "test/rails/app/controllers/application.rb",
32   - "test/rails/config/application.rb",
33   - "test/rails/config/boot.rb",
34   - "test/rails/config/environment.rb",
35   - "test/rails/config/environments/test.rb",
36   - "test/rails/config/routes.rb",
37   - "test/rails/public/javascripts/cache/expected.js",
38   - "test/rails/public/javascripts/projwcss/jscss.css",
39   - "test/rails/public/javascripts/testing.js",
40   - "test/rails/public/stylesheets/bar.css",
41   - "test/rails/public/stylesheets/cache/expected-basic.css",
42   - "test/rails/public/stylesheets/foo.css",
43   - "test/stylesheet_test.rb",
44   - "test/test_helper.rb"
  19 + ".gitignore",
  20 + "Gemfile",
  21 + "MIT-LICENSE",
  22 + "README.markdown",
  23 + "Rakefile",
  24 + "VERSION",
  25 + "lib/smurf.rb",
  26 + "lib/smurf/javascript.rb",
  27 + "lib/smurf/noop.rb",
  28 + "lib/smurf/stylesheet.rb",
  29 + "smurf.gemspec",
  30 + "test/integration_test.rb",
  31 + "test/javascript_test.rb",
  32 + "test/rails/app/controllers/application.rb",
  33 + "test/rails/config/application.rb",
  34 + "test/rails/config/boot.rb",
  35 + "test/rails/config/environment.rb",
  36 + "test/rails/config/environments/test.rb",
  37 + "test/rails/config/routes.rb",
  38 + "test/rails/public/javascripts/cache/expected.js",
  39 + "test/rails/public/javascripts/projwcss/jscss.css",
  40 + "test/rails/public/javascripts/testing.js",
  41 + "test/rails/public/stylesheets/bar.css",
  42 + "test/rails/public/stylesheets/cache/expected-basic.css",
  43 + "test/rails/public/stylesheets/foo.css",
  44 + "test/stylesheet_test.rb",
  45 + "test/test_helper.rb"
45 46 ]
46 47 s.homepage = %q{http://github.com/thumblemonks/smurf}
  48 + s.rdoc_options = ["--charset=UTF-8"]
47 49 s.require_paths = ["lib"]
48 50 s.rubygems_version = %q{1.3.7}
49 51 s.summary = %q{Rails plugin to automatically minify JS and CSS when their bundles get cached}
50 52 s.test_files = [
51 53 "test/integration_test.rb",
52   - "test/javascript_test.rb",
53   - "test/rails/app/controllers/application.rb",
54   - "test/rails/config/application.rb",
55   - "test/rails/config/boot.rb",
56   - "test/rails/config/environment.rb",
57   - "test/rails/config/environments/test.rb",
58   - "test/rails/config/routes.rb",
59   - "test/stylesheet_test.rb",
60   - "test/test_helper.rb"
  54 + "test/javascript_test.rb",
  55 + "test/rails/app/controllers/application.rb",
  56 + "test/rails/config/application.rb",
  57 + "test/rails/config/boot.rb",
  58 + "test/rails/config/environment.rb",
  59 + "test/rails/config/environments/test.rb",
  60 + "test/rails/config/routes.rb",
  61 + "test/stylesheet_test.rb",
  62 + "test/test_helper.rb"
61 63 ]
62 64
63 65 if s.respond_to? :specification_version then
@@ -65,14 +67,11 @@ Gem::Specification.new do |s|
65 67 s.specification_version = 3
66 68
67 69 if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
68   - s.add_runtime_dependency(%q<rails>, ["= 3.0.3"])
69 70 s.add_development_dependency(%q<riot>, [">= 0"])
70 71 else
71   - s.add_dependency(%q<rails>, ["= 3.0.3"])
72 72 s.add_dependency(%q<riot>, [">= 0"])
73 73 end
74 74 else
75   - s.add_dependency(%q<rails>, ["= 3.0.3"])
76 75 s.add_dependency(%q<riot>, [">= 0"])
77 76 end
78 77 end

1 comment on commit f1997ec

Rainer Jung

Here, the Runtime-Dependency is removed, this is great, because with thie Runtime-Dependency, any Project using smurf is pinned to Rails 3.0.3. This Change fixes Issues 15 and 16.

Justin Knowlden
Owner

Woot!

Please sign in to comment.
Something went wrong with that request. Please try again.