mattetti-couchrest 0.23 → 0.24

data/lib/couchrest/core/server.rb

@@ -2,19 +2,9 @@ module CouchRest
   class Server
     attr_accessor :uri, :uuid_batch_count, :available_databases
     def initialize(server = 'http://127.0.0.1:5984', uuid_batch_count = 1000)
-      case server
-      when %r{\A(http://[^/]+)/(.*)\z}
-        @uri, @prefix = $1, $2
-      else   
-        @uri, @prefix = server, ""
-      end
+      @uri = server
       @uuid_batch_count = uuid_batch_count
     end
-
-    # Add default prefix to database name
-    def expand(name)
-      @prefix + name
-    end
   
     # Lists all "available" databases.
     # An available database, is a database that was specified
@@ -42,7 +32,7 @@ module CouchRest
     # @couch.available_database?(:default)
     #
     def available_database?(ref_or_name)
-      ref_or_name.is_a?(Symbol) ? available_databases.keys.include?(ref_or_name) : available_databases.values.map{|db| db.name}.include?(expand(ref_or_name))
+      ref_or_name.is_a?(Symbol) ? available_databases.keys.include?(ref_or_name) : available_databases.values.map{|db| db.name}.include?(ref_or_name)
     end
   
     def default_database=(name, create_unless_exists = true)
@@ -55,17 +45,12 @@ module CouchRest
   
     # Lists all databases on the server
     def databases
-      dbs = CouchRest.get "#{@uri}/_all_dbs"
-      unless @prefix.empty?
-        pfx = @prefix.gsub('/','%2F')
-        dbs.reject! { |db| db.index(pfx) != 0 }
-      end
-      dbs
+      CouchRest.get "#{@uri}/_all_dbs"
     end
   
     # Returns a CouchRest::Database for the given name
     def database(name)
-      CouchRest::Database.new(self, expand(name))
+      CouchRest::Database.new(self, name)
     end
   
     # Creates the database if it doesn't exist
@@ -81,7 +66,7 @@ module CouchRest
 
     # Create a database
     def create_db(name)
-      CouchRest.put "#{@uri}/#{expand(name).gsub('/','%2F')}"
+      CouchRest.put "#{@uri}/#{name}"
       database(name)
     end
 

data/lib/couchrest/mixins/design_doc.rb

@@ -9,6 +9,12 @@ module CouchRest
       end
       
       module ClassMethods
+        attr_accessor :design_doc, :design_doc_slug_cache, :design_doc_fresh
+        
+        def design_doc
+          @design_doc ||= Design.new(default_design_doc)
+        end
+        
         def design_doc_id
           "_design/#{design_doc_slug}"
         end
@@ -16,7 +22,6 @@ module CouchRest
         def design_doc_slug
           return design_doc_slug_cache if (design_doc_slug_cache && design_doc_fresh)
           funcs = []
-          self.design_doc ||= Design.new(default_design_doc)
           design_doc['views'].each do |name, view|
             funcs << "#{name}/#{view['map']}#{view['reduce']}"
           end

data/lib/couchrest/mixins/document_queries.rb

@@ -12,10 +12,6 @@ module CouchRest
         # name of the current class. Take the standard set of
         # CouchRest::Database#view options.
         def all(opts = {}, &block)
-          self.design_doc ||= Design.new(default_design_doc)
-          unless design_doc_fresh
-            refresh_design_doc
-          end
           view(:all, opts, &block)
         end
 

data/lib/couchrest/mixins/properties.rb

@@ -24,7 +24,7 @@ module CouchRest
         self.class.properties.each do |property|
           key = property.name.to_s
           # let's make sure we have a default and we can assign the value
-          if property.default && (self.respond_to?("#{key}=") || self.key?(key))
+          if !property.default.nil? && (self.respond_to?("#{key}=") || self.key?(key))
               if property.default.class == Proc
                 self[key] = property.default.call
               else
@@ -126,4 +126,4 @@ module CouchRest
       
     end
   end
-end
+end

data/lib/couchrest/mixins/views.rb

@@ -7,12 +7,6 @@ module CouchRest
       end
       
       module ClassMethods
-        attr_accessor :design_doc, :design_doc_slug_cache, :design_doc_fresh
-        
-        def design_doc
-          @design_doc ||= Design.new(default_design_doc)
-        end
-        
         # Define a CouchDB view. The name of the view will be the concatenation
         # of <tt>by</tt> and the keys joined by <tt>_and_</tt>
         #  

data/lib/couchrest/more/casted_model.rb

@@ -9,7 +9,8 @@ module CouchRest
     end
     
     def initialize(keys={})
-      super
+      raise StandardError unless self.is_a? Hash
+      super()
       keys.each do |k,v|
         self[k.to_s] = v
       end if keys

data/lib/couchrest/more/extended_document.rb

@@ -33,6 +33,11 @@ module CouchRest
     
     def initialize(passed_keys={})
       apply_defaults # defined in CouchRest::Mixins::Properties
+      passed_keys.each do |k,v|
+        if self.respond_to?("#{k}=")
+          self.send("#{k}=", passed_keys.delete(k))
+        end
+      end if passed_keys
       super
       cast_keys      # defined in CouchRest::Mixins::Properties
       unless self['_id'] && self['_rev']
@@ -212,4 +217,4 @@ module CouchRest
     end
     
   end
-end
+end

data/lib/couchrest/more/property.rb

@@ -30,11 +30,11 @@ module CouchRest
         @validation_format  = options.delete(:format)     if options[:format]
         @read_only          = options.delete(:read_only)  if options[:read_only]
         @alias              = options.delete(:alias)      if options[:alias]
-        @default            = options.delete(:default)    if options[:default]
+        @default            = options.delete(:default)    unless options[:default].nil?
         @casted             = options[:casted] ? true : false
         @init_method        = options[:send] ? options.delete(:send) : 'new'
         @options            = options
       end
     
   end
-end
+end

data/lib/couchrest/support/rails.rb

@@ -0,0 +1,35 @@
+# This file contains various hacks for Rails compatibility.
+# To use, just require in environment.rb, like so:
+#
+#   require 'couchrest/support/rails'
+
+class Hash
+  # Hack so that CouchRest::Document, which descends from Hash,
+  # doesn't appear to Rails routing as a Hash of options
+  def self.===(other)
+    return false if self == Hash && other.is_a?(CouchRest::Document)
+    super
+  end
+end
+
+
+CouchRest::Document.class_eval do
+  # Hack so that CouchRest::Document, which descends from Hash,
+  # doesn't appear to Rails routing as a Hash of options
+  def is_a?(o)
+    return false if o == Hash
+    super
+  end
+  alias_method :kind_of?, :is_a?
+end
+
+
+require Pathname.new(File.dirname(__FILE__)).join('..', 'validation', 'validation_errors')
+
+CouchRest::Validation::ValidationErrors.class_eval do
+  # Returns the total number of errors added. Two errors added to the same attribute will be counted as such.
+  # This method is called by error_messages_for
+  def count
+    errors.values.inject(0) { |error_count, errors_for_attribute| error_count + errors_for_attribute.size }
+  end
+end

data/lib/couchrest.rb

@@ -28,7 +28,7 @@ require 'couchrest/monkeypatches'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION    = '0.23' unless self.const_defined?("VERSION")
+  VERSION    = '0.24' unless self.const_defined?("VERSION")
   
   autoload :Server,       'couchrest/core/server'
   autoload :Database,     'couchrest/core/database'

data/spec/couchrest/core/server_spec.rb

@@ -2,36 +2,6 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe CouchRest::Server do
   
-  describe "named databases" do
-    it "should generate database without prefix" do
-      couch = CouchRest::Server.new "http://192.0.2.1:1234"
-      db = couch.database("foo")
-      db.name.should == "foo"
-      db.uri.should == "http://192.0.2.1:1234/foo"
-    end
-
-    it "should generate database with prefix" do
-      couch = CouchRest::Server.new "http://192.0.2.1:1234/dev"
-      db = couch.database("foo")
-      db.name.should == "devfoo"
-      db.uri.should == "http://192.0.2.1:1234/devfoo"
-    end
-
-    it "should generate database with prefix and slash" do
-      couch = CouchRest::Server.new "http://192.0.2.1:1234/dev/"
-      db = couch.database("foo")
-      db.name.should == "dev/foo"
-      db.uri.should == "http://192.0.2.1:1234/dev%2Ffoo"
-    end
-
-    it "should generate database with slashes" do
-      couch = CouchRest::Server.new "http://192.0.2.1:1234/dev/sample/"
-      db = couch.database("foo/bar")
-      db.name.should == "dev/sample/foo/bar"
-      db.uri.should == "http://192.0.2.1:1234/dev%2Fsample%2Ffoo%2Fbar"
-    end
-  end
-
   describe "available databases" do
     before(:each) do
       @couch = CouchRest::Server.new

data/spec/couchrest/more/casted_model_spec.rb

@@ -4,6 +4,7 @@ require File.join(FIXTURE_PATH, 'more', 'card')
 class WithCastedModelMixin < Hash
   include CouchRest::CastedModel
   property :name
+  property :no_value
 end
 
 class DummyModel < CouchRest::ExtendedDocument
@@ -54,6 +55,14 @@ describe CouchRest::CastedModel do
     it "should know who casted it" do
       @casted_obj.casted_by.should == @obj
     end
+
+    it "should return nil for the 'no_value' attribute" do
+      @casted_obj.no_value.should be_nil
+    end
+
+    it "should return nil for the unknown attribute" do
+      @casted_obj["unknown"].should be_nil
+    end
   end
   
   describe "casted as an array of a different type" do

data/spec/couchrest/more/extended_doc_spec.rb

@@ -10,6 +10,7 @@ describe "ExtendedDocument" do
     property :preset,       :default => {:right => 10, :top_align => false}
     property :set_by_proc,  :default => Proc.new{Time.now},       :cast_as => 'Time'
     property :tags,         :default => []
+    property :false_default, :default => false
     property :name
     timestamps!
   end
@@ -52,6 +53,19 @@ describe "ExtendedDocument" do
     property :preset, :default => 'value'
     property :has_no_default
   end
+
+  class WithGetterAndSetterMethods < CouchRest::ExtendedDocument
+    use_database TEST_SERVER.default_database
+    
+    property :other_arg
+    def arg
+      other_arg
+    end
+
+    def arg=(value)
+      self.other_arg = "foo-#{value}"
+    end
+  end
   
   before(:each) do
     @obj = WithDefaultValues.new
@@ -144,6 +158,11 @@ describe "ExtendedDocument" do
       obj = WithDefaultValues.new(:tags => ['spec'])
       obj.tags.should == ['spec']
     end
+
+    it "should work with a default value of false" do
+      obj = WithDefaultValues.new
+      obj.false_default.should == false
+    end
   end
   
   describe "a doc with template values (CR::Model spec)" do
@@ -506,4 +525,13 @@ describe "ExtendedDocument" do
       
     end
   end
-end
+
+  describe "getter and setter methods" do
+    it "should try to call the arg= method before setting :arg in the hash" do
+      @doc = WithGetterAndSetterMethods.new(:arg => "foo")
+      @doc['arg'].should be_nil
+      @doc[:arg].should be_nil
+      @doc.other_arg.should == "foo-foo"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -23,4 +23,16 @@ def reset_test_db!
   db = cr.database(TESTDB)
   db.recreate! rescue nil
   db
+end
+
+Spec::Runner.configure do |config|
+  config.before(:all) { reset_test_db! }
+  
+  config.after(:all) do
+    cr = TEST_SERVER
+    test_dbs = cr.databases.select { |db| db =~ /^#{TESTDB}/ }
+    test_dbs.each do |db|
+      cr.database(db).delete! rescue nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mattetti-couchrest
 version: !ruby/object:Gem::Version 
-  version: "0.23"
+  version: "0.24"
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -110,6 +110,7 @@ files:
 - lib/couchrest/support
 - lib/couchrest/support/blank.rb
 - lib/couchrest/support/class.rb
+- lib/couchrest/support/rails.rb
 - lib/couchrest/validation
 - lib/couchrest/validation/auto_validate.rb
 - lib/couchrest/validation/contextual_validators.rb
@@ -194,7 +195,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Lean and RESTful interface to CouchDB.
 test_files: []