amigo 0.1.0 → 0.1.1

data/lib/amigo/initial_result.rb

@@ -11,7 +11,7 @@ module Amigo
 
     include Hamster::Immutable
 
-    SOLUTIONS = Hamster.set(Solution.new(Hamster.set, Hamster.hash))
+    SOLUTIONS = Hamster.list(Solution.new(Hamster.set, Hamster.hash))
 
     def initialize(variables, triples)
       @variables = variables

data/lib/amigo/version.rb

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

data/lib/amigo/where.rb

@@ -25,17 +25,17 @@ module Amigo
     end
 
     def select(statements)
-      statements.reduce(Hamster.set) do |result, statement|
+      statements.reduce(Hamster.list) do |result, statement|
         next result unless select?(statement)
-        result.add(bind(statement, Hamster.hash))
+        result.cons(bind(statement, Hamster.hash))
       end
     end
 
     def join(statements, rows)
-      rows.reduce(Hamster.set) do |result, row|
+      rows.reduce(Hamster.list) do |result, row|
         statements.reduce(result) do |result, statement|
           next result unless join?(statement, row)
-          result.add(bind(statement, row))
+          result.cons(bind(statement, row))
         end
       end
     end

data/spec/amigo/select/execute_spec.rb

@@ -20,8 +20,16 @@ module Amigo
             execute(Hamster.set(Triple.new(URI.parse(URI.parse("ex_book:book1")), URI.parse(URI.parse("dc:title")), "SPARQL Tutorial")))
         end
 
-        it "the result has a single solution" do
-          @result.size.should == 1
+        describe "the result" do
+
+          it "is a list" do
+            @result.class.should include(Hamster::List)
+          end
+
+          it "has a single solution" do
+            @result.size.should == 1
+          end
+
         end
 
         describe "the solution" do
@@ -46,8 +54,16 @@ module Amigo
             execute(Hamster.set(Triple.new(URI.parse("ex_book:book1"), URI.parse("dc:title"), "SPARQL Tutorial")))
         end
 
-        it "returns the correct number of solutions" do
-          @result.size.should == 1
+        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
@@ -72,8 +88,16 @@ module Amigo
             execute(Hamster.set(Triple.new(URI.parse("ns:y"), URI.parse("ns:p"), 42)))
         end
 
-        it "returns the correct number of solutions" do
-          @result.size.should == 1
+        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
@@ -98,8 +122,16 @@ module Amigo
             execute(Hamster.set(Triple.new(URI.parse("ex_book:book1"), URI.parse("dc:title"), "SPARQL Tutorial")))
         end
 
-        it "returns the correct number of solutions" do
-          @result.size.should == 1
+        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
@@ -137,8 +169,16 @@ module Amigo
             sort_by(&:name)
         end
 
-        it "returns the correct number of solutions" do
-          @result.size == 2
+        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 == 2
+          end
+
         end
 
         describe "each solution" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Simon Harris
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-14 00:00:00 +10:00
+date: 2010-05-16 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 6
-        version: 0.3.6
+        - 7
+        version: 0.3.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency