rufus-doric 0.1.6 → 0.1.7

data/CHANGELOG.txt

@@ -2,6 +2,14 @@
 = rufus-doric CHANGELOG.txt
 
 
+== rufus-doric - 0.1.7    released 2010/04/16
+
+- view_by 'tysec', "emit(doc.type + '__' + doc.security_level, null);"
+- model : view_by [ :x, :y ]  => view_by_x_and_y
+- neutralize_id(i) now turns dots to underscores as well
+- model : default _id generator (when no _id_field specified)
+
+
 == rufus-doric - 0.1.6    released 2010/04/14
 
 - property :sold, :default => false was not working. Fixed.

data/TODO.txt

@@ -3,12 +3,15 @@
 [o] model : validation
 [o] destroy/delete
 [o] fix Amedeo's infinite loop (model.rb l438)
+[o] all, by : limit and skip (pagination)
+[o] pagination for everybody in Model (DRY)
+[o] eventually : pagination for the text index
 
 [x] lsof check (jig / patron)
 
-[ ] all, by : limit and skip (pagination)
-
 [ ] eventually : cache the text index
-[ ] eventually : pagination for the text index
-[ ] pagination for everybody in Model (DRY)
+
+[ ] view_by 'name' do
+      %{ emit(doc.nada) }
+    end
 

data/lib/rufus/doric/model.rb

@@ -103,16 +103,28 @@ module Doric
       @_id_field
     end
 
-    def self.view_by (key)
+    def self.view_by (key, func=nil)
 
-      @keys ||= []
-      @keys << key.to_s
+      if func
 
-      instance_eval %{
-        def by_#{key} (val, opts={})
-          by('#{key}', val, opts)
-        end
-      }
+        k = { key => func }
+
+        instance_eval %{
+          def by_#{key} (val, opts={})
+            by(#{k.inspect}, val, opts)
+          end
+        }
+
+      else
+
+        skey = key.is_a?(Array) ? key.join('_and_') : key
+
+        instance_eval %{
+          def by_#{skey} (val, opts={})
+            by(#{key.inspect}, val, opts)
+          end
+        }
+      end
     end
 
     def self.text_index (*keys)
@@ -164,15 +176,22 @@ module Doric
 
       raise ActiveRecord::RecordInvalid.new(self) unless valid?
 
-      if @h['_id'].nil? && self.class._id_field
+      if @h['_id'].nil?
+
+        if self.class._id_field
+
+          @h['_id'] = if self.class._id_field.is_a?(String)
+            self.send(self.class._id_field)
+          else
+            self.instance_eval(&self.class._id_field)
+          end
 
-        i = if self.class._id_field.is_a?(String)
-          self.send(self.class._id_field)
         else
-          self.instance_eval &self.class._id_field
+
+          @h['_id'] = generate_id
         end
 
-        @h['_id'] = Rufus::Doric.neutralize_id(i)
+        @h['_id'] = Rufus::Doric.neutralize_id(@h['_id'])
       end
 
       raise ActiveRecord::RecordInvalid.new(self) if @h['_id'].nil?
@@ -402,6 +421,27 @@ module Doric
 
     protected
 
+    # When there is no _id_field specified, this id generation routine
+    # is used.
+    #
+    def generate_id
+
+      s = [
+        $$, Thread.current.object_id, self.object_id, Time.now.to_f.to_s
+      ].join('_')
+
+      "#{self.class.doric_type}__#{s}"
+    end
+
+    def self.func (body)
+      %{
+        function (doc) {
+          if (doc.doric_type != '#{@doric_type}') return;
+          #{body}
+        }
+      }
+    end
+
     def self.put_design_doc (key=nil)
 
       # the 'all' view
@@ -423,32 +463,42 @@ module Doric
         # done on the client side
 
         ddoc['views']['text_index'] = {
-          'map' => %{
-            function(doc) {
-              if (doc.doric_type == '#{@doric_type}') {
-                var keys = #{Rufus::Json.encode(@text_index)};
-                for (var key in doc) {
-                  if (keys.indexOf(key) < 0) continue;
-                  if (doc[key] == undefined) continue;
-                  var words = doc[key].split(/[\s,;\.]/);
-                  words.forEach(function (word) {
-                    if (word != '') emit(word, null);
-                  });
-                }
-              }
+          'map' => func(%{
+            var keys = #{Rufus::Json.encode(@text_index)};
+            for (var key in doc) {
+              if (keys.indexOf(key) < 0) continue;
+              if (doc[key] == undefined) continue;
+              var words = doc[key].split(/[\s,;\.]/);
+              words.forEach(function (word) {
+                if (word != '') emit(word, null);
+              });
             }
-          }
+          })
+        }
+
+      elsif key.is_a?(Hash)
+
+        ddoc['views']["by_#{key.keys.first}"] = {
+          'map' => func(key.values.first)
+        }
+
+      elsif key.is_a?(Array)
+
+        skey = key.join('_and_')
+        keys = key.collect { |k| "doc['#{k}']" }.join(', ')
+
+        ddoc['views']["by_#{skey}"] = {
+          'map' => func(%{
+            emit([#{keys}], null);
+          })
         }
+
       else
 
         ddoc['views']["by_#{key}"] = {
-          'map' => %{
-            function(doc) {
-              if (doc.doric_type == '#{@doric_type}') {
-                emit(doc['#{key}'], null);
-              }
-            }
-          }
+          'map' => func(%{
+            emit(doc['#{key}'], null);
+          })
         }
       end
 
@@ -488,7 +538,7 @@ module Doric
 
       qs = [ 'include_docs=true' ]
 
-      if val.is_a?(Array)
+      if val.is_a?(Array) && ( ! key.is_a?(Array))
 
         st, en = val
         qs << "startkey=#{Rufus::Doric.escape(st)}" if st
@@ -500,7 +550,13 @@ module Doric
 
       add_common_options(qs, opts)
 
-      path = "#{design_path}/_view/by_#{key}?#{qs.join('&')}"
+      skey = case key
+        when Array then key.join('_and_')
+        when Hash then key.keys.first
+        else key
+      end
+
+      path = "#{design_path}/_view/by_#{skey}?#{qs.join('&')}"
 
       result = get_result(path, key)
 

data/lib/rufus/doric/models.rb

@@ -33,7 +33,7 @@ module Doric
 
   def self.neutralize_id (s)
 
-    s.to_s.strip.gsub(/[\s\/:;\*\\\+\?]/, '_')
+    s.to_s.strip.gsub(/[\.\s\/:;\*\\\+\?]/, '_')
   end
 
   def self.escape (o)

data/lib/rufus/doric/version.rb

@@ -1,7 +1,7 @@
 
 module Rufus
 module Doric
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end
 end
 

data/rufus-doric.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-doric}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux"]
-  s.date = %q{2010-04-14}
+  s.date = %q{2010-04-16}
   s.description = %q{
 something at the intersection of Rails3, CouchDB and rufus-jig
   }
@@ -50,6 +50,9 @@ something at the intersection of Rails3, CouchDB and rufus-jig
      "test/ut_11_model_view_range.rb",
      "test/ut_12_model_default.rb",
      "test/ut_13_one_doc_model_default.rb",
+     "test/ut_14_model_default_id.rb",
+     "test/ut_15_model_view_by_and.rb",
+     "test/ut_16_model_custom_view.rb",
      "test/ut_1_model.rb",
      "test/ut_2_model_view.rb",
      "test/ut_3_model_lint.rb",

data/test/ut_14_model_default_id.rb

@@ -0,0 +1,46 @@
+
+#
+# testing rufus-doric
+#
+# Thu Apr 15 15:31:51 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), 'base')
+
+require 'rufus/doric'
+
+
+class Unknown < Rufus::Doric::Model
+
+  db :doric
+  doric_type :unknowns
+
+  #_id_field :serial
+
+  h_accessor :name
+end
+
+
+class UtModelDefaultTest < 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_default_id
+
+    Unknown.new(:name => 'nemo').save!
+
+    assert_equal 1, Unknown.all.size
+  end
+end
+

data/test/ut_15_model_view_by_and.rb

@@ -0,0 +1,64 @@
+
+#
+# testing rufus-doric
+#
+# Fri Apr 16 13:46:53 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), 'base')
+
+require 'rufus/doric'
+
+
+class Squad < Rufus::Doric::Model
+
+  db :doric
+  doric_type :squads
+
+  h_accessor :type
+  h_accessor :ranking
+
+  view_by :ranking
+  view_by [ :type, :ranking ]
+end
+
+
+class UtModelViewByAndTest < 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_view_by_and
+
+    Squad.new(
+      'type' => 'rifle',
+      'ranking' => 'first'
+    ).save!
+    Squad.new(
+      'type' => 'rifle',
+      'ranking' => 'first'
+    ).save!
+    Squad.new(
+      'type' => 'artillery',
+      'ranking' => 'second'
+    ).save!
+    Squad.new(
+      'type' => 'artillery',
+      'ranking' => 'first'
+    ).save!
+
+    assert_equal 2, Squad.by_type_and_ranking([ 'rifle', 'first' ]).size
+    assert_equal 3, Squad.by_ranking('first').size
+  end
+end
+

data/test/ut_16_model_custom_view.rb

@@ -0,0 +1,70 @@
+
+#
+# testing rufus-doric
+#
+# Fri Apr 16 15:19:46 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), 'base')
+
+require 'rufus/doric'
+
+
+class Team < Rufus::Doric::Model
+
+  db :doric
+  doric_type :teams
+
+  h_accessor :type
+  h_accessor :security_level
+  h_accessor :headcount
+
+  view_by 'tysec', %{
+    emit(doc.type + '__' + doc.security_level, null);
+  }
+end
+
+
+class UtModelCustomViewTest < 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_view_by_and
+
+    Team.new(
+      'type' => 'rifle',
+      'security_level' => 'a'
+    ).save!
+    Team.new(
+      'type' => 'rifle',
+      'security_level' => 'a'
+    ).save!
+    Team.new(
+      'type' => 'rifle',
+      'security_level' => 'b'
+    ).save!
+    Team.new(
+      'type' => 'artillery',
+      'security_level' => 'a'
+    ).save!
+    Team.new(
+      'type' => 'artillery',
+      'security_level' => 'c'
+    ).save!
+
+    assert_equal 2, Team.by_tysec('rifle__a').size
+    assert_equal 1, Team.by_tysec('rifle__b').size
+  end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - John Mettraux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-14 00:00:00 +09:00
+date: 2010-04-16 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,6 +137,9 @@ files:
 - test/ut_11_model_view_range.rb
 - test/ut_12_model_default.rb
 - test/ut_13_one_doc_model_default.rb
+- test/ut_14_model_default_id.rb
+- test/ut_15_model_view_by_and.rb
+- test/ut_16_model_custom_view.rb
 - test/ut_1_model.rb
 - test/ut_2_model_view.rb
 - test/ut_3_model_lint.rb