rufus-doric 0.1.13 → 0.1.14

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-doric CHANGELOG.txt
 
 
+== rufus-doric - 0.1.14    released 2010/05/22
+
+- map and now, map and reduce (Model.view_by)
+
+
 == rufus-doric - 0.1.13    released 2010/05/21
 
 - fixed issue with model and missing association

data/lib/rufus/doric/model.rb

@@ -160,11 +160,11 @@ module Doric
     #
     # The all method supports the same options.
     #
-    def self.view_by (key, func=nil)
+    def self.view_by (key, map=nil, reduce=nil)
 
-      if func
+      if map
 
-        k = { key => func }
+        k = { :view => key, :map => map, :reduce => reduce }
 
         instance_eval %{
           def by_#{key} (val, opts={})
@@ -581,13 +581,22 @@ module Doric
       "#{self.class.doric_type}__#{s}"
     end
 
-    def self.func (body)
-      %{
-        function (doc) {
-          if (doc.doric_type != '#{@doric_type}') return;
-          #{body}
+    def self.func (body, type=:map)
+
+      if type == :map
+        %{
+          function (doc) {
+            if (doc.doric_type != '#{@doric_type}') return;
+            #{body}
+          }
         }
-      }
+      else
+        %{
+          function (keys, values, rereduce) {
+            #{body}
+          }
+        }
+      end
     end
 
     def self.put_design_doc (key=nil)
@@ -626,9 +635,15 @@ module Doric
 
       elsif key.is_a?(Hash)
 
-        ddoc['views']["by_#{key.keys.first}"] = {
-          'map' => func(key.values.first)
-        }
+        h = {}
+
+        h['map'] = func(key[:map])
+
+        if red = key[:reduce]
+          h['reduce'] = func(red, :reduce)
+        end
+
+        ddoc['views']["by_#{key[:view]}"] = h
 
       elsif key.is_a?(Array)
 
@@ -697,7 +712,9 @@ module Doric
 
       #p [ key, val, opts ]
 
-      qs = [ 'include_docs=true' ]
+      reduce = key.is_a?(Hash) && key[:reduce]
+
+      qs = reduce ? [] : [ 'include_docs=true' ]
 
       if is_option_hash(val)
         opts = val
@@ -716,7 +733,7 @@ module Doric
 
       skey = case key
         when Array then key.join('_and_')
-        when Hash then key.keys.first
+        when Hash then key[:view]
         else key
       end
 
@@ -724,7 +741,14 @@ module Doric
 
       result = get_result(path, key)
 
-      result['rows'].collect { |r| self.new(r['doc']) }
+      row = result['rows']
+
+      if reduce
+        r = result['rows'].first
+        r ? r['value'] : nil
+      else
+        result['rows'].collect { |r| self.new(r['doc']) }
+      end
     end
 
     # Ensures the necessary design_doc is loaded (if first query failed)

data/lib/rufus/doric/version.rb

@@ -1,7 +1,7 @@
 
 module Rufus
 module Doric
-  VERSION = '0.1.13'
+  VERSION = '0.1.14'
 end
 end
 

data/rufus-doric.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-doric}
-  s.version = "0.1.13"
+  s.version = "0.1.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux"]
-  s.date = %q{2010-05-21}
+  s.date = %q{2010-05-22}
   s.description = %q{
 something at the intersection of Rails3, CouchDB and rufus-jig
   }
@@ -55,6 +55,7 @@ something at the intersection of Rails3, CouchDB and rufus-jig
      "test/ut_15_model_view_by_and.rb",
      "test/ut_16_model_custom_view.rb",
      "test/ut_17_model_and_attachments.rb",
+     "test/ut_18_model_map_reduce.rb",
      "test/ut_1_model.rb",
      "test/ut_2_model_view.rb",
      "test/ut_3_model_lint.rb",

data/test/ut_16_model_custom_view.rb

@@ -27,6 +27,32 @@ class Team < Rufus::Doric::Model
   }
 end
 
+#class City < Rufus::Doric::Model
+#
+#  db :doric
+#  doric_type :cities
+#
+#  id_field :name
+#
+#  h_accessor :name
+#  h_accessor :sister
+#
+#  view_by 'sister', %{
+#    emit(doc.sister, null);
+#  }
+#end
+#
+#  def test_custom_properties_should_not_overwrite_properties
+#
+#    City.new('name' => 'Zurich', 'sister' => 'Kunming').save!
+#    City.new('name' => 'Yokohama', 'sister' => 'Vancouver').save!
+#    City.new('name' => 'Portland', 'sister' => 'Sapporo').save!
+#    City.new('name' => 'Nara', 'sister' => 'Toledo').save!
+#    City.new('name' => "Xi'an", 'sister' => 'Quebec').save!
+#  end
+  #
+  # keeping for a next round of testing
+
 
 class UtModelCustomViewTest < Test::Unit::TestCase
 

data/test/ut_18_model_map_reduce.rb

@@ -0,0 +1,65 @@
+
+#
+# testing rufus-doric
+#
+# Fri May 21 23:41:59 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), 'base')
+
+require 'rufus/doric'
+
+
+class Auth < Rufus::Doric::Model
+
+  db :doric
+  doric_type :auths
+
+  h_accessor :role
+  h_accessor :user
+
+  view_by 'roles', %{
+    emit(null, doc.role);
+  }, %{
+    // unique ...
+    var a = [];
+    for (var i = 0; i < values.length; i++) {
+      var v = values[i];
+      if (a.indexOf(v) < 0) a.push(v);
+    }
+    return a;
+  }
+end
+
+
+class UtModelMapReduceTest < Test::Unit::TestCase
+
+  def setup
+
+    Rufus::Doric.db('doric').delete('.')
+    Rufus::Doric.db('doric').put('.')
+
+    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_mr
+
+    Auth.new('role' => 'president', 'user' => 'Amedeo').save!
+    Auth.new('role' => 'prime minister', 'user' => 'Claudio').save!
+    Auth.new('role' => 'minister of war', 'user' => 'Sergio').save!
+    Auth.new('role' => 'minister of war', 'user' => 'John').save!
+
+    assert_equal(
+      [ 'president', 'prime minister', 'minister of war' ],
+      Auth.roles(nil))
+    assert_equal(
+      [ 'president', 'prime minister', 'minister of war' ],
+      Auth.by_roles(nil))
+  end
+end
+

data/test/ut_1_model.rb

@@ -205,5 +205,14 @@ class UtModelTest < Test::Unit::TestCase
       Thing.find(nil)
     end
   end
+
+  def test_various_ids
+
+    Thing.new('name' => "Xi'an").save!
+    assert_not_nil Thing.find("Xi'an")
+    #Thing.all.each do |thing|
+    #  p thing
+    #end
+  end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 13
-  version: 0.1.13
+  - 14
+  version: 0.1.14
 platform: ruby
 authors: 
 - John Mettraux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-21 00:00:00 +09:00
+date: 2010-05-22 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,6 +142,7 @@ files:
 - test/ut_15_model_view_by_and.rb
 - test/ut_16_model_custom_view.rb
 - test/ut_17_model_and_attachments.rb
+- test/ut_18_model_map_reduce.rb
 - test/ut_1_model.rb
 - test/ut_2_model_view.rb
 - test/ut_3_model_lint.rb