mint 0.2.2 → 0.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 (16) hide show
  1. data/README.md +37 -32
  2. data/bin/mint +15 -52
  3. data/config/{options.yaml → syntax.yaml} +10 -11
  4. data/lib/mint/commandline.rb +63 -15
  5. data/lib/mint/document.rb +48 -28
  6. data/lib/mint/exceptions.rb +3 -0
  7. data/lib/mint/helpers.rb +21 -10
  8. data/lib/mint/layout.rb +2 -1
  9. data/lib/mint/mint.rb +47 -15
  10. data/lib/mint/resource.rb +58 -20
  11. data/lib/mint/style.rb +23 -4
  12. data/lib/mint/version.rb +1 -1
  13. data/spec/document_spec.rb +124 -162
  14. data/spec/spec_helper.rb +90 -2
  15. data/templates/default/style.sass +18 -96
  16. metadata +131 -162
data/spec/spec_helper.rb CHANGED
@@ -1,7 +1,95 @@
1
+ require 'pathname'
1
2
  require 'mint'
2
3
 
3
4
  RSpec::Matchers.define :be_in_directory do |name|
4
- match do |resource|
5
- resource.source.dirname.to_s =~ /#{name}/
5
+ match {|resource| resource.source_directory =~ /#{name}/ }
6
+ end
7
+
8
+ RSpec::Matchers.define :be_path do |name|
9
+ match {|resource| resource == Pathname.new(name) }
10
+ end
11
+
12
+ RSpec::Matchers.define :be_in_template do |name|
13
+ match {|file| file =~ /#{Mint.root}.*#{name}/ }
14
+ end
15
+
16
+ RSpec::Matchers.define :be_a_template do |name|
17
+ match {|file| Mint.template? file }
18
+ end
19
+
20
+ RSpec.configure do |config|
21
+ config.before(:suite) do
22
+ @old_dir = Dir.getwd
23
+ @tmp_dir = '/tmp/mint-test'
24
+
25
+ FileUtils.mkdir_p @tmp_dir
26
+ Dir.chdir @tmp_dir
27
+ end
28
+
29
+ config.after(:suite) do
30
+ Dir.chdir @old_dir
31
+ FileUtils.rm_r @tmp_dir
32
+ end
33
+
34
+ config.before(:each) do
35
+ @content_file = 'content.md'
36
+ @destination_file = 'content.html'
37
+ @layout_file = 'layout.haml'
38
+ @style_file = 'style.css'
39
+
40
+ @static_style_file = 'static.css'
41
+ @dynamic_style_file = 'dynamic.sass'
42
+
43
+ @content = <<-HERE
44
+ Header
45
+ ------
46
+
47
+ This is just a test.
48
+ HERE
49
+
50
+ @layout = <<-HERE
51
+ !!!
52
+ %html
53
+ %head
54
+ %body= content
55
+ HERE
56
+
57
+ @style = 'body { font-size: 16px }'
58
+
59
+ @static_style = <<-HERE
60
+ body #container {
61
+ padding: 1em;
62
+ }
63
+ HERE
64
+
65
+ @dynamic_style = <<HERE
66
+ body
67
+ #container
68
+ padding: 1em
69
+ HERE
70
+
71
+ [:content, :layout, :style, :static_style, :dynamic_style ].each do |v|
72
+ File.open(instance_variable_get(:"@#{v}_file"), 'w') do |f|
73
+ f << instance_variable_get(:"@#{v}")
74
+ end
75
+ end
76
+ end
77
+
78
+ config.after(:each) do
79
+ instance = lambda do |name|
80
+ instance_variable_get(:"@#{name}_file")
81
+ end
82
+
83
+ [:content, :destination, :layout, :style, :static_style, :dynamic_style].
84
+ map(&instance).
85
+ select {|file| File.file? file }.
86
+ each {|file| File.delete(file) }
87
+
88
+ Mint.templates.
89
+ map {|template| Pathname.new(template) + 'css' }.
90
+ select(&:exist?).
91
+ map(&:children).
92
+ flatten.
93
+ each {|cache| File.delete(cache) }
6
94
  end
7
95
  end
data/templates/default/style.sass CHANGED
@@ -1,114 +1,36 @@
1
- @import '../reset.css'
1
+ $screen_font_size: 18px
2
+ $screen_line_height: $screen_font_size * 1.3
3
+ $screen_unit: $screen_line_height
2
4
 
3
- body
4
- font-family: 'Hoefler Text', Georgia, Garamond, FreeSerif, serif
5
+ $print_font_size: 12pt
6
+ $print_line_height: $print_font_size * 1.3
7
+ $print_unit: $print_line_height
5
8
 
6
- h1, h2, h3, h4, h5, h6
7
- line-height: 1.5
9
+ $link_color: #cb0018
8
10
 
9
- h1, h2, h3
10
- font-weight: normal
11
+ @import ../base/style
11
12
 
12
- h4, h5, h6
13
- font-weight: bold
14
- margin-bottom: 9px
13
+ body
14
+ font-family: Georgia, 'Hoefler Text', Garamond, FreeSerif, serif
15
15
 
16
16
  h1
17
- font-size: 130%
18
17
  border-bottom: solid 2px #666
19
- margin-bottom: 18px
20
-
21
- h2
22
- font-size: 125%
23
- margin-top: 18px
24
- margin-bottom: 9px
25
18
 
26
19
  h3
27
- font-size: 100%
28
- font-style: normal
29
- margin-top: 18px
30
- margin-bottom: 9px
20
+ font-style: italic
31
21
 
32
22
  h4
33
- font-size: 100%
34
-
35
- ul
36
- list-style-type: square
37
-
38
- ul
39
- list-style-type: circle
40
-
41
- ul, ol
42
- margin: 6px 0 0 5px
43
- padding-left: 25px
44
-
45
- p
46
- margin: 9px 0 9px 0
23
+ font-variant: small-caps
47
24
 
48
- p+p, ul+p, ol+p
49
- // text-indent: 1em
50
-
51
- $link_color: #cb0018
52
- a
53
- &:link
54
- color: $link_color
55
- &:visited
56
- color: $link_color
57
- &:active
58
- color: $link_color
59
- &:hover
60
- color: #fff
61
- background-color: $link_color
25
+ h5, h6
26
+ font-weight: bold
62
27
 
63
- code
64
- font-family: Menlo, Mensch, Monaco, Consolas, Monotype, mono
65
- font-style: normal
28
+ p+p
29
+ text-indent: $screen_unit
66
30
 
67
31
  pre, blockquote
68
- display: block
69
- width: 90%
70
- margin-left: 0
71
- padding: 5px 10px
72
-
73
- background-color: #eee
74
- font-size: 95%
75
-
76
- p
77
- margin: 0
32
+ font-size: $screen_font_size
33
+ border-left: solid 2px #ddd
78
34
 
79
35
  blockquote
80
- padding: 10px
81
- border-left: solid 4px #ddd
82
-
83
36
  font-style: italic
84
-
85
- @media screen
86
- body
87
- font-size: 16px
88
- background-color: #666
89
- line-height: 18px
90
-
91
- #container
92
- display: block
93
- border: solid 1px #999
94
- width: 500px
95
- padding: 50px
96
- margin: 10px auto
97
- background-color: #fff
98
-
99
- code
100
- font-size: 12px
101
-
102
- pre
103
- code
104
- font-size: 11px
105
-
106
- @media print
107
- body
108
- font-size: 12pt
109
- margin: 1in 1.25in
110
- line-height: 1.3
111
- img
112
- display: block
113
- code
114
- font-size: 12pt
metadata CHANGED
@@ -1,193 +1,171 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: mint
3
- version: !ruby/object:Gem::Version
4
- prerelease: false
5
- segments:
6
- - 0
7
- - 2
8
- - 2
9
- version: 0.2.2
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.2.5
5
+ prerelease:
10
6
  platform: ruby
11
- authors:
7
+ authors:
12
8
  - David Jacobs
13
9
  autorequire:
14
10
  bindir: bin
15
11
  cert_chain: []
16
-
17
- date: 2011-04-11 00:00:00 -04:00
18
- default_executable:
19
- dependencies:
20
- - !ruby/object:Gem::Dependency
12
+ date: 2011-08-10 00:00:00.000000000Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
21
15
  name: tilt
22
- prerelease: false
23
- requirement: &id001 !ruby/object:Gem::Requirement
16
+ requirement: &70301723771180 !ruby/object:Gem::Requirement
24
17
  none: false
25
- requirements:
26
- - - ">="
27
- - !ruby/object:Gem::Version
28
- segments:
29
- - 0
30
- version: "0"
18
+ requirements:
19
+ - - ! '>='
20
+ - !ruby/object:Gem::Version
21
+ version: '0'
31
22
  type: :runtime
32
- version_requirements: *id001
33
- - !ruby/object:Gem::Dependency
34
- name: rdiscount
35
23
  prerelease: false
36
- requirement: &id002 !ruby/object:Gem::Requirement
24
+ version_requirements: *70301723771180
25
+ - !ruby/object:Gem::Dependency
26
+ name: rdiscount
27
+ requirement: &70301723960940 !ruby/object:Gem::Requirement
37
28
  none: false
38
- requirements:
39
- - - ">="
40
- - !ruby/object:Gem::Version
41
- segments:
42
- - 0
43
- version: "0"
29
+ requirements:
30
+ - - ! '>='
31
+ - !ruby/object:Gem::Version
32
+ version: '0'
44
33
  type: :runtime
45
- version_requirements: *id002
46
- - !ruby/object:Gem::Dependency
47
- name: erubis
48
34
  prerelease: false
49
- requirement: &id003 !ruby/object:Gem::Requirement
35
+ version_requirements: *70301723960940
36
+ - !ruby/object:Gem::Dependency
37
+ name: erubis
38
+ requirement: &70301724055420 !ruby/object:Gem::Requirement
50
39
  none: false
51
- requirements:
52
- - - ">="
53
- - !ruby/object:Gem::Version
54
- segments:
55
- - 0
56
- version: "0"
40
+ requirements:
41
+ - - ! '>='
42
+ - !ruby/object:Gem::Version
43
+ version: '0'
57
44
  type: :runtime
58
- version_requirements: *id003
59
- - !ruby/object:Gem::Dependency
45
+ prerelease: false
46
+ version_requirements: *70301724055420
47
+ - !ruby/object:Gem::Dependency
60
48
  name: haml
49
+ requirement: &70301727779460 !ruby/object:Gem::Requirement
50
+ none: false
51
+ requirements:
52
+ - - ! '>='
53
+ - !ruby/object:Gem::Version
54
+ version: '0'
55
+ type: :runtime
61
56
  prerelease: false
62
- requirement: &id004 !ruby/object:Gem::Requirement
57
+ version_requirements: *70301727779460
58
+ - !ruby/object:Gem::Dependency
59
+ name: sass
60
+ requirement: &70301728216900 !ruby/object:Gem::Requirement
63
61
  none: false
64
- requirements:
65
- - - ">="
66
- - !ruby/object:Gem::Version
67
- segments:
68
- - 2
69
- - 2
70
- - 11
71
- version: 2.2.11
62
+ requirements:
63
+ - - ! '>='
64
+ - !ruby/object:Gem::Version
65
+ version: '0'
72
66
  type: :runtime
73
- version_requirements: *id004
74
- - !ruby/object:Gem::Dependency
75
- name: rdiscount
76
67
  prerelease: false
77
- requirement: &id005 !ruby/object:Gem::Requirement
68
+ version_requirements: *70301728216900
69
+ - !ruby/object:Gem::Dependency
70
+ name: rdiscount
71
+ requirement: &70301728230720 !ruby/object:Gem::Requirement
78
72
  none: false
79
- requirements:
80
- - - ">="
81
- - !ruby/object:Gem::Version
82
- segments:
83
- - 0
84
- version: "0"
73
+ requirements:
74
+ - - ! '>='
75
+ - !ruby/object:Gem::Version
76
+ version: '0'
85
77
  type: :runtime
86
- version_requirements: *id005
87
- - !ruby/object:Gem::Dependency
88
- name: liquid
89
78
  prerelease: false
90
- requirement: &id006 !ruby/object:Gem::Requirement
79
+ version_requirements: *70301728230720
80
+ - !ruby/object:Gem::Dependency
81
+ name: liquid
82
+ requirement: &70301728326120 !ruby/object:Gem::Requirement
91
83
  none: false
92
- requirements:
93
- - - ">="
94
- - !ruby/object:Gem::Version
95
- segments:
96
- - 0
97
- version: "0"
84
+ requirements:
85
+ - - ! '>='
86
+ - !ruby/object:Gem::Version
87
+ version: '0'
98
88
  type: :runtime
99
- version_requirements: *id006
100
- - !ruby/object:Gem::Dependency
101
- name: less
102
89
  prerelease: false
103
- requirement: &id007 !ruby/object:Gem::Requirement
90
+ version_requirements: *70301728326120
91
+ - !ruby/object:Gem::Dependency
92
+ name: less
93
+ requirement: &70301728461260 !ruby/object:Gem::Requirement
104
94
  none: false
105
- requirements:
106
- - - ">="
107
- - !ruby/object:Gem::Version
108
- segments:
109
- - 0
110
- version: "0"
95
+ requirements:
96
+ - - ! '>='
97
+ - !ruby/object:Gem::Version
98
+ version: '0'
111
99
  type: :runtime
112
- version_requirements: *id007
113
- - !ruby/object:Gem::Dependency
114
- name: radius
115
100
  prerelease: false
116
- requirement: &id008 !ruby/object:Gem::Requirement
101
+ version_requirements: *70301728461260
102
+ - !ruby/object:Gem::Dependency
103
+ name: radius
104
+ requirement: &70301728624160 !ruby/object:Gem::Requirement
117
105
  none: false
118
- requirements:
119
- - - ">="
120
- - !ruby/object:Gem::Version
121
- segments:
122
- - 0
123
- version: "0"
106
+ requirements:
107
+ - - ! '>='
108
+ - !ruby/object:Gem::Version
109
+ version: '0'
124
110
  type: :runtime
125
- version_requirements: *id008
126
- - !ruby/object:Gem::Dependency
127
- name: markaby
128
111
  prerelease: false
129
- requirement: &id009 !ruby/object:Gem::Requirement
112
+ version_requirements: *70301728624160
113
+ - !ruby/object:Gem::Dependency
114
+ name: markaby
115
+ requirement: &70301728784260 !ruby/object:Gem::Requirement
130
116
  none: false
131
- requirements:
132
- - - ">="
133
- - !ruby/object:Gem::Version
134
- segments:
135
- - 0
136
- version: "0"
117
+ requirements:
118
+ - - ! '>='
119
+ - !ruby/object:Gem::Version
120
+ version: '0'
137
121
  type: :runtime
138
- version_requirements: *id009
139
- - !ruby/object:Gem::Dependency
140
- name: rspec
141
122
  prerelease: false
142
- requirement: &id010 !ruby/object:Gem::Requirement
123
+ version_requirements: *70301728784260
124
+ - !ruby/object:Gem::Dependency
125
+ name: rspec
126
+ requirement: &70301728816860 !ruby/object:Gem::Requirement
143
127
  none: false
144
- requirements:
145
- - - ">="
146
- - !ruby/object:Gem::Version
147
- segments:
148
- - 0
149
- version: "0"
128
+ requirements:
129
+ - - ! '>='
130
+ - !ruby/object:Gem::Version
131
+ version: '0'
150
132
  type: :development
151
- version_requirements: *id010
152
- - !ruby/object:Gem::Dependency
153
- name: cucumber
154
133
  prerelease: false
155
- requirement: &id011 !ruby/object:Gem::Requirement
134
+ version_requirements: *70301728816860
135
+ - !ruby/object:Gem::Dependency
136
+ name: cucumber
137
+ requirement: &70301728833280 !ruby/object:Gem::Requirement
156
138
  none: false
157
- requirements:
158
- - - ">="
159
- - !ruby/object:Gem::Version
160
- segments:
161
- - 0
162
- version: "0"
139
+ requirements:
140
+ - - ! '>='
141
+ - !ruby/object:Gem::Version
142
+ version: '0'
163
143
  type: :development
164
- version_requirements: *id011
165
- - !ruby/object:Gem::Dependency
166
- name: aruba
167
144
  prerelease: false
168
- requirement: &id012 !ruby/object:Gem::Requirement
145
+ version_requirements: *70301728833280
146
+ - !ruby/object:Gem::Dependency
147
+ name: aruba
148
+ requirement: &70301728836260 !ruby/object:Gem::Requirement
169
149
  none: false
170
- requirements:
171
- - - ">="
172
- - !ruby/object:Gem::Version
173
- segments:
174
- - 0
175
- version: "0"
150
+ requirements:
151
+ - - ! '>='
152
+ - !ruby/object:Gem::Version
153
+ version: '0'
176
154
  type: :development
177
- version_requirements: *id012
155
+ prerelease: false
156
+ version_requirements: *70301728836260
178
157
  description:
179
158
  email: david@allthingsprogress.com
180
- executables:
159
+ executables:
181
160
  - mint
182
161
  extensions: []
183
-
184
162
  extra_rdoc_files: []
185
-
186
- files:
163
+ files:
187
164
  - README.md
188
165
  - bin/mint
189
166
  - lib/mint.rb
190
167
  - lib/mint/helpers.rb
168
+ - lib/mint/exceptions.rb
191
169
  - lib/mint/mint.rb
192
170
  - lib/mint/resource.rb
193
171
  - lib/mint/layout.rb
@@ -196,7 +174,7 @@ files:
196
174
  - lib/mint/version.rb
197
175
  - lib/mint/css.rb
198
176
  - lib/mint/commandline.rb
199
- - config/options.yaml
177
+ - config/syntax.yaml
200
178
  - templates/default/layout.haml
201
179
  - templates/default/style.sass
202
180
  - templates/pro/layout.haml
@@ -206,41 +184,32 @@ files:
206
184
  - features/support/env.rb
207
185
  - spec/document_spec.rb
208
186
  - spec/spec_helper.rb
209
- has_rdoc: true
210
187
  homepage: http://github.com/davejacobs/mint
211
188
  licenses: []
212
-
213
189
  post_install_message:
214
190
  rdoc_options: []
215
-
216
- require_paths:
191
+ require_paths:
217
192
  - lib
218
- required_ruby_version: !ruby/object:Gem::Requirement
193
+ required_ruby_version: !ruby/object:Gem::Requirement
219
194
  none: false
220
- requirements:
221
- - - ">="
222
- - !ruby/object:Gem::Version
223
- segments:
224
- - 0
225
- version: "0"
226
- required_rubygems_version: !ruby/object:Gem::Requirement
195
+ requirements:
196
+ - - ! '>='
197
+ - !ruby/object:Gem::Version
198
+ version: '0'
199
+ required_rubygems_version: !ruby/object:Gem::Requirement
227
200
  none: false
228
- requirements:
229
- - - ">="
230
- - !ruby/object:Gem::Version
231
- segments:
232
- - 1
233
- - 3
234
- - 6
201
+ requirements:
202
+ - - ! '>='
203
+ - !ruby/object:Gem::Version
235
204
  version: 1.3.6
236
205
  requirements: []
237
-
238
206
  rubyforge_project:
239
- rubygems_version: 1.3.7
207
+ rubygems_version: 1.8.6
240
208
  signing_key:
241
209
  specification_version: 3
242
- summary: Clean, simple library for maintaining and styling documents without a word processor
243
- test_files:
210
+ summary: Clean, simple library for maintaining and styling documents without a word
211
+ processor
212
+ test_files:
244
213
  - features/mint_document.feature
245
214
  - features/step_definitions/mint_steps.rb
246
215
  - features/support/env.rb