zorglub 0.0.8 → 0.0.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a35c39caf0fcac7d0669ff9a3bc9b41eab722b76
4
- data.tar.gz: 76b69e9f2f3fee168f24f30ce78d1e0fdd8547eb
3
+ metadata.gz: d8537037388d2d3b6171fbd10733d615852ddb74
4
+ data.tar.gz: d76cbd05b5945098b9e35f337b807719bba33caf
5
5
  SHA512:
6
- metadata.gz: 6952df9868cd6dece97edefb7e8b94812347e2d0f41baad6c176c228b1f30a1f7432de3f91fd0aabdc0c5638c32edb76d2bc0b799009842eca54e6bf4198add8
7
- data.tar.gz: be740a5651577ab07d28e8dc6fe95d8787e6eacc2a588e8d68babe53f8c5b38852f5e441d802d2c05f154ffccdc27d793d069c06542eabb5af67a27fdd1111cb
6
+ metadata.gz: 67eb88a6feb28a36ed3fbf1cc611e4297d775c46785581af46722e518a02a0baf3795c859ea603ee831093e6ac623d9528f31cbd2005476ff830bbfa9ac42c46
7
+ data.tar.gz: 47a0fc3960fe8805c3f182a5d198c73c64a50a431d4cb77cc070685bd16e367a1ad56c0972528c54df473c1eec96989527fbd5aaa4ae4c109813262dc899307b
data/.coveralls.yml ADDED
@@ -0,0 +1 @@
1
+ repo_token: gH5KHG6mjqkPKJhTUuOFaKrSKhNSiBuIu
data/.travis.yml CHANGED
@@ -1,7 +1,8 @@
1
1
  language: ruby
2
2
  rvm:
3
- - 1.9.2
4
3
  - 1.9.3
4
+ - 2.0.0
5
+ - 2.1.0
6
+ - rbx
5
7
  - jruby-19mode
6
- - rbx-19mode
7
- script: "rake spec"
8
+ script: "bundle exec rake spec"
data/Gemfile CHANGED
@@ -3,3 +3,16 @@ source "http://rubygems.org"
3
3
  # gem's dependencies are in zorglub.gemspec
4
4
  gemspec
5
5
 
6
+ gem 'rack'
7
+
8
+ group :test do
9
+ gem 'rake'
10
+ gem 'rspec'
11
+ end
12
+
13
+ group :test, :development do
14
+ gem 'haml'
15
+ gem 'sass'
16
+ end
17
+
18
+ gem 'coveralls', require: false
data/Gemfile.lock CHANGED
@@ -2,32 +2,53 @@ PATH
2
2
  remote: .
3
3
  specs:
4
4
  zorglub (0.0.8)
5
- rack
6
5
 
7
6
  GEM
8
7
  remote: http://rubygems.org/
9
8
  specs:
10
- diff-lcs (1.2.4)
11
- haml (4.0.3)
9
+ coveralls (0.7.0)
10
+ multi_json (~> 1.3)
11
+ rest-client
12
+ simplecov (>= 0.7)
13
+ term-ansicolor
14
+ thor
15
+ diff-lcs (1.2.5)
16
+ docile (1.1.3)
17
+ haml (4.0.5)
12
18
  tilt
19
+ mime-types (2.1)
20
+ multi_json (1.8.4)
13
21
  rack (1.5.2)
14
- rake (10.1.0)
22
+ rake (10.1.1)
23
+ rest-client (1.6.7)
24
+ mime-types (>= 1.16)
15
25
  rspec (2.14.1)
16
26
  rspec-core (~> 2.14.0)
17
27
  rspec-expectations (~> 2.14.0)
18
28
  rspec-mocks (~> 2.14.0)
19
- rspec-core (2.14.5)
20
- rspec-expectations (2.14.2)
29
+ rspec-core (2.14.7)
30
+ rspec-expectations (2.14.5)
21
31
  diff-lcs (>= 1.1.3, < 2.0)
22
- rspec-mocks (2.14.3)
23
- sass (3.2.10)
24
- tilt (1.4.1)
32
+ rspec-mocks (2.14.5)
33
+ sass (3.2.14)
34
+ simplecov (0.8.2)
35
+ docile (~> 1.1.0)
36
+ multi_json
37
+ simplecov-html (~> 0.8.0)
38
+ simplecov-html (0.8.0)
39
+ term-ansicolor (1.3.0)
40
+ tins (~> 1.0)
41
+ thor (0.18.1)
42
+ tilt (2.0.0)
43
+ tins (1.0.0)
25
44
 
26
45
  PLATFORMS
27
46
  ruby
28
47
 
29
48
  DEPENDENCIES
49
+ coveralls
30
50
  haml
51
+ rack
31
52
  rake
32
53
  rspec
33
54
  sass
data/README.md CHANGED
@@ -2,6 +2,7 @@
2
2
  by Jérémy Zurcher
3
3
  http://asynk.ch
4
4
  [![Build Status](https://secure.travis-ci.org/jeremyz/zorglub.png)](http://travis-ci.org/jeremyz/zorglub)
5
+ [![Coverage Status](https://coveralls.io/repos/jeremyz/zorglub/badge.png?branch=master)](https://coveralls.io/r/jeremyz/zorglub?branch=master)
5
6
  [![Gem Version](https://badge.fury.io/rb/zorglub.png)](http://badge.fury.io/rb/zorglub)
6
7
 
7
8
  ## DESCRIPTION:
data/Rakefile CHANGED
@@ -1,6 +1,7 @@
1
1
  require 'bundler/gem_tasks'
2
-
3
2
  require 'rspec/core/rake_task'
3
+
4
4
  RSpec::Core::RakeTask.new
5
5
 
6
6
  task :default => :spec
7
+
data/lib/zorglub.rb CHANGED
@@ -2,7 +2,7 @@
2
2
  # -*- coding: UTF-8 -*-
3
3
  #
4
4
  module Zorglub
5
- VERSION = '0.0.8'
5
+ VERSION = '0.0.9'
6
6
  end
7
7
  #
8
8
  require 'zorglub/node'
data/lib/zorglub/node.rb CHANGED
@@ -77,6 +77,10 @@ module Zorglub
77
77
  File.join(self.class.layout_base_path, @layout)+ext
78
78
  end
79
79
  #
80
+ def no_view!
81
+ view! nil
82
+ end
83
+ #
80
84
  def view! view
81
85
  @view = view
82
86
  end
@@ -228,19 +232,19 @@ module Zorglub
228
232
  meth ||= 'index'
229
233
  $stderr << "=> #{meth}(#{args.join ','})\n" if app.opt :debug
230
234
  node = self.new env, meth, args
231
- return error_404 node if not node.respond_to? meth
235
+ return error_404 node, meth if not node.respond_to? meth
232
236
  node.realize!
233
237
  end
234
238
  #
235
239
  def partial env, meth, *args
236
240
  node = self.new env, meth.to_s, args, true
237
- return error_404 node if not node.respond_to? meth
241
+ return error_404 node, meth if not node.respond_to? meth
238
242
  node.feed! env[:no_hooks]
239
243
  node.content
240
244
  end
241
245
  #
242
- def error_404 node
243
- $stderr << " !! method not found\n" if app.opt :debug
246
+ def error_404 node, meth
247
+ $stderr << " !! #{node.class.name}::#{meth} not found\n" if app.opt :debug
244
248
  resp = node.response
245
249
  resp.status = 404
246
250
  resp['Content-Type'] = 'text/plain'
@@ -272,7 +276,7 @@ module Zorglub
272
276
  catch(:stop_realize) {
273
277
  feed!
274
278
  response.write @content
275
- response.header['Content-Type'] = ( @mime || 'text/html' )
279
+ response.header['Content-Type'] ||= ( @mime || 'text/html' )
276
280
  response.finish
277
281
  response
278
282
  }
data/spec/node_spec.rb CHANGED
@@ -166,6 +166,11 @@ describe Zorglub do
166
166
  r.header['Content-type'].should == 'text/view'
167
167
  end
168
168
  #
169
+ it "should be able to override through rack response mime-type" do
170
+ r = Node0.my_call '/do_content_type'
171
+ r.header['Content-type'].should == 'text/mine'
172
+ end
173
+ #
169
174
  it "partial should render correctly" do
170
175
  Node0.partial({},:do_partial, 1, 2).should == 'partial_content'
171
176
  end
@@ -257,6 +262,11 @@ describe Zorglub do
257
262
  r.header['Content-type'].should == 'text/plain'
258
263
  end
259
264
  #
265
+ it "no view no layout should work as well" do
266
+ r = Node0.my_call '/no_view_no_layout'
267
+ r.body[0].should == "hello world"
268
+ end
269
+ #
260
270
  it "haml engine should work" do
261
271
  Node0.app.opt! :engines_cache_enabled, false
262
272
  r = Node0.my_call '/engines/haml'
data/spec/spec_helper.rb CHANGED
@@ -1,5 +1,11 @@
1
1
  #! /usr/bin/env ruby
2
2
  #
3
+ begin
4
+ require 'coveralls'
5
+ Coveralls.wear!
6
+ #
7
+ rescue LoadError
8
+ end
3
9
  begin
4
10
  require 'simplecov'
5
11
  SimpleCov.start do
@@ -54,6 +60,10 @@ class Node0 < Zorglub::Node
54
60
  def do_render
55
61
  engine! 'real'
56
62
  end
63
+ def do_content_type
64
+ engine! 'real'
65
+ response.header['Content-Type'] = 'text/mine'
66
+ end
57
67
  def do_partial a1, a2
58
68
  engine! 'real'
59
69
  end
@@ -76,6 +86,11 @@ class Node0 < Zorglub::Node
76
86
  ext! 'txt'
77
87
  mime! 'text/plain'
78
88
  end
89
+ def no_view_no_layout
90
+ no_view!
91
+ no_layout!
92
+ 'hello world'
93
+ end
79
94
  def engines name
80
95
  no_layout!
81
96
  case name
data/zorglub.gemspec CHANGED
@@ -21,12 +21,6 @@ Gem::Specification.new do |s|
21
21
  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
22
22
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
23
23
  s.require_paths = ["lib"]
24
-
25
- s.add_runtime_dependency "rack"
26
- s.add_development_dependency "rspec"
27
- s.add_development_dependency "rake"
28
- s.add_development_dependency "haml"
29
- s.add_development_dependency "sass"
30
24
  end
31
25
  #
32
26
  # EOF
metadata CHANGED
@@ -1,85 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zorglub
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.8
4
+ version: 0.0.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jérémy Zurcher
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-09-04 00:00:00.000000000 Z
12
- dependencies:
13
- - !ruby/object:Gem::Dependency
14
- name: rack
15
- requirement: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - '>='
18
- - !ruby/object:Gem::Version
19
- version: '0'
20
- type: :runtime
21
- prerelease: false
22
- version_requirements: !ruby/object:Gem::Requirement
23
- requirements:
24
- - - '>='
25
- - !ruby/object:Gem::Version
26
- version: '0'
27
- - !ruby/object:Gem::Dependency
28
- name: rspec
29
- requirement: !ruby/object:Gem::Requirement
30
- requirements:
31
- - - '>='
32
- - !ruby/object:Gem::Version
33
- version: '0'
34
- type: :development
35
- prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
37
- requirements:
38
- - - '>='
39
- - !ruby/object:Gem::Version
40
- version: '0'
41
- - !ruby/object:Gem::Dependency
42
- name: rake
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - '>='
46
- - !ruby/object:Gem::Version
47
- version: '0'
48
- type: :development
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - '>='
53
- - !ruby/object:Gem::Version
54
- version: '0'
55
- - !ruby/object:Gem::Dependency
56
- name: haml
57
- requirement: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - '>='
60
- - !ruby/object:Gem::Version
61
- version: '0'
62
- type: :development
63
- prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
65
- requirements:
66
- - - '>='
67
- - !ruby/object:Gem::Version
68
- version: '0'
69
- - !ruby/object:Gem::Dependency
70
- name: sass
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - '>='
74
- - !ruby/object:Gem::Version
75
- version: '0'
76
- type: :development
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - '>='
81
- - !ruby/object:Gem::Version
82
- version: '0'
11
+ date: 2014-02-12 00:00:00.000000000 Z
12
+ dependencies: []
83
13
  description: This is a very stripped down version of innate.
84
14
  email:
85
15
  - jeremy@asynk.ch
@@ -87,8 +17,9 @@ executables: []
87
17
  extensions: []
88
18
  extra_rdoc_files: []
89
19
  files:
90
- - .gitignore
91
- - .travis.yml
20
+ - ".coveralls.yml"
21
+ - ".gitignore"
22
+ - ".travis.yml"
92
23
  - Changelog
93
24
  - Gemfile
94
25
  - Gemfile.lock
@@ -134,17 +65,17 @@ require_paths:
134
65
  - lib
135
66
  required_ruby_version: !ruby/object:Gem::Requirement
136
67
  requirements:
137
- - - '>='
68
+ - - ">="
138
69
  - !ruby/object:Gem::Version
139
70
  version: '0'
140
71
  required_rubygems_version: !ruby/object:Gem::Requirement
141
72
  requirements:
142
- - - '>='
73
+ - - ">="
143
74
  - !ruby/object:Gem::Version
144
75
  version: '0'
145
76
  requirements: []
146
77
  rubyforge_project:
147
- rubygems_version: 2.0.6
78
+ rubygems_version: 2.2.0
148
79
  signing_key:
149
80
  specification_version: 4
150
81
  summary: a nano web application framework based on rack