couchbase-model 0.5.2 → 0.5.3

data/HISTORY.markdown

@@ -1,4 +1,12 @@
-## 0.5.1 / 2013-02-25
+## 0.5.3 / 2013-06-06
+
+* Prefer single-quoted strings (Andrey Koleshko)
+* Test for Model.design_document (Andrey Koleshko)
+* Support for batch finding multiple objects by id (Jon Moses)
+* Test for activemodel instead of rails for activemodel validations
+* Update couchbase dependency to 1.3.0
+
+## 0.5.2 / 2013-02-25
 
 * Fix attribute inheritance when subclassing (Mike Evans)
 * Added as_json method for rails JSON responses (Stephen von Takach)

data/couchbase-model.gemspec

@@ -1,23 +1,24 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "couchbase/model/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'couchbase/model/version'
 
 Gem::Specification.new do |s|
-  s.name        = "couchbase-model"
+  s.name        = 'couchbase-model'
   s.version     = Couchbase::Model::VERSION
-  s.author      = "Couchbase"
-  s.email       = "support@couchbase.com"
-  s.homepage    = "https://github.com/couchbase/couchbase-ruby-model"
+  s.author      = 'Couchbase'
+  s.email       = 'support@couchbase.com'
+  s.homepage    = 'https://github.com/couchbase/couchbase-ruby-model'
   s.summary     = %q{Declarative interface to Couchbase}
   s.description = %q{ORM-like interface allows you to persist your models to Couchbase}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'couchbase', '~> 1.2.0.dp'
+  s.add_runtime_dependency 'couchbase', '~> 1.3.0'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'minitest'
+  s.add_development_dependency 'activesupport'
 end

data/lib/couchbase-model.rb

@@ -19,5 +19,5 @@ require 'couchbase/model'
 
 # If we are using Rails then we will include the Couchbase railtie.
 if defined?(Rails)
-  require "couchbase/railtie"
+  require 'couchbase/railtie'
 end

data/lib/couchbase/model.rb

@@ -25,10 +25,10 @@ require 'couchbase/model/configuration'
 unless Object.respond_to?(:singleton_class)
   require 'couchbase/model/ext/singleton_class'
 end
-unless "".respond_to?(:constantize)
+unless ''.respond_to?(:constantize)
   require 'couchbase/model/ext/constantize'
 end
-unless "".respond_to?(:camelize)
+unless ''.respond_to?(:camelize)
   require 'couchbase/model/ext/camelize'
 end
 
@@ -43,9 +43,9 @@ module Couchbase
     def initialize(record)
       @record = record
       if @record.errors
-        super(@record.errors.full_messages.join(", "))
+        super(@record.errors.full_messages.join(', '))
       else
-        super("Record invalid")
+        super('Record invalid')
       end
     end
   end
@@ -221,7 +221,7 @@ module Couchbase
     # +by_session_id` and `total_views`.
     def self.ensure_design_document!
       unless Configuration.design_documents_paths
-        raise "Configuration.design_documents_path must be directory"
+        raise 'Configuration.design_documents_path must be directory'
       end
 
       doc = {'_id' => "_design/#{design_document}", 'views' => {}}
@@ -351,7 +351,7 @@ module Couchbase
       end
       is_spatial = options.delete(:spatial)
       names.each do |name|
-        path = "_design/%s/_%s/%s" % [design_document, is_spatial ? "spatial" : "view", name]
+        path = '_design/%s/_%s/%s' % [design_document, is_spatial ? 'spatial' : 'view', name]
         views[name] = lambda do |*params|
           params = options.merge(params.first || {})
           View.new(bucket, path, params)
@@ -389,40 +389,58 @@ module Couchbase
       end
     end
 
+    class << self
+      def _find(quiet, *ids)
+        wants_array = ids.first.kind_of?(Array)
+        ids = ids.flatten.compact.uniq
+        unless ids.empty?
+          res = bucket.get(ids, :quiet => quiet, :extended => true).map do |id, (obj, flags, cas)|
+            obj = {:raw => obj} unless obj.is_a?(Hash)
+            new({:id => id, :meta => {'flags' => flags, 'cas' => cas}}.merge(obj))
+          end
+          wants_array ? res : res.first
+        end
+      end
+
+      private :_find
+    end
+
     # Find the model using +id+ attribute
     #
     # @since 0.0.1
     #
-    # @param [String, Symbol] id model identificator
-    # @return [Couchbase::Model] an instance of the model
+    # @param [String, Symbol, Array] id model identificator(s)
+    # @return [Couchbase::Model, Array] an instance of the model, or an array of instances
     # @raise [Couchbase::Error::NotFound] when given key isn't exist
     #
     # @example Find model using +id+
     #   post = Post.find('the-id')
-    def self.find(id)
-      if id && (res = bucket.get(id, :quiet => false, :extended => true))
-        obj, flags, cas = res
-        obj = {:raw => obj} unless obj.is_a?(Hash)
-        new({:id => id, :meta => {'flags' => flags, 'cas' => cas}}.merge(obj))
-      end
+    #
+    # @example Find multiple models using +id+
+    #   post = Post.find('one', 'two')
+    def self.find(*id)
+      _find(false, *id)
     end
 
     # Find the model using +id+ attribute
     #
+    # Unlike {Couchbase::Model.find}, this method won't raise
+    # {Couchbase::Error::NotFound} error when key doesn't exist in the
+    # bucket
+    #
     # @since 0.1.0
     #
-    # @param [String, Symbol] id model identificator
-    # @return [Couchbase::Model, nil] an instance of the model or +nil+ if
+    # @param [String, Symbol] id model identificator(s)
+    # @return [Couchbase::Model, Array, nil] an instance of the model, an array
+    #   of found instances of the model, or +nil+ if
     #   given key isn't exist
     #
     # @example Find model using +id+
     #   post = Post.find_by_id('the-id')
-    def self.find_by_id(id)
-      if id && (res = bucket.get(id, :quiet => true, :extended => true))
-        obj, flags, cas = res
-        obj = {:raw => obj} unless obj.is_a?(Hash)
-        new({:id => id, :meta => {'flags' => flags, 'cas' => cas}}.merge(obj))
-      end
+    # @example Find multiple models using +id+
+    #   posts = Post.find_by_id(['the-id', 'the-id2'])
+    def self.find_by_id(*id)
+      _find(true, *id)
     end
 
     # Create the model with given attributes
@@ -586,7 +604,7 @@ module Couchbase
     #   p = Post.find('hello-world')
     #   p.delete
     def delete(options = {})
-      raise Couchbase::Error::MissingId, "missing id attribute" unless @id
+      raise Couchbase::Error::MissingId, 'missing id attribute' unless @id
       model.bucket.delete(@id, options)
       @id = nil
       @meta = nil
@@ -704,7 +722,7 @@ module Couchbase
     # @raise [Error::MissingId] for records without +id+
     #   attribute
     def reload
-      raise Couchbase::Error::MissingId, "missing id attribute" unless @id
+      raise Couchbase::Error::MissingId, 'missing id attribute' unless @id
       attrs = model.find(@id).attributes
       update_attributes(attrs)
       self
@@ -779,15 +797,15 @@ module Couchbase
     # @since 0.0.1
     def inspect
       attrs = []
-      attrs << ["key", @key.inspect] unless @key.nil?
-      attrs << ["value", @value.inspect] unless @value.nil?
+      attrs << ['key', @key.inspect] unless @key.nil?
+      attrs << ['value', @value.inspect] unless @value.nil?
       model.attributes.map do |attr, default|
         val = read_attribute(attr)
         attrs << [attr.to_s, val.inspect] unless val.nil?
       end
       attrs.sort!
       attrs.unshift([:id, id]) unless new?
-      sprintf("#<%s %s>", model, attrs.map{|a| a.join(": ")}.join(", "))
+      sprintf('#<%s %s>', model, attrs.map { |a| a.join(': ') }.join(', '))
     end
 
     def self.inspect
@@ -811,7 +829,7 @@ module Couchbase
 
     protected :attributes_with_values
 
-    if defined?(::Rails)
+    if defined?(::ActiveModel)
       extend ActiveModel::Callbacks
       extend ActiveModel::Naming
       include ActiveModel::Conversion
@@ -839,7 +857,7 @@ module Couchbase
     def to_param
       keys = to_key
       if keys && !keys.empty?
-        keys.join("-")
+        keys.join('-')
       end
     end
   end

data/lib/couchbase/model/uuid.rb

@@ -43,7 +43,7 @@ module Couchbase
       # @param [Fixnum] seed seed for pseudorandom number generator.
       def initialize(seed = nil)
         seed ? srand(seed) : srand
-        @prefix, _ = rand_bytes(13).unpack("H26")
+        @prefix, _ = rand_bytes(13).unpack('H26')
         @inc = rand(0xfff) + 1
         @lock = Mutex.new
       end
@@ -69,14 +69,14 @@ module Couchbase
       # @return [String, Array] single string value or array of strings. Where
       #   each value represents 128-bit number written in hexadecimal format.
       def next(count = 1, algorithm = :sequential)
-        raise ArgumentError, "count should be a positive number" unless count > 0
+        raise ArgumentError, 'count should be a positive number' unless count > 0
         uuids = case algorithm
                 when :random
-                  rand_bytes(16 * count).unpack("H32" * count)
+                  rand_bytes(16 * count).unpack('H32' * count)
                 when :utc_random
                   now = Time.now.utc
-                  prefix = "%014x" % [now.to_i * 1_000_000 + now.usec]
-                  rand_bytes(9 * count).unpack("H18" * count).map do |tail|
+                  prefix = '%014x' % [now.to_i * 1_000_000 + now.usec]
+                  rand_bytes(9 * count).unpack('H18' * count).map do |tail|
                     "#{prefix}#{tail}"
                   end
                 when :sequential
@@ -92,16 +92,16 @@ module Couchbase
       def next_seq
         @lock.synchronize do
           if @inc >= 0xfff000
-            @prefix, _ = rand_bytes(13).unpack("H26")
+            @prefix, _ = rand_bytes(13).unpack('H26')
             @inc = rand(0xfff) + 1
           end
           @inc += rand(0xfff) + 1
-          "%s%06x" % [@prefix, @inc]
+          '%s%06x' % [@prefix, @inc]
         end
       end
 
       def rand_bytes(count)
-        bytes = ""
+        bytes = ''
         count.times { bytes << rand(256) }
         bytes
       end

data/lib/couchbase/model/version.rb

@@ -19,7 +19,7 @@ module Couchbase
 
   class Model
 
-    VERSION = "0.5.2"
+    VERSION = '0.5.3'
 
   end
 

data/lib/couchbase/railtie.rb

@@ -49,9 +49,9 @@ module Rails #:nodoc:
       # @return [Hash] rescued responses
       def self.rescue_responses
         {
-          "Couchbase::Error::NotFound" => :not_found,
-          "Couchbase::Error::NotStored" => :unprocessable_entity,
-          "Couchbase::Error::RecordInvalid" => :unprocessable_entity
+          'Couchbase::Error::NotFound' => :not_found,
+          'Couchbase::Error::NotStored' => :unprocessable_entity,
+          'Couchbase::Error::RecordInvalid' => :unprocessable_entity
         }
       end
 
@@ -85,8 +85,8 @@ module Rails #:nodoc:
       #     <<: *common
       #     bucket: example_development
       #
-      initializer "couchbase.setup_connection" do
-        config_file = Rails.root.join("config", "couchbase.yml")
+      initializer 'couchbase.setup_connection' do
+        config_file = Rails.root.join('config', 'couchbase.yml')
         if config_file.file? &&
           config = YAML.load(ERB.new(File.read(config_file)).result)[Rails.env]
           ::Couchbase.connection_options = config.with_indifferent_access
@@ -95,10 +95,10 @@ module Rails #:nodoc:
 
       # After initialization we will warn the user if we can't find a couchbase.yml and
       # alert to create one.
-      initializer "couchbase.warn_configuration_missing" do
-        unless ARGV.include?("couchbase:config")
+      initializer 'couchbase.warn_configuration_missing' do
+        unless ARGV.include?('couchbase:config')
           config.after_initialize do
-            unless Rails.root.join("config", "couchbase.yml").file?
+            unless Rails.root.join('config', 'couchbase.yml').file?
               puts "\nCouchbase config not found. Create a config file at: config/couchbase.yml"
               puts "to generate one run: rails generate couchbase:config\n\n"
             end
@@ -107,13 +107,13 @@ module Rails #:nodoc:
       end
 
       # Check (and upgrade if needed) all design documents
-      initializer "couchbase.upgrade_design_documents", :after =>"couchbase.setup_connection"  do |app|
-        ::Couchbase::Model::Configuration.design_documents_paths ||= app.config.paths["app/models"]
+      initializer 'couchbase.upgrade_design_documents', :after => 'couchbase.setup_connection'  do |app|
+        ::Couchbase::Model::Configuration.design_documents_paths ||= app.config.paths['app/models']
         if config.couchbase.ensure_design_documents
           config.to_prepare do
-            app.config.paths["app/models"].each do |path|
+            app.config.paths['app/models'].each do |path|
               Dir.glob("#{path}/**/*.rb").sort.each do |file|
-                require_dependency(file.gsub("#{path}/" , "").gsub(".rb", ""))
+                require_dependency(file.gsub("#{path}/" , '').gsub('.rb', ''))
               end
             end
             begin
@@ -129,7 +129,7 @@ module Rails #:nodoc:
 
       # Set the proper error types for Rails. NotFound errors should be
       # 404s and not 500s, validation errors are 422s.
-      initializer "couchbase.load_http_errors" do |app|
+      initializer 'couchbase.load_http_errors' do |app|
         config.after_initialize do
           unless config.action_dispatch.rescue_responses
             ActionDispatch::ShowExceptions.rescue_responses.update(Railtie.rescue_responses)

data/lib/rails/generators/couchbase/config/config_generator.rb

@@ -22,12 +22,12 @@ require 'rails/generators/couchbase_generator'
 module Couchbase
   module Generators
     class ConfigGenerator < Rails::Generators::Base
-      desc "Creates a Couchbase configuration file at config/couchbase.yml"
+      desc 'Creates a Couchbase configuration file at config/couchbase.yml'
 
       argument :database_name, :type => :string, :optional => true
 
       def self.source_root
-        @_couchbase_source_root ||= File.expand_path("../templates", __FILE__)
+        @_couchbase_source_root ||= File.expand_path('../templates', __FILE__)
       end
 
       def app_name
@@ -35,7 +35,7 @@ module Couchbase
       end
 
       def create_config_file
-        template 'couchbase.yml', File.join('config', "couchbase.yml")
+        template 'couchbase.yml', File.join('config', 'couchbase.yml')
       end
 
     end

data/lib/rails/generators/couchbase/view/view_generator.rb

@@ -22,12 +22,12 @@ require 'rails/generators/couchbase_generator'
 module Couchbase
   module Generators
     class ViewGenerator < Rails::Generators::Base
-      desc "Creates a Couchbase views skeletons for map/reduce functions"
+      desc 'Creates a Couchbase views skeletons for map/reduce functions'
 
       argument :model_name, :type => :string
       argument :view_name, :type => :string
 
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path('../templates', __FILE__)
 
       def app_name
         Rails::Application.subclasses.first.parent.to_s.underscore

data/lib/rails/generators/couchbase_generator.rb

@@ -17,8 +17,8 @@
 # limitations under the License.
 #
 
-require "rails/generators/named_base"
-require "rails/generators/active_model"
+require 'rails/generators/named_base'
+require 'rails/generators/active_model'
 
 module Couchbase #:nodoc:
   module Generators #:nodoc:

data/test/setup.rb

@@ -34,12 +34,12 @@ class CouchbaseServer
     @port = @port.to_i
 
     if @host.nil? || @host.empty? || @port == 0
-      raise ArgumentError, "Check COUCHBASE_SERVER variable. It should be hostname:port"
+      raise ArgumentError, 'Check COUCHBASE_SERVER variable. It should be hostname:port'
     end
 
     @config = Yajl::Parser.parse(open("http://#{@host}:#{@port}/pools/default"))
-    @num_nodes = @config["nodes"].size
-    @buckets_spec = params[:buckets_spec] || "default:"  # "default:,protected:secret,cache::memcache"
+    @num_nodes = @config['nodes'].size
+    @buckets_spec = params[:buckets_spec] || 'default:'  # "default:,protected:secret,cache::memcache"
   end
 
   def start
@@ -67,17 +67,17 @@ class CouchbaseMock
   end
 
   def initialize(params = {})
-    @host = "127.0.0.1"
+    @host = '127.0.0.1'
     @port = 0
     @num_nodes = 10
     @num_vbuckets = 4096
-    @buckets_spec = "default:"  # "default:,protected:secret,cache::memcache"
+    @buckets_spec = 'default:'  # "default:,protected:secret,cache::memcache"
     params.each do |key, value|
       send("#{key}=", value)
     end
     yield self if block_given?
     if @num_vbuckets < 1 || (@num_vbuckets & (@num_vbuckets - 1) != 0)
-      raise ArgumentError, "Number of vbuckets should be a power of two and greater than zero"
+      raise ArgumentError, 'Number of vbuckets should be a power of two and greater than zero'
     end
   end
 
@@ -86,15 +86,15 @@ class CouchbaseMock
     @monitor.socket = TCPServer.new(nil, 0)
     @monitor.socket.listen(10)
     _, @monitor.port, _, _ = @monitor.socket.addr
-    trap("CLD") do
-      puts "CouchbaseMock.jar died unexpectedly during startup"
+    trap('CLD') do
+      puts 'CouchbaseMock.jar died unexpectedly during startup'
       exit(1)
     end
     @monitor.pid = fork
     if @monitor.pid.nil?
       rc = exec(command_line("--harakiri-monitor=:#{@monitor.port}"))
     else
-      trap("CLD", "SIG_DFL")
+      trap('CLD', 'SIG_DFL')
       @monitor.client, _ = @monitor.socket.accept
       @port = @monitor.client.recv(100).to_i
     end
@@ -103,15 +103,15 @@ class CouchbaseMock
   def stop
     @monitor.client.close
     @monitor.socket.close
-    Process.kill("TERM", @monitor.pid)
+    Process.kill('TERM', @monitor.pid)
     Process.wait(@monitor.pid)
   end
 
-  def failover_node(index, bucket = "default")
+  def failover_node(index, bucket = 'default')
     @monitor.client.send("failover,#{index},#{bucket}", 0)
   end
 
-  def respawn_node(index, bucket = "default")
+  def respawn_node(index, bucket = 'default')
     @monitor.client.send("respawn,#{index},#{bucket}", 0)
   end
 
@@ -137,7 +137,7 @@ class MiniTest::Unit::TestCase
       mock = CouchbaseServer.new(params)
       if (params[:port] && mock.port != params[:port]) ||
         (params[:host] && mock.host != params[:host]) ||
-        mock.buckets_spec != "default:"
+        mock.buckets_spec != 'default:'
         skip("Unable to configure real cluster. Requested config is: #{params.inspect}")
       end
     else
@@ -163,6 +163,6 @@ class MiniTest::Unit::TestCase
   end
 
   def uniq_id(*suffixes)
-    [caller.first[/.*[` ](.*)'/, 1], suffixes].join("_")
+    [caller.first[/.*[` ](.*)'/, 1], suffixes].join('_')
   end
 end

data/test/test_model.rb

@@ -21,7 +21,7 @@ class Post < Couchbase::Model
   attribute :title
   attribute :body
   attribute :author, :default => 'Anonymous'
-  attribute :created_at, :default => lambda { Time.utc("2010-01-01") }
+  attribute :created_at, :default => lambda { Time.utc('2010-01-01') }
 end
 
 class ValidPost < Couchbase::Model
@@ -50,6 +50,10 @@ class Comments < Couchbase::Model
   attribute :comments, :default => []
 end
 
+class User < Couchbase::Model
+  design_document :people
+end
+
 class TestModel < MiniTest::Unit::TestCase
 
   def setup
@@ -64,80 +68,86 @@ class TestModel < MiniTest::Unit::TestCase
     stop_mock(@mock)
   end
 
+  def test_design_document
+    assert_equal 'people', User.design_document
+    assert_equal 'new_people', User.design_document('new_people')
+    assert_equal 'post', Post.design_document
+  end
+
   def test_it_supports_value_property
     doc = {
-      "id" => "x",
-      "key" => "x",
-      "value" => "x",
-      "doc" => {
-        "value" => {"title" => "foo"}
+      'id' => 'x',
+      'key' => 'x',
+      'value' => 'x',
+      'doc' => {
+        'value' => {'title' => 'foo'}
       }
     }
     post = Post.wrap(Post.bucket, doc)
-    assert_equal "foo", post.title
+    assert_equal 'foo', post.title
   end
 
   def test_it_supports_json_property
     doc = {
-      "id" => "x",
-      "key" => "x",
-      "value" => "x",
-      "doc" => {
-        "json" => {"title" => "foo"}
+      'id' => 'x',
+      'key' => 'x',
+      'value' => 'x',
+      'doc' => {
+        'json' => {'title' => 'foo'}
       }
     }
     post = Post.wrap(Post.bucket, doc)
-    assert_equal "foo", post.title
+    assert_equal 'foo', post.title
   end
 
   def test_assigns_attributes_from_the_hash
-    post = Post.new(:title => "Hello, world")
-    assert_equal "Hello, world", post.title
+    post = Post.new(:title => 'Hello, world')
+    assert_equal 'Hello, world', post.title
     refute post.body
     refute post.id
   end
 
   def test_uses_default_value_or_nil
-    post = Post.new(:title => "Hello, world")
+    post = Post.new(:title => 'Hello, world')
     refute post.body
     assert_equal 'Anonymous', post.author
     assert_equal 'Anonymous', post.attributes[:author]
   end
 
   def test_allows_lambda_as_default_value
-    post = Post.new(:title => "Hello, world")
-    expected = Time.utc("2010-01-01")
+    post = Post.new(:title => 'Hello, world')
+    expected = Time.utc('2010-01-01')
     assert_equal expected, post.created_at
     assert_equal expected, post.attributes[:created_at]
   end
 
   def test_assings_id_and_saves_the_object
-    post = Post.create(:title => "Hello, world")
+    post = Post.create(:title => 'Hello, world')
     assert post.id
   end
 
   def test_updates_attributes
-    post = Post.create(:title => "Hello, world")
-    post.update(:body => "This is my first example")
-    assert_equal "This is my first example", post.body
+    post = Post.create(:title => 'Hello, world')
+    post.update(:body => 'This is my first example')
+    assert_equal 'This is my first example', post.body
   end
 
   def test_refreshes_the_attributes_with_reload_method
-    orig = Post.create(:title => "Hello, world")
+    orig = Post.create(:title => 'Hello, world')
     double = Post.find(orig.id)
-    double.update(:title => "Good bye, world")
+    double.update(:title => 'Good bye, world')
     orig.reload
-    assert_equal "Good bye, world", orig.title
+    assert_equal 'Good bye, world', orig.title
   end
 
   def test_it_raises_not_found_exception
     assert_raises Couchbase::Error::NotFound do
-      Post.find("missing_key")
+      Post.find('missing_key')
     end
   end
 
   def test_it_returns_nil_when_key_not_found
-     refute Post.find_by_id("missing_key")
+     refute Post.find_by_id('missing_key')
   end
 
   def test_doesnt_raise_if_the_attribute_redefined
@@ -163,22 +173,22 @@ class TestModel < MiniTest::Unit::TestCase
   end
 
   def test_allows_arbitrary_ids
-    Post.create(:id => uniq_id, :title => "Foo")
-    assert_equal "Foo", Post.find(uniq_id).title
+    Post.create(:id => uniq_id, :title => 'Foo')
+    assert_equal 'Foo', Post.find(uniq_id).title
   end
 
   def test_returns_an_instance_of_post
     Post.bucket.set(uniq_id, {:title => 'foo'})
     assert Post.find(uniq_id).kind_of?(Post)
     assert_equal uniq_id, Post.find(uniq_id).id
-    assert_equal "foo", Post.find(uniq_id).title
+    assert_equal 'foo', Post.find(uniq_id).title
   end
 
   def test_changes_its_attributes
-    post = Post.create(:title => "Hello, world")
-    post.title = "Good bye, world"
+    post = Post.create(:title => 'Hello, world')
+    post.title = 'Good bye, world'
     post.save.reload
-    assert_equal "Good bye, world", post.title
+    assert_equal 'Good bye, world', post.title
   end
 
   def test_assings_a_new_id_to_each_record
@@ -199,7 +209,7 @@ class TestModel < MiniTest::Unit::TestCase
   end
 
   def test_fails_to_delete_model_without_id
-    post = Post.new(:title => "Hello")
+    post = Post.new(:title => 'Hello')
     refute post.id
     assert_raises Couchbase::Error::MissingId do
       post.delete
@@ -207,38 +217,38 @@ class TestModel < MiniTest::Unit::TestCase
   end
 
   def test_belongs_to_assoc
-    brewery = Brewery.create(:name => "Anheuser-Busch")
+    brewery = Brewery.create(:name => 'Anheuser-Busch')
     assert_includes Beer.attributes.keys, :brewery_id
-    beer = Beer.create(:name => "Budweiser", :brewery_id => brewery.id)
+    beer = Beer.create(:name => 'Budweiser', :brewery_id => brewery.id)
     assert_respond_to beer, :brewery
     assoc = beer.brewery
     assert_instance_of Brewery, assoc
-    assert_equal "Anheuser-Busch", assoc.name
+    assert_equal 'Anheuser-Busch', assoc.name
   end
 
   def test_to_key
-    assert_equal ["the-id"], Post.new(:id => "the-id").to_key
-    assert_equal ["the-key"], Post.new(:key => "the-key").to_key
+    assert_equal ['the-id'], Post.new(:id => 'the-id').to_key
+    assert_equal ['the-key'], Post.new(:key => 'the-key').to_key
   end
 
   def test_to_param
-    assert_equal "the-id", Post.new(:id => "the-id").to_param
-    assert_equal "the-key", Post.new(:key => ["the", "key"]).to_param
+    assert_equal 'the-id', Post.new(:id => 'the-id').to_param
+    assert_equal 'the-key', Post.new(:key => ['the', 'key']).to_param
   end
 
   def test_as_json
     require 'active_support/json/encoding'
 
     response = {'id' => 'the-id'}
-    assert_equal response, Post.new(:id => "the-id").as_json
+    assert_equal response, Post.new(:id => 'the-id').as_json
 
     response = {}
-    assert_equal response, Post.new(:id => "the-id").as_json(:except => :id)
+    assert_equal response, Post.new(:id => 'the-id').as_json(:except => :id)
   end
 
   def test_validation
     post = ValidPost.create(:title => 'Hello, World!')
-    assert post.valid?, "post with title should be valid"
+    assert post.valid?, 'post with title should be valid'
     post.title = nil
     refute post.save
     assert_raises(Couchbase::Error::RecordInvalid) do
@@ -261,4 +271,32 @@ class TestModel < MiniTest::Unit::TestCase
     assert_equal Couchbase::Model, Comments.couchbase_ancestor
   end
 
+  def test_returns_multiple_instances_of_post
+    Post.create(:id => uniq_id('first'), :title => 'foo')
+    Post.create(:id => uniq_id('second'), :title => 'bar')
+
+    results = Post.find([uniq_id('first'), uniq_id('second')])
+    assert results.kind_of?(Array)
+    assert results.size == 2
+    assert results.detect { |post| post.id == uniq_id('first') }.title == 'foo'
+    assert results.detect { |post| post.id == uniq_id('second') }.title == 'bar'
+  end
+
+  def test_returns_array_for_array_of_ids
+    Post.create(:id => uniq_id('first'), :title => 'foo')
+
+    results = Post.find([uniq_id('first')])
+    assert results.kind_of?(Array)
+    assert results.size == 1
+    assert results[0].title == 'foo'
+  end
+
+  def test_returns_array_for_array_of_ids_using_find_by_id
+    Post.create(:id => uniq_id('first'), :title => 'foo')
+
+    results = Post.find_by_id([uniq_id('first')])
+    assert results.kind_of?(Array)
+    assert results.size == 1
+    assert results[0].title == 'foo'
+  end
 end

metadata

@@ -1,70 +1,90 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: couchbase-model
-version: !ruby/object:Gem::Version
-  version: 0.5.2
+version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: 
+  segments: 
+  - 0
+  - 5
+  - 3
+  version: 0.5.3
 platform: ruby
-authors:
+authors: 
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: couchbase
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2013-06-06 00:00:00 +03:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0.dp
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  name: couchbase
+  version_requirements: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0.dp
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  version_requirements: *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  version_requirements: *id003
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: activesupport
+  version_requirements: *id004
+  prerelease: false
 description: ORM-like interface allows you to persist your models to Couchbase
 email: support@couchbase.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - .yardopts
@@ -96,28 +116,39 @@ files:
 - test/test_model.rb
 - test/test_model_rails_integration.rb
 - test/test_uuid.rb
+has_rdoc: true
 homepage: https://github.com/couchbase/couchbase-ruby-model
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Declarative interface to Couchbase
 test_files: []
+