rufus-doric 0.1.8 → 0.1.9

data/CHANGELOG.txt

@@ -2,6 +2,14 @@
 = rufus-doric CHANGELOG.txt
 
 
+== rufus-doric - 0.1.9    released 2010/05/13
+
+- model#detach(attachment_name)
+- model#attach(attachment_name, data)
+- raising ActiveRecord::RecordInvalid if _id is missing or ''
+- view, as shortcut for view_by
+
+
 == rufus-doric - 0.1.8    released 2010/04/16
 
 - view_by 'funcname', 'func' creates a 'funcname' method, not a 'by_funcname'

data/Rakefile

@@ -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.beta2'
-  gem.add_dependency 'rufus-jig', '>= 0.1.17'
+  gem.add_dependency 'activerecord', '~> 3.0.0.beta3'
+  gem.add_dependency 'rufus-jig', '>= 0.1.18'
   gem.add_dependency 'mime-types', '>= 1.16'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'yard'

data/lib/rufus/doric/model.rb

@@ -23,6 +23,7 @@
 #++
 
 require 'cgi'
+require 'mime/types'
 
 
 module Rufus
@@ -170,6 +171,13 @@ module Doric
       end
     end
 
+    # Shorter than view_by.
+    #
+    def self.view (key, func=nil)
+
+      view_by(key, func)
+    end
+
     def self.text_index (*keys)
 
       @text_index = keys
@@ -237,13 +245,31 @@ module Doric
         @h['_id'] = Rufus::Doric.neutralize_id(@h['_id'])
       end
 
-      raise ActiveRecord::RecordInvalid.new(self) if @h['_id'].nil?
+      if @h['_id'].nil? || @h['_id'].strip == ''
+        raise ActiveRecord::RecordInvalid.new(self)
+      end
 
       r = db.put(@h)
 
       raise(SaveFailed.new(self.class.doric_type, _id)) unless r.nil?
     end
 
+    def attach (attname, data)
+
+      doc = db.get(@h['_id'])
+
+      db.attach(
+        doc, attname, data,
+        :content_type => ::MIME::Types.type_for(attname).first.to_s)
+    end
+
+    def detach (attname)
+
+      raise ArgumentError.new("model not yet saved") unless @h['_rev']
+
+      db.delete("#{@h['_id']}/#{attname}?rev=#{@h['_rev']}")
+    end
+
     #--
     # methods required by ActiveModel (see test/unit/ut_3_model_lint.rb)
     #++

data/lib/rufus/doric/version.rb

@@ -1,7 +1,7 @@
 
 module Rufus
 module Doric
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end
 end
 

data/rufus-doric.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-doric}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux"]
-  s.date = %q{2010-04-16}
+  s.date = %q{2010-05-13}
   s.description = %q{
 something at the intersection of Rails3, CouchDB and rufus-jig
   }
@@ -78,23 +78,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.beta2"])
-      s.add_runtime_dependency(%q<rufus-jig>, [">= 0.1.17"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.0.beta3"])
+      s.add_runtime_dependency(%q<rufus-jig>, [">= 0.1.18"])
       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.beta2"])
-      s.add_dependency(%q<rufus-jig>, [">= 0.1.17"])
+      s.add_dependency(%q<activerecord>, ["~> 3.0.0.beta3"])
+      s.add_dependency(%q<rufus-jig>, [">= 0.1.18"])
       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.beta2"])
-    s.add_dependency(%q<rufus-jig>, [">= 0.1.17"])
+    s.add_dependency(%q<activerecord>, ["~> 3.0.0.beta3"])
+    s.add_dependency(%q<rufus-jig>, [">= 0.1.18"])
     s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/test/ut_16_model_custom_view.rb

@@ -22,7 +22,7 @@ class Team < Rufus::Doric::Model
   view_by 'tysec', %{
     emit(doc.type + '__' + doc.security_level, null);
   }
-  view_by 'tysec2', %{
+  view 'tysec2', %{
     emit([ doc.type, doc.security_level ], null);
   }
 end

data/test/ut_1_model.rb

@@ -90,6 +90,14 @@ class UtModelTest < Test::Unit::TestCase
     end
   end
 
+  def test_missing_id_when_saving
+
+    assert_raise ActiveRecord::RecordInvalid do
+      Thing.new(
+      ).save!
+    end
+  end
+
   def test_copy
 
     Thing.new(
@@ -179,5 +187,36 @@ class UtModelTest < Test::Unit::TestCase
 
     assert_equal 'art', c.name
   end
+
+  def test_attach
+
+    txt = File.read(__FILE__)
+
+    t = Thing.new('name' => 'piece_of_code')
+    t.save!
+
+    assert_equal [], t.attachments
+
+    t.attach('code.txt', txt)
+
+    t = Thing.find('piece_of_code')
+
+    assert_equal [ 'code.txt' ], t.attachments
+    assert_equal txt, t.db.get('piece_of_code/code.txt')
+  end
+
+  def test_detach
+
+    t = Thing.new('name' => 'ms_excel')
+    t.save!
+    t.attach('code.txt', File.read(__FILE__))
+    t = Thing.find('ms_excel')
+
+    assert_equal [ 'code.txt' ], t.attachments
+
+    t.detach('code.txt')
+
+    assert_equal [], Thing.find('ms_excel').attachments
+  end
 end
 

data/test/ut_4_one_doc_model.rb

@@ -22,6 +22,12 @@ class User < Rufus::Doric::OneDocModel
   validates :password, :presence => true
 end
 
+#class Site < Rufus::Doric::OneDocModel
+#  doc_id :sites
+#  property :name
+#  property :streets
+#end
+
 
 class UtOneDocModelTest < Test::Unit::TestCase
 
@@ -87,5 +93,10 @@ class UtOneDocModelTest < Test::Unit::TestCase
 
     assert_equal [], User.all
   end
+
+#  def test_missing_db_declaration
+#
+#    Site.new(:name => 'Eur', :streets => [:one, :two, :three]).save!
+#  end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - John Mettraux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +09:00
+date: 2010-05-13 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         - 3
         - 0
         - 0
-        - beta2
-        version: 3.0.0.beta2
+        - beta3
+        version: 3.0.0.beta3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,8 +42,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 17
-        version: 0.1.17
+        - 18
+        version: 0.1.18
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency