rdf 0.1.6.1 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6.1
+0.1.7

data/lib/rdf/format.rb

@@ -109,7 +109,7 @@ module RDF
             else
               format = format.to_s.downcase
               @@subclasses.each do |klass|
-                if klass.name.to_s.split('::').map(&:downcase).include?(format)
+                if klass.name.to_s.split('::').map { |x| x.downcase }.include?(format)
                   return klass
                 end
               end

data/lib/rdf/mixin/enumerable.rb

@@ -146,7 +146,7 @@ module RDF
     # @see #each_triple
     # @see #enum_triple
     def triples(options = {})
-      enum_statement.map(&:to_triple)
+      enum_statement.map { |statement| statement.to_triple }
     end
 
     ##
@@ -205,7 +205,7 @@ module RDF
     # @see #each_quad
     # @see #enum_quad
     def quads(options = {})
-      enum_statement.map(&:to_quad)
+      enum_statement.map { |statement| statement.to_quad }
     end
 
     ##
@@ -267,7 +267,7 @@ module RDF
     # @see #enum_subject
     def subjects(options = {})
       if options[:unique] == false
-        enum_statement.map(&:subject)
+        enum_statement.map { |statement| statement.subject }
       else
         enum_subject.to_a
       end
@@ -334,7 +334,7 @@ module RDF
     # @see #enum_predicate
     def predicates(options = {})
       if options[:unique] == false
-        enum_statement.map(&:predicate)
+        enum_statement.map { |statement| statement.predicate }
       else
         enum_predicate.to_a
       end
@@ -401,7 +401,7 @@ module RDF
     # @see #enum_object
     def objects(options = {})
       if options[:unique] == false
-        enum_statement.map(&:object)
+        enum_statement.map { |statement| statement.object }
       else
         enum_object.to_a
       end
@@ -468,7 +468,7 @@ module RDF
     # @see #enum_context
     def contexts(options = {})
       if options[:unique] == false
-        enum_statement.map(&:context)
+        enum_statement.map { |statement| statement.context }
       else
         enum_context.to_a
       end

data/lib/rdf/mixin/mutable.rb

@@ -28,7 +28,7 @@ module RDF
     end
 
     ##
-    # Loads RDF statements from the given file into `self`.
+    # Loads RDF statements from the given file or URL into `self`.
     #
     # @param  [String, #to_s]          filename
     # @param  [Hash{Symbol => Object}] options

data/lib/rdf/model/graph.rb

@@ -14,6 +14,36 @@ module RDF
     # @return [Array<Statement>]
     attr_accessor :data
 
+    ##
+    # Creates a new `Graph` instance populated by the RDF data returned by
+    # dereferencing the given context URL.
+    #
+    # @overload
+    #   @param  [String, #to_s]          url
+    #   @param  [Hash{Symbol => Object}] options
+    #   @yield  [graph]
+    #   @yieldparam [Graph] graph
+    #   @return [void]
+    #
+    # @overload
+    #   @param  [String, #to_s]          url
+    #   @param  [Hash{Symbol => Object}] options
+    #   @return [Graph]
+    #
+    # @return [void]
+    def self.load(url, options = {}, &block)
+      self.new(url, options) do |graph|
+        graph.load! unless graph.unnamed?
+
+        if block_given?
+          case block.arity
+            when 1 then block.call(graph)
+            else graph.instance_eval(&block)
+          end
+        end
+      end
+    end
+
     ##
     # @param  [Resource]               context
     # @param  [Hash{Symbol => Object}] options
@@ -26,8 +56,8 @@ module RDF
         else RDF::URI.new(context)
       end
 
-      @data    = options.delete(:data) || []
-      @options = options
+      @options = options.dup
+      @data    = @options.delete(:data) || []
 
       if block_given?
         case block.arity
@@ -37,6 +67,16 @@ module RDF
       end
     end
 
+    ##
+    # @return [void]
+    def load!(*args)
+      case
+        when args.empty?
+          load(context.to_s, context ? {:base_uri => context}.merge(@options) : @options)
+        else super
+      end
+    end
+
     ##
     # Returns `true` to indicate that this is a graph.
     #

data/lib/rdf/model/value.rb

@@ -79,6 +79,14 @@ module RDF
 
     alias_method :iri?, :uri?
 
+    ##
+    # Returns `true` if this value is a query variable.
+    #
+    # @return [Boolean]
+    def variable?
+      false
+    end
+
     ##
     # Compares this value to `other` for sorting purposes.
     #

data/lib/rdf/query/pattern.rb

@@ -108,7 +108,7 @@ class RDF::Query
     #
     # @return [Boolean]
     def bound?
-      !variables.empty? && variables.values.all?(&:bound?)
+      !variables.empty? && variables.values.all? { |var| var.bound? }
     end
 
     ##
@@ -124,7 +124,7 @@ class RDF::Query
     #
     # @return [Boolean]
     def unbound?
-      !variables.empty? && variables.values.all?(&:unbound?)
+      !variables.empty? && variables.values.all? { |var| var.unbound? }
     end
 
     ##

data/lib/rdf/query/variable.rb

@@ -54,6 +54,15 @@ class RDF::Query
       @name, @value = name.to_sym, value
     end
 
+    ##
+    # Returns `true`.
+    #
+    # @return [Boolean]
+    # @see    RDF::Value#variable?
+    def variable? 
+      true
+    end
+
     ##
     # Returns `true` if this variable has a name.
     #

data/lib/rdf/repository.rb

@@ -108,7 +108,15 @@ module RDF
     end
 
     ##
-    # Outputs a developer-friendly representation of this repository to
+    # Returns a developer-friendly representation of this object.
+    #
+    # @return [String]
+    def inspect
+      sprintf("#<%s:%#0x(%s)>", self.class.name, object_id, uri.to_s)
+    end
+
+    ##
+    # Outputs a developer-friendly representation of this object to
     # `stderr`.
     #
     # @return [void]

data/lib/rdf/version.rb

@@ -2,8 +2,8 @@ module RDF
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 6
-    EXTRA = 1
+    TINY  = 7
+    EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')
     STRING << ".#{EXTRA}" if EXTRA

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  - 1
-  version: 0.1.6.1
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 +02:00
+date: 2010-04-16 00:00:00 +02:00
 default_executable: rdf
 dependencies: 
 - !ruby/object:Gem::Dependency