railties 3.2.4 → 3.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/lib/rails/generators/app_base.rb +1 -1
  2. data/lib/rails/source_annotation_extractor.rb +2 -2
  3. data/lib/rails/version.rb +1 -1
  4. metadata +10 -10
data/lib/rails/generators/app_base.rb CHANGED
@@ -234,7 +234,7 @@ module Rails
234
234
  if defined?(JRUBY_VERSION)
235
235
  "gem 'therubyrhino'\n"
236
236
  else
237
- "# gem 'therubyracer', :platform => :ruby\n"
237
+ "# gem 'therubyracer', :platforms => :ruby\n"
238
238
  end
239
239
  end
240
240
 
data/lib/rails/source_annotation_extractor.rb CHANGED
@@ -53,7 +53,7 @@ class SourceAnnotationExtractor
53
53
 
54
54
  # Returns a hash that maps filenames under +dir+ (recursively) to arrays
55
55
  # with their annotations. Only files with annotations are included, and only
56
- # those with extension +.builder+, +.rb+, +.erb+, +.haml+ and +.slim+
56
+ # those with extension +.builder+, +.rb+, +.erb+, +.haml+, +.slim+ and +.coffee+
57
57
  # are taken into account.
58
58
  def find_in(dir)
59
59
  results = {}
@@ -63,7 +63,7 @@ class SourceAnnotationExtractor
63
63
 
64
64
  if File.directory?(item)
65
65
  results.update(find_in(item))
66
- elsif item =~ /\.(builder|rb)$/
66
+ elsif item =~ /\.(builder|rb|coffee)$/
67
67
  results.update(extract_annotations_from(item, /#\s*(#{tag}):?\s*(.*)$/))
68
68
  elsif item =~ /\.erb$/
69
69
  results.update(extract_annotations_from(item, /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/))
data/lib/rails/version.rb CHANGED
@@ -2,7 +2,7 @@ module Rails
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 3
4
4
  MINOR = 2
5
- TINY = 4
5
+ TINY = 5
6
6
  PRE = nil
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: railties
3
3
  version: !ruby/object:Gem::Version
4
- hash: 7
4
+ hash: 5
5
5
  prerelease:
6
6
  segments:
7
7
  - 3
8
8
  - 2
9
- - 4
10
- version: 3.2.4
9
+ - 5
10
+ version: 3.2.5
11
11
  platform: ruby
12
12
  authors:
13
13
  - David Heinemeier Hansson
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-05-31 00:00:00 Z
18
+ date: 2012-06-01 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  name: rake
@@ -95,12 +95,12 @@ dependencies:
95
95
  requirements:
96
96
  - - "="
97
97
  - !ruby/object:Gem::Version
98
- hash: 7
98
+ hash: 5
99
99
  segments:
100
100
  - 3
101
101
  - 2
102
- - 4
103
- version: 3.2.4
102
+ - 5
103
+ version: 3.2.5
104
104
  type: :runtime
105
105
  version_requirements: *id005
106
106
  - !ruby/object:Gem::Dependency
@@ -111,12 +111,12 @@ dependencies:
111
111
  requirements:
112
112
  - - "="
113
113
  - !ruby/object:Gem::Version
114
- hash: 7
114
+ hash: 5
115
115
  segments:
116
116
  - 3
117
117
  - 2
118
- - 4
119
- version: 3.2.4
118
+ - 5
119
+ version: 3.2.5
120
120
  type: :runtime
121
121
  version_requirements: *id006
122
122
  description: "Rails internals: application bootup, plugins, generators, and rake tasks."