rufus-doric 0.1.14 → 0.1.15

data/CHANGELOG.txt

@@ -2,6 +2,12 @@
 = rufus-doric CHANGELOG.txt
 
 
+== rufus-doric - 0.1.15    released 2010/06/22
+
+- view_by :name, :ignore_case => true
+- hardened Rufus::Doric.neutralize_id
+
+
 == rufus-doric - 0.1.14    released 2010/05/22
 
 - map and now, map and reduce (Model.view_by)

data/Rakefile

@@ -10,7 +10,7 @@ require 'rake'
 # CLEAN
 
 require 'rake/clean'
-CLEAN.include('pkg', 'tmp', 'html')
+CLEAN.include('pkg', 'tmp', 'html', 'rdoc')
 task :default => [ :clean ]
 
 
@@ -35,8 +35,8 @@ something at the intersection of Rails3, CouchDB and rufus-jig
 
   gem.test_file = 'test/test.rb'
 
-  gem.add_dependency 'activerecord', '~> 3.0.0.beta3'
-  gem.add_dependency 'rufus-jig', '>= 0.1.19'
+  gem.add_dependency 'activerecord', '~> 3.0.0.beta4'
+  gem.add_dependency 'rufus-jig', '>= 0.1.20'
   gem.add_dependency 'mime-types', '>= 1.16'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'yard'
@@ -50,29 +50,40 @@ Jeweler::GemcutterTasks.new
 #
 # DOC
 
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new do |doc|
-    doc.options = [
-      '-o', 'html/rufus-doric', '--title',
-      "rufus-doric #{Rufus::Doric::VERSION}"
-    ]
-  end
-rescue LoadError
-  task :yard do
-    abort "YARD is not available : sudo gem install yard"
-  end
+#begin
+#  require 'yard'
+#  YARD::Rake::YardocTask.new do |doc|
+#    doc.options = [
+#      '-o', 'html/rufus-doric', '--title',
+#      "rufus-doric #{Rufus::Doric::VERSION}"
+#    ]
+#  end
+#rescue LoadError
+#  task :yard do
+#    abort "YARD is not available : sudo gem install yard"
+#  end
+#end
+
+#
+# make sure to have rdoc 2.5.x to run that
+#
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rd|
+  rd.main = 'README.rdoc'
+  rd.rdoc_dir = 'rdoc/rufus-doric'
+  rd.rdoc_files.include('README.rdoc', 'CHANGELOG.txt', 'lib/**/*.rb')
+  rd.title = "rufus-doric #{Rufus::Doric::VERSION}"
 end
 
 
 #
 # TO THE WEB
 
-task :upload_website => [ :clean, :yard ] do
+task :upload_website => [ :clean, :rdoc ] do
 
   account = 'jmettraux@rubyforge.org'
   webdir = '/var/www/gforge-projects/rufus'
 
-  sh "rsync -azv -e ssh html/rufus-doric #{account}:#{webdir}/"
+  sh "rsync -azv -e ssh rdoc/rufus-doric #{account}:#{webdir}/"
 end
 

data/TODO.txt

@@ -8,6 +8,7 @@
 [o] eventually : pagination for the text index
 [o] view_by 'name', %{ emit(doc.nada) }
 [o] start and end key should be by_x(:start => a, :end => b)
+[o] credit Claudio
 
 [x] lsof check (jig / patron)
 
@@ -15,5 +16,5 @@
 
 [ ] view_by 'x', 'emit' ==> view 'x', 'emit' ==> Model.x(key)...
 
-[ ] credit Claudio !!
+[ ] case-insentive index (Claudio)
 

data/lib/rufus/doric/model.rb

@@ -162,6 +162,13 @@ module Doric
     #
     def self.view_by (key, map=nil, reduce=nil)
 
+      ignore_case = false
+
+      if map && map.is_a?(Hash)
+        ignore_case = map[:ignore_case]
+        map = nil
+      end
+
       if map
 
         k = { :view => key, :map => map, :reduce => reduce }
@@ -181,6 +188,7 @@ module Doric
 
         instance_eval %{
           def by_#{skey} (val, opts={})
+            opts = opts.merge(:ignore_case => #{ignore_case})
             by(#{key.inspect}, val, opts)
           end
         }
@@ -560,7 +568,7 @@ module Doric
       path = "#{design_path}/_view/text_index"
       path = "#{path}?key=%22#{key}%22" if key
 
-      m = get_result(path, :text_index)
+      m = get_result(path, :text_index, {})
 
       m = m['rows'].inject({}) { |h, r| (h[r['key']] ||= []) << r['id']; h }
 
@@ -599,7 +607,7 @@ module Doric
       end
     end
 
-    def self.put_design_doc (key=nil)
+    def self.put_design_doc (key, opts)
 
       # the 'all' view
 
@@ -651,17 +659,17 @@ module Doric
         keys = key.collect { |k| "doc['#{k}']" }.join(', ')
 
         ddoc['views']["by_#{skey}"] = {
-          'map' => func(%{
-            emit([#{keys}], null);
-          })
+          'map' => func("emit([#{keys}], null);")
         }
 
       else
 
+        emit = opts[:ignore_case] ?
+          "emit(doc['#{key}'].toLowerCase(), null);" :
+          "emit(doc['#{key}'], null);"
+
         ddoc['views']["by_#{key}"] = {
-          'map' => func(%{
-            emit(doc['#{key}'], null);
-          })
+          'map' => func(emit)
         }
       end
 
@@ -692,7 +700,7 @@ module Doric
 
       path = "_design/doric/_view/by_doric_type?#{qs.join('&')}"
 
-      result = get_result(path)
+      result = get_result(path, nil, opts)
 
       result['rows'].collect { |r| r['doc'] }
     end
@@ -739,7 +747,7 @@ module Doric
 
       path = "#{design_path}/_view/by_#{skey}?#{qs.join('&')}"
 
-      result = get_result(path, key)
+      result = get_result(path, key, opts)
 
       row = result['rows']
 
@@ -757,7 +765,7 @@ module Doric
     # Will raise if the design_doc can't be inserted (probably the underlying
     # db is missing).
     #
-    def self.get_result (path, design_doc_key=nil)
+    def self.get_result (path, design_doc_key, opts)
 
       result = db.get(path)
 
@@ -765,7 +773,7 @@ module Doric
 
       # insert design doc
 
-      r = put_design_doc(design_doc_key)
+      r = put_design_doc(design_doc_key, opts)
 
       raise(
         "failed to insert 'any' design_doc in db '#{db.name}'"
@@ -773,7 +781,7 @@ module Doric
 
       # re-get
 
-      get_result(path, design_doc_key)
+      get_result(path, design_doc_key, opts)
     end
   end
 end

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.14'
+  VERSION = '0.1.15'
 end
 end
 

data/rufus-doric.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-doric}
-  s.version = "0.1.14"
+  s.version = "0.1.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux"]
-  s.date = %q{2010-05-22}
+  s.date = %q{2010-06-22}
   s.description = %q{
 something at the intersection of Rails3, CouchDB and rufus-jig
   }
@@ -56,7 +56,9 @@ something at the intersection of Rails3, CouchDB and rufus-jig
      "test/ut_16_model_custom_view.rb",
      "test/ut_17_model_and_attachments.rb",
      "test/ut_18_model_map_reduce.rb",
+     "test/ut_19_neutralize_id.rb",
      "test/ut_1_model.rb",
+     "test/ut_20_model_view_by_ignore_case.rb",
      "test/ut_2_model_view.rb",
      "test/ut_3_model_lint.rb",
      "test/ut_4_one_doc_model.rb",
@@ -81,23 +83,23 @@ something at the intersection of Rails3, CouchDB and rufus-jig
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.0.beta3"])
-      s.add_runtime_dependency(%q<rufus-jig>, [">= 0.1.19"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.0.beta4"])
+      s.add_runtime_dependency(%q<rufus-jig>, [">= 0.1.20"])
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, ["~> 3.0.0.beta3"])
-      s.add_dependency(%q<rufus-jig>, [">= 0.1.19"])
+      s.add_dependency(%q<activerecord>, ["~> 3.0.0.beta4"])
+      s.add_dependency(%q<rufus-jig>, [">= 0.1.20"])
       s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, ["~> 3.0.0.beta3"])
-    s.add_dependency(%q<rufus-jig>, [">= 0.1.19"])
+    s.add_dependency(%q<activerecord>, ["~> 3.0.0.beta4"])
+    s.add_dependency(%q<rufus-jig>, [">= 0.1.20"])
     s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/test/ut_19_neutralize_id.rb

@@ -0,0 +1,34 @@
+# encoding: UTF-8
+
+#
+# testing rufus-doric
+#
+# Mon Jun 21 11:09:39 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), 'base')
+
+require 'rufus/doric'
+
+
+class UtNeutralizeTest < Test::Unit::TestCase
+
+  def test_quotes
+
+    assert_equal "_hogehoge__foo", n('"hogehoge" foo')
+    assert_equal "X'ian", n("X'ian")
+  end
+
+  def test_utf8
+
+    assert_equal "横浜", n("横浜")
+  end
+
+  protected
+
+  def n (s)
+
+    Rufus::Doric.neutralize_id(s)
+  end
+end
+

data/test/ut_1_model.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 #
 # testing rufus-doric
@@ -210,9 +211,9 @@ class UtModelTest < Test::Unit::TestCase
 
     Thing.new('name' => "Xi'an").save!
     assert_not_nil Thing.find("Xi'an")
-    #Thing.all.each do |thing|
-    #  p thing
-    #end
+
+    Thing.new('name' => '横浜').save!
+    assert_not_nil Thing.find('横浜')
   end
 end
 

data/test/ut_20_model_view_by_ignore_case.rb

@@ -0,0 +1,58 @@
+
+#
+# testing rufus-doric
+#
+# Tue Jun 22 15:07:22 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), 'base')
+
+require 'rufus/doric'
+
+
+class Handkerchief < Rufus::Doric::Model
+
+  db :doric
+  doric_type :handkerchief
+
+  _id_field { [ brand, colour, owner ].join('_').downcase }
+  h_accessor :brand
+  h_accessor :colour
+  h_accessor :owner
+
+  view_by :owner, :ignore_case => true
+end
+
+
+class UtModelViewTest < 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_owner
+
+    Handkerchief.new(
+      :brand => 'valentino', :colour => 'blue', :owner => 'Pepe'
+    ).save!
+    Handkerchief.new(
+      :brand => 'lv', :colour => 'brown', :owner => 'Jefe'
+    ).save!
+    Handkerchief.new(
+      :brand => 'chanel', :colour => 'b&w', :owner => 'jefe'
+    ).save!
+
+    assert_equal 1, Handkerchief.by_owner('pepe').size
+    assert_equal 2, Handkerchief.by_owner('jefe').size
+  end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 14
-  version: 0.1.14
+  - 15
+  version: 0.1.15
 platform: ruby
 authors: 
 - John Mettraux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-22 00:00:00 +09:00
+date: 2010-06-22 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,8 +42,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 19
-        version: 0.1.19
+        - 20
+        version: 0.1.20
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -143,7 +143,9 @@ files:
 - test/ut_16_model_custom_view.rb
 - test/ut_17_model_and_attachments.rb
 - test/ut_18_model_map_reduce.rb
+- test/ut_19_neutralize_id.rb
 - test/ut_1_model.rb
+- test/ut_20_model_view_by_ignore_case.rb
 - test/ut_2_model_view.rb
 - test/ut_3_model_lint.rb
 - test/ut_4_one_doc_model.rb