utopia 1.6.1 → 1.6.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (16) hide show
  1. checksums.yaml +4 -4
  2. data/lib/utopia/content/markup.rb +1 -1
  3. data/lib/utopia/version.rb +1 -1
  4. data/setup/server/git/hooks/post-receive +1 -1
  5. data/spec/utopia/content_spec.rb +9 -3
  6. data/spec/utopia/content_spec.ru +1 -1
  7. data/spec/utopia/{pages → content_spec}/_heading.xnode +0 -0
  8. data/spec/utopia/{pages → content_spec}/content/_show-value.xnode +0 -0
  9. data/spec/utopia/{pages → content_spec}/content/links.yaml +0 -0
  10. data/spec/utopia/{pages → content_spec}/content/test-partial.xnode +0 -0
  11. data/spec/utopia/{pages → content_spec}/index.xnode +0 -0
  12. data/spec/utopia/{pages → content_spec}/node/index.xnode +0 -0
  13. data/spec/utopia/{pages → content_spec}/test.txt +0 -0
  14. data/spec/utopia/content_spec/test.xnode +10 -0
  15. data/spec/utopia/middleware_spec.rb +1 -1
  16. metadata +19 -17
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c864c34479bd1084db35b663e66460d6b055935e
4
- data.tar.gz: a8f1c21a3b0756017806330a915296f182e1bc36
3
+ metadata.gz: ce081d5385f3729a098a961a9c99989b8c4a1bf3
4
+ data.tar.gz: 5d274fcfa32e3c9fc20bc97a0205fb572771f3e3
5
5
  SHA512:
6
- metadata.gz: 7844fa2aa90bd3505b58545d24516f9152a421e79463e1146650b4a0ac41359f60fca967a5949ad66065232b42019a7c58f9faa73bf2a7eb981a8133adcd48d4
7
- data.tar.gz: 773ef26f9dc14bb72066f6557080941f1ea2cde0071d91646a9f6d34a4ca5962bd399568dbe5247ea62210caa42599c2940e58ec864ce3511f1080818ed798ab
6
+ metadata.gz: c49d04c98f7777bd1b0626da669b406662abdf360ff274a8ca4f5bcd2c9bfc42cd698137b498af63aa80036504309b4751a55cc3f00f18e6ce369dde6cfc6934
7
+ data.tar.gz: f6e9f1335e46834dc7206abdcedd717433cd160311b93283045309f19ad111076495c6077967880bbeeffb46c62b7976769df65f407eb2047cc47df87be688db
data/lib/utopia/content/markup.rb CHANGED
@@ -98,7 +98,7 @@ module Utopia
98
98
  end
99
99
 
100
100
  def doctype(attributes)
101
- @delegate.cdata("<!DOCTYPE#{attributes}>")
101
+ @delegate.cdata("<!DOCTYPE #{attributes}>")
102
102
  end
103
103
 
104
104
  def text(text)
data/lib/utopia/version.rb CHANGED
@@ -19,5 +19,5 @@
19
19
  # THE SOFTWARE.
20
20
 
21
21
  module Utopia
22
- VERSION = "1.6.1"
22
+ VERSION = "1.6.2"
23
23
  end
data/setup/server/git/hooks/post-receive CHANGED
@@ -67,7 +67,7 @@ Dir.chdir(GIT_WORK_TREE) do
67
67
  sudo %W{git submodule update -i}
68
68
 
69
69
  if File.exist? 'Gemfile'
70
- sudo %W{bundle install --deployment --clean --jobs=4 --retry=2 --quiet}
70
+ sudo %W{bundle install --deployment --jobs=4 --retry=2 --quiet}
71
71
  end
72
72
 
73
73
  if File.exist? 'Rakefile'
data/spec/utopia/content_spec.rb CHANGED
@@ -27,10 +27,16 @@ module Utopia::ContentSpec
27
27
 
28
28
  let(:app) {Rack::Builder.parse_file(File.expand_path('content_spec.ru', __dir__)).first}
29
29
 
30
+ it "should generate identical html" do
31
+ get "/test"
32
+
33
+ expect(last_response.body).to be == File.read(File.expand_path('content_spec/test.xnode', __dir__))
34
+ end
35
+
30
36
  it "should get a local path" do
31
37
  get '/node/index'
32
38
 
33
- expect(last_response.body).to be == File.expand_path('pages/node', __dir__)
39
+ expect(last_response.body).to be == File.expand_path('content_spec/node', __dir__)
34
40
  end
35
41
 
36
42
  it "should successfully redirect to the index page" do
@@ -66,7 +72,7 @@ module Utopia::ContentSpec
66
72
  end
67
73
 
68
74
  describe Utopia::Content do
69
- let(:root) {File.expand_path("pages", __dir__)}
75
+ let(:root) {File.expand_path('content_spec', __dir__)}
70
76
  let(:content) {Utopia::Content.new(lambda{}, root: root, cache_templates: true)}
71
77
 
72
78
  it "should parse file and expand variables" do
@@ -80,7 +86,7 @@ module Utopia::ContentSpec
80
86
  end
81
87
 
82
88
  it "should fetch template and use cache" do
83
- node_path = File.expand_path('../pages/index.xnode', __FILE__)
89
+ node_path = File.expand_path('../content_spec/index.xnode', __FILE__)
84
90
 
85
91
  template = content.fetch_template(node_path)
86
92
 
data/spec/utopia/content_spec.ru CHANGED
@@ -2,7 +2,7 @@
2
2
  require 'utopia/tags/deferred'
3
3
 
4
4
  use Utopia::Content,
5
- root: File.expand_path('pages', __dir__),
5
+ root: File.expand_path('content_spec', __dir__),
6
6
  tags: {
7
7
  'deferred' => Utopia::Tags::Deferred
8
8
  }
data/spec/utopia/content_spec/test.xnode ADDED
@@ -0,0 +1,10 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <title>Testing</title>
5
+ </head>
6
+ <body>
7
+ <h1>Testing</h1>
8
+ <p>This is a test.</p>
9
+ </body>
10
+ </html>
data/spec/utopia/middleware_spec.rb CHANGED
@@ -23,7 +23,7 @@ require 'utopia/middleware'
23
23
  module Utopia::MiddlewareSpec
24
24
  describe Utopia do
25
25
  it "should give a default path relative to the cwd" do
26
- expect(File).to exist(Utopia::default_root('pages', File.dirname(__FILE__)))
26
+ expect(File).to exist(Utopia::default_root('content_spec', File.dirname(__FILE__)))
27
27
  end
28
28
  end
29
29
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: utopia
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.1
4
+ version: 1.6.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Samuel Williams
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-03-13 00:00:00.000000000 Z
11
+ date: 2016-03-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: trenni
@@ -276,6 +276,14 @@ files:
276
276
  - spec/utopia/content/node_spec.rb
277
277
  - spec/utopia/content_spec.rb
278
278
  - spec/utopia/content_spec.ru
279
+ - spec/utopia/content_spec/_heading.xnode
280
+ - spec/utopia/content_spec/content/_show-value.xnode
281
+ - spec/utopia/content_spec/content/links.yaml
282
+ - spec/utopia/content_spec/content/test-partial.xnode
283
+ - spec/utopia/content_spec/index.xnode
284
+ - spec/utopia/content_spec/node/index.xnode
285
+ - spec/utopia/content_spec/test.txt
286
+ - spec/utopia/content_spec/test.xnode
279
287
  - spec/utopia/controller/action_spec.rb
280
288
  - spec/utopia/controller/middleware_spec.rb
281
289
  - spec/utopia/controller/middleware_spec.ru
@@ -307,13 +315,6 @@ files:
307
315
  - spec/utopia/localization_spec/localized.ja.txt
308
316
  - spec/utopia/localization_spec/test.txt
309
317
  - spec/utopia/middleware_spec.rb
310
- - spec/utopia/pages/_heading.xnode
311
- - spec/utopia/pages/content/_show-value.xnode
312
- - spec/utopia/pages/content/links.yaml
313
- - spec/utopia/pages/content/test-partial.xnode
314
- - spec/utopia/pages/index.xnode
315
- - spec/utopia/pages/node/index.xnode
316
- - spec/utopia/pages/test.txt
317
318
  - spec/utopia/path/matcher_spec.rb
318
319
  - spec/utopia/path_spec.rb
319
320
  - spec/utopia/performance_spec.rb
@@ -357,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
357
358
  version: '0'
358
359
  requirements: []
359
360
  rubyforge_project:
360
- rubygems_version: 2.5.2
361
+ rubygems_version: 2.5.1
361
362
  signing_key:
362
363
  specification_version: 4
363
364
  summary: Utopia is a framework for building dynamic content-driven websites.
@@ -390,6 +391,14 @@ test_files:
390
391
  - spec/utopia/content/node_spec.rb
391
392
  - spec/utopia/content_spec.rb
392
393
  - spec/utopia/content_spec.ru
394
+ - spec/utopia/content_spec/_heading.xnode
395
+ - spec/utopia/content_spec/content/_show-value.xnode
396
+ - spec/utopia/content_spec/content/links.yaml
397
+ - spec/utopia/content_spec/content/test-partial.xnode
398
+ - spec/utopia/content_spec/index.xnode
399
+ - spec/utopia/content_spec/node/index.xnode
400
+ - spec/utopia/content_spec/test.txt
401
+ - spec/utopia/content_spec/test.xnode
393
402
  - spec/utopia/controller/action_spec.rb
394
403
  - spec/utopia/controller/middleware_spec.rb
395
404
  - spec/utopia/controller/middleware_spec.ru
@@ -421,13 +430,6 @@ test_files:
421
430
  - spec/utopia/localization_spec/localized.ja.txt
422
431
  - spec/utopia/localization_spec/test.txt
423
432
  - spec/utopia/middleware_spec.rb
424
- - spec/utopia/pages/_heading.xnode
425
- - spec/utopia/pages/content/_show-value.xnode
426
- - spec/utopia/pages/content/links.yaml
427
- - spec/utopia/pages/content/test-partial.xnode
428
- - spec/utopia/pages/index.xnode
429
- - spec/utopia/pages/node/index.xnode
430
- - spec/utopia/pages/test.txt
431
433
  - spec/utopia/path/matcher_spec.rb
432
434
  - spec/utopia/path_spec.rb
433
435
  - spec/utopia/performance_spec.rb