trenni-formatters 1.2.0 → 2.0.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 806ee963b3b27c735e6eaa8479dd82589a863a7c
4
- data.tar.gz: ccfd1e70f2fcb6620c3479c8ba514b6765318e3e
3
+ metadata.gz: 48783cc76b6326eb79d95e38bbd29a318c655a8d
4
+ data.tar.gz: 047eb79e60943f892b2d6c6e83d33ed8ec8eca81
5
5
  SHA512:
6
- metadata.gz: 17dbe8759970644d8b66c90a3f94a7b7b303e2e86cbf51f8cbddafc459ddd4a9ba9ee9686d08a27dfeb545588406998b2bf8ae5d3d3f0291e3265e67e91bd6e5
7
- data.tar.gz: 320e119d5d24eff4dff0edec6b7cca61b898ddc3a3362c53f1bb9b2cb4dbc87343f95013e1277b0a0c2b7ca2b94c47eb1e6a5192e32b00a16da81657f7694f1f
6
+ metadata.gz: ce7cfa889e071527b9f4ff0ad9e8c0f0273dd850e8250e37c75f8da12a9c5c6ba809d454cb928175d0ffbeff314b23cdba3ffe0542ac2786fd014f2a30d53dd2
7
+ data.tar.gz: 5bdd21e6370775cca078afd27b5c4a669a4f5d30a3b738a46bc58bc7815123d84eb21ee6c44182d0c0c534583d632afb8da7515feca0a896353debdd2666d390
@@ -30,7 +30,7 @@ module Trenni
30
30
 
31
31
  def format_unspecified(object, options)
32
32
  if object
33
- Strings::to_html(object.to_s)
33
+ object
34
34
  else
35
35
  options[:blank] || ""
36
36
  end
@@ -43,7 +43,7 @@ module Trenni
43
43
  self.send(method_name, object, options)
44
44
  else
45
45
  format_unspecified(object, options)
46
- end
46
+ end.to_s
47
47
  end
48
48
 
49
49
  alias text format
@@ -20,6 +20,6 @@
20
20
 
21
21
  module Trenni
22
22
  module Formatters
23
- VERSION = "1.2.0"
23
+ VERSION = "2.0.0"
24
24
  end
25
25
  end
@@ -19,6 +19,7 @@
19
19
  # THE SOFTWARE.
20
20
 
21
21
  require 'trenni/formatters'
22
+ require 'trenni/formatters/html/definition_list_form'
22
23
  require 'trenni/formatters/html/option_select'
23
24
 
24
25
  module Trenni::Formatters::HTML::OptionSelectSpec
@@ -32,63 +33,74 @@ module Trenni::Formatters::HTML::OptionSelectSpec
32
33
 
33
34
  describe Trenni::Formatters::HTML::OptionSelect do
34
35
  let(:formatter) {FormFormatter.new(:object => double(:bar => 10))}
35
- let(:_out) {Array.new}
36
36
 
37
37
  it "should list items" do
38
- formatter.select :field => :bar do |select|
39
- _out << select.item(:title => "A", :value => 0)
40
- _out << select.item(:title => "B", :value => 10)
38
+ _out = Trenni::Template.capture do
39
+ formatter.select :field => :bar do |select|
40
+ _out << select.item(:title => "A", :value => 0)
41
+ _out << select.item(:title => "B", :value => 10)
42
+ end
41
43
  end
42
44
 
43
- expect(_out.join).to be == "<dt>Bar</dt>\n<dd>\n\t<select name=\"bar\">\n\t\t<option value=\"0\">A</option><option value=\"10\" selected>B</option>\n\t</select>\n</dd>"
45
+ expect(_out).to be == "<dt>Bar</dt>\n<dd>\n\t<select name=\"bar\">\n\t\t<option value=\"0\">A</option><option value=\"10\" selected>B</option>\n\t</select>\n</dd>"
44
46
  end
45
47
 
46
48
  it "should list items with data attributes" do
47
- formatter.select :field => :bar do |select|
48
- _out << select.item(:title => "A", :value => 0, :data => {foo: 'bar'})
49
+ _out = Trenni::Template.capture do
50
+ formatter.select :field => :bar do |select|
51
+ _out << select.item(:title => "A", :value => 0, :data => {foo: 'bar'})
52
+ end
49
53
  end
50
54
 
51
- expect(_out.join).to be == "<dt>Bar</dt>\n<dd>\n\t<select name=\"bar\">\n\t\t<option value=\"0\" data-foo=\"bar\">A</option>\n\t</select>\n</dd>"
55
+ expect(_out).to be == "<dt>Bar</dt>\n<dd>\n\t<select name=\"bar\">\n\t\t<option value=\"0\" data-foo=\"bar\">A</option>\n\t</select>\n</dd>"
52
56
  end
53
57
 
54
58
  it "should list items for multiple selection" do
55
- formatter.select :field => :bar, multiple: true do |select|
56
- _out << select.item(:title => "A", :value => 0)
57
- _out << select.item(:title => "B", :value => 10)
59
+ _out = Trenni::Template.capture do
60
+ formatter.select :field => :bar, multiple: true do |select|
61
+ _out << select.item(:title => "A", :value => 0)
62
+ _out << select.item(:title => "B", :value => 10)
63
+ end
58
64
  end
59
65
 
60
- expect(_out.join).to be == "<dt>Bar</dt>\n<dd>\n\t<select name=\"bar[]\" multiple>\n\t\t<option value=\"0\">A</option><option value=\"10\" selected>B</option>\n\t</select>\n</dd>"
66
+ expect(_out).to be == "<dt>Bar</dt>\n<dd>\n\t<select name=\"bar[]\" multiple>\n\t\t<option value=\"0\">A</option><option value=\"10\" selected>B</option>\n\t</select>\n</dd>"
61
67
  end
62
68
 
63
69
  it "should add optional item" do
64
- formatter.select :field => :bar, optional: true do |select|
65
- _out << select.item(:title => "A", :value => 0)
66
- _out << select.item(:title => "B", :value => 10)
70
+ _out = Trenni::Template.capture do
71
+ formatter.select :field => :bar, optional: true do |select|
72
+ _out << select.item(:title => "A", :value => 0)
73
+ _out << select.item(:title => "B", :value => 10)
74
+ end
67
75
  end
68
76
 
69
- expect(_out.join).to be == "<dt>Bar</dt>\n<dd>\n\t<select name=\"bar\">\n\t\t<option value=\"\"></option>\t\t<option value=\"0\">A</option><option value=\"10\" selected>B</option>\n\t</select>\n</dd>"
77
+ expect(_out).to be == "<dt>Bar</dt>\n<dd>\n\t<select name=\"bar\">\n\t\t<option value=\"\"></option>\t\t<option value=\"0\">A</option><option value=\"10\" selected>B</option>\n\t</select>\n</dd>"
70
78
  end
71
79
 
72
80
  it "should add optional item in group" do
73
- formatter.select :field => :bar do |select|
74
- select.group(title: 'group', optional: true) do
75
- _out << select.item(:title => "A", :value => 0)
81
+ _out = Trenni::Template.capture do
82
+ formatter.select :field => :bar do |select|
83
+ select.group(title: 'group', optional: true) do
84
+ _out << select.item(:title => "A", :value => 0)
85
+ end
86
+ _out << select.item(:title => "B", :value => 10)
76
87
  end
77
- _out << select.item(:title => "B", :value => 10)
78
88
  end
79
89
 
80
- expect(_out.join).to be == "<dt>Bar</dt>\n<dd>\n\t<select name=\"bar\">\n\t\t<optgroup label=\"group\">\n\t\t\t<option value=\"\"></option>\t\t\t<option value=\"0\">A</option>\n\t\t</optgroup>\t\t<option value=\"10\" selected>B</option>\n\t</select>\n</dd>"
90
+ expect(_out).to be == "<dt>Bar</dt>\n<dd>\n\t<select name=\"bar\">\n\t\t<optgroup label=\"group\">\n\t\t\t<option value=\"\"></option>\t\t\t<option value=\"0\">A</option>\n\t\t</optgroup>\t\t<option value=\"10\" selected>B</option>\n\t</select>\n</dd>"
81
91
  end
82
92
 
83
93
  it "should add a group" do
84
- formatter.select :field => :bar do |select|
85
- select.group(title: 'group') do
86
- _out << select.item(:title => "A", :value => 0)
94
+ _out = Trenni::Template.capture do
95
+ formatter.select :field => :bar do |select|
96
+ select.group(title: 'group') do
97
+ _out << select.item(:title => "A", :value => 0)
98
+ end
99
+ _out << select.item(:title => "B", :value => 10)
87
100
  end
88
- _out << select.item(:title => "B", :value => 10)
89
101
  end
90
102
 
91
- expect(_out.join).to be == "<dt>Bar</dt>\n<dd>\n\t<select name=\"bar\">\n\t\t<optgroup label=\"group\">\n\t\t\t<option value=\"0\">A</option>\n\t\t</optgroup>\t\t<option value=\"10\" selected>B</option>\n\t</select>\n</dd>"
103
+ expect(_out).to be == "<dt>Bar</dt>\n<dd>\n\t<select name=\"bar\">\n\t\t<optgroup label=\"group\">\n\t\t\t<option value=\"0\">A</option>\n\t\t</optgroup>\t\t<option value=\"10\" selected>B</option>\n\t</select>\n</dd>"
92
104
  end
93
105
  end
94
106
  end
@@ -32,15 +32,16 @@ module Trenni::Formatters::HTML::RadioSelectSpec
32
32
 
33
33
  describe Trenni::Formatters::HTML::RadioSelect do
34
34
  let(:formatter) {FormFormatter.new(:object => double(:bar => 10))}
35
- let(:_out) {Array.new}
36
35
 
37
36
  it "should list items" do
38
- formatter.select :field => :bar do |select|
39
- _out << select.item(:title => "A", :value => 0)
40
- _out << select.item(:title => "B", :value => 10)
37
+ _out = Trenni::Template.capture do
38
+ formatter.select :field => :bar do |select|
39
+ _out << select.item(:title => "A", :value => 0)
40
+ _out << select.item(:title => "B", :value => 10)
41
+ end
41
42
  end
42
43
 
43
- expect(_out.join).to be == %Q{<dt>Bar</dt>\n<dd>\n\t<table>\n\t\t<tbody>\n\t\t\t<tr>\n\t\t\t\t<td class="handle"><input type="radio" name="bar" value="0"/></td>\n\t\t\t\t<td class="item">A</td>\n\t\t\t</tr><tr>\n\t\t\t\t<td class="handle"><input type="radio" name="bar" value="10"/></td>\n\t\t\t\t<td class="item">B</td>\n\t\t\t</tr>\n\t\t</tbody>\n\t</table>\n</dd>}
44
+ expect(_out).to be == %Q{<dt>Bar</dt>\n<dd>\n\t<table>\n\t\t<tbody>\n\t\t\t<tr>\n\t\t\t\t<td class="handle"><input type="radio" name="bar" value="0"/></td>\n\t\t\t\t<td class="item">A</td>\n\t\t\t</tr><tr>\n\t\t\t\t<td class="handle"><input type="radio" name="bar" value="10"/></td>\n\t\t\t\t<td class="item">B</td>\n\t\t\t</tr>\n\t\t</tbody>\n\t</table>\n</dd>}
44
45
  end
45
46
  end
46
47
  end
@@ -24,10 +24,10 @@ Gem::Specification.new do |spec|
24
24
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
25
25
  spec.require_paths = ["lib"]
26
26
 
27
- spec.add_dependency "trenni", "~> 1.7.0"
28
- spec.add_dependency "mapping", "~> 1.0.0"
27
+ spec.add_dependency "trenni", "~> 2.0"
28
+ spec.add_dependency "mapping", "~> 1.0"
29
29
 
30
30
  spec.add_development_dependency "bundler", "~> 1.3"
31
- spec.add_development_dependency "rspec", "~> 3.4.0"
31
+ spec.add_development_dependency "rspec", "~> 3.4"
32
32
  spec.add_development_dependency "rake"
33
33
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trenni-formatters
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 2.0.0
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-05-30 00:00:00.000000000 Z
11
+ date: 2016-11-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: trenni
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 1.7.0
19
+ version: '2.0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 1.7.0
26
+ version: '2.0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: mapping
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.0.0
33
+ version: '1.0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.0.0
40
+ version: '1.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bundler
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 3.4.0
61
+ version: '3.4'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 3.4.0
68
+ version: '3.4'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rake
71
71
  requirement: !ruby/object:Gem::Requirement