redlander 0.3.3 → 0.3.5

data/README.rdoc

@@ -12,11 +12,12 @@ Note, that you will have to install Redlander (librdf) for Redlander to work.
 
 = Usage
 
-To start doing anything with Redland, you need to initialize a model first:
+To start doing anything useful with Redlander, you need to initialize a model first:
 
   $ m = Redlander::Model.new
 
 This creates a model where all RDF statements are stored in the memory. Depending on the selected storage you may need to supply extra parameters like :user or :password. Look-up the options for Storage.initialize_storage method for the list of storage options.
+Naturally, you don't need to create a model if you just want to play around with independent statements, nodes and the like.
 
 Now that you have created a model, you can access its RDF statements:
 

data/lib/redlander/node.rb

@@ -13,10 +13,10 @@ module Redlander
     #   - any other Ruby object, which can be coerced into a literal.
     # If nothing else, a RedlandError is thrown.
     #
-    # Note, that you cannot create a resource node from an URI string,
+    # Note that you cannot create a resource node from an URI string,
     # it must be an instance of URI. Otherwise it is treated as a string literal.
     def initialize(arg = nil, role = :subject)
-      bound = false
+      @bound = false
       @rdf_node = case arg
                   when NilClass
                     Redland.librdf_new_node_from_blank_identifier(Redlander.rdf_world, nil)
@@ -25,14 +25,18 @@ module Redlander
                   when Node
                     Redland.librdf_new_node_from_node(arg.rdf_node)
                   when Statement
-                    bound = true
+                    # TODO: Bound nodes should better be produced
+                    # using an explicit "factory" like Node.from_statement
+                    # to keep the clutter in the constructor at minimum.
+                    # (Esp. handling the "bound" stuff)
+                    @bound = true
                     case role
                     when :subject
-                      Redland.librdf_statement_get_subject(arg.rdf_statement)
+                      copy_rdf_node_on_initialize(Redland.librdf_statement_get_subject(arg.rdf_statement))
                     when :object
-                      Redland.librdf_statement_get_object(arg.rdf_statement)
+                      copy_rdf_node_on_initialize(Redland.librdf_statement_get_object(arg.rdf_statement))
                     when :predicate
-                      Redland.librdf_statement_get_predicate(arg.rdf_statement)
+                      copy_rdf_node_on_initialize(Redland.librdf_statement_get_predicate(arg.rdf_statement))
                     else
                       raise RedlandError.new("Invalid role specified")
                     end
@@ -42,14 +46,20 @@ module Redlander
                     Redland.librdf_new_node_from_typed_literal(Redlander.rdf_world, value, nil, datatype.rdf_uri)
                   end
       if @rdf_node.null?
-        raise RedlandError.new("Failed to create a new node") unless bound
+        raise RedlandError.new("Failed to create a new node") unless @bound
       else
         ObjectSpace.define_finalizer(self, proc { Redland.librdf_free_node(@rdf_node) })
         # bound nodes cannot be added to (other) statements
-        freeze if bound
+        freeze if @bound
       end
     end
 
+    # Bound nodes are those belonging to a statement
+    # (bound nodes cannot be modified or added to other statements).
+    def bound?
+      @bound
+    end
+
     def resource?
       Redland.librdf_node_is_resource(@rdf_node) != 0
     end
@@ -93,5 +103,20 @@ module Redlander
         XmlSchema.instantiate(to_s)
       end
     end
+
+
+    private
+
+    def copy_rdf_node_on_initialize(n)
+      if n.null?
+        if bound?
+          n
+        else
+          raise RedlandError.new("Failed to create a new node")
+        end
+      else
+        Redland.librdf_new_node_from_node(n)
+      end
+    end
   end
 end

data/lib/redlander/statement.rb

@@ -15,7 +15,7 @@ module Redlander
       @rdf_statement = case source
                        when Stream
                          # Pull a (current) statement from the stream
-                         Redland.librdf_stream_get_object(source.rdf_stream)
+                         copy_rdf_statement_on_initialize(Redland.librdf_stream_get_object(source.rdf_stream))
                        when Hash
                          # Create a new statement from nodes
                          s = source[:subject] && Node.new(source[:subject]).rdf_node
@@ -105,5 +105,13 @@ module Redlander
         yield
       end
     end
+
+    def copy_rdf_statement_on_initialize(s)
+      if s.null?
+        raise RedlandError.new("Failed to create a new statement")
+      else
+        Redland.librdf_new_statement_from_statement(s)
+      end
+    end
   end
 end

data/lib/redlander/uri.rb

@@ -8,9 +8,9 @@ module Redlander
                    Redland.librdf_new_uri(Redlander.rdf_world, source.to_s)
                  when Node
                    if source.resource?
-                     Redland.librdf_node_get_uri(source.rdf_node)
+                     copy_rdf_uri_on_initialize(Redland.librdf_node_get_uri(source.rdf_node))
                    elsif source.literal?
-                     Redland.librdf_node_get_literal_value_datatype_uri(source.rdf_node)
+                     copy_rdf_uri_on_initialize(Redland.librdf_node_get_literal_value_datatype_uri(source.rdf_node))
                    else
                      raise NotImplementedError.new
                    end
@@ -25,5 +25,16 @@ module Redlander
     def to_s
       Redland.librdf_uri_to_string(@rdf_uri)
     end
+
+
+    private
+
+    def copy_rdf_uri_on_initialize(u)
+      if u.null?
+        raise RedlandError.new("Failed to create URI")
+      else
+        Redland.librdf_new_uri_from_uri(u)
+      end
+    end
   end
 end

data/lib/redlander/version.rb

@@ -1,3 +1,3 @@
 module Redlander
-  VERSION = "0.3.3"
+  VERSION = "0.3.5"
 end

data/lib/redlander.rb

@@ -41,6 +41,10 @@ module Redlander
     #   1) Convert boolean values into 'yes/no' values
     #   2) Change underscores in key names into dashes ('dhar_ma' => 'dhar-ma')
     #   3) Join all options as "key='value'" pairs in a comma-separated string
+    #
+    # E.g.:
+    #   to_rdf_options {:key => true, "key_board" => 3}
+    #   # => "key='yes',key-board='3'"
     def to_rdf_options(options = {})
       options.inject([]){|opts, option_pair|
         key = option_pair[0].to_s.gsub(/_/, '-')

data/spec/redlander/node_spec.rb

@@ -4,12 +4,14 @@ require 'date'
 
 describe Node do
 
-  it "should be created with default options" do
-    lambda { Node.new }.should_not raise_exception
-  end
+  describe "blank" do
+    subject { Node.new }
+
+    it { should be_blank }
 
-  it "should create a blank node" do
-    Node.new.should be_blank
+    it "should have a blank identifier for a blank node" do
+      subject.value.should match(/^_:\w+$/)
+    end
   end
 
   it "should create a resource node" do
@@ -72,11 +74,6 @@ describe Node do
     node.value.xmlschema.should eql(t.xmlschema)
   end
 
-  it "should have a blank identifier for a blank node" do
-    node = Node.new
-    node.value.should match(/^_:\w+$/)
-  end
-
   it "should have an instance of URI for a resource node" do
     resource_uri = URI.parse('http://example.com/nodes#node_1')
     Node.new(resource_uri).value.should be_an_instance_of(URI::HTTP)

metadata

@@ -1,139 +1,118 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: redlander
-version: !ruby/object:Gem::Version 
-  hash: 2933854275357264005
+version: !ruby/object:Gem::Version
+  version: 0.3.5
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 3
-  version: 0.3.3
 platform: ruby
-authors: 
+authors:
 - Slava Kravchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
+date: 2012-06-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: xml_schema
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &9413040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 856480538658449761
-        segments: 
-        - 0
-        - 0
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.0.1
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
+  version_requirements: *9413040
+- !ruby/object:Gem::Dependency
   name: ffi
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &9412480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 4428665182548103036
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  type: :development
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
   prerelease: false
+  version_requirements: *9412480
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &9411960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1396078460937419743
-        segments: 
-        - 1
-        version: "1"
-  requirement: *id003
-description: "    Advanced Redland bindings.\n"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: *9411960
+description: ! '    Advanced Redland bindings.
+
+'
 email: slava.kravchenko@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - lib/redlander/error_container.rb
 - lib/redlander/model.rb
 - lib/redlander/model_proxy.rb
-- lib/redlander/node.rb
 - lib/redlander/parser.rb
 - lib/redlander/parser_proxy.rb
 - lib/redlander/serializer.rb
-- lib/redlander/statement.rb
 - lib/redlander/storage.rb
 - lib/redlander/stream.rb
 - lib/redlander/stream_enumerator.rb
-- lib/redlander/uri.rb
 - lib/redlander/version.rb
-- spec/spec.opts
-- spec/spec_helper.rb
+- lib/redlander/uri.rb
+- lib/redlander/node.rb
+- lib/redlander/statement.rb
 - spec/integration/memory_leak_spec.rb
 - spec/redlander/model_spec.rb
-- spec/redlander/node_spec.rb
 - spec/redlander/parser_spec.rb
 - spec/redlander/serializer_spec.rb
 - spec/redlander/statement_spec.rb
+- spec/redlander/node_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
 - Rakefile
 - lib/redlander.rb
 - README.rdoc
 homepage: https://github.com/cordawyn/redlander
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2002549777813010636
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2648553403970259996
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2002549777813010636
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2648553403970259996
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Advanced Redland bindings.
-test_files: 
-- spec/spec.opts
-- spec/spec_helper.rb
+test_files:
 - spec/integration/memory_leak_spec.rb
 - spec/redlander/model_spec.rb
-- spec/redlander/node_spec.rb
 - spec/redlander/parser_spec.rb
 - spec/redlander/serializer_spec.rb
 - spec/redlander/statement_spec.rb
+- spec/redlander/node_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb