lib/more/grapher.rb scratch/grapher_demo.rb @@ -1,3 +1,4 @@ +graphs pkg .irb_history uuid.state .gitignore @@ -29,6 +29,7 @@ require 'relaxdb/uuid_generator' require 'relaxdb/view_object' require 'relaxdb/view_uploader' require 'relaxdb/views' +require 'more/grapher.rb' module RelaxDB end lib/relaxdb.rb @@ -128,9 +128,11 @@ module RelaxDB # permanent fixture of RelaxDB, but quite likely in a different form to this one def add_denormalised_data(data, relationship, opts) obj = send(relationship) - opts[:denormalise].each do |prop_name| - val = obj.send(prop_name) - data["#{relationship}_#{prop_name}"] = val + if obj + opts[:denormalise].each do |prop_name| + val = obj.send(prop_name) + data["#{relationship}_#{prop_name}"] = val + end end end lib/relaxdb/document.rb @@ -97,11 +97,7 @@ module RelaxDB end def create_from_hash(data) - @objects = [] - data["rows"].each do |row| - @objects << create_object(row["value"]) - end - @objects + data["rows"].map { |row| create_object(row["value"]) } end def create_object(data) lib/relaxdb/relaxdb.rb @@ -28,6 +28,7 @@ Gem::Specification.new do |s| "lib/relaxdb/view_object.rb", "lib/relaxdb/view_uploader.rb", "lib/relaxdb/views.rb", + "lib/more/grapher.rb", "lib/relaxdb.rb", "spec/belongs_to_spec.rb", "spec/callbacks_spec.rb", relaxdb.gemspec @@ -31,6 +31,10 @@ describe RelaxDB::Document, "denormalisation" do obj = JSON.parse(leaf.to_json) obj["tree_name"].should == "sapling" end + + it "should ignore denormalised options for nil properties" do + Leaf.new.to_json + end it "should not interfere with normal belongs_to behaviour" do tree = Tree.new(:name => "sapling", :climate => "tropical").save spec/denormalisation_spec.rb 8e812635d7f70e748ea829e3714650a279f70f88 Paul Carey paul.p.carey@gmail.com http://github.com/paulcarey/relaxdb/commit/cd63e0d51a293cd578523de2e8f9dec472203853 cd63e0d51a293cd578523de2e8f9dec472203853 2008-09-11T15:16:42-07:00 2008-09-11T15:16:42-07:00 Added graph creator and example. Minor denormalisation fix. aa9ad8b92ef3224a25a0f98f214a3ba8acd5d5b4 Paul Carey paul.p.carey@gmail.com