couchrest_model 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38d13ee6807a1d8e08ec19b1402ec3e222c62731
-  data.tar.gz: c5eec5eea342a0c58ca60df0e63f45239398fbfb
+  metadata.gz: dc12bf9934bec928c3317599950ad2ac7b57e623
+  data.tar.gz: 4244221435ea4d8dbd33a6c184ed97926ba5cf14
 SHA512:
-  metadata.gz: 20fa41cff63d880fb8b681338935ffd946ff9bc32e2bb6de33a913d01e466c341708c80af011cf0c7785cd992e7d2963c7ebdce2c5ca625fe43b4e20360c7300
-  data.tar.gz: 10af0f1dee17c7ca5098ccd0aab103686b1714ce95b0f3cccbbe9544faa716d024e11c9b579a04e4ae10594d5dcc5b4da9a45c819316fa3ea631ac034fc4bee8
+  metadata.gz: 337c15afdd8264dfd16341d50ac85a25f8651946f0b1994135e02ac118f63dbde6c7688c4a21e44e21eb639d85aa0f892d979b5465f3d9c516fd9141a9433756
+  data.tar.gz: 9200d9be82615a00e475f05947ccbcef682ab5867a23810368146db85064a63ac46f8f6453efd661a64c16f805376060d65dddcc58cae74ec7892637aeebcfe8

data/README.md

@@ -87,6 +87,12 @@ require 'rails/test_unit/railtie'
 
 You'll then need to make sure any references to `config.active_record` are removed from your environment files.
 
+or alternatively below command do the same work
+```ruby
+rails new <application-name> --skip-active-record
+```
+Now in the gem file just add [couchrest_model] and you are good to go.
+
 ## Generators
 
 ### Configuration

data/VERSION

@@ -1 +1 @@
-2.0.3
+2.0.4

data/couchrest_model.gemspec

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = %q{couchrest_model}
   s.version = `cat VERSION`.strip
@@ -24,7 +22,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency(%q<couchrest>, ">= 1.2")
+  s.add_dependency(%q<couchrest>, "~> 1.2.1")
   s.add_dependency(%q<mime-types>, ">= 1.16")
   s.add_dependency(%q<activemodel>, ">= 4.0", ">= 3.0")
   s.add_dependency(%q<tzinfo>, ">= 0.3.22")

data/history.md

@@ -1,5 +1,14 @@
 # CouchRest Model Change History
 
+## 2.0.4 - 2015-06-26
+
+  * Casting Array properties using anything that inherits from Hash. (@samlown)
+  * Adding `.proxy_method_names` call to help migrations with multiple proxied models. (@samlown)
+  * Fixing `collection_of` dirty tracking when setting with objects. (@samlown)
+  * Added support for design doc `#view_lib` method for [CommonJS modules in views](http://wiki.apache.org/couchdb/CommonJS_Modules). (@samlown)
+  * Updating CouchRest dependency to ~> 1.2.1 (@samlown)
+  * Migrations use design doc info requests as opposed to Stream (@samlown)
+
 ## 2.0.3 - 2014-07-04 
 
   * Added find_by_view! method support for raising DocumentNotFound error when searching.

data/lib/couchrest/model/associations.rb

@@ -183,49 +183,57 @@ module CouchRest
       def initialize(array, property, parent)
         (array ||= []).compact!
         super(array, property, parent)
-        casted_by[casted_by_property.to_s] = [] # replace the original array!
+        self.casted_by_attribute = [] # replace the original array!
         array.compact.each do |obj|
           check_obj(obj)
-          casted_by[casted_by_property.to_s] << obj.id
+          casted_by_attribute << obj.id
         end
       end
 
       def << obj
         check_obj(obj)
-        casted_by[casted_by_property.to_s] << obj.id
+        casted_by_attribute << obj.id
         super(obj)
       end
 
       def push(obj)
         check_obj(obj)
-        casted_by[casted_by_property.to_s].push obj.id
+        casted_by_attribute.push obj.id
         super(obj)
       end
 
       def unshift(obj)
         check_obj(obj)
-        casted_by[casted_by_property.to_s].unshift obj.id
+        casted_by_attribute.unshift obj.id
         super(obj)
       end
 
       def []= index, obj
         check_obj(obj)
-        casted_by[casted_by_property.to_s][index] = obj.id
+        casted_by_attribute[index] = obj.id
         super(index, obj)
       end
 
       def pop
-        casted_by[casted_by_property.to_s].pop
+        casted_by_attribute.pop
         super
       end
 
       def shift
-        casted_by[casted_by_property.to_s].shift
+        casted_by_attribute.shift
         super
       end
 
       protected
 
+      def casted_by_attribute=(value)
+        casted_by.write_attribute(casted_by_property, value)
+      end
+
+      def casted_by_attribute
+        casted_by.read_attribute(casted_by_property)
+      end
+
       def check_obj(obj)
         raise "Object cannot be added to #{casted_by.class.to_s}##{casted_by_property.to_s} collection unless saved" if obj.new?
       end

data/lib/couchrest/model/core_extensions/time_parsing.rb

@@ -10,6 +10,13 @@ module CouchRest
         # Times, unless provided with a time zone, are assumed to be in 
         # UTC.
         #
+        # Uses String#to_r on seconds portion to avoid rounding errors. Eg:
+        #     Time.parse_iso8601("2014-12-11T16:54:54.549Z").as_json
+        #      => "2014-12-11T16:54:54.548Z"
+        #
+        # See: https://bugs.ruby-lang.org/issues/7829
+        #
+
         def parse_iso8601(string)
           if (string =~ /(\d{4})[\-|\/](\d{2})[\-|\/](\d{2})[T|\s](\d{2}):(\d{2}):(\d{2}(\.\d+)?)(Z| ?([\+|\s|\-])?(\d{2}):?(\d{2}))?/)
             # $1 = year
@@ -24,9 +31,9 @@ module CouchRest
             # $11 = tz difference minutes
 
             if $8 == 'Z' || $8.to_s.empty?
-              utc($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_f)
+              utc($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_r)
             else
-              new($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_f, "#{$9 == '-' ? '-' : '+'}#{$10}:#{$11}")
+              new($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_r, "#{$9 == '-' ? '-' : '+'}#{$10}:#{$11}")
             end
           else
             parse(string)

data/lib/couchrest/model/design.rb

@@ -3,6 +3,7 @@ module CouchRest
   module Model
 
     class Design < ::CouchRest::Design
+      include ::CouchRest::Model::Designs::Migrations
 
       # The model Class that this design belongs to and method name
       attr_accessor :model, :method_name
@@ -56,108 +57,6 @@ module CouchRest
         self
       end
 
-      # Migrate the design document preventing downtime on a production
-      # system. Typically this will be used when auto updates are disabled.
-      #
-      # Steps taken are:
-      #
-      #  1. Compare the checksum with the current version
-      #  2. If different, create a new design doc with timestamp
-      #  3. Wait until the view returns a result
-      #  4. Copy over the original design doc
-      #
-      # If a block is provided, it will be called with the result of the migration:
-      #
-      #  * :no_change - Nothing performed as there are no changes.
-      #  * :created   - Add a new design doc as non existed
-      #  * :migrated  - Migrated the existing design doc.
-      #
-      # This can be used for progressivly printing the results of the migration.
-      #
-      # After completion, either a "cleanup" Proc object will be provided to finalize
-      # the process and copy the document into place, or simply nil if no cleanup is
-      # required. For example:
-      #
-      #     print "Synchronising Cat model designs: "
-      #     callback = Cat.design_doc.migrate do |res|
-      #       puts res.to_s
-      #     end
-      #     if callback
-      #       puts "Cleaning up."
-      #       callback.call
-      #     end
-      #
-      def migrate(db = nil, &block)
-        db    ||= database
-        doc     = load_from_database(db)
-        cleanup = nil
-        id      = self['_id']
-
-        if !doc
-          # no need to migrate, just save it
-          new_doc = to_hash.dup
-          db.save_doc(new_doc)
-
-          result = :created
-        elsif doc['couchrest-hash'] != checksum
-          id += "_migration"
-
-          # Delete current migration if there is one
-          old_migration = load_from_database(db, id)
-          db.delete_doc(old_migration) if old_migration
-
-          # Save new design doc
-          new_doc = doc.merge(to_hash)
-          new_doc['_id'] = id
-          new_doc.delete('_rev')
-          db.save_doc(new_doc)
-
-          # Proc definition to copy the migration doc over the original
-          cleanup = Proc.new do
-            db.copy_doc(new_doc, doc)
-            db.delete_doc(new_doc)
-            self
-          end
-
-          result = :migrated
-        else
-          # Already up to date
-          result = :no_change
-        end
-
-        if new_doc && !new_doc['views'].empty?
-          # Create a view query and send
-          name = new_doc['views'].keys.first
-          view = new_doc['views'][name]
-          params = {:limit => 1}
-          params[:reduce] = false if view['reduce']
-          db.view("#{id}/_view/#{name}", params) do |res|
-            # Block to use streamer!
-          end
-        end
-
-        # Provide the result in block
-        yield result if block_given?
-
-        cleanup
-      end
-
-      # Perform a single migration and inmediatly request a cleanup operation:
-      #
-      #     print "Synchronising Cat model designs: "
-      #     Cat.design_doc.migrate! do |res|
-      #       puts res.to_s
-      #     end
-      #
-      def migrate!(db = nil, &block)
-        callback = migrate(db, &block)
-        if callback.is_a?(Proc)
-          callback.call
-        else
-          callback
-        end
-      end
-
       def checksum
         sum = self['couchrest-hash']
         if sum && (@_original_hash == to_hash)
@@ -209,6 +108,13 @@ module CouchRest
         filters[name.to_s] = function
       end
 
+      ######## VIEW LIBS #########
+
+      def create_view_lib(name, function)
+        filters = (self['views']['lib'] ||= {})
+        filters[name.to_s] = function
+      end
+
       protected
 
       def load_from_database(db = database, id = nil)
@@ -221,7 +127,7 @@ module CouchRest
       # Calculate and update the checksum of the Design document.
       # Used for ensuring the latest version has been sent to the database.
       #
-      # This will generate an flatterned, ordered array of all the elements of the
+      # This will generate a flatterned, ordered array of all the elements of the
       # design document, convert to string then generate an MD5 Hash. This should
       # result in a consisitent Hash accross all platforms.
       #
@@ -233,14 +139,13 @@ module CouchRest
         base.delete('_id')
         base.delete('_rev')
         base.delete('couchrest-hash')
-        result = nil
         flatten =
           lambda {|r|
             (recurse = lambda {|v|
               if v.is_a?(Hash) || v.is_a?(CouchRest::Document)
-                v.to_a.map{|v| recurse.call(v)}.flatten
+                v.to_a.map{|p| recurse.call(p)}.flatten
               elsif v.is_a?(Array)
-                v.flatten.map{|v| recurse.call(v)}
+                v.flatten.map{|p| recurse.call(p)}
               else
                 v.to_s
               end

data/lib/couchrest/model/designs/design_mapper.rb

@@ -49,6 +49,11 @@ module CouchRest
           design_doc.create_filter(name, function)
         end
 
+        # Define a new view re-usable lib for shared functions.
+        def view_lib(name, function)
+          design_doc.create_view_lib(name, function)
+        end
+
         # Convenience wrapper to access model's type key option.
         def model_type_key
           model.model_type_key

data/lib/couchrest/model/designs/migrations.rb

@@ -0,0 +1,131 @@
+module CouchRest
+  module Model
+    module Designs
+
+      # Design Document Migrations Support
+      #
+      # A series of methods used inside design documents in order to perform migrations.
+      #
+      module Migrations
+
+        # Migrate the design document preventing downtime on a production
+        # system. Typically this will be used when auto updates are disabled.
+        #
+        # Steps taken are:
+        #
+        #  1. Compare the checksum with the current version
+        #  2. If different, create a new design doc with timestamp
+        #  3. Wait until the view returns a result
+        #  4. Copy over the original design doc
+        #
+        # If a block is provided, it will be called with the result of the migration:
+        #
+        #  * :no_change - Nothing performed as there are no changes.
+        #  * :created   - Add a new design doc as non existed
+        #  * :migrated  - Migrated the existing design doc.
+        #
+        # This can be used for progressivly printing the results of the migration.
+        #
+        # After completion, either a "cleanup" Proc object will be provided to finalize
+        # the process and copy the document into place, or simply nil if no cleanup is
+        # required. For example:
+        #
+        #     print "Synchronising Cat model designs: "
+        #     callback = Cat.design_doc.migrate do |res|
+        #       puts res.to_s
+        #     end
+        #     if callback
+        #       puts "Cleaning up."
+        #       callback.call
+        #     end
+        #
+        def migrate(db = nil, &block)
+          db    ||= database
+          doc     = load_from_database(db)
+          cleanup = nil
+          id      = self['_id']
+
+          if !doc
+            # no need to migrate, just save it
+            new_doc = to_hash.dup
+            db.save_doc(new_doc)
+
+            result = :created
+          elsif doc['couchrest-hash'] != checksum
+            id += "_migration"
+
+            # Delete current migration if there is one
+            old_migration = load_from_database(db, id)
+            db.delete_doc(old_migration) if old_migration
+
+            # Save new design doc
+            new_doc = doc.merge(to_hash)
+            new_doc['_id'] = id
+            new_doc.delete('_rev')
+            db.save_doc(new_doc)
+
+            # Proc definition to copy the migration doc over the original
+            cleanup = Proc.new do
+              db.copy_doc(new_doc, doc)
+              db.delete_doc(new_doc)
+              self
+            end
+
+            result = :migrated
+          else
+            # Already up to date
+            result = :no_change
+          end
+
+          wait_for_view_update_completion(db, new_doc)
+
+          yield result if block_given?
+
+          cleanup
+        end
+
+        # Perform a single migration and inmediatly request a cleanup operation:
+        #
+        #     print "Synchronising Cat model designs: "
+        #     Cat.design_doc.migrate! do |res|
+        #       puts res.to_s
+        #     end
+        #
+        def migrate!(db = nil, &block)
+          callback = migrate(db, &block)
+          if callback.is_a?(Proc)
+            callback.call
+          else
+            callback
+          end
+        end
+
+        private
+
+        def wait_for_view_update_completion(db, attrs)
+          if attrs && !attrs['views'].empty?
+            # Prepare a design doc we can use
+            doc = CouchRest::Design.new(attrs)
+            doc.database = db
+
+            # Request view, to trigger a *background* view update
+            doc.view(doc['views'].keys.first, :limit => 1, :stale => "update_after")
+
+            # Poll the view update process
+            while true
+              sleep 1
+              info = doc.info
+              if !info || !info['view_index']
+                raise "Migration error, unable to load design doc info: #{db.root}/#{doc.id}"
+              end
+              break if !info['view_index']['updater_running']
+            end
+          end
+        end
+
+
+      end
+
+    end
+  end
+end

data/lib/couchrest/model/property.rb

@@ -29,7 +29,7 @@ module CouchRest::Model
       if array
         if value.nil?
           value = []
-        elsif [Hash, HashWithIndifferentAccess].include?(value.class)
+        elsif value.is_a?(Hash)
           # Assume provided as a params hash where key is index
           value = parameter_hash_to_array(value)
         elsif !value.is_a?(Array)

data/lib/couchrest/model/proxyable.rb

@@ -17,7 +17,8 @@ module CouchRest
         def proxy_for(assoc_name, options = {})
           db_method = options[:database_method] || "proxy_database"
           options[:class_name] ||= assoc_name.to_s.singularize.camelize
-          proxied_model_names << options[:class_name] unless proxied_model_names.include?(options[:class_name])
+          proxy_method_names   << assoc_name.to_sym    unless proxy_method_names.include?(assoc_name.to_sym)
+          proxied_model_names  << options[:class_name] unless proxied_model_names.include?(options[:class_name])
           class_eval <<-EOS, __FILE__, __LINE__ + 1
             def #{assoc_name}
               @#{assoc_name} ||= CouchRest::Model::Proxyable::ModelProxy.new(::#{options[:class_name]}, self, self.class.to_s.underscore, #{db_method})
@@ -48,6 +49,10 @@ module CouchRest
           @proxy_database_method
         end
 
+        def proxy_method_names
+          @proxy_method_names ||= []
+        end
+
         def proxied_model_names
           @proxied_model_names ||= []
         end

data/lib/couchrest/model/utils/migrate.rb

@@ -59,7 +59,7 @@ module CouchRest
         end
 
         def find_proxying_models
-          CouchRest::Model::Base.subclasses.reject{|m| m.proxy_database_method.blank?}
+          CouchRest::Model::Base.subclasses.reject{|m| m.proxy_method_names.empty?}
         end
 
         def migrate_each_model(models, db = nil)
@@ -75,17 +75,22 @@ module CouchRest
         def migrate_each_proxying_model(models)
           callbacks = [ ]
           models.each do |model|
-            submodels = model.proxied_model_names.map{|n| n.constantize}
-            model.all.each do |base|
-              puts "Finding proxied models for #{model}: \"#{base.send(model.proxy_database_method)}\""
-              callbacks += migrate_each_model(submodels, base.proxy_database)
+            methods = model.proxy_method_names
+            methods.each do |method|
+              puts "Finding proxied models for #{model}##{method}"
+              model.all.each do |obj|
+                proxy = obj.send(method)
+                callbacks += migrate_each_model([proxy.model], proxy.database)
+              end
             end
           end
           callbacks
         end
 
         def migrate_design(model, design, db = nil)
-          print "Migrating #{model.to_s}##{design.method_name}... "
+          print "Migrating #{model.to_s}##{design.method_name}"
+          print " on #{db.name}" if db
+          print "... "
           callback = design.migrate(db) do |result|
             puts "#{result.to_s.gsub(/_/, ' ')}"
           end

data/lib/couchrest_model.rb

@@ -1,4 +1,4 @@
-require 'active_model'
+require "active_model"
 require "active_model/callbacks"
 require "active_model/conversion"
 require "active_model/errors"
@@ -9,22 +9,22 @@ require "active_model/validator"
 require "active_model/validations"
 require "active_model/dirty"
 
-require 'active_support/core_ext'
-require 'active_support/json'
+require "active_support/core_ext"
+require "active_support/json"
 
-require 'mime/types'
+require "mime/types"
 require "enumerator"
 require "time"
-require 'digest/md5'
+require "digest/md5"
 
-require 'bigdecimal' # used in typecast
-require 'bigdecimal/util' # used in typecast
+require "bigdecimal" # used in typecast
+require "bigdecimal/util" # used in typecast
 
-require 'couchrest'
+require "couchrest"
 
-require 'couchrest/model'
-require 'couchrest/model/errors'
-require 'couchrest/model/translation'
+require "couchrest/model"
+require "couchrest/model/errors"
+require "couchrest/model/translation"
 require "couchrest/model/persistence"
 require "couchrest/model/typecast"
 require "couchrest/model/casted_by"
@@ -42,10 +42,11 @@ require "couchrest/model/proxyable"
 require "couchrest/model/associations"
 require "couchrest/model/configuration"
 require "couchrest/model/connection"
-require "couchrest/model/design"
-require "couchrest/model/designs"
+require "couchrest/model/designs/migrations"
 require "couchrest/model/designs/design_mapper"
 require "couchrest/model/designs/view"
+require "couchrest/model/design"
+require "couchrest/model/designs"
 
 # Monkey patches applied to couchrest
 require "couchrest/model/support/couchrest_database"
@@ -62,6 +63,4 @@ require "couchrest/model/base"
 require "couchrest/model/utils/migrate.rb"
 
 # Add rails support *after* everything has loaded
-if defined?(Rails)
-  require "couchrest/railtie"
-end
+require "couchrest/railtie" if defined?(Rails)

data/spec/unit/assocations_spec.rb

@@ -126,6 +126,7 @@ describe "Assocations" do
       @invoice.entry_ids = @entries.collect{|i| i.id}
       @invoice.entries.length.should eql(3)
       @invoice.entries.first.should eql(@entries.first)
+      @invoice.changed?.should be_true
     end
 
     it "should ignore blank ids when set directly" do
@@ -171,6 +172,10 @@ describe "Assocations" do
 
     # Account for dirty tracking
     describe "dirty tracking" do
+      it "should register changes on replacement" do
+        @invoice.entries = @entries
+        @invoice.changed?.should be_true
+      end
       it "should register changes on push" do
         @invoice.changed?.should be_false
         @invoice.entries << @entries[0]

data/spec/unit/core_extensions/time_parsing.rb

@@ -99,6 +99,21 @@ describe "Time Parsing core extension" do
           Time.parse_iso8601(txt).should eql(Time.new(2011, 04, 01, 19, 05, 30, "+02:30"))
         end
 
+        it "should parse JSON time with second fractions" do
+          txt = "2014-12-11T16:53:54.000Z"
+          Time.parse_iso8601(txt).should eql(Time.utc(2014, 12, 11, 16, 53, Rational(54000, 1000)))
+        end
+
+        it "should avoid rounding errors parsing JSON time with second fractions" do
+          txt = "2014-12-11T16:53:54.548Z"
+          Time.parse_iso8601(txt).should eql(Time.utc(2014, 12, 11, 16, 53, Rational(54548,1000)))
+        end
+
+      end
+
+      it "avoids seconds rounding error" do
+        time_string = "2014-12-11T16:54:54.549Z"
+        Time.parse_iso8601(time_string).as_json.should eql(time_string)
       end
 
       describe "resorting back to normal parse" do

data/spec/unit/design_spec.rb

@@ -163,84 +163,6 @@ describe CouchRest::Model::Design do
     end
 
 
-    describe "#migrate" do
-      # WARNING! ORDER IS IMPORTANT!
-
-      describe "with limited changes" do
-
-        class DesignSampleModelMigrate < DesignSampleModelBase
-        end
-
-        before :all do
-          reset_test_db!
-          @mod = DesignSampleModelMigrate
-          @doc = @mod.design_doc
-          @db  = @mod.database
-        end
-
-        it "should create new design if non exists" do
-          @db.should_receive(:view).with("#{@doc['_id']}/_view/#{@doc['views'].keys.first}", {:limit => 1, :reduce => false})
-          callback = @doc.migrate do |res|
-            res.should eql(:created)
-          end
-          doc = @db.get(@doc['_id'])
-          doc['views']['all'].should eql(@doc['views']['all'])
-          callback.should be_nil
-        end
-
-        it "should not change anything if design is up to date" do
-          @doc.sync
-          @db.should_not_receive(:view)
-          callback = @doc.migrate do |res|
-            res.should eql(:no_change)
-          end
-          callback.should be_nil
-        end
-
-      end
-
-      describe "migrating a document if there are changes" do
-
-        class DesignSampleModelMigrate2 < DesignSampleModelBase
-        end
-
-        before :all do
-          reset_test_db!
-          @mod = DesignSampleModelMigrate2
-          @doc = @mod.design_doc
-          @db  = @mod.database
-          @doc.sync!
-          @doc.create_view(:by_name_and_surname)
-          @doc_id = @doc['_id'] + '_migration'
-        end
-
-        it "should save new migration design doc" do
-          @db.should_receive(:view).with("#{@doc_id}/_view/by_name", {:limit => 1, :reduce => false})
-          @callback = @doc.migrate do |res|
-            res.should eql(:migrated)
-          end
-          @callback.should_not be_nil
-
-          # should not have updated original view until cleanup
-          doc = @db.get(@doc['_id'])
-          doc['views'].should_not have_key('by_name_and_surname')
-
-          # Should have created the migration
-          new_doc = @db.get(@doc_id)
-          new_doc.should_not be_nil
-
-          # should be possible to perform cleanup
-          @callback.call
-          lambda { new_doc = @db.get(@doc_id) }.should raise_error RestClient::ResourceNotFound
-
-          doc = @db.get(@doc['_id'])
-          doc['views'].should have_key('by_name_and_surname')
-        end
-
-      end
-
-    end
-
 
     describe "#checksum" do
 
@@ -346,6 +268,17 @@ describe CouchRest::Model::Design do
       end
     end
 
+    describe "#create_view_lib" do
+      before :each do
+        @doc = DesignSampleModel.design_doc
+      end
+
+      it "should add simple view lib" do
+        @doc.create_view_lib('test', 'foobar')
+        @doc['views']['lib']['test'].should eql('foobar')
+        @doc['views']['lib'] = nil # cleanup
+      end
+    end
   end
 
 

data/spec/unit/designs/design_mapper_spec.rb

@@ -120,5 +120,19 @@ describe CouchRest::Model::Designs::DesignMapper do
     end
   end
 
+  describe "#view_lib" do
+    before :each do
+      @object = @klass.new(DesignModel)
+    end
+
+    it "should add the #view_lib function to the design doc" do
+      val = "exports.bar = 42;"
+      @object.view_lib(:foo, val)
+      DesignModel.design_doc['views']['lib'].should_not be_empty
+      DesignModel.design_doc['views']['lib'].should_not be_blank
+      DesignModel.design_doc['views']['lib']['foo'].should eql(val)
+    end
+  end
+
 end
 

data/spec/unit/designs/migrations_spec.rb

@@ -0,0 +1,104 @@
+
+require 'spec_helper'
+
+describe CouchRest::Model::Designs::Migrations do
+
+  before :all do
+    reset_test_db!
+  end
+
+  describe "base methods" do
+
+    describe "#migrate" do
+      # WARNING! ORDER IS IMPORTANT!
+
+      describe "with limited changes" do
+
+        class MigrationModelBase < CouchRest::Model::Base
+          use_database DB
+          property :name
+          property :surname
+          design do
+            view :by_name
+          end
+        end
+
+        class DesignSampleModelMigrate < MigrationModelBase
+        end
+
+        before :all do
+          reset_test_db!
+          @mod = DesignSampleModelMigrate
+          @doc = @mod.design_doc
+          @db  = @mod.database
+        end
+
+        it "should create new design if non exists" do
+          @db.should_receive(:view).with("#{@doc.name}/#{@doc['views'].keys.first}", {
+            :limit => 1, :stale => 'update_after', :reduce => false
+          })
+          callback = @doc.migrate do |res|
+            res.should eql(:created)
+          end
+          doc = @db.get(@doc['_id'])
+          doc['views']['all'].should eql(@doc['views']['all'])
+          callback.should be_nil
+        end
+
+        it "should not change anything if design is up to date" do
+          @doc.sync
+          @db.should_not_receive(:view)
+          callback = @doc.migrate do |res|
+            res.should eql(:no_change)
+          end
+          callback.should be_nil
+        end
+
+      end
+
+      describe "migrating a document if there are changes" do
+
+        class DesignSampleModelMigrate2 < MigrationModelBase
+        end
+
+        before :all do
+          reset_test_db!
+          @mod = DesignSampleModelMigrate2
+          @doc = @mod.design_doc
+          @db  = @mod.database
+          @doc.sync!
+          @doc.create_view(:by_name_and_surname)
+          @doc_id = @doc['_id'] + '_migration'
+        end
+
+        it "should save new migration design doc" do
+          @db.should_receive(:view).with("#{@doc.name}_migration/by_name", {
+            :limit => 1, :reduce => false, :stale => 'update_after'
+          })
+          @callback = @doc.migrate do |res|
+            res.should eql(:migrated)
+          end
+          @callback.should_not be_nil
+
+          # should not have updated original view until cleanup
+          doc = @db.get(@doc['_id'])
+          doc['views'].should_not have_key('by_name_and_surname')
+
+          # Should have created the migration
+          new_doc = @db.get(@doc_id)
+          new_doc.should_not be_nil
+
+          # should be possible to perform cleanup
+          @callback.call
+          lambda { new_doc = @db.get(@doc_id) }.should raise_error RestClient::ResourceNotFound
+
+          doc = @db.get(@doc['_id'])
+          doc['views'].should have_key('by_name_and_surname')
+        end
+
+      end
+
+    end
+
+  end
+end

data/spec/unit/property_spec.rb

@@ -328,6 +328,15 @@ describe "properties of array of casted models" do
     @course.questions.last.class.should eql(Question)
   end
 
+  it "should allow attribute to be set from Hash subclass with ordered keys" do
+    ourhash = Class.new(HashWithIndifferentAccess)
+    hash = ourhash.new({ '0' => {:q => "Test1"}, '1' => {:q => 'Test2'} })
+    @course.questions = hash
+    @course.questions.length.should eql(2)
+    @course.questions.last.q.should eql('Test2')
+    @course.questions.last.class.should eql(Question)
+  end
+
   it "should raise an error if attempting to set single value for array type" do
     lambda {
       @course.questions = Question.new(:q => 'test1')

data/spec/unit/proxyable_spec.rb

@@ -78,6 +78,11 @@ describe CouchRest::Model::Proxyable do
         @class.proxied_model_names.should eql(['Cat'])
       end
 
+      it "should add method names to proxied method name array" do
+        @class.proxy_for(:cats)
+        @class.proxy_method_names.should eql([:cats])
+      end
+
       it "should create a new method" do
         DummyProxyable.stub!(:method_defined?).and_return(true)
         DummyProxyable.proxy_for(:cats)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchrest_model
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - J. Chris Anderson
@@ -12,22 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +184,7 @@ files:
 - lib/couchrest/model/design.rb
 - lib/couchrest/model/designs.rb
 - lib/couchrest/model/designs/design_mapper.rb
+- lib/couchrest/model/designs/migrations.rb
 - lib/couchrest/model/designs/view.rb
 - lib/couchrest/model/dirty.rb
 - lib/couchrest/model/document_queries.rb
@@ -253,6 +254,7 @@ files:
 - spec/unit/core_extensions/time_parsing.rb
 - spec/unit/design_spec.rb
 - spec/unit/designs/design_mapper_spec.rb
+- spec/unit/designs/migrations_spec.rb
 - spec/unit/designs/view_spec.rb
 - spec/unit/designs_spec.rb
 - spec/unit/dirty_spec.rb
@@ -288,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Extends the CouchRest Document for advanced modelling.
@@ -334,6 +336,7 @@ test_files:
 - spec/unit/core_extensions/time_parsing.rb
 - spec/unit/design_spec.rb
 - spec/unit/designs/design_mapper_spec.rb
+- spec/unit/designs/migrations_spec.rb
 - spec/unit/designs/view_spec.rb
 - spec/unit/designs_spec.rb
 - spec/unit/dirty_spec.rb