awestruct 0.5.4.beta1 → 0.5.4.rc

Sign up to get free protection for your applications and to get access to all the features.
Files changed (58) hide show
  1. data/lib/awestruct/cli/deploy.rb +2 -2
  2. data/lib/awestruct/cli/generate.rb +3 -3
  3. data/lib/awestruct/cli/init.rb +1 -1
  4. data/lib/awestruct/cli/invoker.rb +11 -10
  5. data/lib/awestruct/cli/manifest.rb +1 -1
  6. data/lib/awestruct/cli/options.rb +16 -6
  7. data/lib/awestruct/cli/server.rb +4 -1
  8. data/lib/awestruct/compatibility.rb +5 -0
  9. data/lib/awestruct/config/default-site.yml +7 -0
  10. data/lib/awestruct/deploy/base_deploy.rb +74 -7
  11. data/lib/awestruct/deploy/github_pages_deploy.rb +20 -7
  12. data/lib/awestruct/deploy/rsync_deploy.rb +1 -1
  13. data/lib/awestruct/deploy/s3_deploy.rb +1 -1
  14. data/lib/awestruct/engine.rb +34 -30
  15. data/lib/awestruct/frameworks/base_Rakefile +22 -3
  16. data/lib/awestruct/handlers/asciidoctor_handler.rb +38 -10
  17. data/lib/awestruct/handlers/front_matter_handler.rb +18 -13
  18. data/lib/awestruct/handlers/interpolation_handler.rb +1 -1
  19. data/lib/awestruct/handlers/template/asciidoc.rb +22 -1
  20. data/lib/awestruct/page_loader.rb +1 -1
  21. data/lib/awestruct/version.rb +1 -1
  22. data/spec/asciidoc_handler_spec.rb +51 -1
  23. data/spec/awestruct/scm/git_spec.rb +2 -2
  24. data/spec/coffeescript_handler_spec.rb +1 -3
  25. data/spec/deploy_spec.rb +66 -1
  26. data/spec/engine_spec.rb +10 -6
  27. data/spec/erb_handler_spec.rb +4 -6
  28. data/spec/front_matter_handler_spec.rb +14 -0
  29. data/spec/github_pages_deploy_spec.rb +14 -9
  30. data/spec/haml_handler_spec.rb +2 -5
  31. data/spec/invoker_spec.rb +1 -0
  32. data/spec/javascript_handler_spec.rb +3 -6
  33. data/spec/markdown_handler_spec.rb +0 -2
  34. data/spec/mustache_handler_spec.rb +5 -8
  35. data/spec/orgmode_handler_spec.rb +1 -3
  36. data/spec/page_loader_spec.rb +18 -0
  37. data/spec/redirect_handler_spec.rb +2 -6
  38. data/spec/restructuredtext_handler_spec.rb +1 -3
  39. data/spec/sass_handler_spec.rb +1 -3
  40. data/spec/scss_handler_spec.rb +1 -3
  41. data/spec/slim_handler_spec.rb +2 -5
  42. data/spec/support/shared_handler_example.rb +18 -10
  43. data/spec/test-data/engine/_config/site.yml +2 -0
  44. data/spec/test-data/front-matter-file-no-content.txt +1 -0
  45. data/spec/test-data/front-matter-looking.txt +9 -0
  46. data/spec/test-data/front-matter-middle.txt +12 -0
  47. data/spec/test-data/gzip/no.html.gz +0 -0
  48. data/spec/test-data/gzip/no.txt +0 -0
  49. data/spec/test-data/gzip/subdir/yes.css +3 -0
  50. data/spec/test-data/gzip/yes.html +10 -0
  51. data/spec/test-data/gzip/yes.js +1 -0
  52. data/spec/test-data/handlers/asciidoc_with_attributes.ad +3 -0
  53. data/spec/test-data/handlers/asciidoc_with_interpolation.ad +4 -0
  54. data/spec/test-data/handlers/asciidoc_without_interpolation.ad +3 -0
  55. data/spec/test-data/handlers/asciidoctor_with_headers.ad +7 -4
  56. data/spec/test-data/handlers/textile-page.textile +3 -1
  57. data/spec/textile_handler_spec.rb +16 -6
  58. metadata +28 -7
@@ -1,9 +1,12 @@
1
1
  = AsciiDoc
2
- Stuart Rackham
2
+ Stuart Rackham <srackham@example.com>; Dan Allen
3
3
  2013-02-06
4
- :awestruct-tags: [a, b, c]
5
- :awestruct-layout: haml-layout
4
+ :page-tags: [a, b, c]
5
+ :page-layout: haml-layout
6
6
  :name: NOT_HANDLED
7
+ :site-test: preserved
7
8
 
8
- This is *AsciiDoc* in {name}.
9
+ This is *AsciiDoc* page named {page-name} in an Awestruct site.
9
10
  {awestruct-version}
11
+ {site-encoding}
12
+ {site-test}
@@ -1 +1,3 @@
1
- h3. Test
1
+ h3. Test
2
+
3
+ the WHO
@@ -1,7 +1,11 @@
1
1
  require 'spec_helper'
2
2
 
3
- verify = lambda { |output|
4
- output.should == "<h3>Test</h3>"
3
+ verify_without_span = lambda { |output|
4
+ output.should == "<h3>Test</h3>\n<p>the WHO</p>"
5
+ }
6
+
7
+ verify_with_span = lambda { |output|
8
+ output.should == "<h3>Test</h3>\n<p>the <span class=\"caps\">WHO</span></p>"
5
9
  }
6
10
 
7
11
  theories =
@@ -11,12 +15,18 @@ theories =
11
15
  :simple_name => "textile-page",
12
16
  :syntax => :textile,
13
17
  :extension => '.html',
14
- :matcher => verify
18
+ :matcher => verify_without_span
19
+ },
20
+ {
21
+ :page => "textile-page.textile",
22
+ :simple_name => "textile-page",
23
+ :syntax => :textile,
24
+ :extension => '.html',
25
+ :matcher => verify_with_span,
26
+ :site_overrides => { :textile => { :no_span_caps => false } }
15
27
  }
16
28
  ]
17
29
 
18
30
  describe Awestruct::Handlers::TiltHandler.to_s + "-Textile" do
19
-
20
31
  it_should_behave_like "a handler", theories
21
-
22
- end
32
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: awestruct
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.4.beta1
4
+ version: 0.5.4.rc
5
5
  prerelease: 6
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: 2013-08-14 00:00:00.000000000 Z
12
+ date: 2013-09-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: haml
@@ -112,17 +112,17 @@ dependencies:
112
112
  requirement: !ruby/object:Gem::Requirement
113
113
  none: false
114
114
  requirements:
115
- - - ! '>='
115
+ - - ~>
116
116
  - !ruby/object:Gem::Version
117
- version: 4.0.9
117
+ version: '4'
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  none: false
122
122
  requirements:
123
- - - ! '>='
123
+ - - ~>
124
124
  - !ruby/object:Gem::Version
125
- version: 4.0.9
125
+ version: '4'
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: rest-client
128
128
  requirement: !ruby/object:Gem::Requirement
@@ -284,6 +284,7 @@ files:
284
284
  - lib/awestruct/extensions/remotePartial.rb
285
285
  - lib/awestruct/extensions/minify.rb
286
286
  - lib/awestruct/page.rb
287
+ - lib/awestruct/compatibility.rb
287
288
  - lib/awestruct/page.rb.old
288
289
  - lib/awestruct/dependencies.rb
289
290
  - lib/awestruct/logger.rb
@@ -319,8 +320,10 @@ files:
319
320
  - spec/test-data/engine/_config/other.yml
320
321
  - spec/test-data/engine/_config/arbitrary.yml
321
322
  - spec/test-data/front-matter-file-no-front.txt
323
+ - spec/test-data/front-matter-middle.txt
322
324
  - spec/test-data/stylesheets/screen.css
323
325
  - spec/test-data/out-of-site/page-three.html.haml
326
+ - spec/test-data/front-matter-looking.txt
324
327
  - spec/test-data/subdir/index.html
325
328
  - spec/test-data/front-matter-file-utf8.txt
326
329
  - spec/test-data/handlers/hello.bogus
@@ -353,6 +356,7 @@ files:
353
356
  - spec/test-data/handlers/asciidoctor_with_headers.ad
354
357
  - spec/test-data/handlers/restructuredtext-page.rst
355
358
  - spec/test-data/handlers/javascript-page.js
359
+ - spec/test-data/handlers/asciidoc_with_interpolation.ad
356
360
  - spec/test-data/handlers/slim-with-variables.html.slim
357
361
  - spec/test-data/handlers/slim-with-markdown-page.html.slim
358
362
  - spec/test-data/handlers/haml-with-utf.html.haml
@@ -364,14 +368,21 @@ files:
364
368
  - spec/test-data/handlers/erb-page.html.erb
365
369
  - spec/test-data/handlers/orgmode-page.org
366
370
  - spec/test-data/handlers/outer-layout.html.haml
371
+ - spec/test-data/handlers/asciidoc_without_interpolation.ad
367
372
  - spec/test-data/handlers/textile-page.textile
368
373
  - spec/test-data/handlers/coffeescript-page.coffee
369
374
  - spec/test-data/handlers/erb-utf-page.html.erb
370
375
  - spec/test-data/handlers/simple-redirect-page.redirect
376
+ - spec/test-data/handlers/asciidoc_with_attributes.ad
371
377
  - spec/test-data/handlers/erb-page.xml.erb
372
378
  - spec/test-data/handlers/haml-layout.html.haml
373
379
  - spec/test-data/handlers/sass-page.sass
374
380
  - spec/test-data/images/logo.png
381
+ - spec/test-data/gzip/no.txt
382
+ - spec/test-data/gzip/no.html.gz
383
+ - spec/test-data/gzip/yes.js
384
+ - spec/test-data/gzip/subdir/yes.css
385
+ - spec/test-data/gzip/yes.html
375
386
  - spec/test-data/front-matter-file-no-content.txt
376
387
  - spec/test-data/simple-file.txt
377
388
  - spec/test-data/index.html
@@ -420,7 +431,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
420
431
  version: '0'
421
432
  segments:
422
433
  - 0
423
- hash: -305438061854300207
434
+ hash: -1858453196806018491
424
435
  required_rubygems_version: !ruby/object:Gem::Requirement
425
436
  none: false
426
437
  requirements:
@@ -467,8 +478,10 @@ test_files:
467
478
  - spec/test-data/engine/_config/other.yml
468
479
  - spec/test-data/engine/_config/arbitrary.yml
469
480
  - spec/test-data/front-matter-file-no-front.txt
481
+ - spec/test-data/front-matter-middle.txt
470
482
  - spec/test-data/stylesheets/screen.css
471
483
  - spec/test-data/out-of-site/page-three.html.haml
484
+ - spec/test-data/front-matter-looking.txt
472
485
  - spec/test-data/subdir/index.html
473
486
  - spec/test-data/front-matter-file-utf8.txt
474
487
  - spec/test-data/handlers/hello.bogus
@@ -501,6 +514,7 @@ test_files:
501
514
  - spec/test-data/handlers/asciidoctor_with_headers.ad
502
515
  - spec/test-data/handlers/restructuredtext-page.rst
503
516
  - spec/test-data/handlers/javascript-page.js
517
+ - spec/test-data/handlers/asciidoc_with_interpolation.ad
504
518
  - spec/test-data/handlers/slim-with-variables.html.slim
505
519
  - spec/test-data/handlers/slim-with-markdown-page.html.slim
506
520
  - spec/test-data/handlers/haml-with-utf.html.haml
@@ -512,14 +526,21 @@ test_files:
512
526
  - spec/test-data/handlers/erb-page.html.erb
513
527
  - spec/test-data/handlers/orgmode-page.org
514
528
  - spec/test-data/handlers/outer-layout.html.haml
529
+ - spec/test-data/handlers/asciidoc_without_interpolation.ad
515
530
  - spec/test-data/handlers/textile-page.textile
516
531
  - spec/test-data/handlers/coffeescript-page.coffee
517
532
  - spec/test-data/handlers/erb-utf-page.html.erb
518
533
  - spec/test-data/handlers/simple-redirect-page.redirect
534
+ - spec/test-data/handlers/asciidoc_with_attributes.ad
519
535
  - spec/test-data/handlers/erb-page.xml.erb
520
536
  - spec/test-data/handlers/haml-layout.html.haml
521
537
  - spec/test-data/handlers/sass-page.sass
522
538
  - spec/test-data/images/logo.png
539
+ - spec/test-data/gzip/no.txt
540
+ - spec/test-data/gzip/no.html.gz
541
+ - spec/test-data/gzip/yes.js
542
+ - spec/test-data/gzip/subdir/yes.css
543
+ - spec/test-data/gzip/yes.html
523
544
  - spec/test-data/front-matter-file-no-content.txt
524
545
  - spec/test-data/simple-file.txt
525
546
  - spec/test-data/index.html