merb-haml 1.1.0.pre → 1.1.0.rc1

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/Rakefile +1 -1
  2. data/lib/merb-haml.rb +35 -36
  3. data/lib/merb-haml/version.rb +2 -2
  4. metadata +41 -18
data/Rakefile CHANGED
@@ -14,7 +14,7 @@ begin
14
14
 
15
15
  Jeweler::Tasks.new do |gemspec|
16
16
 
17
- gemspec.version = Merb::Haml::VERSION
17
+ gemspec.version = Merb::Haml::VERSION.dup
18
18
 
19
19
  gemspec.name = "merb-haml"
20
20
  gemspec.description = "Merb plugin for HAML support"
data/lib/merb-haml.rb CHANGED
@@ -1,39 +1,38 @@
1
- # make sure we're running inside Merb
2
- if defined?(Merb)
3
- require "haml"
4
- require "merb-haml/template"
5
- Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / "merb-haml" / "merbtasks"))
6
-
7
- Merb::Plugins.config[:sass] ||= {}
8
-
9
- Merb::BootLoader.after_app_loads do
10
-
11
- template_locations = []
12
- template_locations << Merb.dir_for(:stylesheet) / "sass"
13
-
14
- # extract template locations list from sass config
15
- config_location = Merb::Plugins.config[:sass][:template_location]
16
- if config_location.is_a? Hash
17
- template_locations += config_location.keys
18
- elsif config_location
19
- template_locations << config_location.to_s
20
- end
21
-
22
- # setup sass if any template paths match
23
- if template_locations.any?{|location| File.directory?(location) }
24
- require "sass"
25
- if Merb::Config[:sass]
26
- Merb.logger.info("Please define your sass settings in Merb::Plugins.config[:sass] not Merb::Config")
27
- Sass::Plugin.options = Merb::Config[:sass]
28
- else
29
- Sass::Plugin.options = Merb::Plugins.config[:sass]
30
- end
1
+ require "merb-core"
2
+
3
+ require "haml"
4
+ require "merb-haml/template"
5
+ Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / "merb-haml" / "merbtasks"))
6
+
7
+ Merb::Plugins.config[:sass] ||= {}
8
+
9
+ Merb::BootLoader.after_app_loads do
10
+
11
+ template_locations = []
12
+ template_locations << Merb.dir_for(:stylesheet) / "sass"
13
+
14
+ # extract template locations list from sass config
15
+ config_location = Merb::Plugins.config[:sass][:template_location]
16
+ if config_location.is_a? Hash
17
+ template_locations += config_location.keys
18
+ elsif config_location
19
+ template_locations << config_location.to_s
20
+ end
21
+
22
+ # setup sass if any template paths match
23
+ if template_locations.any?{|location| File.directory?(location) }
24
+ require "sass"
25
+ if Merb::Config[:sass]
26
+ Merb.logger.info("Please define your sass settings in Merb::Plugins.config[:sass] not Merb::Config")
27
+ Sass::Plugin.options = Merb::Config[:sass]
28
+ else
29
+ Sass::Plugin.options = Merb::Plugins.config[:sass]
31
30
  end
32
-
33
31
  end
34
-
35
- generators = File.join(File.dirname(__FILE__), 'generators')
36
- Merb.add_generators generators / "resource_controller"
37
- Merb.add_generators generators / "controller"
38
- Merb.add_generators generators / "layout"
32
+
39
33
  end
34
+
35
+ generators = File.join(File.dirname(__FILE__), 'generators')
36
+ Merb.add_generators generators / "resource_controller"
37
+ Merb.add_generators generators / "controller"
38
+ Merb.add_generators generators / "layout"
data/lib/merb-haml/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Merb
2
2
  module Haml
3
- VERSION = '1.1.0.pre'.freeze
3
+ VERSION = '1.1.0.rc1'.freeze
4
4
  end
5
- end
5
+ end
metadata CHANGED
@@ -1,7 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: merb-haml
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0.pre
4
+ prerelease: true
5
+ segments:
6
+ - 1
7
+ - 1
8
+ - 0
9
+ - rc1
10
+ version: 1.1.0.rc1
5
11
  platform: ruby
6
12
  authors:
7
13
  - Yehuda Katz
@@ -9,39 +15,52 @@ autorequire:
9
15
  bindir: bin
10
16
  cert_chain: []
11
17
 
12
- date: 2010-02-20 00:00:00 +00:00
18
+ date: 2010-03-14 00:00:00 +00:00
13
19
  default_executable:
14
20
  dependencies:
15
21
  - !ruby/object:Gem::Dependency
16
22
  name: merb-core
17
- type: :runtime
18
- version_requirement:
19
- version_requirements: !ruby/object:Gem::Requirement
23
+ prerelease: false
24
+ requirement: &id001 !ruby/object:Gem::Requirement
20
25
  requirements:
21
26
  - - ~>
22
27
  - !ruby/object:Gem::Version
23
- version: 1.1.0.pre
24
- version:
28
+ segments:
29
+ - 1
30
+ - 1
31
+ - 0
32
+ - rc1
33
+ version: 1.1.0.rc1
34
+ type: :runtime
35
+ version_requirements: *id001
25
36
  - !ruby/object:Gem::Dependency
26
37
  name: haml
27
- type: :runtime
28
- version_requirement:
29
- version_requirements: !ruby/object:Gem::Requirement
38
+ prerelease: false
39
+ requirement: &id002 !ruby/object:Gem::Requirement
30
40
  requirements:
31
41
  - - ">="
32
42
  - !ruby/object:Gem::Version
43
+ segments:
44
+ - 2
45
+ - 0
46
+ - 3
33
47
  version: 2.0.3
34
- version:
48
+ type: :runtime
49
+ version_requirements: *id002
35
50
  - !ruby/object:Gem::Dependency
36
51
  name: rspec
37
- type: :development
38
- version_requirement:
39
- version_requirements: !ruby/object:Gem::Requirement
52
+ prerelease: false
53
+ requirement: &id003 !ruby/object:Gem::Requirement
40
54
  requirements:
41
55
  - - ">="
42
56
  - !ruby/object:Gem::Version
57
+ segments:
58
+ - 1
59
+ - 2
60
+ - 9
43
61
  version: 1.2.9
44
- version:
62
+ type: :development
63
+ version_requirements: *id003
45
64
  description: Merb plugin for HAML support
46
65
  email: ykatz@engineyard.com
47
66
  executables: []
@@ -108,18 +127,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
108
127
  requirements:
109
128
  - - ">="
110
129
  - !ruby/object:Gem::Version
130
+ segments:
131
+ - 0
111
132
  version: "0"
112
- version:
113
133
  required_rubygems_version: !ruby/object:Gem::Requirement
114
134
  requirements:
115
135
  - - ">"
116
136
  - !ruby/object:Gem::Version
137
+ segments:
138
+ - 1
139
+ - 3
140
+ - 1
117
141
  version: 1.3.1
118
- version:
119
142
  requirements: []
120
143
 
121
144
  rubyforge_project:
122
- rubygems_version: 1.3.5
145
+ rubygems_version: 1.3.6
123
146
  signing_key:
124
147
  specification_version: 3
125
148
  summary: Merb plugin that provides support for writing view template with HAML