graffiti 2.1 → 2.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d1a5980784c2cc78f9e23e4277110bfa3944e306
+  data.tar.gz: cf3450ef275dd472c8ef8df5d18ad473600188f9
+SHA512:
+  metadata.gz: 4c58ce00dabeb684334776062f94de2d2f79fd61eee9d89946643a0f0246bbe7c56b24b9325b119008e77eb2951f2763070b44c6996b51985affa2887203fc87
+  data.tar.gz: 67119fd8fd88ee3e50f57f969491958003d8ac8947e27cd01aa0bbb3f6a926d2b377a72242c7cb3a8643a69f1f1fd1131a56962182d1ee3fc50480a77663e5a0

data/Rakefile

@@ -0,0 +1,21 @@
+# Graffiti RDF Store
+# (originally written for Samizdat project)
+#
+#   Copyright (c) 2002-2012, 2016  Dmitry Borodaenko <angdraug@debian.org>
+#
+#   This program is free software.
+#   You can distribute/modify this program under the terms of
+#   the GNU General Public License version 3 or later.
+#
+# see doc/rdf-storage.txt for introduction and Graffiti Squish definition;
+# see doc/storage-impl.txt for explanation of implemented algorithms
+#
+# vim: et sw=2 sts=2 ts=8 tw=0
+
+require "rake"
+
+task :default => :test
+
+task :test do
+  sh %{#{FileUtils::RUBY} -I. -Ilib test/ts_graffiti.rb}
+end

data/graffiti.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name        = 'graffiti'
-  spec.version     = '2.1'
+  spec.version     = '2.3.1'
   spec.author      = 'Dmitry Borodaenko'
   spec.email       = 'angdraug@debian.org'
   spec.homepage    = 'https://github.com/angdraug/graffiti'
@@ -13,9 +13,15 @@ and vice versa, to store any RDF data in a relational database.
 Graffiti uses Sequel to connect to database backend and provides a DBI-like
 interface to run RDF queries in Squish query language from Ruby applications.
     EOF
-  spec.files       = `git ls-files`.split "\n"
+  spec.files       = %w(COPYING ChangeLog.mtn README.rdoc TODO
+                        setup.rb Rakefile graffiti.gemspec) +
+                     Dir['{lib,test}/**/*.rb'] +
+                     Dir['doc/**/*.{txt,tex,yaml,sql,svg}']
   spec.test_files  = Dir['test/ts_*.rb']
-  spec.license     = 'GPL3+'
-  spec.add_dependency('syncache')
-  spec.add_dependency('sequel')
+  spec.license     = 'GPL-3.0+'
+  spec.add_dependency 'syncache'
+  spec.add_dependency 'sequel'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'test-unit'
+  spec.add_development_dependency 'sqlite3'
 end

data/lib/graffiti/debug.rb

@@ -22,8 +22,8 @@ module Debug
   def debug(message = nil)
     return unless DEBUG
 
+    message = yield if block_given?
     log message if message
-    log yield if block_given?
   end
 
   def log(message)

data/lib/graffiti/sql_mapper.rb

@@ -211,9 +211,11 @@ class SqlMapper
     refine_ambiguous_properties
 
     debug do
-      @nodes.each do |node, n|
-        debug %{#{node}: #{n[:bind_mode]} #{n[:colors].inspect}}
+      @nodes.keys.sort.each do |node|
+        n = @nodes[node]
+        debug %{map_predicates #{node}: #{n[:bind_mode]} #{n[:colors].inspect}}
       end
+      nil
     end
   end
 
@@ -386,14 +388,14 @@ class SqlMapper
   # be refined based on other occurences of this node in other query clauses.
   #
   def refine_ambiguous_properties
-    @nodes.each_value do |n|
-      map = n[:positions]
+    @nodes.keys.sort.each do |node|
+      map = @nodes[node][:positions]
 
       map.each_with_index do |p, i|
         big = @clauses[ p[:clause] ][ p[:role] ]
         next if big.size <= 1   # no refining needed
 
-        debug { n + ': ' + big.inspect }
+        debug { 'refine_ambiguous_properties ' + @nodes[node] + ': ' + big.inspect }
 
         (i + 1).upto(map.size - 1) do |j|
           small_p = map[j]
@@ -447,9 +449,9 @@ class SqlMapper
   end
 
   def define_relation_aliases
-    @nodes.each do |node, n|
-
-      positions = n[:positions]
+    @nodes.keys.sort.each do |node|
+      positions = @nodes[node][:positions]
+      debug { 'define_relation_aliases ' + positions.inspect }
 
       # go through all clauses with this node in subject position
       positions.each_with_index do |p, i|
@@ -508,8 +510,8 @@ class SqlMapper
     @jc = []
     @bindings = {}
 
-    @nodes.each do |node, n|
-      positions = n[:positions]
+    @nodes.keys.sort.each do |node|
+      positions = @nodes[node][:positions]
 
       # node binding
       first = positions.first
@@ -527,7 +529,7 @@ class SqlMapper
         unless @bindings[node].include?(binding2)
           @bindings[node].push(binding2)
           @jc.push([binding, binding2, node])
-          n[:ground] = true
+          @nodes[node][:ground] = true
         end
       end
 
@@ -561,6 +563,7 @@ class SqlMapper
           end
 
           @aliases[r][:filter].push SqlExpression.new(
+            # FIXME: replace 't' with database-specific boolean literal
             SqlNodeBinding.new(r, 'uriref'), '=', "'t'", 'AND',
             SqlNodeBinding.new(r, 'label'), '=', %{'#{node}'})
 
@@ -569,13 +572,14 @@ class SqlMapper
             "Invalid node '#{node}' should never occur at this point"
         end
 
-        n[:ground] = true
+        @nodes[node][:ground] = true
       end
     end
 
     debug do
-      @aliases.each {|alias_name, a| debug %{#{alias_name}: #{a.inspect}} }
-      @jc.each {|jc| debug jc.inspect }
+      @aliases.keys.sort.each {|a| debug %{transform #{a}: #{@aliases[a].inspect}} }
+      @jc.each {|jc| debug 'transform ' + jc.inspect }
+      nil
     end
   end
 
@@ -583,7 +587,7 @@ class SqlMapper
   #
   def generate_tables_and_conditions
     main_path, seen = jc_subgraph_path(:must_bind)
-    debug { main_path.inspect }
+    debug { 'generate_tables_and_conditions ' + main_path.inspect }
 
     main_path and not main_path.empty? or raise RuntimeError,
       'Failed to find table aliases for main query'
@@ -598,7 +602,7 @@ class SqlMapper
         sub_path, new = jc_subgraph_path(bind_mode, seen)
         break if sub_path.nil? or sub_path.empty?
 
-        debug { sub_path.inspect }
+        debug { 'generate_tables_and_conditions ' + sub_path.inspect }
 
         sub_query, sub_join = sub_path.partition {|a,| main_path.assoc(a).nil? }
         # fixme: make sure that sub_join is not empty
@@ -719,9 +723,9 @@ class SqlMapper
   end
 
   def find_alias(bind_mode, seen = {})
-    @aliases.each do |alias_name, a|
-      next if seen[alias_name] or a[:bind_mode] != bind_mode
-      return alias_name
+    @aliases.keys.sort.each do |a|
+      next if seen[a] or @aliases[a][:bind_mode] != bind_mode
+      return a
     end
 
     nil
@@ -734,7 +738,8 @@ class SqlMapper
     conditions = []
     ground_nodes = @global_filter.scan(SquishQuery::BN_SCAN)
 
-    @nodes.each do |node, n|
+    @nodes.keys.sort.each do |node|
+      n = @nodes[node]
       next if (n[:ground] or ground_nodes.include?(node))
 
       expression =
@@ -800,7 +805,7 @@ class SqlMapper
     wrapped = {}
     sub_path.each {|a,| wrapped[a] = true }
 
-    @nodes.each do |node, n|
+    @nodes.keys.sort.each do |node|
       @bindings[node].each do |b|
         if wrapped[b.alias] and rebind[b].nil?
           field = '_field_' << field_count
@@ -822,7 +827,7 @@ class SqlMapper
     select_nodes = {}
 
     # update the global filter
-    @nodes.each do |node, n|
+    @nodes.keys.sort.each do |node|
       if r = rebind[ @bindings[node].first ]
         @global_filter.gsub!(/#{Regexp.escape(node)}\b/) do
           select_nodes[ @bindings[node].first ] = true

data/lib/graffiti/squish.rb

@@ -84,7 +84,7 @@ class SquishQuery
         "Bad query initialization parameter class: #{query.class}"
     end
 
-    debug { query }
+    debug { 'SquishQuery ' + query }
     @query = query   # keep original string
     query = query.dup
 
@@ -391,7 +391,7 @@ class SquishAssert < SquishQuery
                 :strings => @strings
               }
             )
-            debug { db[s.to_sql, params].select_sql }
+            debug { 'resource_values ' + db[s.to_sql, params].select_sql }
             found = db.fetch(s.to_sql, params).first
           end
 
@@ -401,7 +401,7 @@ class SquishAssert < SquishQuery
           else
             table = @sql_mapper.clauses[ subject_position[:clause] ][:map].table
             value = db[:resource].insert(:label => table)
-            debug { db[:resource].insert_sql(:label => table) }
+            debug { 'resource_values ' + db[:resource].insert_sql(:label => table) }
             new = true unless 'resource' == table
           end
         end
@@ -413,16 +413,16 @@ class SquishAssert < SquishQuery
           value = found[:id]
         else
           value = db[:resource].insert(uriref)
-          debug { db[:resource].insert_sql(uriref) }
+          debug { 'resource_values ' + db[:resource].insert_sql(uriref) }
         end
       end
 
-      debug { node + ' = ' + value.inspect }
+      debug { 'resource_values ' + node + ' = ' + value.inspect }
       v = SquishAssertValue.new(value, new, @update.has_key?(node))
       values[node] = v
     end
 
-    debug { values.inspect }
+    debug { 'resource_values ' + 'resource_values ' + values.inspect }
     values
   end
 
@@ -523,7 +523,7 @@ class SquishAssertStatement
       @filter = {:id => key.value}
     end
 
-    debug { self.inspect }
+    debug { 'SquishAssertStatement ' + self.inspect }
   end
 
   attr_reader :key_node, :references, :action

data/test/ts_graffiti.rb

@@ -46,19 +46,19 @@ LITERAL ?rating >= -1
 ORDER BY ?rating DESC
 USING PRESET NS}
 
-    sql = "SELECT DISTINCT c.id AS msg, c.title AS title, b.full_name AS name, d.published_date AS date, a.rating AS rating
-FROM statement AS a
-INNER JOIN message AS c ON (c.id = a.subject)
-INNER JOIN member AS b ON (c.creator = b.id)
-INNER JOIN resource AS d ON (c.id = d.id)
-INNER JOIN resource AS e ON (a.object = e.id) AND (e.uriref = 't' AND e.label = 'http://www.nongnu.org/samizdat/rdf/schema#Quality')
-INNER JOIN resource AS f ON (a.predicate = f.id) AND (f.uriref = 't' AND f.label = 'http://purl.org/dc/elements/1.1/relation')
-WHERE (a.id IS NOT NULL)
-AND (d.published_date IS NOT NULL)
-AND (b.full_name IS NOT NULL)
-AND (c.title IS NOT NULL)
-AND (a.rating >= -1)
-ORDER BY a.rating DESC"
+    sql = "SELECT DISTINCT b.id AS msg, b.title AS title, a.full_name AS name, c.published_date AS date, d.rating AS rating
+FROM member AS a
+INNER JOIN message AS b ON (b.creator = a.id)
+INNER JOIN resource AS c ON (b.id = c.id)
+INNER JOIN statement AS d ON (b.id = d.subject)
+INNER JOIN resource AS e ON (d.predicate = e.id) AND (e.uriref = 't' AND e.label = 'http://purl.org/dc/elements/1.1/relation')
+INNER JOIN resource AS f ON (d.object = f.id) AND (f.uriref = 't' AND f.label = 'http://www.nongnu.org/samizdat/rdf/schema#Quality')
+WHERE (c.published_date IS NOT NULL)
+AND (a.full_name IS NOT NULL)
+AND (d.id IS NOT NULL)
+AND (b.title IS NOT NULL)
+AND (d.rating >= -1)
+ORDER BY d.rating DESC"
 
     test_squish_select(squish, sql) do |query|
       assert_equal %w[?msg ?title ?name ?date ?rating], query.nodes
@@ -187,21 +187,21 @@ EXCEPT (s::inReplyTo ?msg ?parent)
        (dc::creator ?version_of 1)
 ORDER BY ?date DESC}
 
-    sql = "SELECT DISTINCT b.id AS msg, b.published_date AS date
-FROM resource AS b
+    sql = "SELECT DISTINCT a.id AS msg, a.published_date AS date
+FROM resource AS a
 LEFT JOIN (
-    SELECT b.id AS _field_f
-    FROM message AS a
-    INNER JOIN resource AS b ON (b.part_of = a.id)
-    INNER JOIN resource AS c ON (b.part_of_subproperty = c.id) AND (c.uriref = 't' AND c.label = 'http://purl.org/dc/terms/isVersionOf')
-    WHERE (a.creator = 1)
-) AS _subquery_a ON (b.id = _subquery_a._field_f)
-LEFT JOIN resource AS d ON (b.part_of_subproperty = d.id) AND (d.uriref = 't' AND d.label = 'http://www.nongnu.org/samizdat/rdf/schema#inReplyTo')
-WHERE (b.published_date IS NOT NULL)
-AND (b.id IS NOT NULL)
-AND (_subquery_a._field_f IS NULL)
+    SELECT a.id AS _field_c
+    FROM message AS b
+    INNER JOIN resource AS a ON (a.part_of = b.id)
+    INNER JOIN resource AS c ON (a.part_of_subproperty = c.id) AND (c.uriref = 't' AND c.label = 'http://purl.org/dc/terms/isVersionOf')
+    WHERE (b.creator = 1)
+) AS _subquery_a ON (a.id = _subquery_a._field_c)
+LEFT JOIN resource AS d ON (a.part_of_subproperty = d.id) AND (d.uriref = 't' AND d.label = 'http://www.nongnu.org/samizdat/rdf/schema#inReplyTo')
+WHERE (a.published_date IS NOT NULL)
+AND (a.id IS NOT NULL)
+AND (_subquery_a._field_c IS NULL)
 AND (d.id IS NULL)
-ORDER BY b.published_date DESC"
+ORDER BY a.published_date DESC"
 
     test_squish_select(squish, sql)
   end
@@ -219,20 +219,20 @@ EXCEPT (dct::isPartOf ?msg ?parent)
 GROUP BY ?msg
 ORDER BY max(?date) DESC}
 
-    sql = "SELECT DISTINCT a.subject AS msg, max(b.published_date)
-FROM statement AS a
-INNER JOIN resource AS b ON (a.id = b.id)
-INNER JOIN message AS c ON (a.subject = c.id) AND (c.hidden = 'f')
-INNER JOIN resource AS d ON (a.subject = d.id)
-INNER JOIN resource AS e ON (a.predicate = e.id) AND (e.uriref = 't' AND e.label = 'http://purl.org/dc/elements/1.1/relation')
-WHERE (c.hidden IS NOT NULL)
-AND (b.published_date IS NOT NULL)
-AND (a.object IS NOT NULL)
-AND (a.rating IS NOT NULL)
-AND (d.part_of IS NULL)
-AND ((a.rating >= 1.5))
-GROUP BY a.subject
-ORDER BY max(b.published_date) DESC"
+    sql = "SELECT DISTINCT c.subject AS msg, max(d.published_date)
+FROM message AS a
+INNER JOIN statement AS c ON (c.subject = a.id) AND (c.rating >= 1.5)
+INNER JOIN resource AS b ON (c.subject = b.id)
+INNER JOIN resource AS d ON (c.id = d.id)
+INNER JOIN resource AS e ON (c.predicate = e.id) AND (e.uriref = 't' AND e.label = 'http://purl.org/dc/elements/1.1/relation')
+WHERE (d.published_date IS NOT NULL)
+AND (a.hidden IS NOT NULL)
+AND (b.part_of IS NULL)
+AND (c.rating IS NOT NULL)
+AND (c.object IS NOT NULL)
+AND ((a.hidden = 'f'))
+GROUP BY c.subject
+ORDER BY max(d.published_date) DESC"
 
     test_squish_select(squish, sql)
   end
@@ -272,18 +272,17 @@ OPTIONAL (dct::isPartOf ?tag ?supertag TRANSITIVE)
 LITERAL ?tag = 1 OR ?supertag = 1
 ORDER BY ?date DESC}
 
-    sql = "SELECT DISTINCT a.subject AS msg, b.published_date AS date
-FROM statement AS a
-INNER JOIN resource AS b ON (a.subject = b.id)
-INNER JOIN resource AS d ON (a.predicate = d.id) AND (d.uriref = 't' AND d.label = 'http://purl.org/dc/elements/1.1/relation')
-LEFT JOIN part AS c ON (a.object = c.id)
-WHERE (a.id IS NOT NULL)
-AND (b.published_date IS NOT NULL)
-AND (a.rating IS NOT NULL)
-AND (b.part_of IS NULL)
-AND ((a.rating > 0))
-AND (a.object = 1 OR c.part_of = 1)
-ORDER BY b.published_date DESC"
+    sql = "SELECT DISTINCT b.subject AS msg, a.published_date AS date
+FROM resource AS a
+INNER JOIN statement AS b ON (b.subject = a.id) AND (b.rating > 0)
+INNER JOIN resource AS d ON (b.predicate = d.id) AND (d.uriref = 't' AND d.label = 'http://purl.org/dc/elements/1.1/relation')
+LEFT JOIN part AS c ON (b.object = c.id)
+WHERE (a.published_date IS NOT NULL)
+AND (a.part_of IS NULL)
+AND (b.rating IS NOT NULL)
+AND (b.id IS NOT NULL)
+AND (b.object = 1 OR c.part_of = 1)
+ORDER BY a.published_date DESC"
 
     test_squish_select(squish, sql)
   end
@@ -387,13 +386,11 @@ ORDER BY c.published_date DESC"
   end
 
   def normalize(sql)
-    # alias labels and where conditions may be reordered, but the query string
-    # length should remain the same
-    sql.size
+    sql
   end
 
   def create_mock_db
-    db = Sequel.sqlite(:quote_identifiers => false)
+    db = Sequel.sqlite(:quote_identifiers => false, :integer_booleans => false)
 
     db.create_table(:resource) do
       primary_key :id
@@ -444,12 +441,4 @@ ORDER BY c.published_date DESC"
 
     db
   end
-
-  def create_mock_member(db)
-    db[:member].insert(
-      :login => 'test',
-      :full_name => 'test',
-      :email => 'test@localhost'
-    )
-  end
 end

metadata

@@ -1,68 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: graffiti
-version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: 
-  segments: 
-  - 2
-  - 1
-  version: "2.1"
+version: !ruby/object:Gem::Version
+  version: 2.3.1
 platform: ruby
-authors: 
+authors:
 - Dmitry Borodaenko
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-04-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: syncache
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sequel
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Graffiti is an RDF store based on dynamic translation of RDF queries into SQL.
   Graffiti allows one to map any relational database schema into RDF semantics
   and vice versa, to store any RDF data in a relational database.
-  
+
   Graffiti uses Sequel to connect to database backend and provides a DBI-like
   interface to run RDF queries in Squish query language from Ruby applications.
-
 email: angdraug@debian.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - COPYING
 - ChangeLog.mtn
 - README.rdoc
+- Rakefile
 - TODO
 - doc/diagrams/graffiti-classes.svg
 - doc/diagrams/graffiti-deployment.svg
@@ -86,37 +119,28 @@ files:
 - setup.rb
 - test/ts_graffiti.rb
 homepage: https://github.com/angdraug/graffiti
-licenses: 
-- GPL3+
+licenses:
+- GPL-3.0+
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Relational RDF store for Ruby
-test_files: 
+test_files:
 - test/ts_graffiti.rb