rufus-doric 0.1.4 → 0.1.5

data/CHANGELOG.txt

@@ -2,6 +2,14 @@
 = rufus-doric CHANGELOG.txt
 
 
+== rufus-doric - 0.1.5    released 2010/04/12
+
+- implemented property :x, :default => 'y'
+- added :limit, :skip, :descending, :inclusive_end to by_x and all
+- added :limit and :skip to by_xxx methods (absolute and range OK)
+- Schedules.by_day([ '20101204', '20110105' ]) by range implemented
+
+
 == rufus-doric - 0.1.4    released 2010/04/09
 
 - adapted to rails3 beta2

data/lib/rufus/doric/model.rb

@@ -131,7 +131,7 @@ module Doric
 
     def initialize (doc={})
 
-      @h = doc.inject({}) { |h, (k, v)| h[k.to_s] = v; h }
+      @h = doc.inject(self.class.defaults.dup) { |h, (k, v)| h[k.to_s] = v; h }
       @h['doric_type'] = self.class.doric_type
     end
 
@@ -278,7 +278,7 @@ module Doric
         db.put(dd)
       end
 
-      i = CGI.escape(Rufus::Json.encode(_id))
+      i = Rufus::Doric.escape(_id)
 
       result = db.get("_design/doric/_view/#{view}?key=#{i}&include_docs=true")
 
@@ -455,13 +455,29 @@ module Doric
       db.put(ddoc)
     end
 
+    def self.add_common_options (qs, opts)
+
+      if limit = opts[:limit]
+        qs << "limit=#{limit}"
+      end
+      if skip = opts[:skip]
+        qs << "skip=#{skip}"
+      end
+      if opts[:descending]
+        qs << "descending=true"
+      end
+      if opts[:inclusive_end]
+        qs << "inclusive_end=true"
+      end
+    end
+
     def self.get_all (opts)
 
-      # TODO : limit, skip (opts)
+      qs = [ 'include_docs=true', "key=%22#{@doric_type}%22" ]
 
-      path =
-        "_design/doric/_view/by_doric_type?key=%22#{@doric_type}%22" +
-        "&include_docs=true"
+      add_common_options(qs, opts)
+
+      path = "_design/doric/_view/by_doric_type?#{qs.join('&')}"
 
       result = get_result(path)
 
@@ -470,13 +486,21 @@ module Doric
 
     def self.by (key, val, opts)
 
-      # TODO : limit, skip (opts)
+      qs = [ 'include_docs=true' ]
+
+      if val.is_a?(Array)
+
+        st, en = val
+        qs << "startkey=#{Rufus::Doric.escape(st)}" if st
+        qs << "endkey=#{Rufus::Doric.escape(en)}" if en
+      else
+
+        qs << "key=#{Rufus::Doric.escape(val)}"
+      end
 
-      #v = Rufus::Json.encode(val)
-      #v = CGI.escape(v)
-      v = "%22#{val}%22"
+      add_common_options(qs, opts)
 
-      path = "#{design_path}/_view/by_#{key}?key=#{v}&include_docs=true"
+      path = "#{design_path}/_view/by_#{key}?#{qs.join('&')}"
 
       result = get_result(path, key)
 

data/lib/rufus/doric/models.rb

@@ -36,6 +36,12 @@ module Doric
     s.to_s.strip.gsub(/[\s\/:;\*\\\+\?]/, '_')
   end
 
+  def self.escape (o)
+
+    #"%22#{o}%22"
+    CGI.escape(Rufus::Json.encode(o))
+  end
+
   #
   # The including classes get two new class methods : h_reader and h_accessor
   # plus property as an alias to h_accessor
@@ -44,28 +50,55 @@ module Doric
 
     def self.included (target)
 
+      def target.defaults
+
+        @defaults || {}
+      end
+
       def target.known_fields
+
         @known_fields
       end
 
       def target.h_reader (*names)
+
         names.each do |name|
+
           name = name.to_s
+
           (@known_fields ||= []) << name
+
           define_method(name) do
             @h[name]
           end
         end
       end
+
       def target.h_accessor (*names)
+
+        default = nil
+
+        if names.last.is_a?(Hash)
+          opts = names.pop
+          default = opts[:default]
+        end
+
         h_reader(*names)
+
         names.each do |name|
+
+          name = name.to_s
+
+          (@defaults ||= {})[name] = default if default
+
           define_method("#{name}=") do |v|
-            @h[name.to_s] = v
+            @h[name] = v
           end
         end
       end
+
       def target.property (*names)
+
         h_accessor(*names)
       end
     end

data/lib/rufus/doric/one_doc_model.rb

@@ -54,7 +54,7 @@ module Doric
 
     def initialize (h, doc=nil)
 
-      @h = h.inject({}) { |hh, (k, v)| hh[k.to_s] = v; hh }
+      @h = h.inject(self.class.defaults.dup) { |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.4'
+  VERSION = '0.1.5'
 end
 end
 

data/rufus-doric.gemspec

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

data/test/ut_11_model_view_range.rb

@@ -0,0 +1,87 @@
+
+#
+# testing rufus-doric
+#
+# Mon Apr 12 10:38:53 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), 'base')
+
+require 'rufus/doric'
+
+
+class Schedule < Rufus::Doric::Model
+
+  db :doric
+  doric_type :schedules
+
+  _id_field :name
+  h_accessor :name
+  h_accessor :day #yyyymmdd
+
+  view_by :day
+end
+
+
+class UtModelViewRangeTest < 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'
+
+    Schedule.new('name' => 'wrestling', 'day' => '20101224').save!
+    Schedule.new('name' => 'shopping', 'day' => '20101224').save!
+    Schedule.new('name' => 'cooking', 'day' => '20101225').save!
+    Schedule.new('name' => 'climbing', 'day' => '20101226').save!
+    Schedule.new('name' => 'drinking', 'day' => '20101227').save!
+  end
+
+  #def teardown
+  #end
+
+  def test_view_by_range
+
+    assert_equal 'shopping', Schedule.by_day('20101224').first.name
+
+    assert_equal(
+      %w[ climbing drinking ],
+      Schedule.by_day([ '20101226', nil ]).collect { |s| s.name })
+    assert_equal(
+      %w[ climbing drinking ],
+      Schedule.by_day([ '20101226' ]).collect { |s| s.name })
+
+    assert_equal(
+      %w[ shopping wrestling cooking ],
+      Schedule.by_day([ nil, '20101225' ]).collect { |s| s.name })
+
+    assert_equal(
+      %w[ drinking climbing cooking ],
+      Schedule.by_day([ nil, '20101225' ], :descending => true).collect { |s| s.name })
+  end
+
+  def test_view_limit
+
+    assert_equal(
+      %w[ shopping ],
+      Schedule.by_day('20101224', :limit => 1).collect { |s| s.name })
+
+    assert_equal(
+      %w[ climbing ],
+      Schedule.by_day([ '20101226', nil ], :limit => 1).collect { |s| s.name })
+    assert_equal(
+      %w[ drinking ],
+      Schedule.by_day([ '20101226', nil ], :skip => 1).collect { |s| s.name })
+  end
+
+  def test_all_opts
+
+    assert_equal 4, Schedule.all(:skip => 1).size
+    assert_equal 2, Schedule.all(:skip => 2, :limit => 2).size
+  end
+end
+

data/test/ut_12_model_default.rb

@@ -0,0 +1,52 @@
+
+#
+# testing rufus-doric
+#
+# Mon Apr 12 14:32:35 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), 'base')
+
+require 'rufus/doric'
+
+
+class Can < Rufus::Doric::Model
+
+  db :doric
+  doric_type :cans
+
+  _id_field :serial
+  h_accessor :serial
+  h_accessor :content, :default => 'tuna'
+  h_accessor :colour
+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
+
+    Can.new(:serial => 'abcd', :content => 'anchovy').save!
+    Can.new(:serial => 'efgh').save!
+
+    assert_equal({ 'content' => 'tuna' }, Can.defaults)
+
+    assert_equal 'anchovy', Can.find('abcd').content
+    assert_equal 'tuna', Can.find('efgh').content
+    assert_equal nil, Can.find('abcd').colour
+  end
+end
+

data/test/ut_13_one_doc_model_default.rb

@@ -0,0 +1,47 @@
+
+#
+# testing rufus-doric
+#
+# Mon Apr 12 14:48:28 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), 'base')
+
+require 'rufus/doric'
+
+
+class Place < Rufus::Doric::OneDocModel
+
+  doc_id :places
+  db :doric
+
+  h_accessor :name
+  h_accessor :zip
+  h_accessor :country, :default => 'UK'
+end
+
+
+class UtOneDocModelDefaultTest < Test::Unit::TestCase
+
+  #def setup
+  #  Rufus::Doric.db('doric').delete('.')
+  #  Rufus::Doric.db('doric').put('.')
+  #end
+  #def teardown
+  #end
+
+  def test_defaults
+
+    assert_equal({ 'country' => 'UK' }, Place.defaults)
+  end
+
+  def test_default
+
+    london = Place.new(:name => 'London')
+    berlin = Place.new(:name => 'Berlin', :country => 'Germany')
+
+    assert_equal 'UK', london.country
+    assert_equal 'Germany', berlin.country
+  end
+end
+

data/test/ut_1_model.rb

@@ -62,6 +62,11 @@ class UtModelTest < Test::Unit::TestCase
     assert_equal Concept, Rufus::Doric.types['concepts']
   end
 
+  def test_defaults
+
+    assert_equal({}, Concept.defaults)
+  end
+
   def test_save
 
     Thing.new(

data/test/ut_2_model_view.rb

@@ -25,7 +25,7 @@ module Nada
 end
 
 
-class UtModelTest < Test::Unit::TestCase
+class UtModelViewTest < Test::Unit::TestCase
 
   def setup
 

data/test/ut_4_one_doc_model.rb

@@ -39,6 +39,11 @@ class UtOneDocModelTest < Test::Unit::TestCase
   #def teardown
   #end
 
+  def test_defaults
+
+    assert_equal({}, User.defaults)
+  end
+
   def test_all
 
     assert_equal %w[ jami john justin ], User.all.collect { |u| u._id }.sort

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - John Mettraux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-09 00:00:00 +09:00
+date: 2010-04-12 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -134,6 +134,9 @@ files:
 - test/test.rb
 - test/ut_0_fixtures.rb
 - test/ut_10_value.rb
+- test/ut_11_model_view_range.rb
+- test/ut_12_model_default.rb
+- test/ut_13_one_doc_model_default.rb
 - test/ut_1_model.rb
 - test/ut_2_model_view.rb
 - test/ut_3_model_lint.rb