redlander 0.3.5 → 0.3.6

data/lib/redland.rb

@@ -0,0 +1,84 @@
+# FFI bindings
+
+module Redland
+  if !defined?(RUBY_ENGINE) || RUBY_ENGINE=='ruby'
+    require 'ffi'
+    extend FFI::Library
+    ffi_lib "rdf.so.0"
+  else
+    extend FFI::Library
+    ffi_lib "librdf.so.0"
+  end
+
+  # World
+  attach_function :librdf_new_world, [], :pointer
+  attach_function :librdf_free_world, [:pointer], :void
+  attach_function :librdf_world_open, [:pointer], :void
+
+  # Storage
+  attach_function :librdf_new_storage, [:pointer, :string, :string, :string], :pointer
+  attach_function :librdf_free_storage, [:pointer], :void
+
+  # Model
+  attach_function :librdf_new_model, [:pointer, :pointer, :string], :pointer
+  attach_function :librdf_free_model, [:pointer], :void
+  attach_function :librdf_model_as_stream, [:pointer], :pointer
+  attach_function :librdf_model_size, [:pointer], :int
+  attach_function :librdf_model_find_statements, [:pointer, :pointer], :pointer
+  attach_function :librdf_model_add_statement, [:pointer, :pointer], :int
+  attach_function :librdf_model_remove_statement, [:pointer, :pointer], :int
+  attach_function :librdf_model_transaction_start, [:pointer], :int
+  attach_function :librdf_model_transaction_commit, [:pointer], :int
+  attach_function :librdf_model_transaction_rollback, [:pointer], :int
+
+  # Statement
+  attach_function :librdf_free_statement, [:pointer], :void
+  attach_function :librdf_new_statement_from_nodes, [:pointer, :pointer, :pointer, :pointer], :pointer
+  attach_function :librdf_new_statement_from_statement, [:pointer], :pointer
+  attach_function :librdf_statement_get_subject, [:pointer], :pointer
+  attach_function :librdf_statement_get_predicate, [:pointer], :pointer
+  attach_function :librdf_statement_get_object, [:pointer], :pointer
+  attach_function :librdf_statement_set_subject, [:pointer, :pointer], :void
+  attach_function :librdf_statement_set_predicate, [:pointer, :pointer], :void
+  attach_function :librdf_statement_set_object, [:pointer, :pointer], :void
+  attach_function :librdf_statement_to_string, [:pointer], :string
+
+  # Node
+  attach_function :librdf_free_node, [:pointer], :void
+  attach_function :librdf_new_node_from_blank_identifier, [:pointer, :string], :pointer
+  attach_function :librdf_new_node_from_uri_string, [:pointer, :string], :pointer
+  attach_function :librdf_new_node_from_node, [:pointer], :pointer
+  attach_function :librdf_new_node_from_typed_literal, [:pointer, :string, :string, :pointer], :pointer
+  attach_function :librdf_node_is_resource, [:pointer], :int
+  attach_function :librdf_node_is_literal, [:pointer], :int
+  attach_function :librdf_node_is_blank, [:pointer], :int
+  attach_function :librdf_node_get_literal_value_datatype_uri, [:pointer], :pointer
+  attach_function :librdf_node_equals, [:pointer, :pointer], :int
+  attach_function :librdf_node_to_string, [:pointer], :string
+  attach_function :librdf_node_get_uri, [:pointer], :pointer
+
+  # Stream
+  attach_function :librdf_free_stream, [:pointer], :void
+  attach_function :librdf_stream_end, [:pointer], :int
+  attach_function :librdf_stream_next, [:pointer], :int
+  attach_function :librdf_stream_get_object, [:pointer], :pointer
+
+  # Serializer
+  attach_function :librdf_new_serializer, [:pointer, :string, :string, :pointer], :pointer
+  attach_function :librdf_free_serializer, [:pointer], :void
+  attach_function :librdf_serializer_serialize_model_to_string, [:pointer, :pointer, :pointer], :string
+  attach_function :librdf_serializer_serialize_model_to_file, [:pointer, :string, :pointer, :pointer], :int
+
+  # Parser
+  attach_function :librdf_new_parser, [:pointer, :string, :string, :pointer], :pointer
+  attach_function :librdf_free_parser, [:pointer], :void
+  attach_function :librdf_parser_parse_into_model, [:pointer, :pointer, :pointer, :pointer], :int
+  attach_function :librdf_parser_parse_string_into_model, [:pointer, :string, :pointer, :pointer], :int
+  attach_function :librdf_parser_parse_string_as_stream, [:pointer, :string, :pointer], :pointer
+
+  # URI
+  attach_function :librdf_new_uri, [:pointer, :string], :pointer
+  attach_function :librdf_new_uri_from_uri, [:pointer], :pointer
+  attach_function :librdf_free_uri, [:pointer], :void
+  attach_function :librdf_uri_to_string, [:pointer], :string
+end

data/lib/redlander/exceptions.rb

@@ -0,0 +1,2 @@
+# Generic Redland error
+class RedlandError < RuntimeError; end

data/lib/redlander/model.rb

@@ -1,3 +1,8 @@
+require 'redlander/storage'
+require 'redlander/parser'
+require 'redlander/serializer'
+require 'redlander/model_proxy'
+
 module Redlander
   class Model
     include Redlander::ParsingInstanceMethods
@@ -28,9 +33,9 @@ module Redlander
     # (Does not work for all storages, in which case the changes are instanteous).
     def transaction
       if block_given?
-        Redland.librdf_model_transaction_start(@rdf_model).zero? || RedlandError.new("Failed to initialize a transaction")
+        Redland.librdf_model_transaction_start(@rdf_model).zero? || raise(RedlandError, "Failed to initialize a transaction")
         yield
-        Redland.librdf_model_transaction_commit(@rdf_model).zero? || RedlandError.new("Failed to commit the transaction")
+        Redland.librdf_model_transaction_commit(@rdf_model).zero? || raise(RedlandError, "Failed to commit the transaction")
       end
     rescue
       rollback
@@ -39,7 +44,7 @@ module Redlander
 
     # Rollback the transaction
     def rollback
-      Redland.librdf_model_transaction_rollback(@rdf_model).zero? || RedlandError.new("Failed to rollback the latest transaction")
+      Redland.librdf_model_transaction_rollback(@rdf_model).zero? || raise(RedlandError, "Failed to rollback the latest transaction")
     end
   end
 end

data/lib/redlander/model_proxy.rb

@@ -1,3 +1,6 @@
+require 'redlander/stream'
+require 'redlander/stream_enumerator'
+
 module Redlander
   class ModelProxy
     include StreamEnumerator

data/lib/redlander/parser.rb

@@ -1,3 +1,5 @@
+require 'redlander/parser_proxy'
+
 module Redlander
   class Parser
     attr_reader :rdf_parser

data/lib/redlander/parser_proxy.rb

@@ -1,3 +1,6 @@
+require 'redlander/stream'
+require 'redlander/stream_enumerator'
+
 module Redlander
   class ParserProxy
     include StreamEnumerator

data/lib/redlander/statement.rb

@@ -1,3 +1,6 @@
+require 'redlander/stream'
+require "redlander/error_container"
+
 module Redlander
   class Statement
     include ErrorContainer

data/lib/redlander/storage.rb

@@ -1,7 +1,5 @@
 module Redlander
   class Storage
-    VALID_STORAGE_TYPES = [:memory, :hashes, :file, :uri, :tstore, :mysql, :sqlite, :postgresql]
-
     attr_reader :rdf_storage
 
     # Creates a store of the given type
@@ -15,7 +13,12 @@ module Redlander
     #   :sqlite
     #   :postgresql
     #   :tstore
-    # Options are:
+    #   :virtuoso
+    #   ... anything else that Redland can handle.
+    #
+    # Options are storage-specific.
+    # Read the documentation for the appropriate Redland Storage module.
+    #
     #   :name       - ?
     #   :host       - database host name (for store types: :postgres, :mysql, :tstore)
     #   :port       - database host port (for store types: :postgres, :mysql, :tstore)
@@ -34,15 +37,11 @@ module Redlander
     def initialize(options = {})
       storage_type, storage_options = split_options(options.dup)
 
-      unless VALID_STORAGE_TYPES.include?(storage_type)
-        raise RedlandError.new("Unknown storage type: #{storage_type}")
-      end
-
       @rdf_storage = Redland.librdf_new_storage(Redlander.rdf_world,
                                                 storage_type.to_s,
                                                 storage_options.delete(:name).to_s,
                                                 Redlander.to_rdf_options(storage_options))
-      raise RedlandError.new("Failed to initialize storage") if @rdf_storage.null?
+      raise RedlandError.new("Failed to initialize '#{storage_type}' storage") if @rdf_storage.null?
       ObjectSpace.define_finalizer(self, proc { Redland.librdf_free_storage(@rdf_storage) })
     end
 

data/lib/redlander/version.rb

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

data/lib/redlander.rb

@@ -1,29 +1,15 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
 require 'uri'
 require 'xml_schema'
+require 'redland'
+require 'redlander/version'
 
-module Redlander
-  require 'redland'
-  require 'redlander/version'
-
-  class RedlandError < RuntimeError; end
+require "redlander/exceptions"
+require 'redlander/uri'
+require 'redlander/node'
+require 'redlander/model'
+require 'redlander/statement'
 
-  autoload :ErrorContainer, 'redlander/error_container'
-  autoload :Uri, 'redlander/uri'
-  autoload :Parser, 'redlander/parser'
-  autoload :ParserProxy, 'redlander/parser_proxy'
-  autoload :Serializer, 'redlander/serializer'
-  autoload :Model, 'redlander/model'
-  autoload :ModelProxy, 'redlander/model_proxy'
-  autoload :Node, 'redlander/node'
-  autoload :Stream, 'redlander/stream'
-  autoload :Storage, 'redlander/storage'
-  autoload :ParsingInstanceMethods, 'redlander/parser'
-  autoload :SerializingInstanceMethods, 'redlander/serializer'
-  autoload :StreamEnumerator, 'redlander/stream_enumerator'
-  autoload :Statement, 'redlander/statement'
+module Redlander
 
   class << self
     def rdf_world

data/spec/redlander/model_spec.rb

@@ -2,19 +2,11 @@ require "spec_helper"
 
 describe Model do
 
-  it "should be created with default options" do
-    lambda { Model.new }.should_not raise_exception
-  end
+  before { @model = Model.new }
 
   describe "statements" do
 
-    before :each do
-      @model = Model.new
-    end
-
-    it do
-      @model.statements.should be_an_instance_of(ModelProxy)
-    end
+    it { @model.statements.should be_an_instance_of(ModelProxy) }
 
     it "should be created in the model" do
       lambda {
@@ -107,7 +99,6 @@ describe Model do
   describe "serialization" do
 
     before :each do
-      @model = Model.new
       s = URI.parse("http://example.com/concepts#two-dimensional_seismic_imaging")
       p = URI.parse("http://www.w3.org/2000/01/rdf-schema#label")
       o = "2-D seismic imaging@en"
@@ -197,10 +188,6 @@ describe Model do
 
   describe "deserialization" do
 
-    before :each do
-      @model = Model.new
-    end
-
     it "should be successful for RDF/XML data" do
       content = '<?xml version="1.0" encoding="utf-8"?><rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><rdf:Description rdf:about="http://example.com/concepts#two-dimensional_seismic_imaging"><ns0:label xmlns:ns0="http://www.w3.org/2000/01/rdf-schema#" xml:lang="en">2-D seismic imaging</ns0:label></rdf:Description></rdf:RDF>'
       lambda {
@@ -227,4 +214,42 @@ foo:bar foo: : .'
 
   end
 
+  describe "transactions" do
+    before do
+      Redland.stub(:librdf_model_transaction_start => 0,
+                   :librdf_model_transaction_commit => 0,
+                   :librdf_model_transaction_rollback => 0)
+    end
+
+    context "when start fails" do
+      before { Redland.stub(:librdf_model_transaction_start => -1) }
+
+      it "should raise RedlandError" do
+        lambda {
+          @model.transaction { true }
+        }.should raise_exception RedlandError
+      end
+    end
+
+    context "when commit fails" do
+      before { Redland.stub(:librdf_model_transaction_commit => -1) }
+
+      it "should raise RedlandError" do
+        lambda {
+          @model.transaction { true }
+        }.should raise_exception RedlandError
+      end
+    end
+
+    context "when rollback fails" do
+      before { Redland.stub(:librdf_model_transaction_rollback => -1) }
+
+      it "should raise RedlandError" do
+        lambda {
+          @model.rollback
+        }.should raise_exception RedlandError
+      end
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-$:.unshift(File.join(File.dirname(__FILE__), "..")) unless
-  $:.include?(File.join(File.dirname(__FILE__), "..")) || $:.include?(File.expand_path(File.join(File.dirname(__FILE__), "..")))
-
 require 'spec/autorun'
 
 require 'lib/redlander'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redlander
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml_schema
-  requirement: &9413040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *9413040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &9412480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *9412480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9411960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +53,12 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *9411960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1'
 description: ! '    Advanced Redland bindings.
 
 '
@@ -53,8 +68,8 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- lib/redland.rb
 - lib/redlander/error_container.rb
-- lib/redlander/model.rb
 - lib/redlander/model_proxy.rb
 - lib/redlander/parser.rb
 - lib/redlander/parser_proxy.rb
@@ -64,18 +79,19 @@ files:
 - lib/redlander/stream_enumerator.rb
 - lib/redlander/version.rb
 - lib/redlander/uri.rb
+- lib/redlander/exceptions.rb
+- lib/redlander/model.rb
 - lib/redlander/node.rb
 - lib/redlander/statement.rb
+- lib/redlander.rb
 - spec/integration/memory_leak_spec.rb
 - spec/redlander/model_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: []
@@ -91,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2648553403970259996
+      hash: -3193927855587243710
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,10 +116,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2648553403970259996
+      hash: -3193927855587243710
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Advanced Redland bindings.
@@ -114,5 +130,3 @@ test_files:
 - spec/redlander/serializer_spec.rb
 - spec/redlander/statement_spec.rb
 - spec/redlander/node_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb

data/spec/spec.opts

@@ -1 +0,0 @@
---color