redlander 0.5.1 → 0.5.2

data/ChangeLog

@@ -1,3 +1,8 @@
+redlander (0.5.2)
+
+  * UTF-8 output for Node#value
+  * value of the blank node is its identifier without "_:" prefix
+
 redlander (0.5.1)
 
   * fixed a memory leak in Model#query

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redlander (0.5.1)
+    redlander (0.5.2)
       ffi (~> 1.1)
       xml_schema (~> 0.1.3)
 

data/README.rdoc

@@ -144,7 +144,7 @@ If anything unexpected happens, Redlander raises RedlandError.
 
 = Authors and Contributors
 
-Slava Kravchenko <slava.kravchenko@gmail.com>
+Slava Kravchenko <https://github.com/cordawyn>
 
 = Thanks
 

data/lib/redland.rb

@@ -60,6 +60,7 @@ module Redland
   attach_function :librdf_node_equals, [:pointer, :pointer], :int
   attach_function :librdf_node_to_string, [:pointer], :string
   attach_function :librdf_node_get_uri, [:pointer], :pointer
+  attach_function :librdf_node_get_blank_identifier, [:pointer], :string
 
   # Stream
   attach_function :librdf_free_stream, [:pointer], :void

data/lib/redlander/node.rb

@@ -105,8 +105,11 @@ module Redlander
     def value
       if resource?
         uri
+      elsif blank?
+        Redland.librdf_node_get_blank_identifier(@rdf_node).force_encoding("UTF-8")
       else
-        XmlSchema.instantiate(to_s)
+        v = Redland.librdf_node_get_literal_value(@rdf_node).force_encoding("UTF-8")
+        XmlSchema.instantiate(v, @datatype)
       end
     end
 

data/lib/redlander/version.rb

@@ -1,4 +1,4 @@
 module Redlander
   # Redlander version number
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/lib/redlander/model_spec.rb

@@ -54,7 +54,7 @@ describe Model do
 
           it "should yield multiple bindings" do
             # TODO: librdf screws up the input UTF-8 encoding
-            helpers = ["C\\u0103lin Ardelean", "Danny Gagne", "Joey Geiger", "Fumihiro Kato", "Naoki Kawamukai", "Hellekin O. Wolf", "John Fieber", "Keita Urashima", "Pius Uzamere"]
+            helpers = ["Călin Ardelean", "Danny Gagne", "Joey Geiger", "Fumihiro Kato", "Naoki Kawamukai", "Hellekin O. Wolf", "John Fieber", "Keita Urashima", "Pius Uzamere"]
 
             expect(subject.size).to eql helpers.size
             subject.each do |binding|

data/spec/lib/redlander/node_spec.rb

@@ -10,87 +10,104 @@ describe Node do
     it { should be_blank }
 
     it "should have a blank identifier for a blank node" do
-      subject.value.should match(/^_:\w+$/)
+      subject.to_s.should eql "_:#{subject.value}"
     end
 
-    context "when given :blank_id" do
-      before { @options = {:blank_id => "blank0"} }
+    describe "value" do
+      subject { described_class.new(nil, @options).value }
 
-      it "should create a node with the given identifier" do
-        expect(subject.value).to eql "_:blank0"
+      it "should be UTF-8 encoded" do
+        expect(subject.encoding).to eql Encoding::UTF_8
+      end
+
+      it { should match(/^r\d+/) }
+
+      context "when given :blank_id" do
+        before { @options = {:blank_id => "blank0"} }
+
+        it { should eql "blank0" }
       end
     end
   end
 
-  it "should create a resource node" do
-    resource_uri = URI.parse('http://example.com/nodes#node_1')
-    Node.new(resource_uri).should be_resource
-  end
+  describe "resource" do
+    it "should create a resource node" do
+      resource_uri = URI.parse('http://example.com/nodes#node_1')
+      Node.new(resource_uri).should be_resource
+    end
 
-  it "should create a literal node from a literal rdf_node" do
-    node1 = Node.new("hello, world")
-    node2 = Node.new(node1.rdf_node)
-    node2.datatype.should_not be_nil
-    node2.datatype.should eql node1.datatype
+    it "should have an instance of URI for a resource node" do
+      resource_uri = URI('http://example.com/nodes#node_1')
+      Node.new(resource_uri).value.should be_an_instance_of(URI::HTTP)
+    end
   end
 
-  it "should create a string literal" do
-    node = Node.new("hello, world")
-    node.should be_literal
-    node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#string")
-  end
+  describe "literal" do
+    it "should be created from a literal rdf_node" do
+      node1 = Node.new("hello, world")
+      node2 = Node.new(node1.rdf_node)
+      node2.datatype.should_not be_nil
+      node2.datatype.should eql node1.datatype
+    end
 
-  it "should create a boolean literal" do
-    node = Node.new(true)
-    node.should be_literal
-    node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#boolean")
-  end
+    it "should be created from a string" do
+      node = Node.new("hello, world")
+      node.should be_literal
+      node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#string")
+    end
 
-  it "should create an integer number literal" do
-    node = Node.new(10)
-    node.should be_literal
-    node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#integer")
-  end
+    it "should be created from a boolean value" do
+      node = Node.new(true)
+      node.should be_literal
+      node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#boolean")
+    end
 
-  it "should create a floating-point number literal" do
-    node = Node.new(3.1416)
-    node.should be_literal
-    node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#float")
-  end
+    it "should be created from an integer value" do
+      node = Node.new(10)
+      node.should be_literal
+      node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#integer")
+    end
 
-  it "should create a time literal" do
-    node = Node.new(Time.now)
-    node.should be_literal
-    node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#time")
-  end
+    it "should be created from a floating-point value" do
+      node = Node.new(3.1416)
+      node.should be_literal
+      node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#float")
+    end
 
-  it "should create a date literal" do
-    node = Node.new(Date.today)
-    node.should be_literal
-    node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#date")
-  end
+    it "should be created from a time value" do
+      node = Node.new(Time.now)
+      node.should be_literal
+      node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#time")
+    end
 
-  it "should create a datetime literal" do
-    node = Node.new(DateTime.now)
-    node.should be_literal
-    node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#dateTime")
-  end
+    it "should be created from a date value" do
+      node = Node.new(Date.today)
+      node.should be_literal
+      node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#date")
+    end
 
-  it "should have proper string representation" do
-    node = Node.new("Bye-bye, cruel world...")
-    node.to_s.should eql('"Bye-bye, cruel world..."^^<http://www.w3.org/2001/XMLSchema#string>')
-  end
+    it "should be created from a datetime value" do
+      node = Node.new(DateTime.now)
+      node.should be_literal
+      node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#dateTime")
+    end
 
-  it "should have a proper value for a literal node" do
-    t = Time.now
-    node = Node.new(t)
-    node.value.should be_an_instance_of(Time)
-    # surprisingly, two instances of the same time do not compare
-    node.value.xmlschema.should eql(t.xmlschema)
-  end
+    it "should have proper string representation" do
+      node = Node.new("Bye-bye, cruel world...")
+      node.to_s.should eql('"Bye-bye, cruel world..."^^<http://www.w3.org/2001/XMLSchema#string>')
+    end
 
-  it "should have an instance of URI for a resource node" do
-    resource_uri = URI('http://example.com/nodes#node_1')
-    Node.new(resource_uri).value.should be_an_instance_of(URI::HTTP)
+    it "should have a properly instantiated value" do
+      t = Time.now
+      node = Node.new(t)
+      node.value.should be_an_instance_of(Time)
+      # surprisingly, two instances of the same time do not compare
+      node.value.xmlschema.should eql(t.xmlschema)
+    end
+
+    it "should have UTF-9 encoded value" do
+      node = Node.new("test")
+      expect(node.value.encoding).to eql Encoding::UTF_8
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redlander
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml_schema
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &20744320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.3
+  version_requirements: *20744320
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &21431040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
+  version_requirements: *21431040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &21430560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,12 +43,7 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
+  version_requirements: *21430560
 description: ! 'Redlander is Ruby bindings to Redland library (see http://librdf.org)
   written in C, which is used to manipulate RDF graphs. This is an alternative implementation
   of Ruby bindings (as opposed to the official bindings), aiming to be more intuitive,
@@ -115,21 +100,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 302731036018920791
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 302731036018920791
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Advanced Ruby bindings for Redland runtime library (librdf).