mint 0.2.8 → 0.2.9

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 (5) hide show
  1. data/lib/mint/document.rb +2 -1
  2. data/lib/mint/helpers.rb +14 -11
  3. data/lib/mint/version.rb +1 -1
  4. data/spec/document_spec.rb +4 -5
  5. metadata +29 -29
data/lib/mint/document.rb CHANGED
@@ -181,7 +181,8 @@ module Mint
181
181
  # Returns a relative path from the document to its stylesheet. Can
182
182
  # be called directly from inside a layout template.
183
183
  def stylesheet
184
- self.destination_file_path.relative_path_from(self.style_destination_file_path).to_s
184
+ Helpers.normalize_path(self.style_destination_file,
185
+ self.destination_directory).to_s
185
186
  end
186
187
  end
187
188
  end
data/lib/mint/helpers.rb CHANGED
@@ -54,18 +54,21 @@ module Mint
54
54
  end
55
55
  end
56
56
 
57
- # Returns the relative path to dir1 from dir2. If dir1 and dir2
58
- # have no directories in common besides /, will return the
59
- # absolute directory of dir1. Assumes no symlinks.
57
+ # Returns the relative path to to_directory from from_directory.
58
+ # If to_directory and from_directory have no parents in common besides
59
+ # /, returns the absolute directory of to_directory. Assumes no symlinks.
60
60
  #
61
- # @param [String, Pathname] dir1 the target directory
62
- # @param [String, Pathname] dir2 the starting directory
63
- # @return [Pathname] the relative path to dir1 from dir2, or an absolute
64
- # path if they have no parent directories other than / in common
65
- def self.normalize_path(dir1, dir2)
66
- path1, path2 = [dir1, dir2].map {|d| pathize d }
67
- root1, root2 = [path1, path2].map {|p| p.each_filename.first }
68
- root1 == root2 ? path1.relative_path_from(path2) : path1
61
+ # @param [String, Pathname] to_directory the target directory
62
+ # @param [String, Pathname] from_directory the starting directory
63
+ # @return [Pathname] the relative path to to_directory from
64
+ # from_directory, or an absolute path if they have no parents in common
65
+ # other than /
66
+ def self.normalize_path(to_directory, from_directory)
67
+ to_path, from_path = [to_directory, from_directory].map {|d| pathize d }
68
+ to_root, from_root = [to_path, from_path].map {|p| p.each_filename.first }
69
+ to_root == from_root ?
70
+ to_path.relative_path_from(from_path) :
71
+ to_path
69
72
  end
70
73
 
71
74
  # Reads Yaml options from file. Updates values with new_opts. Writes
data/lib/mint/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Mint
2
- VERSION = '0.2.8'
2
+ VERSION = '0.2.9'
3
3
  end
data/spec/document_spec.rb CHANGED
@@ -13,10 +13,9 @@ module Mint
13
13
  # Convenience methods
14
14
 
15
15
  it "#stylesheet" do
16
- relative_path = document.destination_file_path.
17
- relative_path_from(document.style_destination_file_path)
18
-
19
- document.stylesheet.should == relative_path.to_s
16
+ document.stylesheet.should ==
17
+ Helpers.normalize_path(document.style_destination_file,
18
+ document.destination_directory).to_s
20
19
  end
21
20
 
22
21
  # style_spec.rb ensures that our style generation goes as planned
@@ -25,7 +24,7 @@ module Mint
25
24
  its(:content) { should =~ /<p>This is just a test.<\/p>/ }
26
25
 
27
26
  # Render output
28
-
27
+
29
28
  it "renders its layout, injecting content inside" do
30
29
  document.render.should =~
31
30
  /.*<html>.*#{document.content}.*<\/html>.*/m
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mint
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.8
4
+ version: 0.2.9
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-08-11 00:00:00.000000000Z
12
+ date: 2011-09-01 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: tilt
16
- requirement: &70150881334580 !ruby/object:Gem::Requirement
16
+ requirement: &70172153110900 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70150881334580
24
+ version_requirements: *70172153110900
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rdiscount
27
- requirement: &70150881336760 !ruby/object:Gem::Requirement
27
+ requirement: &70172153110360 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70150881336760
35
+ version_requirements: *70172153110360
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: erubis
38
- requirement: &70150881338620 !ruby/object:Gem::Requirement
38
+ requirement: &70172153109840 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70150881338620
46
+ version_requirements: *70172153109840
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: haml
49
- requirement: &70150881340960 !ruby/object:Gem::Requirement
49
+ requirement: &70172153109360 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70150881340960
57
+ version_requirements: *70172153109360
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: sass
60
- requirement: &70150881345260 !ruby/object:Gem::Requirement
60
+ requirement: &70172153108920 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70150881345260
68
+ version_requirements: *70172153108920
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rdiscount
71
- requirement: &70150892156560 !ruby/object:Gem::Requirement
71
+ requirement: &70172153108440 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70150892156560
79
+ version_requirements: *70172153108440
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: liquid
82
- requirement: &70150892061900 !ruby/object:Gem::Requirement
82
+ requirement: &70172153108000 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *70150892061900
90
+ version_requirements: *70172153108000
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: less
93
- requirement: &70150892061440 !ruby/object:Gem::Requirement
93
+ requirement: &70172153107520 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *70150892061440
101
+ version_requirements: *70172153107520
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: radius
104
- requirement: &70150892060900 !ruby/object:Gem::Requirement
104
+ requirement: &70172153107080 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *70150892060900
112
+ version_requirements: *70172153107080
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: markaby
115
- requirement: &70150892060360 !ruby/object:Gem::Requirement
115
+ requirement: &70172153106500 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *70150892060360
123
+ version_requirements: *70172153106500
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: rspec
126
- requirement: &70150892059940 !ruby/object:Gem::Requirement
126
+ requirement: &70172153105960 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *70150892059940
134
+ version_requirements: *70172153105960
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: cucumber
137
- requirement: &70150892059400 !ruby/object:Gem::Requirement
137
+ requirement: &70172153105440 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '0'
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *70150892059400
145
+ version_requirements: *70172153105440
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: aruba
148
- requirement: &70150892058860 !ruby/object:Gem::Requirement
148
+ requirement: &70172153104780 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,9 +153,9 @@ dependencies:
153
153
  version: '0'
154
154
  type: :development
155
155
  prerelease: false
156
- version_requirements: *70150892058860
156
+ version_requirements: *70172153104780
157
157
  description:
158
- email: david@allthingsprogress.com
158
+ email: david@wit.io
159
159
  executables:
160
160
  - mint
161
161
  extensions: []