spread2rdf 0.0.2 → 0.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDBiNzc0ZTVkZTk5ZjY0OWEwZjA2YTYyYzgxN2MyYzNkYTBkZjkyYw==
+  data.tar.gz: !binary |-
+    N2M2YTZlNDVmZjE0ZTFjYjFjMzAwMDBhYWQ4NzkzNjJmNzI3YzQ2Mg==
+SHA512:
+  metadata.gz: !binary |-
+    YTBkZmY4Y2IxNjc0NGM2MzJlNjFjZDY0Y2E4ODBmZWI5NTgzNGFkNGRkNmFk
+    YWIyOTU0ZWEzZGRiNzE5ZTFkMWE1ZjA4NDBjOGUzNWMxOWRhYjg5MGUyZWYx
+    NmY2ZWZhNzNjZDllOGVlYzAzZmQzNGY4NjQ0ZTkzNjU4NGU3M2E=
+  data.tar.gz: !binary |-
+    MjgzZGQwMzI2MmQ1MzFjOTBkOTRiOThhNTcwNjNiOWZmODBmNWUyN2MyNTBi
+    NWYzZmU0MmYwODNhMDU2YjNkZDg5MjA5NTRlMmE0ODc5NWZlOWVkNTIzOGVi
+    ZDZiZTRmNTdhYWM3MzY4ODFiZGQ0ZThjZDk1OTIyYjI3N2UxNGM=

data/README.md

@@ -1,7 +1,8 @@
 # Spread2RDF
 
-Spread2RDF is a converter for complex spreadsheets to RDF and a DSL for
-specifying the mapping rules for this conversion.
+Spread2RDF is a converter for complex spreadsheets to RDF and a Ruby-internal
+[DSL](http://en.wikipedia.org/wiki/Domain-specific_language)
+for specifying the mapping rules for this conversion.
 
 ## Features
 
@@ -12,6 +13,8 @@ specifying the mapping rules for this conversion.
   [raise an issue](https://github.com/marcelotto/spread2rdf/issues).)
 * Supports many RDF serialization formats for the output, thanks to
   [RDF.rb](https://github.com/ruby-rdf/rdf).
+* Mapping definitions are compilable to executables, which can be run without
+  Ruby installed.
 
 ## Installation
 
@@ -20,25 +23,6 @@ in a terminal:
 
     $ gem install spread2rdf
 
-## Command-line interface
-
-For a description of all available parameters, type the following in a terminal:
-
-    $ spread2rdf --help
-
-## Mapping DSL
-
-Description is following soon.
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-
-## Authors
+## Author
 
 * Marcel Otto

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/lib/spread2rdf/attributes.rb

@@ -17,9 +17,14 @@ module Spread2RDF
         defaults.each { |attribute, default_value| attr_accessor attribute }
         @attributes = @attributes.try(:merge, defaults) || defaults
       end
+
+      def normalize_attributes(values)
+        values
+      end
     end
 
     def init_attributes(initial_values)
+      initial_values = self.class.normalize_attributes(initial_values)
       self.class.attributes.each do |attribute, default_value|
         instance_variable_set("@#{attribute}".to_sym,
           initial_values.delete(attribute) || default_value)
@@ -28,6 +33,7 @@ module Spread2RDF
     end
 
     def update_attributes(update_values)
+      update_values = self.class.normalize_attributes(update_values)
       update_values.each do |attribute, value|
         next unless self.class.attributes.include? attribute
         instance_variable_set("@#{attribute}".to_sym, value)

data/lib/spread2rdf/cli.rb

@@ -101,6 +101,11 @@ module Spread2RDF
           @options[:output_format] = format.strip.downcase
         end
 
+        opts.on( '-I', '--include DIR', "Add DIR to the search path for external data" ) do |dir|
+          raise "Directory #{dir} doesn't exist" unless File.directory?(dir)
+          Spread2RDF::SEARCH_PATH.unshift dir
+        end
+
         opts.on( '-d', '--debug', 'Run in debug mode' ) do
           Spread2RDF.debug_mode = true
         end
@@ -112,7 +117,8 @@ module Spread2RDF
       else
         raise OptionParser::ParseError, 'required schema specification file missing' if @mapping_schema.nil?
         @input_file = ARGV.first or @input_file or
-            raise OptionParser::ParseError, 'required file arguments missing'
+            raise OptionParser::ParseError, 'required input file missing'
+        SEARCH_PATH << File.expand_path(File.dirname(@input_file))
       end
     rescue OptionParser::ParseError => e
       puts e.message

data/lib/spread2rdf/extensions/file.rb

@@ -0,0 +1,10 @@
+class File
+  def self.in_path(filename, search_path = Spread2RDF::SEARCH_PATH)
+    return filename if File.exist? filename
+    search_path.each do |path|
+      file = File.join(path, filename)
+      return file if File.exist? file
+    end
+    nil
+  end
+end

data/lib/spread2rdf/mapping/cell.rb

@@ -46,19 +46,46 @@ module Spread2RDF
 
       def resolve_resource_ref
         source = schema.object[:from]
-        source = { worksheet: source } if source.is_a? Symbol
-        raise ArgumentError, "expecting a Hash as source, but got #{source}" unless source.is_a? Hash
-        source_worksheet = source[:worksheet]
-        source_worksheet = spreadsheet.worksheet(source_worksheet)
-        raise "#{self}: couldn't find source worksheet #{source[:worksheet]}" if source_worksheet.nil?
-        source_predicate = source[:predicate] || RDF::RDFS.label
-        result = source_worksheet.graph.query([nil, source_predicate, value])
-        raise "#{self}: couldn't find a resource for #{value} in #{source_worksheet}" if result.empty?
-        raise "#{self}: found multiple resources for #{value} in #{source_worksheet}: #{result.map(&:subject)}" if result.count > 1
-        result.first.subject
+        if source[:worksheet] && result = resolve_resource_ref_from_worksheet(source[:worksheet])
+          return result
+        elsif source[:data_source] && result = resolve_resource_ref_from_data_sources(source[:data_source])
+          return result
+        else
+          raise "#{self}: couldn't find a resource for #{value} in any of the defined sources"
+        end
       end
       private :resolve_resource_ref
 
+      def resolve_resource_ref_from_worksheet(worksheet)
+        worksheet = spreadsheet.worksheet(worksheet)
+        raise "#{self}: couldn't find source worksheet #{source[:worksheet]}" if worksheet.nil?
+        source_predicate = RDF::RDFS.label # TODO: make this configurable via a attribute in the schema definition
+        result = worksheet.graph.query([nil, source_predicate, value])
+        return nil if result.empty?
+        raise "#{self}: found multiple resources for #{value} in #{worksheet}: #{result.map(&:subject)}" if result.count > 1
+        result.first.subject
+      end
+      private :resolve_resource_ref_from_worksheet
+
+      def resolve_resource_ref_from_data_sources(data_sources)
+        raise ArgumentError, "expecting an Array, but got #{data_sources}" unless data_sources.is_a? Array
+        data_sources.each do |data_source|
+          result = resolve_resource_ref_from_data_source(data_source)
+          return result if result
+        end
+        nil
+      end
+      private :resolve_resource_ref_from_data_sources
+
+      def resolve_resource_ref_from_data_source(data_source)
+        source_predicate = RDF::RDFS.label # TODO: make this configurable via a attribute in the schema definition
+        result = data_source.query([nil, source_predicate, value])
+        return nil if result.empty?
+        raise "#{self}: found multiple resources for #{value} in data sources: #{result.map(&:subject)}" if result.count > 1
+        result.first.subject
+      end
+      private :resolve_resource_ref_from_data_source
+
       def create_resource_object
         case
           when (schema.object.try(:fetch, :uri, nil) || object) == :bnode

data/lib/spread2rdf/schema/column.rb

@@ -9,6 +9,40 @@ module Spread2RDF
           statement:  nil
       }
 
+      def self.normalize_attributes(values)
+        if object = values[:object]
+          case
+            when object.is_a?(Proc) then # nothing
+            when !(from = object.delete(:from_worksheet) ||
+                          object.delete(:from_sheet)).nil?
+              object[:from] = { worksheet: from.to_sym }
+            when !(from = object.delete(:from_data_source)).nil?
+              object[:from] = { data_source: resolve_data_sources(from) }
+            when !(from = object[:from]).nil?
+              case from
+                when Symbol then object[:from] = { worksheet: from }
+                when String then object[:from] = { data_source: resolve_data_sources(from) }
+                when Hash
+                  from[:data_source] = resolve_data_sources(from[:data_source]) if from.include?(:data_source)
+              end
+          end
+        end
+        values
+      end
+
+      def self.resolve_data_sources(data_sources)
+        return [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?
+              raise NotImplementedError, "resolving of uris is not implemented yet"
+            when data_source.is_a?(String) && !(file = File.in_path(data_source)).nil?
+              RDF::Graph.load file
+            else puts "WARNING: couldn't resolve data source #{data_source}"
+          end
+        end.compact
+      end
+
       attr_reader :coord # this is set by Worksheet#index_columns!
 
       alias sheet parent

data/lib/spread2rdf/schema/worksheet.rb

@@ -25,7 +25,8 @@ module Spread2RDF
         references = []
         each_column do |column|
           if column.object_mapping_mode == :resource_ref
-            references << spreadsheet.worksheet[column.object[:from]]
+            references << spreadsheet.worksheet[
+                column.object[:from].try(:fetch, :worksheet)]
           end
         end
         references

data/lib/spread2rdf.rb

@@ -16,6 +16,7 @@ require 'spread2rdf/version'
 require 'spread2rdf/coord'
 require 'spread2rdf/namespace'
 require 'spread2rdf/roo_helper'
+require 'spread2rdf/extensions/file'
 
 require 'spread2rdf/schema/schema'
 require 'spread2rdf/schema/statement_mapping_schema'
@@ -40,7 +41,6 @@ require 'spread2rdf/mapping/cell'
 
 require 'spread2rdf/mapping/default_cell_mappings'
 
-
 require 'spread2rdf/cli'
 
 module Spread2RDF
@@ -51,5 +51,8 @@ module Spread2RDF
   ROOT = File.expand_path('../../', __FILE__)
   ONTOLOGY_DIR = File.join(ROOT, 'ontologies')
 
+  SEARCH_PATH = []
+  #SEARCH_PATH << ONTOLOGY_DIR
+
 end
 

data/spread2rdf.gemspec

@@ -26,7 +26,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency('roo', '~> 1.12.2')
   gem.add_dependency('rubyzip', '~> 1.0.0') # for the roo-xlsm-fix
 
-  gem.add_dependency('linkeddata', '~> 1.0.0')
+  gem.add_dependency('linkeddata', '~> 1.1.0')
+  gem.add_dependency('equivalent-xml', '~> 0.3.0')
 
   gem.add_dependency('ocra', '~> 1.3.1')
   gem.add_dependency('bundler') # needed for ocra

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: spread2rdf
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Marcel Otto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,23 +69,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: equivalent-xml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: ocra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -192,6 +185,7 @@ files:
 - lib/spread2rdf/attributes.rb
 - lib/spread2rdf/cli.rb
 - lib/spread2rdf/coord.rb
+- lib/spread2rdf/extensions/file.rb
 - lib/spread2rdf/extensions/roo_xlsm_fix.rb
 - lib/spread2rdf/mapping/cell.rb
 - lib/spread2rdf/mapping/column.rb
@@ -221,27 +215,26 @@ 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: 1.8.24
+rubygems_version: 2.1.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: a DSL-based converter for spreadsheets to RDF
 test_files: []
 has_rdoc: