amigo 0.1.3 → 0.1.4

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 0.1.4 / 2010-05-31
+
+* Implement Solution#to_ary so you can auto-expand the variables as block arguments.
+
+* Improve error message when solution variable not found.
+
+* Implement Store#to_ntriples.
+
 === 0.1.3 / 2010-05-23
 
 * Fixed: weird 1.9 scoping behaviour.

data/lib/amigo/solution.rb

@@ -17,7 +17,11 @@ module Amigo
 
     def [](name)
       return @row[name] if include?(name)
-      raise NameError, "#{name} not found"
+      raise NameError, "#{name.inspect} not found"
+    end
+
+    def to_ary
+      @variables.map(@row).to_ary
     end
 
     def eql?(other)

data/lib/amigo/store.rb

@@ -26,6 +26,10 @@ module Amigo
       query.execute(@triples)
     end
 
+    def to_ntriples
+      @triples.map(&:to_ntriple).join("\n")
+    end
+
     def eql?(other)
       return true if other.equal?(self)
       other.class.equal?(self.class) &&

data/lib/amigo/variables.rb

@@ -36,6 +36,10 @@ module Amigo
       @names.include?(name)
     end
 
+    def map(row)
+      @names.map { |name| row[name] }
+    end
+
     def to_sparql
       @names.map { |name| "?#{name}" }.join(" ")
     end

data/lib/amigo/version.rb

@@ -1,5 +1,5 @@
 module Amigo
 
-  VERSION = "0.1.3".freeze
+  VERSION = "0.1.4".freeze
 
 end

data/spec/amigo/select/to_sql_spec.rb

@@ -9,14 +9,14 @@ module Amigo
     describe "#to_sql" do
 
       [
-        [Select.new(:*), "SELECT * FROM triples LIMIT 0"],
-        [Select.new(:*).where(:x, :y, :z), "SELECT subject x, predicate y, object z FROM triples"],
-        [Select.new(:x, :y, :z).where(:x, :y, :z), "SELECT subject x, predicate y, object z FROM triples"],
-        [Select.new(:x, :z).where(:x, :y, :z), "SELECT subject x, object z FROM triples"],
-        [Select.new(:*).where(:x, "bee", :z), "SELECT subject x, object z, FROM triples WHERE triples.predicate = 'bee'"],
-        [Select.new(:x, :z).where(:x, "bee", :z), "SELECT subject x, object z FROM triples WHERE triples.predicate = 'bee'"],
-        [Select.new(:*).where(:x, "bee", :z).where("dee", :y, "eff"), "SELECT a.subject x, a.object z, b.predicate y FROM triples a CROSS JOIN triples b WHERE a.predicate = 'bee' AND b.subject = 'dee' AND b.object = 'eff'"],
-        [Select.new(:x, :y).where(:x, "bee", :z).where(:z, :y, "see"), "SELECT a.subject x, b.predicate y FROM triples a JOIN triples b ON (a.object = b.subject) WHERE a.predicate = 'bee' AND b.object = 'see'"],
+        [Select.new(:*), "SELECT * FROM triple LIMIT 0"],
+        [Select.new(:*).where(:x, :y, :z), "SELECT subject x, predicate y, object z FROM triple"],
+        [Select.new(:x, :y, :z).where(:x, :y, :z), "SELECT subject x, predicate y, object z FROM triple"],
+        [Select.new(:x, :z).where(:x, :y, :z), "SELECT subject x, object z FROM triple"],
+        [Select.new(:*).where(:x, "bee", :z), "SELECT subject x, object z, FROM triple WHERE triple.predicate = 'bee'"],
+        [Select.new(:x, :z).where(:x, "bee", :z), "SELECT subject x, object z FROM triple WHERE triple.predicate = 'bee'"],
+        [Select.new(:*).where(:x, "bee", :z).where("dee", :y, "eff"), "SELECT a.subject x, a.object z, b.predicate y FROM triple a CROSS JOIN triple b WHERE a.predicate = 'bee' AND b.subject = 'dee' AND b.object = 'eff'"],
+        [Select.new(:x, :y).where(:x, "bee", :z).where(:z, :y, "see"), "SELECT a.subject x, b.predicate y FROM triple a JOIN triple b ON (a.object = b.subject) WHERE a.predicate = 'bee' AND b.object = 'see'"],
       ].each do |select, sql|
 
         describe "given #{select.inspect}" do

data/spec/amigo/solution/to_ary_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+require 'hamster/list'
+require 'hamster/hash'
+require 'amigo/solution'
+
+module Amigo
+
+  describe Solution do
+
+    describe "#to_ary" do
+
+      before do
+        @solution = Solution.new(
+          Hamster.list(:a, :b, :c),
+          Hamster.hash(:a => "Aye", :b => "Bee", :c => "See")
+        ).to_ary
+      end
+
+      it "should description" do
+        @solution.to_ary.should == ["Aye", "Bee", "See"]
+      end
+
+    end
+
+  end
+
+end

data/spec/amigo/store/to_ntriples_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+require 'amigo/uri'
 require 'amigo/store'
 
 module Amigo
@@ -8,7 +9,18 @@ module Amigo
 
     describe "#to_ntriples" do
 
-
+      before do
+        @store = Store.new.
+          add("a", "b", "c").
+          add(URI.parse("http://www.example.com/x"), "b", URI.parse("http://www.example.com/z"))
+      end
+
+      it "returns a textual representation of the store in the form of N-Triples" do
+        [
+          %Q{"a" "b" "c" .\n<http://www.example.com/x> "b" <http://www.example.com/z> .},
+          %Q{<http://www.example.com/x> "b" <http://www.example.com/z> .\n"a" "b" "c" .}
+        ].should include(@store.to_ntriples)
+      end
 
     end
 

data/spec/amigo/store/to_sql_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+require 'amigo/uri'
+require 'amigo/store'
+
+module Amigo
+
+  describe Store do
+
+    describe "#to_sql" do
+
+      before do
+        @store = Store.new.
+          add("a", "b", "c").
+          add(URI.parse("http://www.example.com/x"), "b", URI.parse("http://www.example.com/z"))
+      end
+
+      it "returns a textual representation of the store in the form of SQL" do
+        #   COPY triple (subject, predicate, object) FROM stdin;
+        #   \.
+        # ].should include(@store.to_ntriples)
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amigo
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Simon Harris
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-23 00:00:00 +10:00
+date: 2010-05-31 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,8 +97,10 @@ files:
 - spec/amigo/select/immutable_spec.rb
 - spec/amigo/select/to_sparql_spec.rb
 - spec/amigo/select/to_sql_spec.rb
+- spec/amigo/solution/to_ary_spec.rb
 - spec/amigo/store/hash_spec.rb
 - spec/amigo/store/to_ntriples_spec.rb
+- spec/amigo/store/to_sql_spec.rb
 - spec/amigo/term/to_sparql_spec.rb
 - spec/amigo/triple/immutable_spec.rb
 - spec/amigo/triple/inspect_spec.rb