amigo 0.1.1 → 0.1.2

data/History.rdoc

@@ -1,3 +1,15 @@
+=== 0.1.2 / 2010-05-17
+
+* Fixed: Inadvertently reported select variables to be bound even if they weren't in the solution.
+
+* Add vocabulary support along with some standard vocabularies.
+
+* Implement URI#to_s.
+
+=== 0.1.1 / 2010-05-16
+
+* Select should return a list not a set
+
 === 0.1.0 / 2010-05-14
 
 * Initial version

data/lib/amigo.rb

@@ -1,3 +1,5 @@
+require 'amigo/uri'
+require 'amigo/vocabulary'
 require 'amigo/triple'
 require 'amigo/store'
 require 'amigo/select'

data/lib/amigo/solution.rb

@@ -12,7 +12,7 @@ module Amigo
     end
 
     def include?(name)
-      @variables.include?(name)
+      @variables.include?(name) && @row.has_key?(name)
     end
 
     def [](name)
@@ -35,8 +35,7 @@ module Amigo
     private
 
     def method_missing(name, *args, &block)
-      return self[name] if args.empty? && !block_given?
-      super
+      self[name]
     end
 
   end

data/lib/amigo/uri.rb

@@ -2,6 +2,10 @@ require 'hamster/immutable'
 
 module Amigo
 
+  def self.URI(uri)
+    URI.new(uri)
+  end
+
   class URI
 
     include Hamster::Immutable
@@ -33,6 +37,10 @@ module Amigo
       @uri.hash
     end
 
+    def to_s
+      @uri
+    end
+
   end
 
 end

data/lib/amigo/version.rb

@@ -1,5 +1,5 @@
 module Amigo
 
-  VERSION = "0.1.1".freeze
+  VERSION = "0.1.2".freeze
 
 end

data/lib/amigo/vocabulary.rb

@@ -0,0 +1,46 @@
+require 'amigo/uri'
+
+module Amigo
+
+  class Vocabulary
+
+    def initialize(base_uri)
+      @base_uri = base_uri
+    end
+
+    def [](name)
+      respond_to?(name) ? send(name) : self << name
+    end
+
+    def type
+      self << "type"
+    end
+
+    protected
+
+    def <<(name)
+      URI.new("#{@base_uri}#{name}").tap do |uri|
+        (class << self; self; end).class_eval do
+          define_method(name) { |*args| uri }
+        end
+      end
+    end
+
+    private
+
+    def method_missing(name, *args, &block)
+      self[name]
+    end
+
+  end
+
+  DC = Vocabulary.new("http://purl.org/dc/terms/")
+  FOAF = Vocabulary.new("http://xmlns.com/foaf/0.1/")
+  RDF = Vocabulary.new("http://www.w3.org/1999/02/22-rdf-syntax-ns#")
+  RDFS = Vocabulary.new("http://www.w3.org/2000/01/rdf-schema#")
+  RSS = Vocabulary.new("http://purl.org/rss/1.0/")
+  OWL = Vocabulary.new("http://www.w3.org/2002/07/owl#")
+  XSD = Vocabulary.new("http://www.w3.org/2001/XMLSchema#")
+
+end
+

data/spec/amigo/select/execute_spec.rb

@@ -140,11 +140,11 @@ module Amigo
             @solution = @result.first
           end
 
-          it "correctly bind the the selected variables" do
+          it "correctly binds the the selected variables" do
             @solution[:title].should == "SPARQL Tutorial"
           end
 
-          it "do not bind any non-selected variables" do
+          it "does not bind non-selected variables" do
             @solution.include?(:x).should == false
             @solution.include?(:y).should == false
           end
@@ -153,6 +153,44 @@ module Amigo
 
       end
 
+      describe "with selected variables not present in the results" do
+
+        before do
+          @result = Select.new(:title, :flibble).
+            where(:x, :y, :title).
+            execute(Hamster.set(Triple.new(URI.parse("ex_book:book1"), URI.parse("dc:title"), "SPARQL Tutorial")))
+        end
+
+        describe "the result" do
+
+          it "is a list" do
+            @result.class.should include(Hamster::List)
+          end
+
+          it "returns the correct number of solutions" do
+            @result.size.should == 1
+          end
+
+        end
+
+        describe "each solution" do
+
+          before do
+            @solution = @result.first
+          end
+
+          it "correctly binds the the selected variables" do
+            @solution[:title].should == "SPARQL Tutorial"
+          end
+
+          it "does not bind variables not present in the results" do
+            @solution.include?(:flibble).should == false
+          end
+
+        end
+
+      end
+
       describe "with joins" do
 
         before do
@@ -187,12 +225,12 @@ module Amigo
             @solution = @result.first
           end
 
-          it "correctly bind the selected variables" do
+          it "correctly binds the selected variables" do
             @solution[:name].should == "Johnny Lee Outlaw"
             @solution[:mbox].should == URI.parse("mailto:jlow@example.com")
           end
 
-          it "does not bind any un-selected variables" do
+          it "does not bind un-selected variables" do
             @solution.include?(:x).should == false
           end
 
@@ -204,12 +242,12 @@ module Amigo
             @solution = @result.last
           end
 
-          it "correctly bind the selected variables" do
+          it "correctly binds the selected variables" do
             @solution[:name].should == "Peter Goodguy"
             @solution[:mbox].should == URI.parse("mailto:peter@example.com")
           end
 
-          it "does not bind any un-selected variables" do
+          it "does not bind un-selected variables" do
             @solution.include?(:x).should == false
           end
 

data/spec/amigo/store/hash_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+require 'amigo/store'
+
+module Amigo
+
+  describe Store do
+
+    describe "#hash" do
+
+      describe "for the same content" do
+
+        before do
+          @a = Amigo.store.add("a", "b", "c").add("d", "e", "f")
+          @b = Amigo.store.add("a", "b", "c").add("d", "e", "f")
+        end
+
+        it "returns the same value" do
+          @a.hash.should == @b.hash
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/amigo/uri/to_s_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+require 'amigo/uri'
+
+module Amigo
+
+  describe URI do
+
+    describe "#to_s" do
+
+      [
+        ["http://www.example.com/", "http://www.example.com/"],
+        ["foaf:name", "foaf:name"],
+      ].each do |uri, expected|
+
+        describe "given #{uri.inspect}" do
+
+          before do
+            @uri = URI.new(uri)
+          end
+
+          it "returns #{expected.inspect}" do
+            @uri.to_s.should == expected
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/amigo/vocabulary/lookup_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+require 'amigo/uri'
+require 'amigo/vocabulary'
+
+module Amigo
+
+  describe Vocabulary do
+
+    before do
+      @vocabulary = Vocabulary.new("http://example.com/")
+    end
+
+    ["type", "foo", "bar", "baz"].each do |name|
+
+      describe "##{name}" do
+
+        before do
+          @uri = @vocabulary.send(name)
+        end
+
+        it "returns a URI" do
+          @uri.should == URI.new("http://example.com/#{name}")
+        end
+
+        it "returns the same URI each time" do
+          @uri.should equal(@vocabulary.send(name))
+        end
+
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amigo
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Simon Harris
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-16 00:00:00 +10:00
+date: 2010-05-17 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hamster
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
         - 3
@@ -35,9 +38,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -49,9 +54,11 @@ dependencies:
   name: diff-lcs
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 1
@@ -83,23 +90,27 @@ files:
 - lib/amigo/variable.rb
 - lib/amigo/variables.rb
 - lib/amigo/version.rb
+- lib/amigo/vocabulary.rb
 - lib/amigo/where.rb
 - lib/amigo.rb
 - spec/amigo/select/execute_spec.rb
 - spec/amigo/select/immutable_spec.rb
 - spec/amigo/select/to_sparql_spec.rb
 - spec/amigo/select/to_sql_spec.rb
+- spec/amigo/store/hash_spec.rb
 - spec/amigo/store/to_ntriples_spec.rb
 - spec/amigo/term/to_sparql_spec.rb
 - spec/amigo/triple/immutable_spec.rb
 - spec/amigo/triple/inspect_spec.rb
 - spec/amigo/triple/to_ntriple_spec.rb
 - spec/amigo/uri/to_ntriple_spec.rb
+- spec/amigo/uri/to_s_spec.rb
 - spec/amigo/uri/to_sparql_spec.rb
 - spec/amigo/variable/to_sparql_spec.rb
 - spec/amigo/variables/immutable_spec.rb
 - spec/amigo/variables/include_spec.rb
 - spec/amigo/variables/to_sparql_spec.rb
+- spec/amigo/vocabulary/lookup_spec.rb
 - spec/amigo/where/to_sparql_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -118,25 +129,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: In-memory triple store