spread2rdf 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDIwZWJiNjVmMWYzNzJjMjQxOGE3NzE1OTE2MmUyMWVhZjNkZWU2Ng==
+    NGJiMTM4NmY0YzNmY2IwZDkyMWFmZTRjMDY2MDk5ZmE1NWEyMTdjOQ==
   data.tar.gz: !binary |-
-    NDE3Nzg4OTJhZGZiN2QxNmI2NGE2OTk3NTIwN2M5YjZiMDYzYzYyNw==
+    MGJkOWUyOTI2MTA4YjgwOTdlNDZmOTY4MDZhOTcxMjA0ZWI3MmEwMg==
 SHA512:
   metadata.gz: !binary |-
-    M2JlYzY1YmI5ZjgwMGMyNzc5MDc4MjU1OTFhMDU5Y2M4ZDU4Mzc5ODk0MTAy
-    OGRhNDNjMTE3NDBkMzU1YzA1OGM5NzM3OTNkOWM4YWNmNzNkODQxYzMxOTNh
-    NWYxNGZlZTMxYThhY2E1OTM2ZDFkNTc2YTRiMTA4ZDgyZDMzN2I=
+    MzE5Y2M3ZGZhMjc2NzFhYTg4Yzk1ZGFmMDExNTQ4YmYzNzQyOWIyZGNhNzgy
+    MDA5NzZmNDI5MGNmMDE4OTVjOWI0ODc5NWEzNGY4OTY3MDI3YTkyYjk5NGNm
+    NzBkOTYzYTUyYWUzOTU1NzJhNTQ0NDg1ODhkMzBkMTAzNGViN2U=
   data.tar.gz: !binary |-
-    Yjg0ZmIyODcwNzMyM2MzMmNmZTM0Y2E4YTNiZWZkYjQ5ZjBjZWU1ODhkN2Jm
-    NmI2MmExNGQ0NDk3MmNiNDVhZTk5Y2I5NWZhOTVlYTIyMGE3NzBjZjI0MTE5
-    ODU2NjgwYjM5NjkzYjQ5YTA3MzAwMzI3ODYxZjM4ZTQxYmU2MWI=
+    YzY0ZWQ0MjBmNGViZDQzYTAwYzM2ZDc0MDY0YzBkNmU1ZGQ4MDBlODg1MGMy
+    YWU0MmRhY2UwNWI5YzMwNDU2Zjc1ZGVlZjg2ZjM5NjM3MmQwYTU1ZjZjOWVk
+    ZTdiYzg5ZmRkOWUzN2JhNjFlMzQ5MGE4MTQwNzhiNWRmM2E1ODg=

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/spread2rdf/mapping/cell.rb

@@ -1,6 +1,7 @@
 module Spread2RDF
   module Mapping
     class Cell < Element
+      include ResourceCreation
 
       attr_reader :row
 
@@ -24,6 +25,7 @@ module Spread2RDF
       def value
         @value ||= worksheet.cell_value(coord)
       end
+      alias resource_creation_value value
 
       def object
         @object ||= value && map_to_object(value)
@@ -37,9 +39,9 @@ module Spread2RDF
         case schema.object_mapping_mode
           when :to_string     then map_to_literal(value)
           when :resource_ref  then resolve_resource_ref
-          when :new_resource  then create_resource_object
+          when :new_resource  then create_resource
           when :custom        then exec(&schema.cell_mapping)
-          else raise 'internal error: unknown column mapping type'
+          else raise 'internal error: unknown column mapping mode'
         end
       end
       private :map_to_object
@@ -97,16 +99,6 @@ module Spread2RDF
         result.first.subject
       end
 
-      def create_resource_object
-        case
-          when (schema.object.try(:fetch, :uri, nil) || object) == :bnode
-            RDF::Node.new
-          else
-            raise NotImplementedError
-        end
-      end
-      private :create_resource_object
-
       ##########################################################################
       # for the DSL for column statement blocks
 

data/lib/spread2rdf/mapping/default_cell_mappings.rb

@@ -16,8 +16,10 @@ module Spread2RDF
 
         def self.uri_normalization(string)
           string
+            .gsub(' - ', '-')
+            .gsub('- ', '-')
             .gsub(', ', '-')
-            .gsub(' ', '-')
+            .gsub(' ', '_')
         end
 
       end

data/lib/spread2rdf/mapping/resource.rb

@@ -24,29 +24,11 @@ module Spread2RDF
       ##########################################################################
       # subject mapping
 
-      def subject
-        @subject ||=
-            case schema.subject_mapping_mode
-              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
+      include ResourceCreation
 
-      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}")
+      def subject
+        @subject ||= create_resource
       end
-      private :subject_resource_from_column_with_suffix
 
       def subject_value
         cells = row_range.map do |row|
@@ -56,6 +38,7 @@ module Spread2RDF
         raise "multiple subjects found for Resource in #{row_range} of #{sheet}: #{cells.inspect}" if cells.count > 1
         cells.first
       end
+      alias resource_creation_value subject_value
       private :subject_value
 
       def subject_description

data/lib/spread2rdf/mapping/resource_creation.rb

@@ -0,0 +1,29 @@
+module Spread2RDF
+  module Mapping
+    module ResourceCreation
+
+      def create_resource
+        case schema.resource_creation_mode
+          when :bnode                   then RDF::Node.new
+          when :from_column_with_suffix then resource_from_suffix
+          when :from_column             then resource_from_full_uri
+          else raise 'unknown resource creation mode'
+        end
+      end
+
+      def resource_from_full_uri
+        RDF::URI.new(resource_creation_value, validate: true)
+      end
+      private :resource_from_full_uri
+
+      def resource_from_suffix
+        namespace = schema.resource_creation_namespace
+        suffix = Mapping::Cell::Default.uri_normalization(resource_creation_value)
+        #puts "creating resource " + RDF::URI.new("#{namespace}#{suffix}" )
+        RDF::URI.new("#{namespace}#{suffix}")
+      end
+      private :resource_from_suffix
+
+    end
+  end
+end

data/lib/spread2rdf/mapping/statement.rb

@@ -5,8 +5,13 @@ module Spread2RDF
       def statements_to_object(object)
         case schema.statement_mapping_mode
           when :default
-            statement(subject, predicate, object)
+            if schema.inverse_mode
+              statement(object, predicate, subject)
+            else
+              statement(subject, predicate, object)
+            end
           when :restriction
+            raise NotImplementedError if schema.inverse_mode
             restriction_class = RDF::Node.new
             statements(
                 [ subject, RDF::RDFS.subClassOf, restriction_class ],

data/lib/spread2rdf/schema/column.rb

@@ -2,6 +2,7 @@ module Spread2RDF
   module Schema
     class Column < Element
       include StatementMapping
+      include ResourceCreation
 
       self.attributes = {
           predicate:  nil,
@@ -31,7 +32,7 @@ module Spread2RDF
       end
 
       def self.resolve_data_sources(data_sources)
-        return [data_sources] unless data_sources.is_a? Array
+        data_sources = [data_sources] unless data_sources.is_a? Array
         data_sources.map do |data_source|
           case
             when (uri = data_source).is_a?(RDF::URI) || (uri = RDF::URI.new(data_source)).valid?
@@ -63,6 +64,10 @@ module Spread2RDF
         end
       end
 
+      def resource_creation_attributes
+        object
+      end
+
       def cell_mapping
         object if object.is_a?(Proc)
       end

data/lib/spread2rdf/schema/resource_creation_schema.rb

@@ -0,0 +1,27 @@
+module Spread2RDF
+  module Schema
+    module ResourceCreation
+
+      def resource_creation_mode
+        attr = self.resource_creation_attributes
+        case
+          when ( attr.try(:fetch, :uri, nil) || attr ) == :bnode
+            :bnode
+          when !( attr.try(:fetch, :uri, nil).try(:fetch, :namespace, nil) ).nil?
+            :from_column_with_suffix
+          else
+            :from_column
+        end
+      end
+
+      def resource_creation_namespace
+        namespace_name =
+            self.resource_creation_attributes.try(:fetch, :uri, nil).try(:fetch, :namespace, nil)
+        return warn("No namespace for resource creation found") if namespace_name.nil?
+        Namespace.resolve_to_namespace(namespace_name)
+      end
+
+    end
+  end
+end
+

data/lib/spread2rdf/schema/sheet.rb

@@ -1,6 +1,7 @@
 module Spread2RDF
   module Schema
     class Sheet < Element
+      include ResourceCreation
 
       self.attributes = {
           start:                  :A2,
@@ -14,6 +15,10 @@ module Spread2RDF
         @column_index = {}
       end
 
+      def resource_creation_attributes
+        subject
+      end
+
       def start_coord
         Coord[start]
       end
@@ -64,23 +69,6 @@ module Spread2RDF
         row_count_per_resource or ( !subject_column && 1 ) or nil
       end
 
-      def subject_mapping_mode
-        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
-      end
-
-      def subject_namespace
-        subject_namespace_name =
-            subject.try(:fetch, :uri, nil).try(:fetch, :namespace, nil)
-        Namespace.resolve_to_namespace(subject_namespace_name)
-      end
-
       def subject_resource_type
         subject.try(:fetch, :type, nil) or
             (subject.try(:fetch, :sub_class_of, nil) && RDF::RDFS.Class) or

data/lib/spread2rdf/schema/statement_mapping_schema.rb

@@ -4,7 +4,6 @@ module Spread2RDF
 
       def statement_mapping_mode
         case
-          when statement == :none then :ignore
           when statement == :none then :ignore
           when predicate.nil?     then :ignore
           when restriction_mode   then :restriction
@@ -15,11 +14,15 @@ module Spread2RDF
       def restriction_mode
         case statement
           when :restriction then RDF::OWL.hasValue
-          when Hash         then restriction_mode[:restriction]
+          when Hash         then statement[:restriction]
           else false
         end
       end
 
+      def inverse_mode
+        statement == :inverse ||
+            ( statement.is_a?(Hash) && statement.try(:fetch, :inverse, false) )
+      end
 
     end
   end

data/lib/spread2rdf.rb

@@ -20,6 +20,7 @@ require 'spread2rdf/extensions/file'
 
 require 'spread2rdf/schema/schema'
 require 'spread2rdf/schema/statement_mapping_schema'
+require 'spread2rdf/schema/resource_creation_schema'
 require 'spread2rdf/schema/element'
 require 'spread2rdf/schema/spreadsheet'
 require 'spread2rdf/schema/sheet'
@@ -30,6 +31,7 @@ require 'spread2rdf/schema/sheet_dsl'
 require 'spread2rdf/schema/spreadsheet_dsl'
 
 require 'spread2rdf/mapping/element'
+require 'spread2rdf/mapping/resource_creation'
 require 'spread2rdf/mapping/statement'
 require 'spread2rdf/mapping/sheet'
 require 'spread2rdf/mapping/spreadsheet'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spread2rdf
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Marcel Otto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -193,6 +193,7 @@ files:
 - lib/spread2rdf/mapping/default_cell_mappings.rb
 - lib/spread2rdf/mapping/element.rb
 - lib/spread2rdf/mapping/resource.rb
+- lib/spread2rdf/mapping/resource_creation.rb
 - lib/spread2rdf/mapping/sheet.rb
 - lib/spread2rdf/mapping/spreadsheet.rb
 - lib/spread2rdf/mapping/statement.rb
@@ -202,6 +203,7 @@ files:
 - lib/spread2rdf/schema/column.rb
 - lib/spread2rdf/schema/column_block.rb
 - lib/spread2rdf/schema/element.rb
+- lib/spread2rdf/schema/resource_creation_schema.rb
 - lib/spread2rdf/schema/schema.rb
 - lib/spread2rdf/schema/sheet.rb
 - lib/spread2rdf/schema/sheet_dsl.rb