rufus-doric 0.1.0 → 0.1.1

data/CHANGELOG.txt

@@ -2,6 +2,15 @@
 = rufus-doric CHANGELOG.txt
 
 
+== rufus-doric - 0.1.1    not yet released
+
+- associations are in (_id[s]) for Model
+- equality and hash for Model
+- now raises if putting a design doc fails
+- Rufus::Doric.db(dbname) returns the couchdb 'connection'
+- Rufus::Doric::Value : one document containing a single [big] value
+
+
 == rufus-doric - 0.1.0    released 2010/03/17
 
 - initial release

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.beta'
-  gem.add_dependency 'rufus-jig', '>= 0.1.16'
+  gem.add_dependency 'rufus-jig', '>= 0.1.17'
   gem.add_dependency 'mime-types', '>= 1.16'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'yard'

data/lib/rufus/doric/couch.rb

@@ -29,56 +29,55 @@
 module Rufus
 module Doric
 
-  module Couch
+  def self.couch_url
 
-    def self.url
+    if defined?(Rails)
+      return File.read(Rails.root.join('config', 'couch_url.txt')).strip
+    end
+    if File.exist?('couch_url.txt')
+      return File.read('couch_url.txt').strip
+    end
 
-      if defined?(Rails)
-        return File.read(Rails.root.join('config', 'couch_url.txt')).strip
-      end
-      if File.exist?('couch_url.txt')
-        return File.read('couch_url.txt').strip
-      end
+    'http://127.0.0.1:5984'
+  end
 
-      'http://127.0.0.1:5984'
-    end
+  def self.couch
 
-    def self.couch
+    Rufus::Jig::Couch.new(couch_url)
+  end
 
-      Rufus::Jig::Couch.new(url)
-    end
+  def self.db (name, opts={})
 
-    def self.db (name, opts={})
+    env = opts[:env]
+    env ||= Rails.env if defined?(Rails)
+    env ||= 'test'
 
-      env = opts[:env]
-      env ||= Rails.env if defined?(Rails)
-      env ||= 'test'
+    u = opts[:absolute] ? "#{couch_url}/#{name}" : "#{couch_url}/#{name}_#{env}"
 
-      u = opts[:absolute] ? "#{url}/#{name}" : "#{url}/#{name}_#{env}"
+    return u if opts[:url_only] || opts[:uo]
 
-      return u if opts[:url_only] || opts[:uo]
+    @connections ||= {}
 
-      Rufus::Jig::Couch.new(u)
-    end
+    @connections[u] ||= Rufus::Jig::Couch.new(u)
+  end
 
-#    def self.purge! TODO (name, env)
+#  def self.purge! TODO (name, env)
 #
-#      result = Doric::Couch.get('_all_docs')
+#    result = Doric::Couch.get('_all_docs')
 #
-#      return unless result
+#    return unless result
 #
-#      result['rows'].each do |r|
+#    result['rows'].each do |r|
 #
-#        _id = r['id']
+#      _id = r['id']
 #
-#        next if _id.match(/^\_design\//)
+#      next if _id.match(/^\_design\//)
 #
-#        _rev = r['value']['rev']
+#      _rev = r['value']['rev']
 #
-#        Doric::Couch.delete('_id' => _id, '_rev' => _rev)
-#      end
+#      Doric::Couch.delete('_id' => _id, '_rev' => _rev)
 #    end
-  end
+#  end
 end
 end
 

data/lib/rufus/doric/model.rb

@@ -179,6 +179,51 @@ module Doric
       delete
     end
 
+    def method_missing (m, *args)
+
+      mm = m.to_s
+      sm = mm.singularize
+      multiple = (mm != sm)
+
+      klass = sm.camelize
+      klass = (self.class.const_get(klass) rescue nil)
+
+      return super unless klass
+
+      id_method = multiple ? "#{sm}_ids" : "#{mm}_id"
+
+      if multiple
+
+        if self.respond_to?(id_method)
+
+          ids = self.send(id_method)
+          return [] unless ids
+
+          ids.collect { |i| klass.find(i) }
+
+        else
+
+          by_method = "by_#{self.class.doric_type.singularize}_id"
+          klass.send(by_method, self._id)
+        end
+
+      else
+
+        return super unless self.respond_to?(id_method)
+        klass.find(self.send(id_method))
+      end
+    end
+
+    def hash
+      h.hash
+    end
+
+    def == (other)
+      return false unless other.class == self.class
+      (h == other.h)
+    end
+    alias eql? ==
+
     #--
     # class methods
     #++
@@ -216,10 +261,7 @@ module Doric
 
       # the 'all' view
 
-      unless key
-        db.put(DORIC_DESIGN_DOC)
-        return
-      end
+      return db.put(DORIC_DESIGN_DOC) unless key
 
       # by_{key} views
 
@@ -268,7 +310,10 @@ module Doric
 
         # insert design doc
 
-        put_design_doc
+        r = put_design_doc
+        raise(
+          "failed to insert design_doc in db '#{db.name}'"
+        ) if r == true
         return get_all(opts)
       end
 
@@ -292,7 +337,7 @@ module Doric
         return by(key, val, opts)
       end
 
-      result['rows'].collect { |r| r['doc'] }
+      result['rows'].collect { |r| self.new(r['doc']) }
     end
   end
 end

data/lib/rufus/doric/models.rb

@@ -82,7 +82,7 @@ module Doric
           return @db
         end
 
-        Rufus::Doric::Couch.db(@db, @db_opts)
+        Rufus::Doric.db(@db, @db_opts)
       end
     end
 
@@ -120,3 +120,5 @@ end
 require 'rufus/doric/model'
 require 'rufus/doric/one_doc_model'
 
+require 'rufus/doric/value'
+

data/lib/rufus/doric/value.rb

@@ -0,0 +1,88 @@
+#--
+# Copyright (c) 2010, John Mettraux, jmettraux@gmail.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Made in Japan.
+#++
+
+
+module Rufus
+module Doric
+
+  #
+  # One document containing a single value
+  #
+  class Value
+
+    #
+    # class 'helpers'
+
+    def self.doc_id (_id=nil)
+
+      @doc_id = _id.to_s if _id
+      @doc_id
+    end
+
+    include WithDb
+
+    #
+    # constructor and instance methods
+
+    attr_reader :h
+
+    def initialize (h)
+
+      @h = h.inject({}) { |hh, (k, v)| hh[k.to_s] = v; hh }
+    end
+
+    def value
+
+      @h['value']
+    end
+
+    def save!
+
+      doc = self.class.do_get(self.class.doc_id)
+      doc ||= { '_id' => self.class.doc_id }
+
+      doc['value'] = value
+
+      db.put(doc)
+    end
+
+    #--
+    # class methods
+    #++
+
+    def self.load
+
+      self.new(do_get(doc_id))
+    end
+
+    protected
+
+    def self.do_get (doc_id)
+
+      db.get(doc_id) ||  { '_id' => doc_id, 'value' => nil }
+    end
+  end
+end
+end
+

data/lib/rufus/doric/version.rb

@@ -1,7 +1,7 @@
 
 module Rufus
 module Doric
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end
 end
 

data/rufus-doric.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-doric}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux"]
-  s.date = %q{2010-03-17}
+  s.date = %q{2010-03-22}
   s.description = %q{
 something at the intersection of Rails3, CouchDB and rufus-jig
   }
@@ -31,6 +31,7 @@ something at the intersection of Rails3, CouchDB and rufus-jig
      "lib/rufus/doric/model.rb",
      "lib/rufus/doric/models.rb",
      "lib/rufus/doric/one_doc_model.rb",
+     "lib/rufus/doric/value.rb",
      "lib/rufus/doric/version.rb",
      "rufus-doric.gemspec",
      "test/base.rb",
@@ -38,6 +39,7 @@ something at the intersection of Rails3, CouchDB and rufus-jig
      "test/fixtures/test/doric/69249__picture.jpg",
      "test/fixtures/test/doric/product0.json",
      "test/fixtures/test/doric/product1.json",
+     "test/fixtures/test/doric/tuples.json",
      "test/fixtures/test/doric/users.json",
      "test/fixtures/test/doric/users__jami.png",
      "test/fixtures/test/doric/users__john.jpg",
@@ -47,7 +49,9 @@ something at the intersection of Rails3, CouchDB and rufus-jig
      "test/ut_1_model.rb",
      "test/ut_2_model_view.rb",
      "test/ut_3_model_lint.rb",
-     "test/ut_4_one_doc_model.rb"
+     "test/ut_4_one_doc_model.rb",
+     "test/ut_5_value.rb",
+     "test/ut_6_model_associations.rb"
   ]
   s.homepage = %q{http://github.com/jmettraux/rufus-doric/}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -65,14 +69,14 @@ 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.beta"])
-      s.add_runtime_dependency(%q<rufus-jig>, [">= 0.1.16"])
+      s.add_runtime_dependency(%q<rufus-jig>, [">= 0.1.17"])
       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.beta"])
-      s.add_dependency(%q<rufus-jig>, [">= 0.1.16"])
+      s.add_dependency(%q<rufus-jig>, [">= 0.1.17"])
       s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -80,7 +84,7 @@ something at the intersection of Rails3, CouchDB and rufus-jig
     end
   else
     s.add_dependency(%q<activerecord>, ["~> 3.0.0.beta"])
-    s.add_dependency(%q<rufus-jig>, [">= 0.1.16"])
+    s.add_dependency(%q<rufus-jig>, [">= 0.1.17"])
     s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/test/fixtures/test/doric/tuples.json

@@ -0,0 +1,4 @@
+{
+  "_id": "tuples",
+  "value": [ "alpha", "bravo", "charly" ]
+}

data/test/ut_0_fixtures.rb

@@ -15,7 +15,7 @@ class UtFixturesTest < Test::Unit::TestCase
   #def setup
   #end
   def teardown
-    couch = Rufus::Jig::Couch.new(Rufus::Doric::Couch.url)
+    couch = Rufus::Jig::Couch.new(Rufus::Doric.couch_url)
     couch.delete('doric_test')
     couch.delete('doric_nada')
     couch.delete('doric')
@@ -25,11 +25,11 @@ class UtFixturesTest < Test::Unit::TestCase
   def test_load
 
     Rufus::Doric::Fixtures.load(
-      Rufus::Doric::Couch.url, 'test/fixtures/test',
+      Rufus::Doric.couch_url, 'test/fixtures/test',
       :purge => true,
       :verbose => false)
 
-    img = Rufus::Doric::Couch.db('doric').get('users/john.jpg')
+    img = Rufus::Doric.db('doric').get('users/john.jpg')
 
     assert_not_nil img
   end
@@ -37,12 +37,12 @@ class UtFixturesTest < Test::Unit::TestCase
   def test_env_option
 
     Rufus::Doric::Fixtures.load(
-      Rufus::Doric::Couch.url, 'test/fixtures/test',
+      Rufus::Doric.couch_url, 'test/fixtures/test',
       :env => 'nada',
       :purge => true,
       :verbose => false)
 
-    img = Rufus::Doric::Couch.db('doric', :env => 'nada').get('users/john.jpg')
+    img = Rufus::Doric.db('doric', :env => 'nada').get('users/john.jpg')
 
     assert_not_nil img
   end
@@ -50,12 +50,12 @@ class UtFixturesTest < Test::Unit::TestCase
   def test_absolute_option
 
     Rufus::Doric::Fixtures.load(
-      Rufus::Doric::Couch.url, 'test/fixtures/test',
+      Rufus::Doric.couch_url, 'test/fixtures/test',
       :db => 'doric',
       :purge => true,
       :verbose => false)
 
-    img = Rufus::Doric::Couch.db('doric', :absolute => true).get('users/john.jpg')
+    img = Rufus::Doric.db('doric', :absolute => true).get('users/john.jpg')
 
     assert_not_nil img
   end

data/test/ut_1_model.rb

@@ -36,9 +36,15 @@ end
 class UtModelTest < Test::Unit::TestCase
 
   def setup
-    Rufus::Doric::Couch.db('doric').delete('.')
-    Rufus::Doric::Couch.db('doric').put('.')
+
+    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
 
@@ -106,13 +112,13 @@ class UtModelTest < Test::Unit::TestCase
   def test_not_found
 
     assert_raise Rufus::Doric::NotFound do
-      Thing.find('nada')
+      Thing.find('gozaimasen')
     end
   end
 
   def test_destroy_all
 
-    Thing.new('name' => 'flamenco').save!
+    Thing.new('name' => 'dokodemo').save!
 
     assert_equal 1, Thing.all.size
 
@@ -123,11 +129,27 @@ class UtModelTest < Test::Unit::TestCase
 
   def test_putting_in_missing_db
 
-    Rufus::Doric::Couch.db('doric').delete('.')
+    Rufus::Doric.db('doric').delete('.')
 
     assert_raise Rufus::Doric::SaveFailed do
-      Thing.new('name' => 'flamenco').save!
+      Thing.new('name' => 'doraemon').save!
     end
   end
+
+  def test_equality
+
+    Thing.new('name' => 'onaji').save!
+    Thing.new('name' => 'chigau').save!
+
+    a = Thing.find('onaji')
+    b = Thing.find('onaji')
+    c = Thing.find('chigau')
+
+    assert_equal a, b
+    assert_equal a.hash, b.hash
+
+    assert_not_equal a, c
+    assert_not_equal a.hash, c.hash
+  end
 end
 

data/test/ut_2_model_view.rb

@@ -28,9 +28,15 @@ end
 class UtModelTest < Test::Unit::TestCase
 
   def setup
-    Rufus::Doric::Couch.db('doric').delete('.')
-    Rufus::Doric::Couch.db('doric').put('.')
+
+    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
 
@@ -53,6 +59,9 @@ class UtModelTest < Test::Unit::TestCase
     assert_equal 1, Nada::Thing.by_colour('blue').size
     assert_equal 2, Nada::Thing.by_colour('red').size
 
+    assert_equal Nada::Thing, Nada::Thing.all.first.class
+    assert_equal Nada::Thing, Nada::Thing.by_colour('blue').first.class
+
     assert_not_nil Nada::Thing.db.get('_design/doric_nada__thing')
   end
 end

data/test/ut_4_one_doc_model.rb

@@ -27,13 +27,13 @@ class UtOneDocModelTest < Test::Unit::TestCase
 
   def setup
 
-    Rufus::Doric::Couch.db('doric').delete('.')
-    Rufus::Doric::Couch.db('doric').put('.')
+    Rufus::Doric.db('doric').delete('.')
+    Rufus::Doric.db('doric').put('.')
 
     users = Rufus::Json.decode(File.read(File.join(
       File.dirname(__FILE__), 'fixtures', 'test', 'doric', 'users.json')))
 
-    Rufus::Doric::Couch.db('doric').put(users)
+    Rufus::Doric.db('doric').put(users)
   end
 
   #def teardown

data/test/ut_5_value.rb

@@ -0,0 +1,69 @@
+
+#
+# testing rufus-doric
+#
+# Thu Mar 18 22:30:00 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), 'base')
+
+require 'rufus/doric'
+
+
+class Tuples < Rufus::Doric::Value
+
+  doc_id :tuples
+  db :doric
+
+  def to_s
+
+    value.sort.join(' ')
+  end
+end
+
+
+class UtValueTest < Test::Unit::TestCase
+
+  def setup
+
+    @db = Rufus::Doric.db('doric')
+    @db.delete('.')
+    @db.put('.')
+
+    tuples = Rufus::Json.decode(File.read(File.join(
+      File.dirname(__FILE__), 'fixtures', 'test', 'doric', 'tuples.json')))
+
+    @db.put(tuples)
+  end
+
+  #def teardown
+  #end
+
+  def test_load
+
+    assert_equal 'alpha bravo charly', Tuples.load.to_s
+  end
+
+  def test_save
+
+    tuples = Tuples.load
+    tuples.value << 'borneo'
+    tuples.save!
+
+    assert_equal 'alpha borneo bravo charly', tuples.to_s
+    assert_equal 'alpha borneo bravo charly', Tuples.load.to_s
+  end
+
+  def test_save_new
+
+    @db.delete(Tuples.load.h)
+
+    assert_nil @db.get('tuples')
+
+    tuples = Tuples.new(
+      '_id' => 'tuples', 'value' => %w[ alpha beta delta gamma ]).save!
+
+    assert_equal 'alpha beta delta gamma', Tuples.load.to_s
+  end
+end
+

data/test/ut_6_model_associations.rb

@@ -0,0 +1,125 @@
+
+#
+# testing rufus-doric
+#
+# Sun Mar 21 12:07:00 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), 'base')
+
+require 'rufus/doric'
+
+
+class Customer < Rufus::Doric::Model
+
+  db :doric
+  doric_type :customers
+
+  _id_field :name
+
+  h_accessor :name
+  h_accessor :region_id
+  h_accessor :interest_ids
+end
+
+class Interest < Rufus::Doric::Model
+
+  db :doric
+  doric_type :interests
+
+  _id_field :name
+
+  h_accessor :name
+end
+
+class Region < Rufus::Doric::Model
+
+  db :doric
+  doric_type :regions
+
+  _id_field :name
+
+  h_accessor :name
+end
+
+class Order < Rufus::Doric::Model
+
+  db :doric
+  doric_type :orders
+
+  _id_field :order_id
+
+  h_accessor :order_id
+  h_accessor :customer_id
+
+  view_by :customer_id
+end
+
+
+class UtModelTest < 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'
+
+    Customer.new(
+      :name => 'fred', :region_id => 'eu'
+    ).save!
+    Customer.new(
+      :name => 'famke', :region_id => 'eu', :interest_ids => %w[ music dance ]
+    ).save!
+
+    Region.new(:name => 'eu').save!
+
+    Order.new(:order_id => 'a', :customer_id => 'fred').save!
+    Order.new(:order_id => 'b', :customer_id => 'fred').save!
+    Order.new(:order_id => 'c', :customer_id => 'nemo').save!
+
+    Interest.new(:name => 'litterature').save!
+    Interest.new(:name => 'music').save!
+    Interest.new(:name => 'dance').save!
+  end
+
+  #def teardown
+  #end
+
+  def test_customer
+
+    o = Order.find('a')
+    c = Customer.find('fred')
+
+    assert_equal c, o.customer
+  end
+
+  def test_missing_customer
+
+    assert_raise Rufus::Doric::NotFound do
+      Order.find('c').customer
+    end
+  end
+
+  def test_orders
+
+    c = Customer.find('fred')
+
+    os = c.orders
+
+    assert_equal 2, os.size
+    assert_equal [ Order ], os.collect { |o| o.class }.sort.uniq
+  end
+
+  def test_interests
+
+    fred = Customer.find('fred')
+    famke = Customer.find('famke')
+
+    assert_equal [], fred.interests
+    assert_equal %w[ dance music ], famke.interests.collect { |i| i.name }.sort
+  end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - John Mettraux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 +09:00
+date: 2010-03-22 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,8 +42,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 16
-        version: 0.1.16
+        - 17
+        version: 0.1.17
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -118,6 +118,7 @@ files:
 - lib/rufus/doric/model.rb
 - lib/rufus/doric/models.rb
 - lib/rufus/doric/one_doc_model.rb
+- lib/rufus/doric/value.rb
 - lib/rufus/doric/version.rb
 - rufus-doric.gemspec
 - test/base.rb
@@ -125,6 +126,7 @@ files:
 - test/fixtures/test/doric/69249__picture.jpg
 - test/fixtures/test/doric/product0.json
 - test/fixtures/test/doric/product1.json
+- test/fixtures/test/doric/tuples.json
 - test/fixtures/test/doric/users.json
 - test/fixtures/test/doric/users__jami.png
 - test/fixtures/test/doric/users__john.jpg
@@ -135,6 +137,8 @@ files:
 - test/ut_2_model_view.rb
 - test/ut_3_model_lint.rb
 - test/ut_4_one_doc_model.rb
+- test/ut_5_value.rb
+- test/ut_6_model_associations.rb
 has_rdoc: true
 homepage: http://github.com/jmettraux/rufus-doric/
 licenses: []