rdf 0.3.0.pre → 0.3.0

data/lib/rdf/repository.rb

@@ -58,6 +58,7 @@ module RDF
     #
     # @return [URI]
     attr_reader :uri
+    alias_method :url, :uri
 
     ##
     # Returns the title of this repository.
@@ -149,8 +150,9 @@ module RDF
     #
     # @param  [RDF::Resource] context
     # @yield  [tx]
-    # @yieldparam [RDF::Transaction] tx
-    # @return [void]
+    # @yieldparam  [RDF::Transaction] tx
+    # @yieldreturn [void] ignored
+    # @return [void] `self`
     # @see    RDF::Transaction
     # @since  0.3.0
     def transaction(context = nil, &block)
@@ -193,7 +195,7 @@ module RDF
     # the underlying storage.
     #
     # @param  [RDF::Transaction] tx
-    # @return [void]
+    # @return [void] ignored
     # @since  0.3.0
     def rollback_transaction(tx)
       # nothing to do
@@ -207,7 +209,7 @@ module RDF
     # the underlying storage.
     #
     # @param  [RDF::Transaction] tx
-    # @return [void]
+    # @return [void] ignored
     # @since  0.3.0
     def commit_transaction(tx)
       tx.execute(self)
@@ -216,6 +218,8 @@ module RDF
     ##
     # @see RDF::Repository
     module Implementation
+      DEFAULT_CONTEXT = false
+
       ##
       # @private
       def self.extend_object(obj)
@@ -268,6 +272,7 @@ module RDF
       # @see RDF::Enumerable#has_statement?
       def has_statement?(statement)
         s, p, o, c = statement.to_quad
+        c ||= DEFAULT_CONTEXT
         @data.has_key?(c) &&
           @data[c].has_key?(s) &&
           @data[c][s].has_key?(p) &&
@@ -287,30 +292,32 @@ module RDF
             ss.dup.each do |s, ps|
               ps.dup.each do |p, os|
                 os.dup.each do |o|
-                  block.call(RDF::Statement.new(s, p, o, :context => c))
+                  block.call(RDF::Statement.new(s, p, o, :context => c.equal?(DEFAULT_CONTEXT) ? nil : c))
                 end
               end
             end
           end
-        else
-          enum_statement
         end
+        enum_statement
       end
-
       alias_method :each, :each_statement
 
       ##
       # @private
       # @see RDF::Enumerable#has_context?
       def has_context?(value)
-        @data.keys.compact.include?(value)
+        @data.keys.include?(value)
       end
 
       ##
       # @private
       # @see RDF::Enumerable#each_context
       def each_context(&block)
-        @data.keys.compact.each(&block) if block_given?
+        if block_given?
+          contexts = @data.keys
+          contexts.delete(DEFAULT_CONTEXT)
+          contexts.each(&block)
+        end
         enum_context
       end
 
@@ -320,15 +327,24 @@ module RDF
       # @private
       # @see RDF::Queryable#query
       def query_pattern(pattern, &block)
-        @data.dup.each do |c, ss|
-          next if pattern.has_context? && pattern.context != c
-          ss.dup.each do |s, ps|
-            next if pattern.has_subject? && pattern.subject != s
-            ps.dup.each do |p, os|
-              next if pattern.has_predicate? && pattern.predicate != p
-              os.dup.each do |o|
-                next if pattern.has_object? && pattern.object != o
-                block.call(RDF::Statement.new(s, p, o, :context => c))
+        context   = pattern.context
+        subject   = pattern.subject
+        predicate = pattern.predicate
+        object    = pattern.object
+
+        cs = @data.has_key?(context) ? {context => @data[context]} : @data.dup
+        cs.each do |c, ss|
+          next unless context.nil? || context == c
+          ss = ss.has_key?(subject) ? {subject => ss[subject]} : ss.dup
+          ss.each do |s, ps|
+            next unless subject.nil? || subject == s
+            ps = ps.has_key?(predicate) ? {predicate => ps[predicate]} : ps.dup
+            ps.each do |p, os|
+              next unless predicate.nil? || predicate == p
+              os = os.dup # TODO: is this really needed?
+              os.each do |o|
+                next unless object.nil? || object == o
+                block.call(RDF::Statement.new(s, p, o, :context => c.equal?(DEFAULT_CONTEXT) ? nil : c))
               end
             end
           end
@@ -341,6 +357,7 @@ module RDF
       def insert_statement(statement)
         unless has_statement?(statement)
           s, p, o, c = statement.to_quad
+          c ||= DEFAULT_CONTEXT
           @data[c] ||= {}
           @data[c][s] ||= {}
           @data[c][s][p] ||= []
@@ -354,6 +371,7 @@ module RDF
       def delete_statement(statement)
         if has_statement?(statement)
           s, p, o, c = statement.to_quad
+          c ||= DEFAULT_CONTEXT
           @data[c][s][p].delete(o)
           @data[c][s].delete(p) if @data[c][s][p].empty?
           @data[c].delete(s) if @data[c][s].empty?
@@ -372,6 +390,6 @@ module RDF
       protected :insert_statement
       protected :delete_statement
       protected :clear_statements
-    end # module Implementation
-  end # class Repository
-end # module RDF
+    end # Implementation
+  end # Repository
+end # RDF

data/lib/rdf/util/aliasing.rb

@@ -58,6 +58,6 @@ module RDF; module Util
 
         return self
       end
-    end # module LateBound
-  end # module Aliasing
-end; end # module RDF::Util
+    end # LateBound
+  end # Aliasing
+end; end # RDF::Util

data/lib/rdf/util/cache.rb

@@ -9,8 +9,9 @@ module RDF; module Util
   #
   # While this cache is something of an internal implementation detail of
   # RDF.rb, some external libraries do currently make use of it as well,
-  # including [Spira](http://spira.rubyforge.org/). Do be sure to include
-  # any changes here in the RDF.rb changelog.
+  # including [SPARQL::Algebra](http://sparql.rubyforge.org/algebra/) and
+  # [Spira](http://spira.rubyforge.org/). Do be sure to include any changes
+  # here in the RDF.rb changelog.
   #
   # @see   RDF::URI.intern
   # @see   http://en.wikipedia.org/wiki/Weak_reference
@@ -48,7 +49,7 @@ module RDF; module Util
     ##
     # @return [Boolean]
     def has_capacity?
-      @capacity == -1 || @capacity > @cache.size
+      @capacity.equal?(-1) || @capacity > @cache.size
     end
 
     ##
@@ -94,7 +95,7 @@ module RDF; module Util
         end
         value
       end
-    end # class ObjectSpaceCache
+    end # ObjectSpaceCache
 
     ##
     # This implementation uses the `WeakRef` class from Ruby's standard
@@ -131,6 +132,6 @@ module RDF; module Util
         end
         value
       end
-    end # class WeakRefCache
-  end # class Cache
-end; end # module RDF::Util
+    end # WeakRefCache
+  end # Cache
+end; end # RDF::Util

data/lib/rdf/version.rb

@@ -3,7 +3,7 @@ module RDF
     MAJOR = 0
     MINOR = 3
     TINY  = 0
-    EXTRA = :pre
+    EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')
 

data/lib/rdf/writer.rb

@@ -238,8 +238,8 @@ module RDF
     #
     # @return [RDF::URI]
     def prefix(name, uri = nil)
-      name = name.respond_to?(:to_sym) ? name.to_sym : name.to_s.to_sym
-      uri.nil? ? prefixes[name] : prefixes[name] = RDF::URI(uri)
+      name = name.to_s.empty? ? nil : (name.respond_to?(:to_sym) ? name.to_sym : name.to_s.to_sym)
+      uri.nil? ? prefixes[name] : prefixes[name] = uri
     end
     alias_method :prefix!, :prefix
 
@@ -300,7 +300,7 @@ module RDF
     end
 
     ##
-    # @param  [Array<Array(RDF::Resource, RDF::URI, RDF::Value)>] triples
+    # @param  [Array<Array(RDF::Resource, RDF::URI, RDF::Term)>] triples
     # @return [void] `self`
     def write_triples(*triples)
       triples.each { |triple| write_triple(*triple) }
@@ -310,7 +310,7 @@ module RDF
     ##
     # @param  [RDF::Resource] subject
     # @param  [RDF::URI]      predicate
-    # @param  [RDF::Value]    object
+    # @param  [RDF::Term]     object
     # @return [void] `self`
     # @raise  [NotImplementedError] unless implemented in subclass
     # @abstract
@@ -324,18 +324,20 @@ module RDF
     alias_method :insert_statement,  :write_statement
 
     ##
-    # @param  [RDF::Value] value
+    # @param  [RDF::Term] term
     # @return [String]
-    def format_value(value, options = {})
-      case value
-        when String       then format_literal(RDF::Literal(value, options), options)
-        when RDF::List    then format_list(value, options)
-        when RDF::Literal then format_literal(value, options)
-        when RDF::URI     then format_uri(value, options)
-        when RDF::Node    then format_node(value, options)
+    # @since  0.3.0
+    def format_term(term, options = {})
+      case term
+        when String       then format_literal(RDF::Literal(term, options), options)
+        when RDF::List    then format_list(term, options)
+        when RDF::Literal then format_literal(term, options)
+        when RDF::URI     then format_uri(term, options)
+        when RDF::Node    then format_node(term, options)
         else nil
       end
     end
+    alias_method :format_value, :format_term # @deprecated
 
     ##
     # @param  [RDF::Node] value
@@ -374,7 +376,7 @@ module RDF
     # @abstract
     # @since  0.2.3
     def format_list(value, options = {})
-      format_value(value.subject, options)
+      format_term(value.subject, options)
     end
 
   protected

data/lib/rdf.rb

@@ -44,6 +44,7 @@ module RDF
   autoload :Statement,   'rdf/model/statement'
   autoload :URI,         'rdf/model/uri'
   autoload :Value,       'rdf/model/value'
+  autoload :Term,        'rdf/model/term'
 
   # RDF collections
   autoload :List,        'rdf/model/list'
@@ -115,7 +116,10 @@ module RDF
   #
   # @return [RDF::Literal]
   def self.Literal(*args, &block)
-    Literal.new(*args, &block)
+    case literal = args.first
+      when RDF::Literal then literal
+      else Literal.new(*args, &block)
+    end
   end
 
   ##

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rdf
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 3
   - 0
-  - pre
-  version: 0.3.0.pre
+  version: 0.3.0
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 +01:00
+date: 2010-12-27 00:00:00 +01:00
 default_executable: rdf
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,10 +54,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 2
         - 1
-        - 3
         - 0
-        version: 1.3.0
+        version: 2.1.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -66,14 +65,13 @@ dependencies:
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 3
         - 0
-        - pre
-        version: 0.3.0.pre
+        version: 0.3.0
   type: :development
   version_requirements: *id004
 description: RDF.rb is a pure-Ruby library for working with Resource Description Framework (RDF) data.
@@ -112,6 +110,7 @@ files:
 - lib/rdf/model/literal/decimal.rb
 - lib/rdf/model/literal/double.rb
 - lib/rdf/model/literal/integer.rb
+- lib/rdf/model/literal/numeric.rb
 - lib/rdf/model/literal/time.rb
 - lib/rdf/model/literal/token.rb
 - lib/rdf/model/literal/xml.rb
@@ -119,6 +118,7 @@ files:
 - lib/rdf/model/node.rb
 - lib/rdf/model/resource.rb
 - lib/rdf/model/statement.rb
+- lib/rdf/model/term.rb
 - lib/rdf/model/uri.rb
 - lib/rdf/model/value.rb
 - lib/rdf/nquads.rb
@@ -181,13 +181,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: rdf