spread2rdf 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/spread2rdf/mapping/resource.rb

@@ -27,14 +27,28 @@ module Spread2RDF
       def subject
         @subject ||=
             case schema.subject_mapping_mode
-              when :bnode         then RDF::Node.new
-              when :from_column   then subject_resource_from_column
+              when :bnode                   then RDF::Node.new
+              when :from_column_with_suffix then subject_resource_from_column_with_suffix
+              when :from_column             then subject_resource_from_column
               else raise 'unknown subject mapping type'
             end
       end
       alias subject_resource subject
 
-      def subject_name_suffix
+      def subject_resource_from_column
+        RDF::URI.new(subject_value, validate: true)
+      end
+      private :subject_resource_from_column
+
+      def subject_resource_from_column_with_suffix
+        namespace = schema.subject_namespace
+        subject_suffix = Mapping::Cell::Default.uri_normalization(subject_value)
+        #puts "subject resource for #{sheet} in #{range}: " + RDF::URI.new("#{namespace}#{subject_suffix}" )
+        RDF::URI.new("#{namespace}#{subject_suffix}")
+      end
+      private :subject_resource_from_column_with_suffix
+
+      def subject_value
         cells = row_range.map do |row|
           parent.cell_value(row: row, column: schema.subject_column.coord).presence
         end.compact
@@ -42,15 +56,7 @@ module Spread2RDF
         raise "multiple subjects found for Resource in #{row_range} of #{sheet}: #{cells.inspect}" if cells.count > 1
         cells.first
       end
-      private :subject_name_suffix
-
-      def subject_resource_from_column
-        namespace = schema.subject_namespace
-        subject_suffix = Mapping::Cell::Default.uri_normalization(subject_name_suffix)
-        #puts "subject resource for #{sheet} in #{range}: " + RDF::URI.new("#{namespace}#{subject_suffix}" )
-        RDF::URI.new("#{namespace}#{subject_suffix}")
-      end
-      private :subject_resource_from_column
+      private :subject_value
 
       def subject_description
         type = schema.subject_resource_type

data/lib/spread2rdf/schema/sheet.rb

@@ -65,6 +65,8 @@ module Spread2RDF
         case
           when ( subject.try(:fetch, :uri, nil) || subject ) == :bnode
             :bnode
+          when !( subject.try(:fetch, :uri, nil).try(:fetch, :namespace, nil) ).nil?
+            :from_column_with_suffix
           else
             :from_column
         end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: spread2rdf
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
+  prerelease: 
 platform: ruby
 authors:
 - Marcel Otto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ocra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -215,26 +238,27 @@ files:
 homepage: http://github.com/marcelotto/spread2rdf
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: a DSL-based converter for spreadsheets to RDF
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTZiZGRhYTY3ZjcwZGUyOWFlYjQ5MGE1NjFkMGI5NjE5MjhjYjNiZA==
-  data.tar.gz: !binary |-
-    OTY5OWZjOTQwZTI5YmVjYmRiNmZmNTM3MDRlODZjMzlkMTZmNzg4YQ==
-SHA512:
-  metadata.gz: !binary |-
-    YTU0YWYzNGU0NzNkODU3YWZmOTE0MTcyZjI1NjRkODdhNTdhYmMyYmIzMGU1
-    NTllMmIxNmRjMzRhODQzNDEwNTgwMGVjM2E2ZGRiZWZjMWJiOTU5OTFhZGRj
-    NzQzNjg4NDdiNzA4Mzc5ZDY4ZTNiYTBkYjE0NDVkZDQ2MjlkMDA=
-  data.tar.gz: !binary |-
-    YzFlNDAzNWYyZTAzOGJlZTNlNmE4MjMwOTc4NzIyYjMxOGViMzdiYmMwZTcy
-    ZDNhYTQ4NzJmYzg1N2NmNmMyYzkwZGE5NjgzYWIwNDMyYjVjN2RjYjg4NTM0
-    Mzk0NDk3ZWFmYjNhNzAwMTNkMDZmYmJiZDkwYWQxOGMwYWJlYzg=