rdbi-result-driver-json 0.1.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.1

data/lib/rdbi-result-driver-json.rb

@@ -0,0 +1,2 @@
+require 'rdbi'
+require 'rdbi/result/driver/json'

data/lib/rdbi/result/driver/json.rb

@@ -19,17 +19,31 @@ class RDBI::Result::Driver::JSON < RDBI::Result::Driver
 
       @result.schema.columns.map(&:name).each { |name| index.push(name); obj_hash[name] = nil }
 
-      @result.raw_fetch(row_count).each do |row|
+      if [:first, :last].include?(row_count)
         my_hash = obj_hash.dup
-        row.each_with_index do |col, i|
+        @result.raw_fetch(row_count)[0].each_with_index do |col, i|
           my_hash[index[i]] = col
         end
-        results.push my_hash
+        return ::JSON.dump(my_hash)
+      else
+        @result.raw_fetch(row_count).each do |row|
+          my_hash = obj_hash.dup
+          row.each_with_index do |col, i|
+            my_hash[index[i]] = col
+          end
+          results.push my_hash
+        end
+
+        File.open('/tmp/foo', 'w') << results.inspect
+        return ::JSON.dump(results)
       end
 
-      return ::JSON.dump(results)
     else
-      return ::JSON.dump(@result.raw_fetch(row_count))
+      if [:first, :last].include?(row_count)
+        return ::JSON.dump(@result.raw_fetch(row_count)[0])
+      else
+        return ::JSON.dump(@result.raw_fetch(row_count))
+      end
     end
   end
 end

data/rdbi-result-driver-json.gemspec

@@ -1,41 +1,40 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rdbi-result-driver-json}
-  s.version = "0.1.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erik Hollensbe"]
-  s.date = %q{2010-08-21}
+  s.date = %q{2010-12-10}
   s.description = %q{JSON result output for RDBI}
   s.email = %q{erik@hollensbe.org}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/rdbi/result/driver/json.rb",
-     "rdbi-result-driver-json.gemspec",
-     "test/helper.rb",
-     "test/test_driver.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/rdbi-result-driver-json.rb",
+    "lib/rdbi/result/driver/json.rb",
+    "rdbi-result-driver-json.gemspec",
+    "test/helper.rb",
+    "test/test_driver.rb"
   ]
   s.homepage = %q{http://github.com/RDBI/rdbi-result-driver-json}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{JSON result output for RDBI}
   s.test_files = [
     "test/helper.rb",
-     "test/test_driver.rb"
+    "test/test_driver.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/helper.rb

@@ -16,7 +16,7 @@ class Test::Unit::TestCase
   end
 
   def mock_statement_with_results(dbh, results)
-    sth = dbh.prepare("some statmeent")
+    sth = dbh.prepare("some statement")
     sth.result = results
     return sth
   end

data/test/test_driver.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'json'
 
 class TestDriver < Test::Unit::TestCase
   def setup
@@ -18,6 +19,12 @@ class TestDriver < Test::Unit::TestCase
     json = sth.execute.as(:JSON).fetch(:all)
     assert_equal('[[1,2,3]]', json)
 
+    json = sth.execute.as(:JSON).first
+    assert_equal('[1,2,3]', json)
+
+    json = sth.execute.as(:JSON).last
+    assert_equal('[1,2,3]', json)
+
     sth.finish
   end
 
@@ -26,10 +33,37 @@ class TestDriver < Test::Unit::TestCase
     sth = mock_statement_with_results(@dbh, [[1,2,3]])
 
     json = sth.execute.fetch(:all, :JSON, :as_object => true)
-    assert_equal("[{\"5\":null,\"0\":1,\"6\":null,\"1\":2,\"7\":null,\"2\":3,\"8\":null,\"3\":null,\"9\":null,\"4\":null}]", json)
-    
+    assert_equal(
+      {
+          "0" => 1,
+          "1" => 2,
+          "2" => 3,
+      }, JSON.load(json)[0].reject { |x,y| y.nil? })
+
+
     json = sth.execute.as(:JSON, :as_object => true).fetch(:all)
-    assert_equal("[{\"5\":null,\"0\":1,\"6\":null,\"1\":2,\"7\":null,\"2\":3,\"8\":null,\"3\":null,\"9\":null,\"4\":null}]", json)
+    assert_equal(
+      {
+          "0" => 1,
+          "1" => 2,
+          "2" => 3,
+      }, JSON.load(json)[0].reject { |x,y| y.nil? })
+
+    json = sth.execute.as(:JSON, :as_object => true).first
+    assert_equal(
+      {
+          "0" => 1,
+          "1" => 2,
+          "2" => 3,
+      }, JSON.load(json).reject { |x,y| y.nil? })
+
+    json = sth.execute.as(:JSON, :as_object => true).last
+    assert_equal(
+      {
+          "0" => 1,
+          "1" => 2,
+          "2" => 3,
+      }, JSON.load(json).reject { |x,y| y.nil? })
 
     sth.finish
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rdbi-result-driver-json
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 0
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Erik Hollensbe
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-21 00:00:00 -04:00
+date: 2010-12-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,7 +51,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -71,11 +67,11 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
+- lib/rdbi-result-driver-json.rb
 - lib/rdbi/result/driver/json.rb
 - rdbi-result-driver-json.gemspec
 - test/helper.rb
@@ -85,8 +81,8 @@ homepage: http://github.com/RDBI/rdbi-result-driver-json
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -94,7 +90,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -103,7 +98,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC