wunderbar 0.16.8 → 0.16.9

Sign up to get free protection for your applications and to get access to all the features.
@@ -73,7 +73,18 @@ module Wunderbar
73
73
  _newline if @pending_newline
74
74
  @pending_newline = @pending_margin
75
75
  @first_tag = @pending_margin = false
76
- super
76
+ # workaround for https://github.com/jimweirich/builder/commit/7c824996637d2d76455c87ad47d76ba440937e38
77
+ sym = "#{sym}:#{args.shift}" if args.first.kind_of?(::Symbol)
78
+ if not block and args.first == ''
79
+ attrs = {}
80
+ attrs.merge!(args.last) if ::Hash === args.last
81
+ _indent
82
+ _start_tag(sym, attrs)
83
+ _end_tag(sym)
84
+ _newline
85
+ else
86
+ super
87
+ end
77
88
  end
78
89
  end
79
90
 
@@ -43,10 +43,12 @@ elsif defined? ActionView::Template
43
43
  else
44
44
 
45
45
  require 'etc'
46
- $USER = ENV['REMOTE_USER'] ||= ENV['USER'] || Etc.getlogin
47
- if $USER.nil?
46
+ user = Etc.getlogin
47
+
48
+ $USER = ENV['REMOTE_USER'] ||= ENV['USER'] || user
49
+ if $USER.nil? or $USER == '_securityagent'
48
50
  if RUBY_PLATFORM =~ /darwin/i
49
- $USER = `dscl . -search /Users UniqueID #{Process.uid}`.split.first
51
+ user = $USER = `dscl . -search /Users UniqueID #{Process.uid}`.split.first
50
52
  elsif RUBY_PLATFORM =~ /linux/i
51
53
  $USER = `getent passwd #{Process.uid}`.split(':').first
52
54
  end
@@ -66,7 +68,8 @@ else
66
68
  end
67
69
 
68
70
  $HOME = ENV['HOME']
69
- if $HOME.nil? and $USER == Etc.getlogin
71
+ $HOME = nil if $HOME == '/var/empty'
72
+ if $HOME.nil? and $USER == user
70
73
  $HOME ||= Dir.home($USER) rescue nil
71
74
  $HOME ||= File.expand_path("~#{$USER}") rescue nil
72
75
  end
@@ -2,7 +2,7 @@ module Wunderbar
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
4
  MINOR = 16
5
- TINY = 8
5
+ TINY = 9
6
6
 
7
7
  STRING = [MAJOR, MINOR, TINY].join('.')
8
8
  end
data/wunderbar.gemspec CHANGED
@@ -2,17 +2,17 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = "wunderbar"
5
- s.version = "0.16.8"
5
+ s.version = "0.16.9"
6
6
 
7
7
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
8
8
  s.authors = ["Sam Ruby"]
9
- s.date = "2012-06-11"
9
+ s.date = "2013-03-07"
10
10
  s.description = " Wunderbar makes it easy to produce valid HTML5, wellformed XHTML, Unicode\n (utf-8), consistently indented, readable applications. This includes\n output that conforms to the Polyglot specification and the emerging\n results from the XML Error Recovery Community Group.\n"
11
11
  s.email = "rubys@intertwingly.net"
12
- s.files = ["wunderbar.gemspec", "README.md", "COPYING", "lib/wunderbar.rb", "lib/wunderbar", "lib/wunderbar/installation.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/server.rb", "lib/wunderbar/logger.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/websocket.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/version.rb"]
12
+ s.files = ["wunderbar.gemspec", "README.md", "COPYING", "lib/wunderbar.rb", "lib/wunderbar", "lib/wunderbar/logger.rb", "lib/wunderbar/rails.rb", "lib/wunderbar/builder.rb", "lib/wunderbar/environment.rb", "lib/wunderbar/server.rb", "lib/wunderbar/version.rb", "lib/wunderbar/websocket.rb", "lib/wunderbar/html-methods.rb", "lib/wunderbar/job-control.rb", "lib/wunderbar/cssproxy.rb", "lib/wunderbar/cgi-methods.rb", "lib/wunderbar/sinatra.rb", "lib/wunderbar/rack.rb", "lib/wunderbar/installation.rb"]
13
13
  s.homepage = "http://github.com/rubys/wunderbar"
14
14
  s.require_paths = ["lib"]
15
- s.rubygems_version = "1.8.21"
15
+ s.rubygems_version = "1.8.23"
16
16
  s.summary = "HTML Generator and CGI application support"
17
17
 
18
18
  if s.respond_to? :specification_version then
metadata CHANGED
@@ -1,110 +1,97 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: wunderbar
3
- version: !ruby/object:Gem::Version
4
- hash: 79
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.16.9
5
5
  prerelease:
6
- segments:
7
- - 0
8
- - 16
9
- - 8
10
- version: 0.16.8
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Sam Ruby
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
-
18
- date: 2012-06-11 00:00:00 Z
19
- dependencies:
20
- - !ruby/object:Gem::Dependency
12
+ date: 2013-03-07 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
21
15
  name: builder
22
- prerelease: false
23
- requirement: &id001 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
24
17
  none: false
25
- requirements:
26
- - - ">="
27
- - !ruby/object:Gem::Version
28
- hash: 7
29
- segments:
30
- - 3
31
- - 0
32
- version: "3.0"
18
+ requirements:
19
+ - - ! '>='
20
+ - !ruby/object:Gem::Version
21
+ version: '3.0'
33
22
  type: :runtime
34
- version_requirements: *id001
35
- - !ruby/object:Gem::Dependency
36
- name: json
37
23
  prerelease: false
38
- requirement: &id002 !ruby/object:Gem::Requirement
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: '3.0'
30
+ - !ruby/object:Gem::Dependency
31
+ name: json
32
+ requirement: !ruby/object:Gem::Requirement
39
33
  none: false
40
- requirements:
41
- - - ">="
42
- - !ruby/object:Gem::Version
43
- hash: 3
44
- segments:
45
- - 0
46
- version: "0"
34
+ requirements:
35
+ - - ! '>='
36
+ - !ruby/object:Gem::Version
37
+ version: '0'
47
38
  type: :runtime
48
- version_requirements: *id002
49
- description: " Wunderbar makes it easy to produce valid HTML5, wellformed XHTML, Unicode\n (utf-8), consistently indented, readable applications. This includes\n output that conforms to the Polyglot specification and the emerging\n results from the XML Error Recovery Community Group.\n"
39
+ prerelease: false
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: '0'
46
+ description: ! " Wunderbar makes it easy to produce valid HTML5, wellformed XHTML,
47
+ Unicode\n (utf-8), consistently indented, readable applications. This includes\n
48
+ \ output that conforms to the Polyglot specification and the emerging\n results
49
+ from the XML Error Recovery Community Group.\n"
50
50
  email: rubys@intertwingly.net
51
51
  executables: []
52
-
53
52
  extensions: []
54
-
55
53
  extra_rdoc_files: []
56
-
57
- files:
54
+ files:
58
55
  - wunderbar.gemspec
59
56
  - README.md
60
57
  - COPYING
61
58
  - lib/wunderbar.rb
62
- - lib/wunderbar/installation.rb
63
- - lib/wunderbar/html-methods.rb
64
- - lib/wunderbar/job-control.rb
65
- - lib/wunderbar/server.rb
66
59
  - lib/wunderbar/logger.rb
67
- - lib/wunderbar/rack.rb
60
+ - lib/wunderbar/rails.rb
68
61
  - lib/wunderbar/builder.rb
69
- - lib/wunderbar/websocket.rb
70
- - lib/wunderbar/sinatra.rb
71
62
  - lib/wunderbar/environment.rb
72
- - lib/wunderbar/rails.rb
73
- - lib/wunderbar/cgi-methods.rb
74
- - lib/wunderbar/cssproxy.rb
63
+ - lib/wunderbar/server.rb
75
64
  - lib/wunderbar/version.rb
65
+ - lib/wunderbar/websocket.rb
66
+ - lib/wunderbar/html-methods.rb
67
+ - lib/wunderbar/job-control.rb
68
+ - lib/wunderbar/cssproxy.rb
69
+ - lib/wunderbar/cgi-methods.rb
70
+ - lib/wunderbar/sinatra.rb
71
+ - lib/wunderbar/rack.rb
72
+ - lib/wunderbar/installation.rb
76
73
  homepage: http://github.com/rubys/wunderbar
77
74
  licenses: []
78
-
79
75
  post_install_message:
80
76
  rdoc_options: []
81
-
82
- require_paths:
77
+ require_paths:
83
78
  - lib
84
- required_ruby_version: !ruby/object:Gem::Requirement
79
+ required_ruby_version: !ruby/object:Gem::Requirement
85
80
  none: false
86
- requirements:
87
- - - ">="
88
- - !ruby/object:Gem::Version
89
- hash: 3
90
- segments:
91
- - 0
92
- version: "0"
93
- required_rubygems_version: !ruby/object:Gem::Requirement
81
+ requirements:
82
+ - - ! '>='
83
+ - !ruby/object:Gem::Version
84
+ version: '0'
85
+ required_rubygems_version: !ruby/object:Gem::Requirement
94
86
  none: false
95
- requirements:
96
- - - ">="
97
- - !ruby/object:Gem::Version
98
- hash: 3
99
- segments:
100
- - 0
101
- version: "0"
87
+ requirements:
88
+ - - ! '>='
89
+ - !ruby/object:Gem::Version
90
+ version: '0'
102
91
  requirements: []
103
-
104
92
  rubyforge_project:
105
- rubygems_version: 1.8.21
93
+ rubygems_version: 1.8.23
106
94
  signing_key:
107
95
  specification_version: 3
108
96
  summary: HTML Generator and CGI application support
109
97
  test_files: []
110
-