spread2rdf 0.1.1 → 0.1.2

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.1
1
+ 0.1.2
@@ -27,14 +27,28 @@ module Spread2RDF
27
27
  def subject
28
28
  @subject ||=
29
29
  case schema.subject_mapping_mode
30
- when :bnode then RDF::Node.new
31
- when :from_column then subject_resource_from_column
30
+ when :bnode then RDF::Node.new
31
+ when :from_column_with_suffix then subject_resource_from_column_with_suffix
32
+ when :from_column then subject_resource_from_column
32
33
  else raise 'unknown subject mapping type'
33
34
  end
34
35
  end
35
36
  alias subject_resource subject
36
37
 
37
- def subject_name_suffix
38
+ def subject_resource_from_column
39
+ RDF::URI.new(subject_value, validate: true)
40
+ end
41
+ private :subject_resource_from_column
42
+
43
+ def subject_resource_from_column_with_suffix
44
+ namespace = schema.subject_namespace
45
+ subject_suffix = Mapping::Cell::Default.uri_normalization(subject_value)
46
+ #puts "subject resource for #{sheet} in #{range}: " + RDF::URI.new("#{namespace}#{subject_suffix}" )
47
+ RDF::URI.new("#{namespace}#{subject_suffix}")
48
+ end
49
+ private :subject_resource_from_column_with_suffix
50
+
51
+ def subject_value
38
52
  cells = row_range.map do |row|
39
53
  parent.cell_value(row: row, column: schema.subject_column.coord).presence
40
54
  end.compact
@@ -42,15 +56,7 @@ module Spread2RDF
42
56
  raise "multiple subjects found for Resource in #{row_range} of #{sheet}: #{cells.inspect}" if cells.count > 1
43
57
  cells.first
44
58
  end
45
- private :subject_name_suffix
46
-
47
- def subject_resource_from_column
48
- namespace = schema.subject_namespace
49
- subject_suffix = Mapping::Cell::Default.uri_normalization(subject_name_suffix)
50
- #puts "subject resource for #{sheet} in #{range}: " + RDF::URI.new("#{namespace}#{subject_suffix}" )
51
- RDF::URI.new("#{namespace}#{subject_suffix}")
52
- end
53
- private :subject_resource_from_column
59
+ private :subject_value
54
60
 
55
61
  def subject_description
56
62
  type = schema.subject_resource_type
@@ -65,6 +65,8 @@ module Spread2RDF
65
65
  case
66
66
  when ( subject.try(:fetch, :uri, nil) || subject ) == :bnode
67
67
  :bnode
68
+ when !( subject.try(:fetch, :uri, nil).try(:fetch, :namespace, nil) ).nil?
69
+ :from_column_with_suffix
68
70
  else
69
71
  :from_column
70
72
  end
metadata CHANGED
@@ -1,18 +1,20 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spread2rdf
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Marcel Otto
8
9
  autorequire:
9
10
  bindir: bin
10
11
  cert_chain: []
11
- date: 2013-12-13 00:00:00.000000000 Z
12
+ date: 2014-01-08 00:00:00.000000000 Z
12
13
  dependencies:
13
14
  - !ruby/object:Gem::Dependency
14
15
  name: activesupport
15
16
  requirement: !ruby/object:Gem::Requirement
17
+ none: false
16
18
  requirements:
17
19
  - - ~>
18
20
  - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
20
22
  type: :runtime
21
23
  prerelease: false
22
24
  version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
23
26
  requirements:
24
27
  - - ~>
25
28
  - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
27
30
  - !ruby/object:Gem::Dependency
28
31
  name: awesome_print
29
32
  requirement: !ruby/object:Gem::Requirement
33
+ none: false
30
34
  requirements:
31
35
  - - ~>
32
36
  - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
34
38
  type: :runtime
35
39
  prerelease: false
36
40
  version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
37
42
  requirements:
38
43
  - - ~>
39
44
  - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
41
46
  - !ruby/object:Gem::Dependency
42
47
  name: roo
43
48
  requirement: !ruby/object:Gem::Requirement
49
+ none: false
44
50
  requirements:
45
51
  - - ~>
46
52
  - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
48
54
  type: :runtime
49
55
  prerelease: false
50
56
  version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
51
58
  requirements:
52
59
  - - ~>
53
60
  - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
55
62
  - !ruby/object:Gem::Dependency
56
63
  name: rubyzip
57
64
  requirement: !ruby/object:Gem::Requirement
65
+ none: false
58
66
  requirements:
59
67
  - - ~>
60
68
  - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
62
70
  type: :runtime
63
71
  prerelease: false
64
72
  version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
65
74
  requirements:
66
75
  - - ~>
67
76
  - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
69
78
  - !ruby/object:Gem::Dependency
70
79
  name: linkeddata
71
80
  requirement: !ruby/object:Gem::Requirement
81
+ none: false
72
82
  requirements:
73
83
  - - ~>
74
84
  - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
76
86
  type: :runtime
77
87
  prerelease: false
78
88
  version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
79
90
  requirements:
80
91
  - - ~>
81
92
  - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
83
94
  - !ruby/object:Gem::Dependency
84
95
  name: equivalent-xml
85
96
  requirement: !ruby/object:Gem::Requirement
97
+ none: false
86
98
  requirements:
87
99
  - - ~>
88
100
  - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
90
102
  type: :runtime
91
103
  prerelease: false
92
104
  version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
93
106
  requirements:
94
107
  - - ~>
95
108
  - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
97
110
  - !ruby/object:Gem::Dependency
98
111
  name: ocra
99
112
  requirement: !ruby/object:Gem::Requirement
113
+ none: false
100
114
  requirements:
101
115
  - - ~>
102
116
  - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
104
118
  type: :runtime
105
119
  prerelease: false
106
120
  version_requirements: !ruby/object:Gem::Requirement
121
+ none: false
107
122
  requirements:
108
123
  - - ~>
109
124
  - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
111
126
  - !ruby/object:Gem::Dependency
112
127
  name: bundler
113
128
  requirement: !ruby/object:Gem::Requirement
129
+ none: false
114
130
  requirements:
115
131
  - - ! '>='
116
132
  - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
118
134
  type: :runtime
119
135
  prerelease: false
120
136
  version_requirements: !ruby/object:Gem::Requirement
137
+ none: false
121
138
  requirements:
122
139
  - - ! '>='
123
140
  - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
125
142
  - !ruby/object:Gem::Dependency
126
143
  name: rake
127
144
  requirement: !ruby/object:Gem::Requirement
145
+ none: false
128
146
  requirements:
129
147
  - - ! '>='
130
148
  - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
132
150
  type: :development
133
151
  prerelease: false
134
152
  version_requirements: !ruby/object:Gem::Requirement
153
+ none: false
135
154
  requirements:
136
155
  - - ! '>='
137
156
  - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
139
158
  - !ruby/object:Gem::Dependency
140
159
  name: pry
141
160
  requirement: !ruby/object:Gem::Requirement
161
+ none: false
142
162
  requirements:
143
163
  - - ~>
144
164
  - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
146
166
  type: :development
147
167
  prerelease: false
148
168
  version_requirements: !ruby/object:Gem::Requirement
169
+ none: false
149
170
  requirements:
150
171
  - - ~>
151
172
  - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
153
174
  - !ruby/object:Gem::Dependency
154
175
  name: pry-nav
155
176
  requirement: !ruby/object:Gem::Requirement
177
+ none: false
156
178
  requirements:
157
179
  - - ~>
158
180
  - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
160
182
  type: :development
161
183
  prerelease: false
162
184
  version_requirements: !ruby/object:Gem::Requirement
185
+ none: false
163
186
  requirements:
164
187
  - - ~>
165
188
  - !ruby/object:Gem::Version
@@ -215,26 +238,27 @@ files:
215
238
  homepage: http://github.com/marcelotto/spread2rdf
216
239
  licenses:
217
240
  - MIT
218
- metadata: {}
219
241
  post_install_message:
220
242
  rdoc_options: []
221
243
  require_paths:
222
244
  - lib
223
245
  required_ruby_version: !ruby/object:Gem::Requirement
246
+ none: false
224
247
  requirements:
225
248
  - - ! '>='
226
249
  - !ruby/object:Gem::Version
227
250
  version: 1.9.3
228
251
  required_rubygems_version: !ruby/object:Gem::Requirement
252
+ none: false
229
253
  requirements:
230
254
  - - ! '>='
231
255
  - !ruby/object:Gem::Version
232
256
  version: '0'
233
257
  requirements: []
234
258
  rubyforge_project:
235
- rubygems_version: 2.1.9
259
+ rubygems_version: 1.8.24
236
260
  signing_key:
237
- specification_version: 4
261
+ specification_version: 3
238
262
  summary: a DSL-based converter for spreadsheets to RDF
239
263
  test_files: []
240
264
  has_rdoc:
checksums.yaml DELETED
@@ -1,15 +0,0 @@
1
- ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- OTZiZGRhYTY3ZjcwZGUyOWFlYjQ5MGE1NjFkMGI5NjE5MjhjYjNiZA==
5
- data.tar.gz: !binary |-
6
- OTY5OWZjOTQwZTI5YmVjYmRiNmZmNTM3MDRlODZjMzlkMTZmNzg4YQ==
7
- SHA512:
8
- metadata.gz: !binary |-
9
- YTU0YWYzNGU0NzNkODU3YWZmOTE0MTcyZjI1NjRkODdhNTdhYmMyYmIzMGU1
10
- NTllMmIxNmRjMzRhODQzNDEwNTgwMGVjM2E2ZGRiZWZjMWJiOTU5OTFhZGRj
11
- NzQzNjg4NDdiNzA4Mzc5ZDY4ZTNiYTBkYjE0NDVkZDQ2MjlkMDA=
12
- data.tar.gz: !binary |-
13
- YzFlNDAzNWYyZTAzOGJlZTNlNmE4MjMwOTc4NzIyYjMxOGViMzdiYmMwZTcy
14
- ZDNhYTQ4NzJmYzg1N2NmNmMyYzkwZGE5NjgzYWIwNDMyYjVjN2RjYjg4NTM0
15
- Mzk0NDk3ZWFmYjNhNzAwMTNkMDZmYmJiZDkwYWQxOGMwYWJlYzg=