xrd 0.1.0
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +3 -0
- data/LICENSE +202 -0
- data/README.md +36 -0
- data/Rakefile +59 -0
- data/lib/xrd.rb +30 -0
- data/lib/xrd/link.rb +46 -0
- data/lib/xrd/properties.rb +62 -0
- data/lib/xrd/resource_descriptor.rb +122 -0
- data/lib/xrd/title.rb +18 -0
- data/lib/xrd/version.rb +26 -0
- data/spec/spec.opts +2 -0
- data/spec/spec_helper.rb +21 -0
- data/spec/xrd/link_spec.rb +111 -0
- data/spec/xrd/xrd_spec.rb +431 -0
- data/tasks/clobber.rake +2 -0
- data/tasks/gem.rake +70 -0
- data/tasks/git.rake +40 -0
- data/tasks/metrics.rake +22 -0
- data/tasks/rdoc.rake +26 -0
- data/tasks/rubyforge.rake +103 -0
- data/tasks/spec.rake +71 -0
- data/tasks/yard.rake +26 -0
- data/website/index.html +95 -0
- metadata +171 -0
data/CHANGELOG
ADDED
data/LICENSE
ADDED
@@ -0,0 +1,202 @@
|
|
1
|
+
|
2
|
+
Apache License
|
3
|
+
Version 2.0, January 2004
|
4
|
+
http://www.apache.org/licenses/
|
5
|
+
|
6
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
7
|
+
|
8
|
+
1. Definitions.
|
9
|
+
|
10
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
11
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
12
|
+
|
13
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
14
|
+
the copyright owner that is granting the License.
|
15
|
+
|
16
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
17
|
+
other entities that control, are controlled by, or are under common
|
18
|
+
control with that entity. For the purposes of this definition,
|
19
|
+
"control" means (i) the power, direct or indirect, to cause the
|
20
|
+
direction or management of such entity, whether by contract or
|
21
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
22
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
23
|
+
|
24
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
25
|
+
exercising permissions granted by this License.
|
26
|
+
|
27
|
+
"Source" form shall mean the preferred form for making modifications,
|
28
|
+
including but not limited to software source code, documentation
|
29
|
+
source, and configuration files.
|
30
|
+
|
31
|
+
"Object" form shall mean any form resulting from mechanical
|
32
|
+
transformation or translation of a Source form, including but
|
33
|
+
not limited to compiled object code, generated documentation,
|
34
|
+
and conversions to other media types.
|
35
|
+
|
36
|
+
"Work" shall mean the work of authorship, whether in Source or
|
37
|
+
Object form, made available under the License, as indicated by a
|
38
|
+
copyright notice that is included in or attached to the work
|
39
|
+
(an example is provided in the Appendix below).
|
40
|
+
|
41
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
42
|
+
form, that is based on (or derived from) the Work and for which the
|
43
|
+
editorial revisions, annotations, elaborations, or other modifications
|
44
|
+
represent, as a whole, an original work of authorship. For the purposes
|
45
|
+
of this License, Derivative Works shall not include works that remain
|
46
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
47
|
+
the Work and Derivative Works thereof.
|
48
|
+
|
49
|
+
"Contribution" shall mean any work of authorship, including
|
50
|
+
the original version of the Work and any modifications or additions
|
51
|
+
to that Work or Derivative Works thereof, that is intentionally
|
52
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
53
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
54
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
55
|
+
means any form of electronic, verbal, or written communication sent
|
56
|
+
to the Licensor or its representatives, including but not limited to
|
57
|
+
communication on electronic mailing lists, source code control systems,
|
58
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
59
|
+
Licensor for the purpose of discussing and improving the Work, but
|
60
|
+
excluding communication that is conspicuously marked or otherwise
|
61
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
62
|
+
|
63
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
64
|
+
on behalf of whom a Contribution has been received by Licensor and
|
65
|
+
subsequently incorporated within the Work.
|
66
|
+
|
67
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
68
|
+
this License, each Contributor hereby grants to You a perpetual,
|
69
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
70
|
+
copyright license to reproduce, prepare Derivative Works of,
|
71
|
+
publicly display, publicly perform, sublicense, and distribute the
|
72
|
+
Work and such Derivative Works in Source or Object form.
|
73
|
+
|
74
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
75
|
+
this License, each Contributor hereby grants to You a perpetual,
|
76
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
77
|
+
(except as stated in this section) patent license to make, have made,
|
78
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
79
|
+
where such license applies only to those patent claims licensable
|
80
|
+
by such Contributor that are necessarily infringed by their
|
81
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
82
|
+
with the Work to which such Contribution(s) was submitted. If You
|
83
|
+
institute patent litigation against any entity (including a
|
84
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
85
|
+
or a Contribution incorporated within the Work constitutes direct
|
86
|
+
or contributory patent infringement, then any patent licenses
|
87
|
+
granted to You under this License for that Work shall terminate
|
88
|
+
as of the date such litigation is filed.
|
89
|
+
|
90
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
91
|
+
Work or Derivative Works thereof in any medium, with or without
|
92
|
+
modifications, and in Source or Object form, provided that You
|
93
|
+
meet the following conditions:
|
94
|
+
|
95
|
+
(a) You must give any other recipients of the Work or
|
96
|
+
Derivative Works a copy of this License; and
|
97
|
+
|
98
|
+
(b) You must cause any modified files to carry prominent notices
|
99
|
+
stating that You changed the files; and
|
100
|
+
|
101
|
+
(c) You must retain, in the Source form of any Derivative Works
|
102
|
+
that You distribute, all copyright, patent, trademark, and
|
103
|
+
attribution notices from the Source form of the Work,
|
104
|
+
excluding those notices that do not pertain to any part of
|
105
|
+
the Derivative Works; and
|
106
|
+
|
107
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
108
|
+
distribution, then any Derivative Works that You distribute must
|
109
|
+
include a readable copy of the attribution notices contained
|
110
|
+
within such NOTICE file, excluding those notices that do not
|
111
|
+
pertain to any part of the Derivative Works, in at least one
|
112
|
+
of the following places: within a NOTICE text file distributed
|
113
|
+
as part of the Derivative Works; within the Source form or
|
114
|
+
documentation, if provided along with the Derivative Works; or,
|
115
|
+
within a display generated by the Derivative Works, if and
|
116
|
+
wherever such third-party notices normally appear. The contents
|
117
|
+
of the NOTICE file are for informational purposes only and
|
118
|
+
do not modify the License. You may add Your own attribution
|
119
|
+
notices within Derivative Works that You distribute, alongside
|
120
|
+
or as an addendum to the NOTICE text from the Work, provided
|
121
|
+
that such additional attribution notices cannot be construed
|
122
|
+
as modifying the License.
|
123
|
+
|
124
|
+
You may add Your own copyright statement to Your modifications and
|
125
|
+
may provide additional or different license terms and conditions
|
126
|
+
for use, reproduction, or distribution of Your modifications, or
|
127
|
+
for any such Derivative Works as a whole, provided Your use,
|
128
|
+
reproduction, and distribution of the Work otherwise complies with
|
129
|
+
the conditions stated in this License.
|
130
|
+
|
131
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
132
|
+
any Contribution intentionally submitted for inclusion in the Work
|
133
|
+
by You to the Licensor shall be under the terms and conditions of
|
134
|
+
this License, without any additional terms or conditions.
|
135
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
136
|
+
the terms of any separate license agreement you may have executed
|
137
|
+
with Licensor regarding such Contributions.
|
138
|
+
|
139
|
+
6. Trademarks. This License does not grant permission to use the trade
|
140
|
+
names, trademarks, service marks, or product names of the Licensor,
|
141
|
+
except as required for reasonable and customary use in describing the
|
142
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
143
|
+
|
144
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
145
|
+
agreed to in writing, Licensor provides the Work (and each
|
146
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
147
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
148
|
+
implied, including, without limitation, any warranties or conditions
|
149
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
150
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
151
|
+
appropriateness of using or redistributing the Work and assume any
|
152
|
+
risks associated with Your exercise of permissions under this License.
|
153
|
+
|
154
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
155
|
+
whether in tort (including negligence), contract, or otherwise,
|
156
|
+
unless required by applicable law (such as deliberate and grossly
|
157
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
158
|
+
liable to You for damages, including any direct, indirect, special,
|
159
|
+
incidental, or consequential damages of any character arising as a
|
160
|
+
result of this License or out of the use or inability to use the
|
161
|
+
Work (including but not limited to damages for loss of goodwill,
|
162
|
+
work stoppage, computer failure or malfunction, or any and all
|
163
|
+
other commercial damages or losses), even if such Contributor
|
164
|
+
has been advised of the possibility of such damages.
|
165
|
+
|
166
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
167
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
168
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
169
|
+
or other liability obligations and/or rights consistent with this
|
170
|
+
License. However, in accepting such obligations, You may act only
|
171
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
172
|
+
of any other Contributor, and only if You agree to indemnify,
|
173
|
+
defend, and hold each Contributor harmless for any liability
|
174
|
+
incurred by, or claims asserted against, such Contributor by reason
|
175
|
+
of your accepting any such warranty or additional liability.
|
176
|
+
|
177
|
+
END OF TERMS AND CONDITIONS
|
178
|
+
|
179
|
+
APPENDIX: How to apply the Apache License to your work.
|
180
|
+
|
181
|
+
To apply the Apache License to your work, attach the following
|
182
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
183
|
+
replaced with your own identifying information. (Don't include
|
184
|
+
the brackets!) The text should be enclosed in the appropriate
|
185
|
+
comment syntax for the file format. We also recommend that a
|
186
|
+
file or class name and description of purpose be included on the
|
187
|
+
same "printed page" as the copyright notice for easier
|
188
|
+
identification within third-party archives.
|
189
|
+
|
190
|
+
Copyright [yyyy] [name of copyright owner]
|
191
|
+
|
192
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
193
|
+
you may not use this file except in compliance with the License.
|
194
|
+
You may obtain a copy of the License at
|
195
|
+
|
196
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
197
|
+
|
198
|
+
Unless required by applicable law or agreed to in writing, software
|
199
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
200
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
201
|
+
See the License for the specific language governing permissions and
|
202
|
+
limitations under the License.
|
data/README.md
ADDED
@@ -0,0 +1,36 @@
|
|
1
|
+
# XRD
|
2
|
+
|
3
|
+
<dl>
|
4
|
+
<dt>Homepage</dt><dd><a href="http://xrd.rubyforge.org/">http://xrd.rubyforge.org/</a></dd>
|
5
|
+
<dt>Author</dt><dd><a href="mailto:bobaman@google.com">Bob Aman</a></dd>
|
6
|
+
<dt>Copyright</dt><dd>Copyright © 2010 Google, Inc.</dd>
|
7
|
+
<dt>License</dt><dd>Apache 2.0</dd>
|
8
|
+
</dl>
|
9
|
+
|
10
|
+
# Description
|
11
|
+
|
12
|
+
An XRD parser for Ruby.
|
13
|
+
|
14
|
+
# Example Usage
|
15
|
+
|
16
|
+
require 'xrd'
|
17
|
+
xrd = XRD.fetch_and_parse(
|
18
|
+
'http://www.google.com/s2/webfinger/?q=acct%3Agooglebuzz%40gmail.com'
|
19
|
+
)
|
20
|
+
xrd.subject
|
21
|
+
# => #<Addressable::URI:0x80fb3864 URI:acct:googlebuzz@gmail.com>
|
22
|
+
xrd.aliases
|
23
|
+
# => [#<Addressable::URI:0x80fb3224 URI:http://www.google.com/profiles/googlebuzz>]
|
24
|
+
xrd.links(:media_type => 'application/atom+xml')
|
25
|
+
# => [#<XRD::Link:0x80fbc11c URI:https://www.googleapis.com/buzz/v1/activities/111062888259659218284/@public>]
|
26
|
+
xrd.links(:rel => 'describedby')
|
27
|
+
# => [
|
28
|
+
# #<XRD::Link:0x80fbd224 URI:http://www.google.com/profiles/googlebuzz>,
|
29
|
+
# #<XRD::Link:0x80fbc914 URI:http://www.google.com/s2/webfinger/?q=acct%3Agooglebuzz%40gmail.com&fmt=foaf>
|
30
|
+
# ]
|
31
|
+
xrd.links(:rel => 'describedby', :media_type => 'text/html')
|
32
|
+
# => [#<XRD::Link:0x80fbd224 URI:http://www.google.com/profiles/googlebuzz>]
|
33
|
+
|
34
|
+
# Install
|
35
|
+
|
36
|
+
* sudo gem install xrd
|
data/Rakefile
ADDED
@@ -0,0 +1,59 @@
|
|
1
|
+
lib_dir = File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
|
2
|
+
$:.unshift(lib_dir)
|
3
|
+
$:.uniq!
|
4
|
+
|
5
|
+
require 'rubygems'
|
6
|
+
require 'rake'
|
7
|
+
require 'rake/testtask'
|
8
|
+
require 'rake/rdoctask'
|
9
|
+
require 'rake/packagetask'
|
10
|
+
require 'rake/gempackagetask'
|
11
|
+
require 'rake/contrib/rubyforgepublisher'
|
12
|
+
|
13
|
+
begin
|
14
|
+
require 'spec/rake/spectask'
|
15
|
+
rescue LoadError
|
16
|
+
STDERR.puts 'Please install rspec:'
|
17
|
+
STDERR.puts 'sudo gem install rspec'
|
18
|
+
exit(1)
|
19
|
+
end
|
20
|
+
|
21
|
+
require File.join(File.dirname(__FILE__), 'lib/xrd', 'version')
|
22
|
+
|
23
|
+
PKG_DISPLAY_NAME = 'XRD'
|
24
|
+
PKG_NAME = PKG_DISPLAY_NAME.downcase
|
25
|
+
PKG_VERSION = XRD::VERSION::STRING
|
26
|
+
PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
|
27
|
+
|
28
|
+
RELEASE_NAME = "REL #{PKG_VERSION}"
|
29
|
+
|
30
|
+
RUBY_FORGE_PROJECT = PKG_NAME
|
31
|
+
RUBY_FORGE_USER = 'sporkmonger'
|
32
|
+
RUBY_FORGE_PATH = "/var/www/gforge-projects/#{RUBY_FORGE_PROJECT}"
|
33
|
+
RUBY_FORGE_URL = "http://#{RUBY_FORGE_PROJECT}.rubyforge.org/"
|
34
|
+
|
35
|
+
PKG_AUTHOR = 'Bob Aman'
|
36
|
+
PKG_AUTHOR_EMAIL = 'bob@sporkmonger.com'
|
37
|
+
PKG_HOMEPAGE = RUBY_FORGE_URL
|
38
|
+
PKG_SUMMARY = 'Package Summary'
|
39
|
+
PKG_DESCRIPTION = <<-TEXT
|
40
|
+
An XRD parser and generator for Ruby.
|
41
|
+
TEXT
|
42
|
+
|
43
|
+
PKG_FILES = FileList[
|
44
|
+
'lib/**/*', 'spec/**/*', 'vendor/**/*',
|
45
|
+
'tasks/**/*', 'website/**/*',
|
46
|
+
'[A-Z]*', 'Rakefile'
|
47
|
+
].exclude(/database\.yml/).exclude(/[_\.]git$/)
|
48
|
+
|
49
|
+
RCOV_ENABLED = (RUBY_PLATFORM != 'java' && RUBY_VERSION =~ /^1\.8/)
|
50
|
+
if RCOV_ENABLED
|
51
|
+
task :default => 'spec:verify'
|
52
|
+
else
|
53
|
+
task :default => 'spec'
|
54
|
+
end
|
55
|
+
|
56
|
+
WINDOWS = (RUBY_PLATFORM =~ /mswin|win32|mingw|bccwin|cygwin/) rescue false
|
57
|
+
SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
|
58
|
+
|
59
|
+
Dir['tasks/**/*.rake'].each { |rake| load rake }
|
data/lib/xrd.rb
ADDED
@@ -0,0 +1,30 @@
|
|
1
|
+
# Copyright 2010 Google, Inc.
|
2
|
+
#
|
3
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
4
|
+
# you may not use this file except in compliance with the License.
|
5
|
+
# You may obtain a copy of the License at
|
6
|
+
#
|
7
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
8
|
+
#
|
9
|
+
# Unless required by applicable law or agreed to in writing, software
|
10
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
11
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
12
|
+
# See the License for the specific language governing permissions and
|
13
|
+
# limitations under the License.
|
14
|
+
|
15
|
+
require 'xrd/version'
|
16
|
+
require 'xrd/resource_descriptor'
|
17
|
+
|
18
|
+
require 'httpadapter'
|
19
|
+
require 'httpadapter/adapters/net_http'
|
20
|
+
|
21
|
+
module XRD
|
22
|
+
def self.parse(xml)
|
23
|
+
return XRD::ResourceDescriptor.parse(xml)
|
24
|
+
end
|
25
|
+
|
26
|
+
def self.fetch_and_parse(
|
27
|
+
uri, adapter=HTTPAdapter::NetHTTPRequestAdapter, connection=nil)
|
28
|
+
return XRD::ResourceDescriptor.fetch_and_parse(uri, adapter, connection)
|
29
|
+
end
|
30
|
+
end
|
data/lib/xrd/link.rb
ADDED
@@ -0,0 +1,46 @@
|
|
1
|
+
require 'sax-machine'
|
2
|
+
require 'addressable/uri'
|
3
|
+
require 'xrd/properties'
|
4
|
+
require 'xrd/title'
|
5
|
+
|
6
|
+
module XRD
|
7
|
+
class Link
|
8
|
+
include SAXMachine
|
9
|
+
include XRD::Properties
|
10
|
+
|
11
|
+
element "Link", :as => :rel, :value => "rel"
|
12
|
+
element "Link", :as => :media_type, :value => "type"
|
13
|
+
element "Link", :as => :href, :value => "href"
|
14
|
+
element "Link", :as => :template, :value => "template"
|
15
|
+
elements "Title", :as => :titles, :class => XRD::Title
|
16
|
+
|
17
|
+
def title(lang=nil)
|
18
|
+
title = self.titles.detect { |t| t.lang == lang }
|
19
|
+
unless title
|
20
|
+
title = self.titles.detect { |t| t.lang == nil }
|
21
|
+
end
|
22
|
+
unless title
|
23
|
+
title = self.titles.detect { |t| t.lang == 'en' }
|
24
|
+
end
|
25
|
+
return title
|
26
|
+
end
|
27
|
+
|
28
|
+
##
|
29
|
+
# Returns a <code>String</code> representation of the link object's state.
|
30
|
+
#
|
31
|
+
# @return [String] The Link object's state, as a <code>String</code>.
|
32
|
+
def inspect
|
33
|
+
if self.template
|
34
|
+
sprintf(
|
35
|
+
"#<%s:%#0x TEMPLATE:%s>",
|
36
|
+
self.class.to_s, self.object_id, self.template
|
37
|
+
)
|
38
|
+
else
|
39
|
+
sprintf(
|
40
|
+
"#<%s:%#0x HREF:%s>",
|
41
|
+
self.class.to_s, self.object_id, self.href
|
42
|
+
)
|
43
|
+
end
|
44
|
+
end
|
45
|
+
end
|
46
|
+
end
|
@@ -0,0 +1,62 @@
|
|
1
|
+
require 'sax-machine'
|
2
|
+
require 'addressable/uri'
|
3
|
+
|
4
|
+
module XRD
|
5
|
+
module Properties
|
6
|
+
def self.included(base)
|
7
|
+
base.send :include, SAXMachine
|
8
|
+
base.send :elements, "Property", :as => :property_values
|
9
|
+
base.send :elements, "Property", :as => :property_keys, :value => "type"
|
10
|
+
base.send(:elements, "Property",
|
11
|
+
:as => :property_nils, :value => "xsi:nil")
|
12
|
+
|
13
|
+
base.send(:remove_method,
|
14
|
+
:property_keys, :property_keys=, :add_property_keys
|
15
|
+
)
|
16
|
+
base.send(:remove_method,
|
17
|
+
:property_values, :property_values=, :add_property_values
|
18
|
+
)
|
19
|
+
base.send(:remove_method,
|
20
|
+
:property_nils, :property_nils=, :add_property_nils
|
21
|
+
)
|
22
|
+
end
|
23
|
+
|
24
|
+
def properties
|
25
|
+
return @properties ||= []
|
26
|
+
end
|
27
|
+
|
28
|
+
protected
|
29
|
+
def add_property_keys(new_property_key)
|
30
|
+
@new_property_key = Addressable::URI.parse(new_property_key)
|
31
|
+
merge_and_add_property()
|
32
|
+
return @new_property_key
|
33
|
+
end
|
34
|
+
|
35
|
+
def add_property_values(new_property_value)
|
36
|
+
@new_property_value = new_property_value
|
37
|
+
merge_and_add_property()
|
38
|
+
return @new_property_value
|
39
|
+
end
|
40
|
+
|
41
|
+
def add_property_nils(new_property_value)
|
42
|
+
# If xsi:nil is set to anything but 'true', ignore it.
|
43
|
+
if new_property_value == "true"
|
44
|
+
# Hack to detect when we've set this to nil
|
45
|
+
@new_property_value = :nil
|
46
|
+
merge_and_add_property()
|
47
|
+
return @new_property_value
|
48
|
+
end
|
49
|
+
end
|
50
|
+
|
51
|
+
def merge_and_add_property
|
52
|
+
if @new_property_key && @new_property_value
|
53
|
+
self.properties << [
|
54
|
+
Addressable::URI.parse(@new_property_key),
|
55
|
+
@new_property_value == :nil ? nil : @new_property_value
|
56
|
+
]
|
57
|
+
@new_property_key, @new_property_value = nil, nil
|
58
|
+
end
|
59
|
+
return nil
|
60
|
+
end
|
61
|
+
end
|
62
|
+
end
|