fluiddb 0.0.10 → 0.0.11

data/lib/FluidDb/Mock.rb

@@ -5,8 +5,16 @@ module FluidDb
     #A constant way of enabling testing for FluidDb
     class Mock<Base
         
+        @verbose = false
+        
         def initialize
             @hash = Hash.new
+            
+        end
+        
+        def verbose()
+            @verbose = true
+            return self
         end
         
         def connect()
@@ -17,21 +25,46 @@ module FluidDb
         
         def queryForArray( sql, params )
             sql = self.format_to_sql( sql, params )
-            return @hash[sql]
+            puts "FluidDb::Mock.queryForArray. sql: #{sql}" if @verbose == true
+            
+            results = @hash[sql]
+            case results.length
+                when 0
+                raise FluidDb::NoDataFoundError.new
+                when 1
+                return results.first
+                return r
+                else
+                raise FluidDb::TooManyRowsError.new
+            end
+            
         end
         
         def queryForValue( sql, params )
             sql = self.format_to_sql( sql, params )
+            puts "FluidDb::Mock.queryForValue. sql: #{sql}" if @verbose == true
+            
+            results = @hash[sql]
+            case results.length
+                when 0
+                raise FluidDb::NoDataFoundError.new
+                when 1
+                return results.first.first[1]
+                else
+                raise FluidDb::TooManyRowsError.new
+            end
             return @hash[sql]
         end
         
         def queryForResultset( sql, params )
             sql = self.format_to_sql( sql, params )
+            puts "FluidDb::Mock.queryForResultset. sql: #{sql}" if @verbose == true
             return @hash[sql]
         end
         
         def execute( sql, params, expected_affected_rows=nil )
             sql = self.format_to_sql( sql, params )
+            puts "FluidDb::Mock.execute. sql: #{sql}" if @verbose == true
             return @hash[sql]
         end
         
@@ -40,9 +73,13 @@ module FluidDb
         end
         
         def addSql( sql, result )
+            if !result.is_a? Array then
+                raise TypeError.new( "Expecting an Array of Hashes, eg [{'field1'=>1, 'field2'=>2}]. Note, the Array may be empty" )
+            end
+            
             @hash[sql] = result;
         end
-
+        
         def addSqlWithParams( sql, params, result )
             sql = self.format_to_sql( sql, params )
             

data/lib/FluidDb/Pgsql.rb

@@ -28,7 +28,7 @@ module FluidDb
             #    $message = pg_last_error( $this->connection );
             #    throw new Fluid_ConnectionException( $message );
             #end
-            
+
             case results.num_tuples
                 when -1
                 raise FluidDb::ConnectionError.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluiddb
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-07 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies: []
 description: A semantic layer for db interaction
 email: guy@guyirvine.com