redlander 0.3.6 → 0.4.0

data/spec/{redlander → lib/redlander}/node_spec.rb

@@ -1,17 +1,25 @@
 require "spec_helper"
-
-require 'date'
+require "date"
 
 describe Node do
+  before { @options = {} }
 
   describe "blank" do
-    subject { Node.new }
+    subject { described_class.new(nil, @options) }
 
     it { should be_blank }
 
     it "should have a blank identifier for a blank node" do
       subject.value.should match(/^_:\w+$/)
     end
+
+    context "when given :blank_id" do
+      before { @options = {:blank_id => "blank0"} }
+
+      it "should create a node with the given identifier" do
+        expect(subject.value).to eql "_:blank0"
+      end
+    end
   end
 
   it "should create a resource node" do
@@ -19,46 +27,53 @@ describe Node do
     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
+  end
+
   it "should create a string literal" do
     node = Node.new("hello, world")
     node.should be_literal
-    node.datatype.should eql("http://www.w3.org/2001/XMLSchema#string")
+    node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#string")
   end
 
   it "should create a boolean literal" do
     node = Node.new(true)
     node.should be_literal
-    node.datatype.should eql("http://www.w3.org/2001/XMLSchema#boolean")
+    node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#boolean")
   end
 
   it "should create an integer number literal" do
     node = Node.new(10)
     node.should be_literal
-    node.datatype.should eql("http://www.w3.org/2001/XMLSchema#int")
+    node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#int")
   end
 
   it "should create a floating-point number literal" do
     node = Node.new(3.1416)
     node.should be_literal
-    node.datatype.should eql("http://www.w3.org/2001/XMLSchema#float")
+    node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#float")
   end
 
   it "should create a time literal" do
     node = Node.new(Time.now)
     node.should be_literal
-    node.datatype.should eql("http://www.w3.org/2001/XMLSchema#time")
+    node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#time")
   end
 
   it "should create a date literal" do
     node = Node.new(Date.today)
     node.should be_literal
-    node.datatype.should eql("http://www.w3.org/2001/XMLSchema#date")
+    node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#date")
   end
 
   it "should create a datetime literal" do
     node = Node.new(DateTime.now)
     node.should be_literal
-    node.datatype.should eql("http://www.w3.org/2001/XMLSchema#dateTime")
+    node.datatype.should eql URI("http://www.w3.org/2001/XMLSchema#dateTime")
   end
 
   it "should have proper string representation" do
@@ -75,8 +90,7 @@ describe Node do
   end
 
   it "should have an instance of URI for a resource node" do
-    resource_uri = URI.parse('http://example.com/nodes#node_1')
+    resource_uri = URI('http://example.com/nodes#node_1')
     Node.new(resource_uri).value.should be_an_instance_of(URI::HTTP)
   end
-
 end

data/spec/lib/redlander/statement_spec.rb

@@ -0,0 +1,56 @@
+require "spec_helper"
+
+describe Statement do
+  subject { described_class.new(statement_attributes) }
+
+  context "with default values" do
+    subject { described_class.new }
+
+    it "should have nil subject" do
+      subject.subject.should be_nil
+    end
+
+    it "should have nil predicate" do
+      subject.predicate.should be_nil
+    end
+
+    it "should have nil object" do
+      subject.object.should be_nil
+    end
+
+    [:subject, :predicate, :object].each do |attribute|
+      it "should be assigned a #{attribute}" do
+        attr = Node.new(statement_attributes[attribute])
+        expect {
+          subject.send("#{attribute}=", attr)
+        }.to change(subject, attribute).from(nil).to(attr)
+      end
+    end
+  end
+
+  it "should be created with the given values" do
+    subject.subject.should be_an_instance_of(Node)
+    subject.predicate.should be_an_instance_of(Node)
+    subject.object.should be_an_instance_of(Node)
+  end
+
+  it "should have proper attributes" do
+    subject.subject.value.to_s.should eql('http://example.com/concepts#subject')
+    subject.predicate.value.to_s.should eql('http://example.com/concepts#label')
+    subject.object.value.should eql('subject!')
+  end
+
+
+  private
+
+  def statement_attributes
+    s = URI.parse('http://example.com/concepts#subject')
+    p = URI.parse('http://example.com/concepts#label')
+    o = "subject!"
+    {
+      :subject => s,
+      :predicate => p,
+      :object => o
+    }
+  end
+end

data/spec/spec.opts

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

data/spec/spec_helper.rb

@@ -1,7 +1,18 @@
-require 'spec/autorun'
-
-require 'lib/redlander'
+require 'redlander'
 include Redlander
 
-Spec::Runner.configure do |config|
+# Helpful testing methods
+Redlander.module_eval <<HERE
+  class << self
+    def root
+      '#{File.expand_path(File.join(File.dirname(__FILE__), ".."))}'
+    end
+
+    def fixture_path(filename = "")
+      File.join(root, "spec", "fixtures", filename)
+    end
+  end
+HERE
+
+RSpec.configure do |config|
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redlander
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-07-23 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.0.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,43 +58,52 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1'
-description: ! '    Advanced Redland bindings.
+        version: '2'
+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,
+  lightweight, high-performing and as bug-free as possible.
 
 '
-email: slava.kravchenko@gmail.com
+email:
+- slava.kravchenko@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
+- ChangeLog
 files:
+- .gitignore
+- ChangeLog
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README.rdoc
+- Rakefile
 - lib/redland.rb
-- lib/redlander/error_container.rb
-- lib/redlander/model_proxy.rb
-- lib/redlander/parser.rb
-- lib/redlander/parser_proxy.rb
-- lib/redlander/serializer.rb
-- lib/redlander/storage.rb
-- lib/redlander/stream.rb
-- lib/redlander/stream_enumerator.rb
-- lib/redlander/version.rb
-- lib/redlander/uri.rb
+- lib/redlander.rb
 - lib/redlander/exceptions.rb
 - lib/redlander/model.rb
+- lib/redlander/model_proxy.rb
 - lib/redlander/node.rb
+- lib/redlander/parsing.rb
+- lib/redlander/serializing.rb
 - lib/redlander/statement.rb
-- lib/redlander.rb
+- lib/redlander/uri.rb
+- lib/redlander/version.rb
+- redlander.gemspec
+- spec/fixtures/doap.nt
+- spec/fixtures/doap.rdf
+- spec/fixtures/doap.ttl
 - 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/lib/redlander/model_spec.rb
+- spec/lib/redlander/node_spec.rb
+- spec/lib/redlander/statement_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
-- Rakefile
-- README.rdoc
 homepage: https://github.com/cordawyn/redlander
-licenses: []
+licenses:
+- The MIT License (MIT)
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -107,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3193927855587243710
+      hash: 3614393653179496496
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,17 +125,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3193927855587243710
+      hash: 3614393653179496496
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Advanced Redland bindings.
+summary: Advanced Ruby bindings for Redland runtime library (librdf).
 test_files:
+- spec/fixtures/doap.nt
+- spec/fixtures/doap.rdf
+- spec/fixtures/doap.ttl
 - 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/lib/redlander/model_spec.rb
+- spec/lib/redlander/node_spec.rb
+- spec/lib/redlander/statement_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb

data/lib/redlander/error_container.rb

@@ -1,42 +0,0 @@
-module Redlander
-  module ErrorContainer
-    class Errors
-      include Enumerable
-
-      def initialize
-        @container = []
-      end
-
-      def add(error_message)
-        if @container.include?(error_message)
-          @container
-        else
-          @container << error_message
-        end
-      end
-
-      def each
-        @container.each do |err|
-          yield err
-        end
-      end
-
-      def empty?
-        @container.empty?
-      end
-
-      def clear
-        @container.clear
-      end
-
-      def size
-        @container.size
-      end
-    end
-
-    def errors
-      @errors ||= Errors.new
-    end
-
-  end
-end

data/lib/redlander/parser.rb

@@ -1,92 +0,0 @@
-require 'redlander/parser_proxy'
-
-module Redlander
-  class Parser
-    attr_reader :rdf_parser
-
-    # Create a new parser.
-    # Name can be either of [:rdfxml, :ntriples, :turtle],
-    # or nil, which defaults to :rdfxml.
-    #
-    # TODO: Only a small subset of parsers is implemented,
-    # because the rest seem to be very buggy.
-    def initialize(name = :rdfxml)
-      # name, mime-type and syntax uri can all be nil, which defaults to :rdfxml parser
-      @rdf_parser = Redland.librdf_new_parser(Redlander.rdf_world, name.to_s, nil, nil)
-      raise RedlandError.new("Failed to create a new parser") if @rdf_parser.null?
-      ObjectSpace.define_finalizer(self, proc { Redland.librdf_free_parser(@rdf_parser) })
-    end
-
-    # Parse the content (String) into the model.
-    #
-    # Options are:
-    #   :base_uri   base URI (String or URI)
-    #
-    # Returns true on success, or false.
-    def from_string(model, content, options = {})
-      # FIXME: A bug (?) in Redland breaks NTriples parser if its input is not terminated with "\n"
-      content.concat("\n") unless content.end_with?("\n")
-      base_uri = if options.has_key?(:base_uri)
-                   Uri.new(options[:base_uri]).rdf_uri
-                 else
-                   nil
-                 end
-      Redland.librdf_parser_parse_string_into_model(@rdf_parser, content, base_uri, model.rdf_model).zero?
-    end
-
-    # Parse the content from URI into the model.
-    # (It is possible to use "file:" schema for local files).
-    #
-    # Options are:
-    #   :base_uri   base URI (String or URI)
-    #
-    # Returns true on success, or false.
-    def from_uri(model, uri, options = {})
-      uri = URI.parse(uri)
-      uri = URI.parse("file://#{File.expand_path(uri.to_s)}") if uri.scheme.nil?
-      base_uri = if options.has_key?(:base_uri)
-                   Uri.new(options[:base_uri]).rdf_uri
-                 else
-                   nil
-                 end
-      Redland.librdf_parser_parse_into_model(@rdf_parser, Uri.new(uri).rdf_uri, base_uri, model.rdf_model).zero?
-    end
-    alias_method :from_file, :from_uri
-
-    def statements(content, options = {})
-      # FIXME: A bug (?) in Redland breaks NTriples parser if its input is not terminated with "\n"
-      content.concat("\n") unless content.end_with?("\n")
-      ParserProxy.new(self, content, options)
-    end
-  end
-
-  # Applied to Model
-  module ParsingInstanceMethods
-    def from_rdfxml(content, options = {})
-      parser = Parser.new(:rdfxml)
-      parser.from_string(self, content, options)
-    end
-
-    def from_ntriples(content, options = {})
-      parser = Parser.new(:ntriples)
-      parser.from_string(self, content, options)
-    end
-
-    def from_turtle(content, options = {})
-      parser = Parser.new(:turtle)
-      parser.from_string(self, content, options)
-    end
-
-    # Load the model from an URI content.
-    #
-    # Options are:
-    #   :format   - content format [:rdfxml (default), :ntriples, :turtle]
-    #   :base_uri - base URI
-    def from_uri(uri, options = {})
-      parser_options = options.dup
-      parser = Parser.new(parser_options.delete(:format) || :rdfxml)
-      parser.from_uri(self, uri, parser_options)
-    end
-    alias_method :from_file, :from_uri
-  end
-end