redlander 0.5.0 → 0.5.1

data/ChangeLog

@@ -1,3 +1,8 @@
+redlander (0.5.1)
+
+  * fixed a memory leak in Model#query
+  * using xml_schema 0.1.3 to handle integer literals and "integer", not "int"
+
 redlander (0.5.0)
 
   * Model#query for queries in SPARQL (and other supported languages)

data/Gemfile.lock

@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    redlander (0.5.0)
+    redlander (0.5.1)
       ffi (~> 1.1)
-      xml_schema (~> 0.1.0)
+      xml_schema (~> 0.1.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    ffi (1.1.0)
+    ffi (1.1.2)
     rake (0.9.2.2)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
       rspec-mocks (~> 2.11.0)
     rspec-core (2.11.1)
-    rspec-expectations (2.11.1)
+    rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.1)
-    xml_schema (0.1.0)
+    xml_schema (0.1.3)
 
 PLATFORMS
   ruby

data/lib/redland.rb

@@ -107,5 +107,6 @@ module Redland
   attach_function :librdf_query_results_as_stream, [:pointer], :pointer
   attach_function :librdf_query_results_next, [:pointer], :int
   attach_function :librdf_query_results_finished, [:pointer], :int
+  attach_function :librdf_query_results_get_count, [:pointer], :int
   attach_function :librdf_free_query_results, [:pointer], :void
 end

data/lib/redlander/model.rb

@@ -99,9 +99,9 @@ module Redlander
     #     if given a block, yields each binding hash to it
     #   - nil, if query fails
     # @raise [RedlandError] if fails to create a query
-    def query(q, options = {})
+    def query(q, options = {}, &block)
       query = Query::Results.new(q, options)
-      query.process(self)
+      query.process(self, &block)
     end
 
     # Merge statements from another model

data/lib/redlander/query/results.rb

@@ -19,19 +19,21 @@ module Redlander
       def process(model)
         @rdf_results = Redland.librdf_model_query_execute(model.rdf_model, @rdf_query)
 
-        if @rdf_results.null?
-          return nil
-        else
+        begin
           case
           when bindings?
             if block_given?
+              return nil if @rdf_results.null?
               each { yield process_bindings }
             else
+              return [] if @rdf_results.null?
               map { process_bindings }
             end
           when boolean?
+            return nil if @rdf_results.null?
             process_boolean
           when graph?
+            return nil if @rdf_results.null?
             if block_given?
               process_graph { |statement| yield statement }
             else
@@ -42,9 +44,9 @@ module Redlander
           else
             raise RedlandError, "Cannot determine the type of query results"
           end
+        ensure
+          Redland.librdf_free_query_results(@rdf_results)
         end
-      ensure
-        Redland.librdf_free_query_results(@rdf_results)
       end
 
       def each
@@ -82,7 +84,10 @@ module Redlander
           while n > 0
             name = Redland.librdf_query_results_get_binding_name(@rdf_results, n-1)
             value = Redland.librdf_query_results_get_binding_value(@rdf_results, n-1)
-            bindings[name] = Node.new(value) unless value.null?
+            unless value.null?
+              bindings[name] = Node.new(value)
+              Redland.librdf_free_node(value)
+            end
             n -= 1
           end
         end

data/lib/redlander/version.rb

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

data/redlander.gemspec

@@ -18,7 +18,7 @@ HERE
   gem.require_paths = ["lib"]
 
   # gem.add_dependency("librdf0", "~> 1.0.14")
-  gem.add_dependency("xml_schema", "~> 0.1.0")
+  gem.add_dependency("xml_schema", "~> 0.1.3")
   gem.add_dependency("ffi", "~> 1.1")
   gem.add_development_dependency("rspec", "~> 2")
 

data/spec/lib/redlander/model_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require "spec_helper"
 
 describe Model do
@@ -20,27 +21,44 @@ describe Model do
   end
 
   describe "query" do
-    before { model.from_file(Redlander.fixture_path("doap.ttl"), :format => "turtle") }
+    let(:project) { URI("http://rubygems.org/gems/rdf") }
     subject { model.query(q) }
+    before { model.from_file(Redlander.fixture_path("doap.ttl"), :format => "turtle") }
 
     describe "SPARQL" do
       describe "SELECT" do
-        let(:q) { "PREFIX doap: <http://usefulinc.com/ns/doap#> SELECT ?name WHERE { <http://rubygems.org/gems/rdf> doap:name ?name }" }
+        context "for a single result" do
+          let(:q) { "PREFIX doap: <http://usefulinc.com/ns/doap#> SELECT ?subject WHERE { ?subject doap:name 'RDF.rb' . ?subject doap:platform 'Ruby' }" }
 
-        it { should be_a Enumerable }
+          it { should be_a Enumerable }
+
+          it "should return an array of binding hashes" do
+            expect(subject.size).to eql 1
+            expect(subject.first["subject"]).to be_a Redlander::Node
+            expect(subject.first["subject"].value).to eql project
+          end
 
-        it "should return an array of binding hashes" do
-          expect(subject.size).to eql 1
-          expect(subject.first["name"]).to be_a Redlander::Node
-          expect(subject.first["name"].value).to eql "RDF.rb"
+          context "with a block" do
+            it "should yield a binding hash" do
+              model.query(q) do |binding|
+                expect(binding).to be_a Hash
+                expect(binding["subject"]).to be_a Redlander::Node
+                expect(binding["subject"].value).to eql project
+              end
+            end
+          end
         end
 
-        context "with a block" do
-          it "should yield a binding hash" do
-            subject do |binding|
-              expect(binding).to be_a Hash
-              expect(binding["name"]).to be_a Redlander::Node
-              expect(binding["name"].value).to eql "RDF.rb"
+        context "for multiple results" do
+          let(:q) { "PREFIX doap: <http://usefulinc.com/ns/doap#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> SELECT ?name WHERE { <http://rubygems.org/gems/rdf> doap:helper [ foaf:name ?name ] }" }
+
+          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"]
+
+            expect(subject.size).to eql helpers.size
+            subject.each do |binding|
+              expect(helpers).to include binding["name"].value
             end
           end
         end
@@ -125,7 +143,7 @@ describe Model do
 
         it "should be iterated over" do
           expect {
-            subject.each { |s| @statements << s }
+            model.statements.each { |s| @statements << s }
           }.to change(@statements, :count).by(1)
           expect(@statements).to include @statement
         end

data/spec/lib/redlander/node_spec.rb

@@ -49,7 +49,7 @@ describe Node do
   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#int")
+    node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#integer")
   end
 
   it "should create a floating-point number literal" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redlander
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml_schema
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3720732623496571962
+      hash: 302731036018920791
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3720732623496571962
+      hash: 302731036018920791
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24