sequel_core 1.5.0 → 1.5.1

data/CHANGELOG

@@ -1,4 +1,8 @@
-=== HEAD
+=== 1.5.1 (2008-04-30)
+
+* Have Dataset#graph give a nil value instead of a hash with all nil values if no matching rows exist in the graphed table (jeremyevans)
+
+=== 1.5.0 (2008-04-29)
 
 * Set a timeout in the Sqlite adapter, default to 5 seconds (hrvoje.marjanovic) (#218)
 

data/Rakefile

@@ -9,15 +9,13 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "sequel_core"
-VERS = "1.5.0"
+VERS = "1.5.1"
 CLEAN.include ["**/.*.sw?", "pkg/*", ".config", "doc/*", "coverage/*"]
 RDOC_OPTS = ["--quiet", "--line-numbers", "--inline-source"]
 
 ##############################################################################
 # RDoc
 ##############################################################################
-task :doc => [:rdoc]
-
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = "doc/rdoc"
   rdoc.options += RDOC_OPTS
@@ -71,16 +69,19 @@ end
 ##############################################################################
 # installation & removal
 ##############################################################################
+desc "Install sequel_core gem"
 task :install do
   sh %{rake package}
   sh %{sudo gem install pkg/#{NAME}-#{VERS}}
 end
 
+desc "Install sequel_core gem without docs"
 task :install_no_docs do
   sh %{rake package}
   sh %{sudo gem install pkg/#{NAME}-#{VERS} --no-rdoc --no-ri}
 end
 
+desc "Uninstall sequel_core gem"
 task :uninstall => [:clean] do
   sh %{sudo gem uninstall #{NAME}}
 end
@@ -88,6 +89,7 @@ end
 ##############################################################################
 # gem and rdoc release
 ##############################################################################
+desc "Upload sequel_core gem to rubyforge"
 task :release => [:package] do
   sh %{rubyforge login}
   sh %{rubyforge add_release sequel #{NAME} #{VERS} pkg/#{NAME}-#{VERS}.tgz}

data/lib/sequel_core/object_graph.rb

@@ -20,6 +20,14 @@ module Sequel
     # any row_proc or transform attributes of the current dataset and the datasets
     # you use with graph.
     #
+    # If you are graphing a table and all columns for that table are nil, this
+    # indicates that no matching rows existed in the table, so graph will return nil
+    # instead of a hash with all nil values:
+    #
+    #   # If the artist doesn't have any albums
+    #   DB[:artists].graph(:albums, :artist_id=>:id).first
+    #   => {:artists=>{:id=>artists.id, :name=>artists.name}, :albums=>nil}
+    #
     # Arguments:
     # * dataset -  Can be a symbol (specifying a table), another dataset,
     #   or an object that responds to .dataset and yields a symbol or a dataset
@@ -186,9 +194,13 @@ module Sequel
           # row_proc if applicable
           datasets.each do |ta,ds,tr,rp|
             g = graph[ta]
-            g = ds.transform_load(g) if tr
-            g = rp[g] if rp
-            graph[ta] = g
+            graph[ta] = if g.values.any?
+              g = ds.transform_load(g) if tr
+              g = rp[g] if rp
+              g
+            else
+              nil
+            end
           end
 
           yield graph

data/spec/object_graph_spec.rb

@@ -152,6 +152,30 @@ describe Sequel::Dataset, " graphing" do
     results.first.should == {:points=>{:id=>1, :x=>2, :y=>3}, :lines=>{:id=>4, :x=>5, :y=>6, :graph_id=>7}, :graph=>{:id=>8, :x=>9, :y=>10, :graph_id=>11}}
   end
 
+  it "#graph_each should give a nil value instead of a hash when all values for a table are nil" do
+    ds = @ds1.graph(@ds2, :x=>:id)
+    def ds.fetch_rows(sql, &block)
+      yield({:id=>1,:x=>2,:y=>3,:lines_id=>nil,:lines_x=>nil,:lines_y=>nil,:graph_id=>nil})
+    end
+    results = ds.all
+    results.length.should == 1
+    results.first.should == {:points=>{:id=>1, :x=>2, :y=>3}, :lines=>nil}
+
+    ds = @ds1.graph(@ds2, :x=>:id).graph(@ds3, :id=>:graph_id)
+    def ds.fetch_rows(sql, &block)
+      yield({:id=>1,:x=>2,:y=>3,:lines_id=>4,:lines_x=>5,:lines_y=>6,:graph_id=>7, :graphs_id=>nil, :name=>nil, :graphs_x=>nil, :graphs_y=>nil, :graphs_lines_x=>nil})
+      yield({:id=>2,:x=>4,:y=>5,:lines_id=>nil,:lines_x=>nil,:lines_y=>nil,:graph_id=>nil, :graphs_id=>nil, :name=>nil, :graphs_x=>nil, :graphs_y=>nil, :graphs_lines_x=>nil})
+      yield({:id=>3,:x=>5,:y=>6,:lines_id=>4,:lines_x=>5,:lines_y=>6,:graph_id=>7, :graphs_id=>7, :name=>8, :graphs_x=>9, :graphs_y=>10, :graphs_lines_x=>11})
+      yield({:id=>3,:x=>5,:y=>6,:lines_id=>7,:lines_x=>5,:lines_y=>8,:graph_id=>9, :graphs_id=>9, :name=>10, :graphs_x=>10, :graphs_y=>11, :graphs_lines_x=>12})
+    end
+    results = ds.all
+    results.length.should == 4
+    results[0].should == {:points=>{:id=>1, :x=>2, :y=>3}, :lines=>{:id=>4, :x=>5, :y=>6, :graph_id=>7}, :graphs=>nil}
+    results[1].should == {:points=>{:id=>2, :x=>4, :y=>5}, :lines=>nil, :graphs=>nil}
+    results[2].should == {:points=>{:id=>3, :x=>5, :y=>6}, :lines=>{:id=>4, :x=>5, :y=>6, :graph_id=>7}, :graphs=>{:id=>7, :name=>8, :x=>9, :y=>10, :lines_x=>11}}
+    results[3].should == {:points=>{:id=>3, :x=>5, :y=>6}, :lines=>{:id=>7, :x=>5, :y=>8, :graph_id=>9}, :graphs=>{:id=>9, :name=>10, :x=>10, :y=>11, :lines_x=>12}}
+  end
+
   it "#graph_each should not included tables graphed with the :select option in the result set" do
     ds = @ds1.graph(:lines, {:x=>:id}, :select=>false).graph(:graphs, :id=>:graph_id)
     def ds.fetch_rows(sql, &block)
@@ -177,7 +201,7 @@ describe Sequel::Dataset, " graphing" do
     end
     results = ds.all
     results.length.should == 1
-    results.first.should == {:points=>{:x=>2}, :lines=>{}}
+    results.first.should == {:points=>{:x=>2}, :lines=>nil}
   end
 
   it "#graph_each should run the row_proc and transform for graphed datasets" do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: sequel_core
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
-date: 2008-04-29 00:00:00 -07:00
+  version: 1.5.1
+date: 2008-04-30 00:00:00 -07:00
 summary: "The Database Toolkit for Ruby: Core Library and Adapters"
 require_paths: 
 - lib