couch_potato 1.4.0 → 1.6.3

data/Rakefile

@@ -1,34 +1,34 @@
 require 'bundler'
-Bundler::GemHelper.install_tasks
+Bundler::GemHelper.install_tasks name: 'couch_potato'
 
 require 'rake'
-require "rspec/core/rake_task"
+require 'rspec/core/rake_task'
 
-task :default => :spec
+task default: :spec
 
-desc "Run functional specs"
+desc 'Run functional specs'
 RSpec::Core::RakeTask.new(:spec_functional) do |spec|
   spec.pattern = 'spec/*_spec.rb'
   spec.rspec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
 end
 
-desc "Run unit specs"
+desc 'Run unit specs'
 RSpec::Core::RakeTask.new(:spec_unit) do |spec|
   spec.pattern = 'spec/unit/*_spec.rb'
   spec.rspec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
 end
 
-desc "Run all specs"
+desc 'Run all specs'
 task :spec do
   if ENV['TRAVIS'] # travis handles the environments for us
     Rake::Task[:spec_unit].execute
     Rake::Task[:spec_functional].execute
   else
-    ['3_2', '4_0'].each do |version|
+    %w(4_0 4_1 4_2).each do |version|
       Bundler.with_clean_env do
         puts "Running tests with ActiveSupport #{version.sub('_', '.')}"
-        sh "env BUNDLE_GEMFILE=active_support_#{version} bundle install"
-        sh "env BUNDLE_GEMFILE=active_support_#{version} bundle exec rake spec_unit spec_functional"
+        sh "env BUNDLE_GEMFILE=gemfiles/active_support_#{version} bundle install"
+        sh "env BUNDLE_GEMFILE=gemfiles/active_support_#{version} bundle exec rake spec_unit spec_functional"
       end
     end
   end

data/couch_potato-rspec.gemspec

@@ -0,0 +1,20 @@
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'couch_potato/version'
+
+Gem::Specification.new do |s|
+  s.name = 'couch_potato-rspec'
+  s.summary = 'RSpec matchers for Couch Potato'
+  s.email = 'alex@upstre.am'
+  s.homepage = 'http://github.com/langalex/couch_potato'
+  s.description = 'RSpec matchers for Couch Potato'
+  s.authors = ['Alexander Lang']
+  s.version     = CouchPotato::RSPEC_VERSION
+  s.platform    = Gem::Platform::RUBY
+
+  s.add_dependency 'rspec', '~>3.0'
+  s.add_development_dependency 'rake'
+
+  s.files         = `git ls-files | grep "lib/couch_potato/rspec"`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/* | grep rspec_matchers`.split("\n")
+  s.require_paths = ['lib']
+end

data/couch_potato.gemspec

@@ -1,28 +1,27 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "couch_potato/version"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'couch_potato/version'
 
 Gem::Specification.new do |s|
-  s.name = "couch_potato"
-  s.summary = %Q{Ruby persistence layer for CouchDB}
-  s.email = "alex@upstre.am"
-  s.homepage = "http://github.com/langalex/couch_potato"
-  s.description = "Ruby persistence layer for CouchDB"
-  s.authors = ["Alexander Lang"]
+  s.name = 'couch_potato'
+  s.summary = 'Ruby persistence layer for CouchDB'
+  s.email = 'alex@upstre.am'
+  s.homepage = 'http://github.com/langalex/couch_potato'
+  s.description = 'Ruby persistence layer for CouchDB'
+  s.authors = ['Alexander Lang']
   s.version     = CouchPotato::VERSION
   s.platform    = Gem::Platform::RUBY
 
   s.add_dependency 'json', '~> 1.6'
-  s.add_dependency 'couchrest', '~>1.2.0'
-  s.add_dependency 'activemodel'
+  s.add_dependency 'couchrest', '~>2.0.0.rc3'
+  s.add_dependency 'activemodel', '~> 4.0'
 
-  s.add_development_dependency 'rspec', '~>2.11.0'
+  s.add_development_dependency 'rspec', '~>3.2.0'
   s.add_development_dependency 'timecop'
   s.add_development_dependency 'tzinfo'
   s.add_development_dependency 'rake'
 
-  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.files         = `git ls-files | grep -v "lib/couch_potato/rspec"`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/* | grep -v rspec_matchers`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map {|f| File.basename(f) }
+  s.require_paths = ['lib']
 end

data/{active_support_4_0 → gemfiles/active_support_4_0}

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'activemodel', '~>4.0.0.rc1'
-gem 'rails', '~>4.0.0.rc1'
+gem 'activemodel', '~>4.0.0'
+gem 'rails', '~>4.0.0'
 if RUBY_PLATFORM =~ /java/
   gem 'therubyrhino'
 else
    gem 'therubyracer'
 end
 
-gemspec
+gemspec name: 'couch_potato', path: '..'

data/{active_support_3_2 → gemfiles/active_support_4_1}

@@ -1,10 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'activemodel', '~>3.2'
+gem 'activemodel', '~>4.1.0'
+gem 'rails', '~>4.1.0'
 if RUBY_PLATFORM =~ /java/
   gem 'therubyrhino'
 else
    gem 'therubyracer'
 end
 
-gemspec
+gemspec name: 'couch_potato', path: '..'

data/gemfiles/active_support_4_2

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem 'activemodel', '~>4.2.0'
+gem 'rails', '~>4.2.0'
+if RUBY_PLATFORM =~ /java/
+  gem 'therubyrhino'
+else
+   gem 'therubyracer'
+end
+
+gemspec name: 'couch_potato', path: '..'

data/lib/couch_potato-rspec.rb

@@ -0,0 +1,3 @@
+$LOAD_PATH << File.dirname(__FILE__)
+
+require 'couch_potato/rspec'

data/lib/couch_potato.rb

@@ -7,8 +7,10 @@ JSON.create_id = 'ruby_class'
 CouchRest.decode_json_objects = true
 
 module CouchPotato
-  Config = Struct.new(:database_host, :database_name, :split_design_documents_per_view, :default_language).new
+  Config = Struct.new(:database_host, :database_name, :digest_view_names,
+    :split_design_documents_per_view, :default_language).new
   Config.split_design_documents_per_view = false
+  Config.digest_view_names = false
   Config.default_language = :javascript
   Config.database_host = "http://127.0.0.1:5984"
 

data/lib/couch_potato/database.rb

@@ -37,23 +37,25 @@ module CouchPotato
     #
     #   db.view(User.all(keys: [1, 2, 3]))
     def view(spec)
-      results = CouchPotato::View::ViewQuery.new(
-        couchrest_database,
-        spec.design_document,
-        {spec.view_name => {
-          :map => spec.map_function,
-          :reduce => spec.reduce_function
-        }
-        },
-        ({spec.list_name => spec.list_function} unless spec.list_name.nil?),
-        spec.lib,
-        spec.language
-      ).query_view!(spec.view_parameters)
-      processed_results = spec.process_results results
-      processed_results.each do |document|
-        document.database = self if document.respond_to?(:database=)
-      end if processed_results.respond_to?(:each)
-      processed_results
+      ActiveSupport::Notifications.instrument('couch_potato.view') do
+        results = CouchPotato::View::ViewQuery.new(
+          couchrest_database,
+          spec.design_document,
+          {spec.view_name => {
+            :map => spec.map_function,
+            :reduce => spec.reduce_function
+          }
+          },
+          ({spec.list_name => spec.list_function} unless spec.list_name.nil?),
+          spec.lib,
+          spec.language
+        ).query_view!(spec.view_parameters)
+        processed_results = spec.process_results results
+        processed_results.each do |document|
+          document.database = self if document.respond_to?(:database=)
+        end if processed_results.respond_to?(:each)
+        processed_results
+      end
     end
 
     # returns the first result from a #view query or nil
@@ -71,22 +73,15 @@ module CouchPotato
     # if passed a block will:
     # * yield the object to be saved to the block and run if once before saving
     # * on conflict: reload the document, run the block again and retry saving
-    def save_document(document, validate = true, &block)
-      retries = 0
+    def save_document(document, validate = true, retries = 0, &block)
       begin
         block.call document if block
         save_document_without_conflict_handling(document, validate)
-      rescue RestClient::Conflict => e
+      rescue CouchRest::Conflict => e
         if block
-          document = document.reload
-          if retries == 5
-            raise CouchPotato::Conflict.new
-          else
-            retries += 1
-            retry
-          end
+          handle_write_conflict document, validate, retries, &block
         else
-          raise e
+          raise CouchPotato::Conflict.new
         end
       end
     end
@@ -101,7 +96,7 @@ module CouchPotato
     def destroy_document(document)
       begin
         destroy_document_without_conflict_handling document
-      rescue RestClient::Conflict
+      rescue CouchRest::Conflict
         retry if document = document.reload
       end
     end
@@ -115,15 +110,13 @@ module CouchPotato
     def load_document(id)
       raise "Can't load a document without an id (got nil)" if id.nil?
 
-      if id.is_a?(Array)
-        bulk_load id
-      else
-        begin
+      ActiveSupport::Notifications.instrument('couch_potato.load') do
+        if id.is_a?(Array)
+          bulk_load id
+        else
           instance = couchrest_database.get(id)
-          instance.database = self
+          instance.database = self if instance
           instance
-        rescue(RestClient::ResourceNotFound)
-          nil
         end
       end
     end
@@ -151,6 +144,15 @@ module CouchPotato
 
     private
 
+    def handle_write_conflict(document, validate, retries, &block)
+      document = document.reload
+      if retries == 5
+        raise CouchPotato::Conflict.new
+      else
+        save_document document, validate, retries + 1, &block
+      end
+    end
+
     def destroy_document_without_conflict_handling(document)
       document.run_callbacks :destroy do
         document._deleted = true
@@ -161,7 +163,6 @@ module CouchPotato
     end
 
     def save_document_without_conflict_handling(document, validate = true)
-      return true unless document.dirty? || document.new?
       if document.new?
         create_document(document, validate)
       else
@@ -211,8 +212,10 @@ module CouchPotato
 
       return false if false == document.run_callbacks(:save) do
         return false if false == document.run_callbacks(:update) do
-          res = couchrest_database.save_doc document.to_hash
-          document._rev = res['rev']
+          if document.dirty?
+            res = couchrest_database.save_doc document.to_hash
+            document._rev = res['rev']
+          end
         end
       end
       true

data/lib/couch_potato/persistence/magic_timestamps.rb

@@ -6,18 +6,18 @@ module CouchPotato
       base.instance_eval do
         property :created_at, :type => Time
         property :updated_at, :type => Time
-        
+
         before_create lambda {|model|
           model.created_at ||= (Time.zone || Time).now
-          @changed_attributes.delete 'created_at'
+          @changed_attributes.try :delete, 'created_at'
           model.updated_at ||= (Time.zone || Time).now
-          @changed_attributes.delete 'updated_at'
+          @changed_attributes.try :delete, 'updated_at'
         }
         before_update lambda {|model|
           model.updated_at = (Time.zone || Time).now
-          @changed_attributes.delete 'updated_at'
+          @changed_attributes.try :delete, 'updated_at'
         }
       end
     end
   end
-end
+end

data/lib/couch_potato/persistence/properties.rb

@@ -12,16 +12,22 @@ module CouchPotato
         def initialize(clazz)
           @clazz = clazz
           @list = []
+          @hash = {}
         end
 
-        def each
-          (list + inherited_properties).each {|property| yield property}
+        def each(&block)
+          (list + inherited_properties).each(&block)
         end
 
         def <<(property)
+          @hash[property.name] = property
           @list << property
         end
 
+        def find_property(name)
+          @hash[name]
+        end
+
         # XXX
         def inspect
           list.map(&:name).inspect

data/lib/couch_potato/persistence/simple_property.rb

@@ -4,8 +4,8 @@ module CouchPotato
       private
 
       def load_attribute_from_document(name)
-        if _document.has_key?(name.to_sym) || _document.has_key?(name.to_s)
-          property = self.class.properties.find{|property| property.name == name}
+        if _document.has_key?(name)
+          property = self.class.properties.find_property name
           @skip_dirty_tracking = true
           value = property.build(self, _document)
           @skip_dirty_tracking = false
@@ -19,6 +19,7 @@ module CouchPotato
 
       def initialize(owner_clazz, name, options = {})
         self.name = name
+        @setter_name = "#{name}="
         self.type = options[:type]
         @type_caster = TypeCaster.new
         owner_clazz.send :include, PropertyMethods unless owner_clazz.ancestors.include?(PropertyMethods)
@@ -27,8 +28,8 @@ module CouchPotato
       end
 
       def build(object, json)
-        value = json[name.to_s].nil? ? json[name.to_sym] : json[name.to_s]
-        object.send "#{name}=", value
+        value = json[name]
+        object.send @setter_name, value
       end
 
       def dirty?(object)
@@ -56,10 +57,11 @@ module CouchPotato
       end
 
       def define_accessors(base, name, options)
+        ivar_name = "@#{name}".freeze
         base.class_eval do
-          define_method "#{name}" do
-            load_attribute_from_document(name) unless instance_variable_defined?("@#{name}")
-            value = instance_variable_get("@#{name}")
+          define_method name do
+            load_attribute_from_document(name) unless instance_variable_defined?(ivar_name)
+            value = instance_variable_get(ivar_name)
             if value.nil? && !options[:default].nil?
               default = if options[:default].respond_to?(:call)
                 if options[:default].arity == 1
@@ -70,7 +72,7 @@ module CouchPotato
               else
                 clone_attribute(options[:default])
               end
-              self.instance_variable_set("@#{name}", default)
+              self.instance_variable_set(ivar_name, default)
               default
             else
               value
@@ -80,7 +82,7 @@ module CouchPotato
           define_method "#{name}=" do |value|
             typecasted_value = type_caster.cast(value, options[:type])
             send("#{name}_will_change!") unless @skip_dirty_tracking || typecasted_value == send(name)
-            self.instance_variable_set("@#{name}", typecasted_value)
+            self.instance_variable_set(ivar_name, typecasted_value)
           end
 
           define_method "#{name}?" do

data/lib/couch_potato/persistence/type_caster.rb

@@ -27,7 +27,7 @@ module CouchPotato
       end
 
       def cast_native(value, type)
-        if type && !value.instance_of?(type)
+        if type && !value.is_a?(type)
           if type == Fixnum
             BigDecimal.new(value.to_s.scan(NUMBER_REGEX).join).round unless value.blank?
           elsif type == Float

data/lib/couch_potato/railtie.rb

@@ -5,12 +5,14 @@ module CouchPotato
   def self.rails_init
     path = Rails.root.join('config/couchdb.yml')
     if File.exist?(path)
+      require 'yaml'
       config = YAML::load(ERB.new(File.read(path)).result)[Rails.env]
       if config.is_a?(String)
         CouchPotato::Config.database_name = config
       else
         CouchPotato::Config.database_name = config['database']
         CouchPotato::Config.split_design_documents_per_view = config['split_design_documents_per_view'] if config['split_design_documents_per_view']
+        CouchPotato::Config.digest_view_names = config['digest_view_names'] if config['digest_view_names']
         CouchPotato::Config.default_language = config['default_language'] if config['default_language']
       end
     else

data/lib/couch_potato/version.rb

@@ -1,3 +1,4 @@
 module CouchPotato
-  VERSION = "1.4.0"
+  VERSION = '1.6.3'
+  RSPEC_VERSION = '3.0.0'
 end