flott 1.0.0 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
data/COPYING ADDED
@@ -0,0 +1,340 @@
1
+ GNU GENERAL PUBLIC LICENSE
2
+ Version 2, June 1991
3
+
4
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
5
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
6
+ Everyone is permitted to copy and distribute verbatim copies
7
+ of this license document, but changing it is not allowed.
8
+
9
+ Preamble
10
+
11
+ The licenses for most software are designed to take away your
12
+ freedom to share and change it. By contrast, the GNU General Public
13
+ License is intended to guarantee your freedom to share and change free
14
+ software--to make sure the software is free for all its users. This
15
+ General Public License applies to most of the Free Software
16
+ Foundation's software and to any other program whose authors commit to
17
+ using it. (Some other Free Software Foundation software is covered by
18
+ the GNU Library General Public License instead.) You can apply it to
19
+ your programs, too.
20
+
21
+ When we speak of free software, we are referring to freedom, not
22
+ price. Our General Public Licenses are designed to make sure that you
23
+ have the freedom to distribute copies of free software (and charge for
24
+ this service if you wish), that you receive source code or can get it
25
+ if you want it, that you can change the software or use pieces of it
26
+ in new free programs; and that you know you can do these things.
27
+
28
+ To protect your rights, we need to make restrictions that forbid
29
+ anyone to deny you these rights or to ask you to surrender the rights.
30
+ These restrictions translate to certain responsibilities for you if you
31
+ distribute copies of the software, or if you modify it.
32
+
33
+ For example, if you distribute copies of such a program, whether
34
+ gratis or for a fee, you must give the recipients all the rights that
35
+ you have. You must make sure that they, too, receive or can get the
36
+ source code. And you must show them these terms so they know their
37
+ rights.
38
+
39
+ We protect your rights with two steps: (1) copyright the software, and
40
+ (2) offer you this license which gives you legal permission to copy,
41
+ distribute and/or modify the software.
42
+
43
+ Also, for each author's protection and ours, we want to make certain
44
+ that everyone understands that there is no warranty for this free
45
+ software. If the software is modified by someone else and passed on, we
46
+ want its recipients to know that what they have is not the original, so
47
+ that any problems introduced by others will not reflect on the original
48
+ authors' reputations.
49
+
50
+ Finally, any free program is threatened constantly by software
51
+ patents. We wish to avoid the danger that redistributors of a free
52
+ program will individually obtain patent licenses, in effect making the
53
+ program proprietary. To prevent this, we have made it clear that any
54
+ patent must be licensed for everyone's free use or not licensed at all.
55
+
56
+ The precise terms and conditions for copying, distribution and
57
+ modification follow.
58
+
59
+ GNU GENERAL PUBLIC LICENSE
60
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
61
+
62
+ 0. This License applies to any program or other work which contains
63
+ a notice placed by the copyright holder saying it may be distributed
64
+ under the terms of this General Public License. The "Program", below,
65
+ refers to any such program or work, and a "work based on the Program"
66
+ means either the Program or any derivative work under copyright law:
67
+ that is to say, a work containing the Program or a portion of it,
68
+ either verbatim or with modifications and/or translated into another
69
+ language. (Hereinafter, translation is included without limitation in
70
+ the term "modification".) Each licensee is addressed as "you".
71
+
72
+ Activities other than copying, distribution and modification are not
73
+ covered by this License; they are outside its scope. The act of
74
+ running the Program is not restricted, and the output from the Program
75
+ is covered only if its contents constitute a work based on the
76
+ Program (independent of having been made by running the Program).
77
+ Whether that is true depends on what the Program does.
78
+
79
+ 1. You may copy and distribute verbatim copies of the Program's
80
+ source code as you receive it, in any medium, provided that you
81
+ conspicuously and appropriately publish on each copy an appropriate
82
+ copyright notice and disclaimer of warranty; keep intact all the
83
+ notices that refer to this License and to the absence of any warranty;
84
+ and give any other recipients of the Program a copy of this License
85
+ along with the Program.
86
+
87
+ You may charge a fee for the physical act of transferring a copy, and
88
+ you may at your option offer warranty protection in exchange for a fee.
89
+
90
+ 2. You may modify your copy or copies of the Program or any portion
91
+ of it, thus forming a work based on the Program, and copy and
92
+ distribute such modifications or work under the terms of Section 1
93
+ above, provided that you also meet all of these conditions:
94
+
95
+ a) You must cause the modified files to carry prominent notices
96
+ stating that you changed the files and the date of any change.
97
+
98
+ b) You must cause any work that you distribute or publish, that in
99
+ whole or in part contains or is derived from the Program or any
100
+ part thereof, to be licensed as a whole at no charge to all third
101
+ parties under the terms of this License.
102
+
103
+ c) If the modified program normally reads commands interactively
104
+ when run, you must cause it, when started running for such
105
+ interactive use in the most ordinary way, to print or display an
106
+ announcement including an appropriate copyright notice and a
107
+ notice that there is no warranty (or else, saying that you provide
108
+ a warranty) and that users may redistribute the program under
109
+ these conditions, and telling the user how to view a copy of this
110
+ License. (Exception: if the Program itself is interactive but
111
+ does not normally print such an announcement, your work based on
112
+ the Program is not required to print an announcement.)
113
+
114
+ These requirements apply to the modified work as a whole. If
115
+ identifiable sections of that work are not derived from the Program,
116
+ and can be reasonably considered independent and separate works in
117
+ themselves, then this License, and its terms, do not apply to those
118
+ sections when you distribute them as separate works. But when you
119
+ distribute the same sections as part of a whole which is a work based
120
+ on the Program, the distribution of the whole must be on the terms of
121
+ this License, whose permissions for other licensees extend to the
122
+ entire whole, and thus to each and every part regardless of who wrote it.
123
+
124
+ Thus, it is not the intent of this section to claim rights or contest
125
+ your rights to work written entirely by you; rather, the intent is to
126
+ exercise the right to control the distribution of derivative or
127
+ collective works based on the Program.
128
+
129
+ In addition, mere aggregation of another work not based on the Program
130
+ with the Program (or with a work based on the Program) on a volume of
131
+ a storage or distribution medium does not bring the other work under
132
+ the scope of this License.
133
+
134
+ 3. You may copy and distribute the Program (or a work based on it,
135
+ under Section 2) in object code or executable form under the terms of
136
+ Sections 1 and 2 above provided that you also do one of the following:
137
+
138
+ a) Accompany it with the complete corresponding machine-readable
139
+ source code, which must be distributed under the terms of Sections
140
+ 1 and 2 above on a medium customarily used for software interchange; or,
141
+
142
+ b) Accompany it with a written offer, valid for at least three
143
+ years, to give any third party, for a charge no more than your
144
+ cost of physically performing source distribution, a complete
145
+ machine-readable copy of the corresponding source code, to be
146
+ distributed under the terms of Sections 1 and 2 above on a medium
147
+ customarily used for software interchange; or,
148
+
149
+ c) Accompany it with the information you received as to the offer
150
+ to distribute corresponding source code. (This alternative is
151
+ allowed only for noncommercial distribution and only if you
152
+ received the program in object code or executable form with such
153
+ an offer, in accord with Subsection b above.)
154
+
155
+ The source code for a work means the preferred form of the work for
156
+ making modifications to it. For an executable work, complete source
157
+ code means all the source code for all modules it contains, plus any
158
+ associated interface definition files, plus the scripts used to
159
+ control compilation and installation of the executable. However, as a
160
+ special exception, the source code distributed need not include
161
+ anything that is normally distributed (in either source or binary
162
+ form) with the major components (compiler, kernel, and so on) of the
163
+ operating system on which the executable runs, unless that component
164
+ itself accompanies the executable.
165
+
166
+ If distribution of executable or object code is made by offering
167
+ access to copy from a designated place, then offering equivalent
168
+ access to copy the source code from the same place counts as
169
+ distribution of the source code, even though third parties are not
170
+ compelled to copy the source along with the object code.
171
+
172
+ 4. You may not copy, modify, sublicense, or distribute the Program
173
+ except as expressly provided under this License. Any attempt
174
+ otherwise to copy, modify, sublicense or distribute the Program is
175
+ void, and will automatically terminate your rights under this License.
176
+ However, parties who have received copies, or rights, from you under
177
+ this License will not have their licenses terminated so long as such
178
+ parties remain in full compliance.
179
+
180
+ 5. You are not required to accept this License, since you have not
181
+ signed it. However, nothing else grants you permission to modify or
182
+ distribute the Program or its derivative works. These actions are
183
+ prohibited by law if you do not accept this License. Therefore, by
184
+ modifying or distributing the Program (or any work based on the
185
+ Program), you indicate your acceptance of this License to do so, and
186
+ all its terms and conditions for copying, distributing or modifying
187
+ the Program or works based on it.
188
+
189
+ 6. Each time you redistribute the Program (or any work based on the
190
+ Program), the recipient automatically receives a license from the
191
+ original licensor to copy, distribute or modify the Program subject to
192
+ these terms and conditions. You may not impose any further
193
+ restrictions on the recipients' exercise of the rights granted herein.
194
+ You are not responsible for enforcing compliance by third parties to
195
+ this License.
196
+
197
+ 7. If, as a consequence of a court judgment or allegation of patent
198
+ infringement or for any other reason (not limited to patent issues),
199
+ conditions are imposed on you (whether by court order, agreement or
200
+ otherwise) that contradict the conditions of this License, they do not
201
+ excuse you from the conditions of this License. If you cannot
202
+ distribute so as to satisfy simultaneously your obligations under this
203
+ License and any other pertinent obligations, then as a consequence you
204
+ may not distribute the Program at all. For example, if a patent
205
+ license would not permit royalty-free redistribution of the Program by
206
+ all those who receive copies directly or indirectly through you, then
207
+ the only way you could satisfy both it and this License would be to
208
+ refrain entirely from distribution of the Program.
209
+
210
+ If any portion of this section is held invalid or unenforceable under
211
+ any particular circumstance, the balance of the section is intended to
212
+ apply and the section as a whole is intended to apply in other
213
+ circumstances.
214
+
215
+ It is not the purpose of this section to induce you to infringe any
216
+ patents or other property right claims or to contest validity of any
217
+ such claims; this section has the sole purpose of protecting the
218
+ integrity of the free software distribution system, which is
219
+ implemented by public license practices. Many people have made
220
+ generous contributions to the wide range of software distributed
221
+ through that system in reliance on consistent application of that
222
+ system; it is up to the author/donor to decide if he or she is willing
223
+ to distribute software through any other system and a licensee cannot
224
+ impose that choice.
225
+
226
+ This section is intended to make thoroughly clear what is believed to
227
+ be a consequence of the rest of this License.
228
+
229
+ 8. If the distribution and/or use of the Program is restricted in
230
+ certain countries either by patents or by copyrighted interfaces, the
231
+ original copyright holder who places the Program under this License
232
+ may add an explicit geographical distribution limitation excluding
233
+ those countries, so that distribution is permitted only in or among
234
+ countries not thus excluded. In such case, this License incorporates
235
+ the limitation as if written in the body of this License.
236
+
237
+ 9. The Free Software Foundation may publish revised and/or new versions
238
+ of the General Public License from time to time. Such new versions will
239
+ be similar in spirit to the present version, but may differ in detail to
240
+ address new problems or concerns.
241
+
242
+ Each version is given a distinguishing version number. If the Program
243
+ specifies a version number of this License which applies to it and "any
244
+ later version", you have the option of following the terms and conditions
245
+ either of that version or of any later version published by the Free
246
+ Software Foundation. If the Program does not specify a version number of
247
+ this License, you may choose any version ever published by the Free Software
248
+ Foundation.
249
+
250
+ 10. If you wish to incorporate parts of the Program into other free
251
+ programs whose distribution conditions are different, write to the author
252
+ to ask for permission. For software which is copyrighted by the Free
253
+ Software Foundation, write to the Free Software Foundation; we sometimes
254
+ make exceptions for this. Our decision will be guided by the two goals
255
+ of preserving the free status of all derivatives of our free software and
256
+ of promoting the sharing and reuse of software generally.
257
+
258
+ NO WARRANTY
259
+
260
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
261
+ FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
262
+ OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
263
+ PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
264
+ OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
265
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
266
+ TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
267
+ PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
268
+ REPAIR OR CORRECTION.
269
+
270
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
271
+ WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
272
+ REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
273
+ INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
274
+ OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
275
+ TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
276
+ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
277
+ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
278
+ POSSIBILITY OF SUCH DAMAGES.
279
+
280
+ END OF TERMS AND CONDITIONS
281
+
282
+ How to Apply These Terms to Your New Programs
283
+
284
+ If you develop a new program, and you want it to be of the greatest
285
+ possible use to the public, the best way to achieve this is to make it
286
+ free software which everyone can redistribute and change under these terms.
287
+
288
+ To do so, attach the following notices to the program. It is safest
289
+ to attach them to the start of each source file to most effectively
290
+ convey the exclusion of warranty; and each file should have at least
291
+ the "copyright" line and a pointer to where the full notice is found.
292
+
293
+ <one line to give the program's name and a brief idea of what it does.>
294
+ Copyright (C) <year> <name of author>
295
+
296
+ This program is free software; you can redistribute it and/or modify
297
+ it under the terms of the GNU General Public License as published by
298
+ the Free Software Foundation; either version 2 of the License, or
299
+ (at your option) any later version.
300
+
301
+ This program is distributed in the hope that it will be useful,
302
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
303
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
304
+ GNU General Public License for more details.
305
+
306
+ You should have received a copy of the GNU General Public License
307
+ along with this program; if not, write to the Free Software
308
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
309
+
310
+
311
+ Also add information on how to contact you by electronic and paper mail.
312
+
313
+ If the program is interactive, make it output a short notice like this
314
+ when it starts in an interactive mode:
315
+
316
+ Gnomovision version 69, Copyright (C) year name of author
317
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
318
+ This is free software, and you are welcome to redistribute it
319
+ under certain conditions; type `show c' for details.
320
+
321
+ The hypothetical commands `show w' and `show c' should show the appropriate
322
+ parts of the General Public License. Of course, the commands you use may
323
+ be called something other than `show w' and `show c'; they could even be
324
+ mouse-clicks or menu items--whatever suits your program.
325
+
326
+ You should also get your employer (if you work as a programmer) or your
327
+ school, if any, to sign a "copyright disclaimer" for the program, if
328
+ necessary. Here is a sample; alter the names:
329
+
330
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
331
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
332
+
333
+ <signature of Ty Coon>, 1 April 1989
334
+ Ty Coon, President of Vice
335
+
336
+ This General Public License does not permit incorporating your program into
337
+ proprietary programs. If your program is a subroutine library, you may
338
+ consider it more useful to permit linking proprietary applications with the
339
+ library. If this is what you want to do, use the GNU Library General
340
+ Public License instead of this License.
data/Gemfile CHANGED
@@ -5,5 +5,9 @@ source :rubygems
5
5
  gemspec
6
6
 
7
7
  group :test do
8
- gem 'simplecov', '0.6.2', :platform => :mri_19
8
+ gem 'simplecov', '0.6.4', :platform => :mri_19
9
+ end
10
+
11
+ group :development do
12
+ gem 'utils'
9
13
  end
@@ -1,12 +1,21 @@
1
+ = Flott - Floris Tolle Templates
2
+
3
+ This is ruby templating system with some unique features.
4
+
5
+ == Installation
6
+
7
+ Use rubygems and just type:
8
+
9
+ # gem install permutation
10
+
1
11
  == Usage
2
12
 
3
13
  If you want to play with the parser it's best to use the Flott method:
4
14
 
5
15
  Flott('1 + 1 = [=1 + 1]') # => "1 + 1 = 2"
6
16
 
7
-
8
- However if you want to take advantage of the directory tree walking and inclusion
9
- features, you have to use actual files:
17
+ However if you want to take advantage of the directory tree walking and
18
+ inclusion features, you have to use actual files:
10
19
 
11
20
  If two template files are stored in the current directory.
12
21
  One file "header":
@@ -74,3 +83,12 @@ After execution the output is:
74
83
  </body>
75
84
  </html>
76
85
 
86
+ == Author
87
+
88
+ Florian Frank mailto:flori@ping.de
89
+
90
+ == License
91
+
92
+ This is free software; you can redistribute it and/or modify it under the
93
+ terms of the GNU General Public License Version 2 as published by the Free
94
+ Software Foundation: www.gnu.org/copyleft/gpl.html
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.0.0
1
+ 1.0.1
@@ -2,21 +2,21 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = "flott"
5
- s.version = "1.0.0"
5
+ s.version = "1.0.1"
6
6
 
7
7
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
8
8
  s.authors = ["Florian Frank"]
9
- s.date = "2012-05-11"
9
+ s.date = "2012-05-25"
10
10
  s.description = "Ruby as a templating language"
11
11
  s.email = "flori@ping.de"
12
12
  s.extra_rdoc_files = ["README.rdoc", "lib/flott.rb", "lib/flott/version.rb", "lib/flott/cache.rb"]
13
- s.files = [".gitignore", ".travis.yml", "Gemfile", "README.rdoc", "Rakefile", "VERSION", "benchmarks/data/.keep", "benchmarks/flott_benchmark.rb", "benchmarks/runner.rb", "doc-main.txt", "flott.gemspec", "install.rb", "lib/flott.rb", "lib/flott/cache.rb", "lib/flott/version.rb", "make_doc.rb", "tests/templates/header", "tests/templates/subdir/deeptemplate", "tests/templates/subdir/included", "tests/templates/subdir/subdir2/deepincluded2", "tests/templates/subdir/subdir2/included2", "tests/templates/subdir/subdir3/included3", "tests/templates/template", "tests/templates/template2", "tests/templates/toplevel", "tests/templates/toplevel2", "tests/test_cache.rb", "tests/test_flott.rb", "tests/test_flott_file.rb", "tests/test_helper.rb"]
13
+ s.files = [".gitignore", ".travis.yml", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "VERSION", "benchmarks/data/.keep", "benchmarks/flott_benchmark.rb", "benchmarks/runner.rb", "flott.gemspec", "lib/flott.rb", "lib/flott/cache.rb", "lib/flott/version.rb", "tests/cache_test.rb", "tests/flott_file_test.rb", "tests/flott_test.rb", "tests/templates/header", "tests/templates/subdir/deeptemplate", "tests/templates/subdir/included", "tests/templates/subdir/subdir2/deepincluded2", "tests/templates/subdir/subdir2/included2", "tests/templates/subdir/subdir3/included3", "tests/templates/template", "tests/templates/template2", "tests/templates/toplevel", "tests/templates/toplevel2", "tests/test_helper.rb"]
14
14
  s.homepage = "http://github.com/flori/flott"
15
15
  s.rdoc_options = ["--title", "Flott - Ruby as a templating language", "--main", "README.rdoc"]
16
16
  s.require_paths = ["lib"]
17
17
  s.rubygems_version = "1.8.24"
18
18
  s.summary = "Ruby as a templating language"
19
- s.test_files = ["tests/test_flott_file.rb", "tests/test_flott.rb", "tests/test_cache.rb", "tests/test_helper.rb"]
19
+ s.test_files = ["tests/cache_test.rb", "tests/flott_test.rb", "tests/flott_file_test.rb", "tests/test_helper.rb"]
20
20
 
21
21
  if s.respond_to? :specification_version then
22
22
  s.specification_version = 3
@@ -369,7 +369,7 @@ module Flott
369
369
  string = ''
370
370
  PP.pp(o, string)
371
371
  @__output__ << @__escape__.call(string)
372
- @__output__ << $/ unless string =~ /\r?#$/\Z/
372
+ @__output__ << $/ unless string =~ /\r?#$/\z/
373
373
  end
374
374
  nil
375
375
  end
@@ -381,7 +381,7 @@ module Flott
381
381
  string = ''
382
382
  PP.pp(o, string)
383
383
  @__output__ << string
384
- @__output__ << $/ unless string =~ /\r?#$/\Z/
384
+ @__output__ << $/ unless string =~ /\r?#$/\z/
385
385
  end
386
386
  nil
387
387
  end
@@ -391,7 +391,7 @@ module Flott
391
391
  for o in objects.flatten
392
392
  string = o.to_s
393
393
  @__output__ << string
394
- @__output__ << $/ unless string =~ /\r?#$/\Z/
394
+ @__output__ << $/ unless string =~ /\r?#$/\z/
395
395
  end
396
396
  nil
397
397
  end
@@ -402,7 +402,7 @@ module Flott
402
402
  for o in objects.flatten
403
403
  string = @__escape__.call(o)
404
404
  @__output__ << string
405
- @__output__ << $/ unless string =~ /\r?#$/\Z/
405
+ @__output__ << $/ unless string =~ /\r?#$/\z/
406
406
  end
407
407
  nil
408
408
  end
@@ -840,7 +840,7 @@ module Flott
840
840
  when scanner.scan(MINPRIOPEN)
841
841
  state.last_open = :PRIOPEN
842
842
  if t = state.text.last
843
- t.sub!(/[\t ]*\Z/, '')
843
+ t.sub!(/[\t ]*\z/, '')
844
844
  end
845
845
  parser.goto_ruby_mode
846
846
  state.text2compiled
@@ -848,7 +848,7 @@ module Flott
848
848
  when scanner.scan(MINRAWOPEN)
849
849
  state.last_open = :RAWOPEN
850
850
  if t = state.text.last
851
- t.sub!(/[\t ]*\Z/, '')
851
+ t.sub!(/[\t ]*\z/, '')
852
852
  end
853
853
  parser.goto_ruby_mode
854
854
  state.text2compiled
@@ -856,7 +856,7 @@ module Flott
856
856
  when scanner.scan(MINCOMOPEN)
857
857
  state.last_open = :COMOPEN
858
858
  if t = state.text.last
859
- t.sub!(/[\t ]*\Z/, '')
859
+ t.sub!(/[\t ]*\z/, '')
860
860
  end
861
861
  parser.goto_ruby_mode
862
862
  state.text2compiled
@@ -864,7 +864,7 @@ module Flott
864
864
  when scanner.scan(MINOPEN)
865
865
  state.last_open = :OPEN
866
866
  if t = state.text.last
867
- t.sub!(/[\t ]*\Z/, '')
867
+ t.sub!(/[\t ]*\z/, '')
868
868
  end
869
869
  parser.goto_ruby_mode
870
870
  state.text2compiled(false)
@@ -1,6 +1,6 @@
1
1
  module Flott
2
2
  # Flott version
3
- VERSION = '1.0.0'
3
+ VERSION = '1.0.1'
4
4
  VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
5
5
  VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
6
6
  VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:
@@ -3,7 +3,7 @@ require 'flott'
3
3
  require 'stringio'
4
4
  require 'fileutils'
5
5
 
6
- class TC_Cache < Test::Unit::TestCase
6
+ class CacheTest < Test::Unit::TestCase
7
7
  include FileUtils
8
8
  include Flott
9
9
 
@@ -2,7 +2,7 @@ require 'test_helper'
2
2
  require 'flott'
3
3
  require 'stringio'
4
4
 
5
- class TC_FlottFile < Test::Unit::TestCase
5
+ class FlottFileTest < Test::Unit::TestCase
6
6
  include Flott
7
7
  Flott.debug = false
8
8
  def setup
@@ -2,7 +2,7 @@ require 'test_helper'
2
2
  require 'flott'
3
3
  require 'stringio'
4
4
 
5
- class TC_Flott < Test::Unit::TestCase
5
+ class FlottTest < Test::Unit::TestCase
6
6
  include Flott
7
7
 
8
8
  def assert_template_equal(expected, template, hash = {})
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: flott
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-05-11 00:00:00.000000000 Z
12
+ date: 2012-05-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: gem_hadar
@@ -87,6 +87,7 @@ extra_rdoc_files:
87
87
  files:
88
88
  - .gitignore
89
89
  - .travis.yml
90
+ - COPYING
90
91
  - Gemfile
91
92
  - README.rdoc
92
93
  - Rakefile
@@ -94,13 +95,13 @@ files:
94
95
  - benchmarks/data/.keep
95
96
  - benchmarks/flott_benchmark.rb
96
97
  - benchmarks/runner.rb
97
- - doc-main.txt
98
98
  - flott.gemspec
99
- - install.rb
100
99
  - lib/flott.rb
101
100
  - lib/flott/cache.rb
102
101
  - lib/flott/version.rb
103
- - make_doc.rb
102
+ - tests/cache_test.rb
103
+ - tests/flott_file_test.rb
104
+ - tests/flott_test.rb
104
105
  - tests/templates/header
105
106
  - tests/templates/subdir/deeptemplate
106
107
  - tests/templates/subdir/included
@@ -111,9 +112,6 @@ files:
111
112
  - tests/templates/template2
112
113
  - tests/templates/toplevel
113
114
  - tests/templates/toplevel2
114
- - tests/test_cache.rb
115
- - tests/test_flott.rb
116
- - tests/test_flott_file.rb
117
115
  - tests/test_helper.rb
118
116
  homepage: http://github.com/flori/flott
119
117
  licenses: []
@@ -133,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
133
131
  version: '0'
134
132
  segments:
135
133
  - 0
136
- hash: -2936619538582661052
134
+ hash: -4059463642508053595
137
135
  required_rubygems_version: !ruby/object:Gem::Requirement
138
136
  none: false
139
137
  requirements:
@@ -147,7 +145,7 @@ signing_key:
147
145
  specification_version: 3
148
146
  summary: Ruby as a templating language
149
147
  test_files:
150
- - tests/test_flott_file.rb
151
- - tests/test_flott.rb
152
- - tests/test_cache.rb
148
+ - tests/cache_test.rb
149
+ - tests/flott_test.rb
150
+ - tests/flott_file_test.rb
153
151
  - tests/test_helper.rb
@@ -1,76 +0,0 @@
1
- == Usage
2
-
3
- If you want to play with the parser it's best to use the Flott method:
4
-
5
- Flott('1 + 1 = [=1 + 1]') # => "1 + 1 = 2"
6
-
7
-
8
- However if you want to take advantage of the directory tree walking and inclusion
9
- features, you have to use methods.
10
-
11
- If two template files are stored in the current directory.
12
- One file "header":
13
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
14
- "http://www.w3.org/TR/html4/strict.dtd">
15
- <html>
16
- <head>
17
- <title>Hello [=@name]!</title>
18
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-15">
19
- </head>
20
- <body>
21
- And one file "template":
22
- [^header-]
23
- <h1>Hello [=@name]!</h1>
24
- [for i in 1..6
25
- if i % 2 == 0-]
26
- <b>Hello [=@name]!</b>
27
- [else-]
28
- <i>Hello [=@name]!</i>
29
- [end
30
- end-]
31
- </body>
32
- </html>
33
-
34
- The parser can be used like this
35
- fp = Flott::Parser.from_filename('template')
36
- env = Flott::Environment.new
37
- env[:name] = "Florian"
38
- fp.evaluate(env)
39
-
40
- Or this:
41
- puts Flott.string_from_file(filename, :name => "Florian")
42
-
43
- You should also take a look at the other convenience methods in the Flott
44
- module.
45
-
46
- The output is created by including "header" into "template" with the
47
- <tt>[^filename]</tt> syntax. <tt>[!@name]</tt> is a shortcut for
48
- <tt>[print @name]</tt> while <tt>[=@name]</tt> first calls
49
- Flott::Parser.escape on @name. It's also possible to just print or puts
50
- strings.
51
-
52
- Note the use of the assignment to the instance variable @name before
53
- executing the template. The state passed to Parser#evaluate as
54
- an environment and can be referenced in the template itself with
55
- <tt>[=@name]</tt>.
56
-
57
- After execution the output is:
58
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
59
- "http://www.w3.org/TR/html4/strict.dtd">
60
- <html>
61
- <head>
62
- <title>Hello Florian!</title>
63
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-15">
64
- </head>
65
- <body>
66
-
67
- <h1>Hello Florian!</h1>
68
- <i>Hello Florian!</i>
69
- <b>Hello Florian!</b>
70
- <i>Hello Florian!</i>
71
- <b>Hello Florian!</b>
72
- <i>Hello Florian!</i>
73
- <b>Hello Florian!</b>
74
- </body>
75
- </html>
76
-
data/install.rb DELETED
@@ -1,16 +0,0 @@
1
- #!/usr/bin/env ruby
2
-
3
- require 'rbconfig'
4
- require 'fileutils'
5
- include FileUtils::Verbose
6
- include Config
7
-
8
- dest = CONFIG["sitelibdir"]
9
- mkdir_p(dest)
10
- file = 'lib/flott.rb'
11
- install(file, dest)
12
-
13
- dest = File.join(dest, 'flott')
14
- mkdir_p dest
15
- file = 'lib/flott/cache.rb'
16
- install(file, dest)
@@ -1,5 +0,0 @@
1
- #!/usr/bin/env ruby
2
-
3
- $outdir = 'doc/'
4
- puts "Creating documentation in '#$outdir'."
5
- system "rdoc -m doc-main.txt -o #$outdir doc-main.txt lib/flott.rb lib/flott/*.rb"