tommorris-rena 0.0.1 → 0.0.2

data/Rakefile

@@ -7,11 +7,11 @@ task :default => [:spec]
 desc "Install dependencies"
 task :dependencies do
   require ''
-  gems = ['addressable/uri']
+  gems = ['addressable/uri', 'treetop']
   gems.each do |g|
     g2 = g.split('/')[0]
     begin
-      require g2
+      require g
     rescue
       sh "sudo gem install " + g2
     end
@@ -24,27 +24,31 @@ task :push do
   sh "growlnotify -m \"Updates pushed\" \"Git\""
 end
 
-desc "Runs specs"
 task :spec do
-  sh "spec --colour --pattern test/spec/*.spec.rb"
+  sh "spec --colour spec"
 end
 
 desc "Turns spec results into HTML and publish to web (Tom only!)"
 task :spec_html do
-  sh "spec --pattern test/spec/*.spec.rb --format html:rena_new_spec.html"
+  sh "spec --format html:rena_new_spec.html spec"
   sh "scp rena_new_spec.html bbcityco@bbcity.co.uk:www/tom/files/rena_new_spec.html"
   sh "rm rena_new_spec.html"
 end
 
 desc "Turns spec results into local HTML"
 task :spec_local do
-  sh "spec --pattern test/spec/*.spec.rb --format html:rena_new_spec.html"
+  sh "spec --format html:rena_new_spec.html spec/"
 #  sh "open rena_new_spec.html"
 end
 
 desc "Run specs through RCov"
 Spec::Rake::SpecTask.new('coverage') do |t|
-  t.spec_files = FileList['test/spec/**/*.rb']
+  t.spec_files = FileList['spec']
   t.rcov = true
-  t.rcov_opts = ['--exclude', 'test,\/Library\/Ruby\/Gems\/1.8\/gems']
-end
+  t.rcov_opts = ['--exclude', 'spec,test,\/Library\/Ruby\/Gems\/1.8\/gems']
+end
+
+desc "Runs specs on JRuby"
+task :jspec do
+  sh "jruby -S `whereis spec` --colour spec"
+end

data/lib/rena/bnode.rb

@@ -1,63 +1,69 @@
-class BNode
-  attr_accessor :identifier
-  def initialize(identifier = nil)
-    if identifier != nil && self.valid_id?(identifier) != false
-      @identifier = identifier
-    else
-      @identifier = "bn" + self.hash.to_s
+module Rena
+  class BNode
+    attr_accessor :identifier
+    def initialize(identifier = nil)
+      if identifier != nil && self.valid_id?(identifier) != false
+        @identifier = identifier
+      else
+        @identifier = "bn" + self.hash.to_s
+      end
     end
-  end
-  
-  def eql? (eql)
-    if self.identifier == eql.identifier
-      true
-    else
-      false
+
+    def eql? (other)
+      other.is_a?(self.class) && other.identifier == self.identifier
     end
-  end
-  
-  ## 
-  # Exports the BNode in N-Triples form.
-  #
-  # ==== Example
-  #   b = BNode.new; b.to_n3  # => returns a string of the BNode in n3 form
-  #
-  # ==== Returns
-  # @return [String] The BNode in n3.
-  #
-  # @author Tom Morris
-  
-  def to_n3
-    "_:" + @identifier
-  end
-  
-  
-  ## 
-  # Exports the BNode in N-Triples form.
-  #
-  # ==== Example
-  #   b = BNode.new; b.to_ntriples  # => returns a string of the BNode in N-Triples form
-  #
-  # ==== Returns
-  # @return [String] The BNode in N-Triples.
-  #
-  # @author Tom Morris
-  
-  def to_ntriples
-    self.to_n3
-  end
-  
-  def to_s
-    @identifier
-  end  
-  
-  # TODO: add valid bnode name exceptions?
-  protected
-  def valid_id? name
-    if name =~ /^[a-zA-Z_][a-zA-Z0-9]*$/
-      true
-    else
-      false
+
+    alias_method :==, :eql?
+
+    ## 
+    # Exports the BNode in N-Triples form.
+    #
+    # ==== Example
+    #   b = BNode.new; b.to_n3  # => returns a string of the BNode in n3 form
+    #
+    # ==== Returns
+    # @return [String] The BNode in n3.
+    #
+    # @author Tom Morris
+
+    def to_n3
+      "_:" + @identifier
+    end
+
+
+    ## 
+    # Exports the BNode in N-Triples form.
+    #
+    # ==== Example
+    #   b = BNode.new; b.to_ntriples  # => returns a string of the BNode in N-Triples form
+    #
+    # ==== Returns
+    # @return [String] The BNode in N-Triples.
+    #
+    # @author Tom Morris
+
+    def to_ntriples
+      self.to_n3
+    end
+
+    ##
+    # Returns the identifier as a string.
+    # 
+    # === Returns
+    # @return [String] Blank node identifier.
+    #
+    # @author Tom Morris
+    def to_s
+      @identifier
+    end  
+
+    protected
+    def valid_id? name
+      if name =~ /^[a-zA-Z_][a-zA-Z0-9]*$/
+        true
+      else
+        false
+      end
     end
   end
-end
+end

data/lib/rena/graph.rb

@@ -4,147 +4,185 @@ require 'rena/uriref'
 require 'rena/literal'
 require 'rena/triple'
 
-class Graph
-  attr_accessor :triples, :nsbinding
-  
-  def initialize
-    @triples = []
-    @nsbinding = {}
-  end
-  
-  def size
-    @triples.size
-  end
-  
-  def each
-    @triples.each { |value| yield value }
-  end
-  
-  def each_with_subject(subject)
-    @triples.each {|value|
-      if value.subject == subject
-        yield value
+module Rena
+  class Graph
+    attr_accessor :triples, :nsbinding
+
+    def initialize
+      @triples = []
+      @nsbinding = {}
+    end
+
+    def size
+      @triples.size
+    end
+
+    def each
+      @triples.each { |value| yield value }
+    end
+    
+    def [] (item)
+      @triples[item]
+    end
+
+    def each_with_subject(subject)
+      @triples.each do |value|
+        yield value if value.subject == subject
       end
-    }
-  end
-  
-  ## 
-  # Adds a triple to a graph directly from the intended subject, predicate, and object.
-  #
-  # ==== Example
-  #   g = Graph.new; g.add_triple(BNode.new, URIRef.new("http://xmlns.com/foaf/0.1/knows"), BNode.new) # => results in the triple being added to g; returns an array of g's triples
-  #
-  # @param [URIRef, BNode] s the subject of the triple
-  # @param [URIRef] p the predicate of the triple
-  # @param [URIRef, BNode, Literal, TypedLiteral] o the object of the triple
-  #
-  # ==== Returns
-  # @return [Array] An array of the triples (leaky abstraction? consider returning the graph instead)
-  #
-  # @raise [Error] Checks parameter types and raises if they are incorrect.
-  # @author Tom Morris
-  
-  def add_triple(s, p, o)
-    @triples += [ Triple.new(s, p, o) ]
-  end
-  
-  ## 
-  # Adds an extant triple to a graph
-  #
-  # ==== Example
-  #   g = Graph.new; t = Triple.new(BNode.new, URIRef.new("http://xmlns.com/foaf/0.1/knows"), BNode.new); g << t) # => results in the triple being added to g; returns an array of g's triples
-  #
-  # @param [Triple] t the triple to be added to the graph
-  #
-  # ==== Returns
-  # @return [Array] An array of the triples (leaky abstraction? consider returning the graph instead)
-  #
-  # @author Tom Morris
-  
-  
-  def << (triple)
-#    self.add_triple(s, p, o)
-    @triples += [ triple ]
-  end
-  
-  ## 
-  # Exports the graph to RDF in N-Triples form.
-  #
-  # ==== Example
-  #   g = Graph.new; g.add_triple(BNode.new, URIRef.new("http://xmlns.com/foaf/0.1/knows"), BNode.new); g.to_ntriples  # => returns a string of the graph in N-Triples form
-  #
-  # ==== Returns
-  # @return [String] The graph in N-Triples.
-  #
-  # @author Tom Morris
-  
-  def to_ntriples
-    str = ""
-    @triples.each do |t|
-      str << t.to_ntriples + "\n"
     end
-    return str
-  end
-  
-  ## 
-  # Creates a new namespace given a URI and the short name and binds it to the graph.
-  #
-  # ==== Example
-  #   g = Graph.new; g.namespace("http://xmlns.com/foaf/0.1/", "foaf") # => binds the Foaf namespace to g
-  #
-  # @param [String] uri the URI of the namespace
-  # @param [String] short the short name of the namespace
-  #
-  # ==== Returns
-  # @return [Namespace] The newly created namespace.
-  #
-  # @raise [Error] Checks validity of the desired shortname and raises if it is incorrect.
-  # @raise [Error] Checks that the newly created Namespace is of type Namespace and raises if it is incorrect.
-  # @author Tom Morris
-  
-  def namespace(uri, short)
-    self.bind Namespace.new(uri, short)
-  end
-  
-  def bind(namespace)
-    if namespace.class == Namespace
-      @nsbinding["#{namespace.short}"] = namespace
-    else
-      raise
+
+    def get_resource(subject)
+      temp = []
+      each_with_subject(subject) do |value|
+        temp << subject
+      end
+      if temp.any?
+        Resource.new(temp)
+      end
     end
-  end
-  
-  def has_bnode_identifier?(bnodeid)
-    temp_bnode = BNode.new(bnodeid)
-    returnval = false
-    @triples.each { |triple|
-      if triple.subject.eql?(temp_bnode)
-        returnval = true
-        break
+
+    ## 
+    # Adds a triple to a graph directly from the intended subject, predicate, and object.
+    #
+    # ==== Example
+    #   g = Graph.new; g.add_triple(BNode.new, URIRef.new("http://xmlns.com/foaf/0.1/knows"), BNode.new) # => results in the triple being added to g; returns an array of g's triples
+    #
+    # @param [URIRef, BNode] s the subject of the triple
+    # @param [URIRef] p the predicate of the triple
+    # @param [URIRef, BNode, Literal, TypedLiteral] o the object of the triple
+    #
+    # ==== Returns
+    # @return [Array] An array of the triples (leaky abstraction? consider returning the graph instead)
+    #
+    # @raise [Error] Checks parameter types and raises if they are incorrect.
+    # @author Tom Morris
+
+    def add_triple(s, p, o)
+      @triples += [ Triple.new(s, p, o) ]
+    end
+
+    ## 
+    # Adds an extant triple to a graph
+    #
+    # ==== Example
+    #   g = Graph.new; t = Triple.new(BNode.new, URIRef.new("http://xmlns.com/foaf/0.1/knows"), BNode.new); g << t) # => results in the triple being added to g; returns an array of g's triples
+    #
+    # @param [Triple] t the triple to be added to the graph
+    #
+    # ==== Returns
+    # @return [Array] An array of the triples (leaky abstraction? consider returning the graph instead)
+    #
+    # @author Tom Morris
+
+
+    def << (triple)
+  #    self.add_triple(s, p, o)
+      @triples += [ triple ]
+    end
+
+    ## 
+    # Exports the graph to RDF in N-Triples form.
+    #
+    # ==== Example
+    #   g = Graph.new; g.add_triple(BNode.new, URIRef.new("http://xmlns.com/foaf/0.1/knows"), BNode.new); g.to_ntriples  # => returns a string of the graph in N-Triples form
+    #
+    # ==== Returns
+    # @return [String] The graph in N-Triples.
+    #
+    # @author Tom Morris
+
+    def to_ntriples
+      @triples.collect do |t|
+        t.to_ntriples
+      end * "\n"
+    end
+
+    ## 
+    # Creates a new namespace given a URI and the short name and binds it to the graph.
+    #
+    # ==== Example
+    #   g = Graph.new; g.namespace("http://xmlns.com/foaf/0.1/", "foaf") # => binds the Foaf namespace to g
+    #
+    # @param [String] uri the URI of the namespace
+    # @param [String] short the short name of the namespace
+    #
+    # ==== Returns
+    # @return [Namespace] The newly created namespace.
+    #
+    # @raise [Error] Checks validity of the desired shortname and raises if it is incorrect.
+    # @raise [Error] Checks that the newly created Namespace is of type Namespace and raises if it is incorrect.
+    # @author Tom Morris
+
+    def namespace(uri, short)
+      self.bind Namespace.new(uri, short)
+    end
+
+    def bind(namespace)
+      if namespace.class == Namespace
+        @nsbinding["#{namespace.short}"] = namespace
+      else
+        raise
       end
-      if triple.object.eql?(temp_bnode)
-        returnval = true
-        break
+    end
+
+    def has_bnode_identifier?(bnodeid)
+      temp_bnode = BNode.new(bnodeid)
+      returnval = false
+      @triples.each { |triple|
+        if triple.subject.eql?(temp_bnode)
+          returnval = true
+          break
+        end
+        if triple.object.eql?(temp_bnode)
+          returnval = true
+          break
+        end
+      }
+      return returnval
+    end
+
+    def get_bnode_by_identifier(bnodeid)
+      temp_bnode = BNode.new(bnodeid)
+      each do |triple|
+        if triple.subject == temp_bnode
+          return triple.subject
+        end
+        if triple.object == temp_bnode
+          return triple.object
+        end
       end
-    }
-    return returnval
-  end
-  
-  def get_bnode_by_identifier(bnodeid)
-    temp_bnode = BNode.new(bnodeid)
-    returnval = false
-    @triples.each { |triple|
-      if triple.subject.eql?(temp_bnode)
-        returnval = triple.subject
-        break
+      return false
+    end
+    
+    def get_by_type(object)
+      out = []
+      each do |t|
+        next unless t.is_type?
+        next unless case object
+                    when String
+                      object == t.object.to_s
+                    when Regexp
+                      object.match(t.object.to_s)
+                    else
+                      object == t.object
+                    end
+        out << t.subject
       end
-      if triple.object.eql?(temp_bnode)
-        returnval = triple.object
-        break
+      return out
+    end
+    
+    def join(graph)
+      if graph.class == Graph
+        graph.each { |t| 
+          self << t
+        }
+      else
+        raise "join requires you provide a graph object"
       end
-    }
-    return returnval
+    end
+  #  alias :add, :add_triple
+    #  alias (=+, add_triple)
+    private
+
   end
-#  alias :add, :add_triple
-#  alias (=+, add_triple)
 end