haml-edge 2.3.69 → 2.3.70
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.
- data/EDGE_GEM_VERSION +1 -1
- data/VERSION +1 -1
- data/init.rb +11 -3
- data/test/linked_rails.rb +1 -2
- metadata +2 -2
data/EDGE_GEM_VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.3.
|
|
1
|
+
2.3.70
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.3.
|
|
1
|
+
2.3.70
|
data/init.rb
CHANGED
|
@@ -1,8 +1,16 @@
|
|
|
1
1
|
begin
|
|
2
2
|
require File.join(File.dirname(__FILE__), 'lib', 'haml') # From here
|
|
3
3
|
rescue LoadError
|
|
4
|
-
|
|
4
|
+
begin
|
|
5
|
+
require 'haml' # From gem
|
|
6
|
+
rescue LoadError => e
|
|
7
|
+
# gems:install may be run to install Haml with the skeleton plugin
|
|
8
|
+
# but not the gem itself installed.
|
|
9
|
+
# Don't die if this is the case.
|
|
10
|
+
raise e unless defined?(Rake) && Rake.application.top_level_tasks.include?('gems:install')
|
|
11
|
+
end
|
|
5
12
|
end
|
|
6
13
|
|
|
7
|
-
# Load Haml and Sass
|
|
8
|
-
Haml.
|
|
14
|
+
# Load Haml and Sass.
|
|
15
|
+
# Haml may be undefined if we're running gems:install.
|
|
16
|
+
Haml.init_rails(binding) if defined?(Haml)
|
data/test/linked_rails.rb
CHANGED
|
@@ -5,9 +5,8 @@ if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib
|
|
|
5
5
|
puts "[ using linked Rails ]"
|
|
6
6
|
$:.unshift linked_rails + '/activesupport/lib'
|
|
7
7
|
$:.unshift linked_rails + '/actionpack/lib'
|
|
8
|
-
else
|
|
9
|
-
require 'rubygems'
|
|
10
8
|
end
|
|
9
|
+
require 'rubygems'
|
|
11
10
|
require 'action_controller'
|
|
12
11
|
require 'action_view'
|
|
13
12
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: haml-edge
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.3.
|
|
4
|
+
version: 2.3.70
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Nathan Weizenbaum
|
|
@@ -10,7 +10,7 @@ autorequire:
|
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
12
|
|
|
13
|
-
date: 2009-11-
|
|
13
|
+
date: 2009-11-05 00:00:00 -05:00
|
|
14
14
|
default_executable:
|
|
15
15
|
dependencies:
|
|
16
16
|
- !ruby/object:Gem::Dependency
|