rufus-doric 0.1.17 → 0.1.18

data/CHANGELOG.txt

@@ -2,6 +2,13 @@
 = rufus-doric CHANGELOG.txt
 
 
+== rufus-doric - 0.1.18    released 2010/11/09
+
+- made sure to do a deep clone of model default values. Thanks Claudio.
+- views : :raw => true option
+- pointing to rufus-jig 0.1.23
+
+
 == rufus-doric - 0.1.17    released 2010/09/30
 
 - basic auth thanks to rufus-jig 0.1.22

data/README.rdoc

@@ -186,7 +186,7 @@ will load the documents (and their attachements) into http://127.0.0.1:5984/dori
 
 == credits
 
-Claudio Petasecca Donati - for his help about attachments
+Claudio Petasecca Donati - for all his help.
 
 
 == license

data/Rakefile

@@ -36,7 +36,7 @@ something at the intersection of Rails3, CouchDB and rufus-jig
   gem.test_file = 'test/test.rb'
 
   gem.add_dependency 'activerecord', '~> 3.0.0'
-  gem.add_dependency 'rufus-jig', '>= 0.1.22'
+  gem.add_dependency 'rufus-jig', '>= 0.1.23'
   gem.add_dependency 'mime-types', '>= 1.16'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'jeweler'

data/lib/rufus/doric/model.rb

@@ -225,7 +225,9 @@ module Doric
 
     def initialize (doc={})
 
-      @h = doc.inject(self.class.defaults.dup) { |h, (k, v)| h[k.to_s] = v; h }
+      @h = doc.inject(Rufus::Json.dup(self.class.defaults)) { |h, (k, v)|
+        h[k.to_s] = v; h
+      }
       @h['doric_type'] = self.class.doric_type
     end
 
@@ -760,6 +762,8 @@ module Doric
 
       #p [ key, val, opts ]
 
+      raw = opts.delete(:raw)
+
       reduce = key.is_a?(Hash) && key[:reduce]
 
       qs = reduce ? [] : [ 'include_docs=true' ]
@@ -789,13 +793,14 @@ module Doric
 
       result = get_result(path, key, opts)
 
-      row = result['rows']
+      rows = result['rows']
+
+      return rows if raw
 
       if reduce
-        r = result['rows'].first
-        r ? r['value'] : []
+        rows.first ? rows.first['value'] : []
       else
-        result['rows'].collect { |r| self.new(r['doc']) }.uniq
+        rows.collect { |r| self.new(r['doc']) }.uniq
       end
     end
 

data/lib/rufus/doric/one_doc_model.rb

@@ -54,7 +54,9 @@ module Doric
 
     def initialize (h, doc=nil)
 
-      @h = h.inject(self.class.defaults.dup) { |hh, (k, v)| hh[k.to_s] = v; hh }
+      @h = h.inject(Rufus::Json.dup(self.class.defaults)) { |hh, (k, v)|
+        hh[k.to_s] = v; hh
+      }
 
       if doc && atts = doc['_attachments']
 

data/lib/rufus/doric/version.rb

@@ -1,7 +1,7 @@
 
 module Rufus
 module Doric
-  VERSION = '0.1.17'
+  VERSION = '0.1.18'
 end
 end
 

data/rufus-doric.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-doric}
-  s.version = "0.1.17"
+  s.version = "0.1.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux"]
-  s.date = %q{2010-09-30}
+  s.date = %q{2010-11-09}
   s.description = %q{
 something at the intersection of Rails3, CouchDB and rufus-jig
   }
@@ -85,20 +85,20 @@ something at the intersection of Rails3, CouchDB and rufus-jig
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<rufus-jig>, [">= 0.1.22"])
+      s.add_runtime_dependency(%q<rufus-jig>, [">= 0.1.23"])
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
-      s.add_dependency(%q<rufus-jig>, [">= 0.1.22"])
+      s.add_dependency(%q<rufus-jig>, [">= 0.1.23"])
       s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
-    s.add_dependency(%q<rufus-jig>, [">= 0.1.22"])
+    s.add_dependency(%q<rufus-jig>, [">= 0.1.23"])
     s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/test/ut_12_model_default.rb

@@ -20,6 +20,7 @@ class Can < Rufus::Doric::Model
   h_accessor :content, :default => 'tuna'
   h_accessor :colour
   property :sold, :default => false
+  property :customers, :default => []
 end
 
 
@@ -43,12 +44,29 @@ class UtModelDefaultTest < Test::Unit::TestCase
     Can.new(:serial => 'abcd', :content => 'anchovy').save!
     Can.new(:serial => 'efgh').save!
 
-    assert_equal({ 'content' => 'tuna', 'sold' => false }, Can.defaults)
+    assert_equal(
+      { 'content' => 'tuna', 'sold' => false, 'customers' => [] },
+      Can.defaults)
 
     assert_equal 'anchovy', Can.find('abcd').content
     assert_equal 'tuna', Can.find('efgh').content
     assert_equal nil, Can.find('abcd').colour
     assert_equal false, Can.find('abcd').sold
   end
+
+  def test_default_is_not_shared_among_all_instances
+
+    anchovy = Can.new(:serial => 'anchovy', :content => 'anchovy')
+    tuna = Can.new(:serial => 'tuna', :content => 'tuna')
+
+    anchovy.customers << 'alice'
+    anchovy.customers << 'bob'
+
+    anchovy.save!
+    tuna.save!
+
+    assert_equal %w[ alice bob ], Can.find('anchovy').customers
+    assert_equal [], Can.find('tuna').customers
+  end
 end
 

data/test/ut_13_one_doc_model_default.rb

@@ -18,6 +18,7 @@ class Place < Rufus::Doric::OneDocModel
   h_accessor :name
   h_accessor :zip
   h_accessor :country, :default => 'UK'
+  h_accessor :neighbours, :default => []
 end
 
 
@@ -32,7 +33,9 @@ class UtOneDocModelDefaultTest < Test::Unit::TestCase
 
   def test_defaults
 
-    assert_equal({ 'country' => 'UK' }, Place.defaults)
+    assert_equal(
+      { 'country' => 'UK', 'neighbours' => [] },
+      Place.defaults)
   end
 
   def test_default
@@ -43,5 +46,15 @@ class UtOneDocModelDefaultTest < Test::Unit::TestCase
     assert_equal 'UK', london.country
     assert_equal 'Germany', berlin.country
   end
+
+  def test_default_is_not_shared_among_all_instances
+
+    tokyo = Place.new(:name => 'Tokyo')
+    hiroshima = Place.new(:name => 'Hiroshima')
+
+    tokyo.neighbours << 'Yokohama'
+
+    assert_equal [], hiroshima.neighbours
+  end
 end
 

data/test/ut_15_model_view_by_and.rb

@@ -33,12 +33,6 @@ class UtModelViewByAndTest < Test::Unit::TestCase
     Rufus::Doric.db('doric').http.cache.clear
       # CouchDB feeds the same etags for views, even after a db has
       # been deleted and put back, so have to do that 'forgetting'
-  end
-
-  #def teardown
-  #end
-
-  def test_view_by_and
 
     Squad.new(
       'type' => 'rifle',
@@ -56,9 +50,27 @@ class UtModelViewByAndTest < Test::Unit::TestCase
       'type' => 'artillery',
       'ranking' => 'first'
     ).save!
+  end
+
+  #def teardown
+  #end
+
+  def test_view_by_and
 
     assert_equal 2, Squad.by_type_and_ranking([ 'rifle', 'first' ]).size
     assert_equal 3, Squad.by_ranking('first').size
   end
+
+  def test_view_raw
+
+    br = Squad.by_ranking('first', :raw => true)
+    btar = Squad.by_type_and_ranking([ 'rifle', 'first' ], :raw => true)
+
+    assert_equal 3, br.size
+    assert_equal Hash, br.first.class
+    assert_equal %w[ doc id key value ], br.first.keys.sort
+
+    assert_equal 2, btar.size
+  end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 17
-  version: 0.1.17
+  - 18
+  version: 0.1.18
 platform: ruby
 authors: 
 - John Mettraux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 +09:00
+date: 2010-11-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 22
-        version: 0.1.22
+        - 23
+        version: 0.1.23
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency