couch_potato 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30f6ff4ae48fa386a7c210a840f7bc2e5504e812
-  data.tar.gz: e3cc6d272dab7679b7766bb96a0b9cdf557ad2b3
+  metadata.gz: 7afdf21007e24fddeb4df04575ea8ee1062e4b29
+  data.tar.gz: 815dc0bd6c4a35a2770a28aff57e1901da66fc62
 SHA512:
-  metadata.gz: d8ec9aba049750bc2d18053ba05633d4a593d6fd7e44f002746dd629d2fd8c4ad6297228f549b9653d60ad9a54e410ad6334aa6356c1d3a2d6825b102241cb43
-  data.tar.gz: 1b9106d793d8874f32345492ad25aac13a1a3817df7af885d3f084117c7c9a8a34f7fbcd3eca834ee0b62cb4f2d20c9b86fbcdb015979e20712475dd0b9f383e
+  metadata.gz: d0aedb24caecaac662bd3758683b74cb723d3361f0b25ad55463c102dfe6242b62a877337fa0c43091a4d52f0220371fb227fea2307c0fcc631d4767b5ae807a
+  data.tar.gz: fdbdea5fa1179b9026480fd128537e36e7b61edd385edbaf87899725a7af63540fddae8bd747471739307e1b6de4695e2e75c61fcb686402412f85d182c86d6c

data/.travis.yml

@@ -1,16 +1,16 @@
+language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.2
-  - 2.2.2
-  - 2.3.0
-  - jruby-9.0.1.0
-  - rbx-2.5.8
+  - "2.2"
+  - "2.3.0"
+  - "jruby-9.0.5.0"
+  - "rbx-3.9"
 services:
   - couchdb
 gemfile:
   - gemfiles/active_support_4_0
   - gemfiles/active_support_4_1
   - gemfiles/active_support_4_2
+  - gemfiles/active_support_5_0
 before_install:
   gem install bundler --version 1.11.2
 before_script:

data/CHANGES.md

@@ -1,5 +1,9 @@
 ## Changes
 
+### 1.7.1
+
+* added support for properties of type Integer
+
 ### 1.7.0
 
 * added `_revisions` method that returns all available revisions of a document.

data/README.md

@@ -27,11 +27,7 @@ Lastly Couch Potato aims to provide a seamless integration with Ruby on Rails, e
 
 ### Supported Environments
 
-* Ruby 2.0, 2.1, 2.2, Rubinius
-* CouchDB 1.6.0
-* ActiveSupport 4.0, 4.1, 4.2
-
-(Supported means I run the specs against those before releasing a new gem.)
+Check travis.yml for supported Ruby/ActiveSupport versions.
 
 ### Installation
 
@@ -164,18 +160,18 @@ end
 ```
 
 In this case `Address` also implements `CouchPotato::Persistence` which means its JSON representation will be added to the user document.
-Couch Potato also has support for the basic types (right now `Fixnum`, `Date`, `Time` and `:boolean` are supported):
+Couch Potato also has support for the basic types (right now `Integer`, `Date`, `Time` and `:boolean` are supported):
 
 ```ruby
 class User
   include CouchPotato::Persistence
 
-  property :age, :type => Fixnum
+  property :age, :type => Integer
   property :receive_newsletter, :type => :boolean
 end
 ```
 
-With this in place when you set the user's age as a String (e.g. using an HTML form) it will be converted into a `Fixnum` automatically.
+With this in place when you set the user's age as a String (e.g. using an HTML form) it will be converted into a `Integer` automatically.
 
 
 Properties can have a default value:
@@ -472,7 +468,7 @@ You can pass in your own view specifications by passing in `:type => MyViewSpecC
 
 ##### Digest view names
 
-If turned on, Couch Potato will append an MD5 digest of the map function to each view name. This makes sure (together with split_design_documents_per_view) that no views/design documents are ever updated. Instead, new ones are created. Since reindexing can take a long time once your database is larger, you want to avoid blocking your app while CouchDB is busy. Instead, you create a new view, warm it up, and only then start using it. 
+If turned on, Couch Potato will append an MD5 digest of the map function to each view name. This makes sure (together with split_design_documents_per_view) that no views/design documents are ever updated. Instead, new ones are created. Since reindexing can take a long time once your database is larger, you want to avoid blocking your app while CouchDB is busy. Instead, you create a new view, warm it up, and only then start using it.
 
 ##### Lists
 
@@ -630,7 +626,7 @@ class User
   include CouchPotato::Persistence
 
   property :name
-  property :age, :type => Fixnum
+  property :age, :type => Integer
 
   view :by_name, :key => :name
   view :by_age,  :key => :age

data/Rakefile

@@ -24,7 +24,7 @@ task :spec do
     Rake::Task[:spec_unit].execute
     Rake::Task[:spec_functional].execute
   else
-    %w(4_0 4_1 4_2).each do |version|
+    %w(4_0 4_1 4_2 5_0).each do |version|
       Bundler.with_clean_env do
         puts "Running tests with ActiveSupport #{version.sub('_', '.')}"
         sh "env BUNDLE_GEMFILE=gemfiles/active_support_#{version} bundle install"

data/couch_potato.gemspec

@@ -12,13 +12,13 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
 
   s.add_dependency 'json', '~> 1.6'
-  s.add_dependency 'couchrest', '~>2.0.0.rc3'
-  s.add_dependency 'activemodel', '~> 4.0'
+  s.add_dependency 'couchrest', '~>2.0.0'
+  s.add_dependency 'activemodel', ['>= 4.0', '< 6.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.add_development_dependency 'rake', '< 11.0'
 
   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")

data/gemfiles/active_support_5_0

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

data/lib/couch_potato.rb

@@ -12,7 +12,7 @@ module CouchPotato
   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"
+  Config.database_host = 'http://127.0.0.1:5984'
 
   class NotFound < StandardError; end
   class Conflict < StandardError; end
@@ -25,19 +25,19 @@ module CouchPotato
 
   # Returns a database instance which you can then use to create objects and query views. You have to set the CouchPotato::Config.database_name before this works.
   def self.database
-    @@__database ||= Database.new(self.couchrest_database)
+    Thread.current[:__couch_potato_database] ||= Database.new(couchrest_database)
   end
 
   # Returns the underlying CouchRest database object if you want low level access to your CouchDB. You have to set the CouchPotato::Config.database_name before this works.
   def self.couchrest_database
-    @@__couchrest_database ||= CouchRest.database(full_url_to_database(CouchPotato::Config.database_name, CouchPotato::Config.database_host))
+    Thread.current[:__couchrest_database] ||= CouchRest.database(full_url_to_database(CouchPotato::Config.database_name, CouchPotato::Config.database_host))
   end
 
   # Returns a specific database instance
   def self.use(database_name)
-    @@__databases ||= {}
-    @@__databases["#{database_name}"] = Database.new(couchrest_database_for_name!(database_name)) unless @@__databases["#{database_name}"]
-    @@__databases["#{database_name}"]
+    Thread.current[:__couch_potato_databases] ||= {}
+    Thread.current[:__couch_potato_databases][database_name] = Database.new(couchrest_database_for_name!(database_name)) unless Thread.current[:__couch_potato_databases][database_name]
+    Thread.current[:__couch_potato_databases][database_name]
   end
 
   # Executes a block of code and yields a datbase with the given name.
@@ -48,9 +48,9 @@ module CouchPotato
   #  end
   #
   def self.with_database(database_name)
-    @@__databases ||= {}
-    @@__databases["#{database_name}"] = Database.new(couchrest_database_for_name(database_name)) unless @@__databases["#{database_name}"]
-    yield(@@__databases["#{database_name}"])
+    Thread.current[:__couch_potato_databases] ||= {}
+    Thread.current[:__couch_potato_databases][database_name] = Database.new(couchrest_database_for_name(database_name)) unless Thread.current[:__couch_potato_databases][database_name]
+    yield Thread.current[:__couch_potato_databases][database_name]
   end
 
   # Returns a CouchRest-Database for directly accessing that functionality.
@@ -63,9 +63,7 @@ module CouchPotato
     CouchRest.database!(full_url_to_database(database_name))
   end
 
-  private
-
-  def self.full_url_to_database(database_name=CouchPotato::Config.database_name, database_host = CouchPotato::Config.database_host)
+  def self.full_url_to_database(database_name = CouchPotato::Config.database_name, database_host = CouchPotato::Config.database_host)
     raise('No Database configured. Set CouchPotato::Config.database_name') unless database_name
     if database_name.match(%r{https?://})
       database_name

data/lib/couch_potato/database.rb

@@ -145,10 +145,12 @@ module CouchPotato
     private
 
     def handle_write_conflict(document, validate, retries, &block)
-      document = document.reload
       if retries == 5
         raise CouchPotato::Conflict.new
       else
+        reloaded = document.reload
+        document.attributes = reloaded.attributes
+        document._rev = reloaded._rev
         save_document document, validate, retries + 1, &block
       end
     end

data/lib/couch_potato/persistence/type_caster.rb

@@ -28,7 +28,7 @@ module CouchPotato
 
       def cast_native(value, type)
         if type && !value.is_a?(type)
-          if type == Fixnum
+          if [Fixnum, Integer].include? type
             BigDecimal.new(value.to_s.scan(NUMBER_REGEX).join).round unless value.blank?
           elsif type == Float
             value.to_s.scan(NUMBER_REGEX).join.to_f unless value.blank?
@@ -36,6 +36,8 @@ module CouchPotato
             BigDecimal.new(value.to_s) unless value.blank?
           elsif type == Hash
             value.to_hash unless value.blank?
+          elsif type.ancestors.include?(CouchPotato::Persistence)
+            type.new value unless value.blank?
           else
             type.json_create value unless value.blank?
           end

data/lib/couch_potato/version.rb

@@ -1,4 +1,4 @@
 module CouchPotato
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.7.1'.freeze
   RSPEC_VERSION = '3.4.0'.freeze
 end

data/spec/conflict_handling_spec.rb

@@ -19,7 +19,7 @@ describe 'conflict handling' do
       m.value += 1
     end
 
-    expect(measurement.reload.value).to eql(3)
+    expect(measurement.value).to eql(3)
   end
 
   it 'raises an error after 5 tries' do

data/spec/property_spec.rb

@@ -114,12 +114,21 @@ describe 'properties' do
   end
 
   it "should persist subclasses of the specified type" do
-    w = Watch.new(:custom_address => [Address2.new])
+    w = Watch.new(:custom_address => [Address2.new(id: 'a1', city: 'Berlin')])
     CouchPotato.database.save_document! w
     w = CouchPotato.database.load_document w.id
+
     expect(w.custom_address[0]).to be_an_instance_of Address2
   end
 
+  it 'initializes an typed array property from an array of hashes' do
+    w = Watch.new(custom_address: [{id: 'a1', city: 'Berlin'}])
+
+    expect(w.custom_address.map(&:class)).to eq([Address])
+    expect(w.custom_address.map(&:id)).to eq(['a1'])
+    expect(w.custom_address.map(&:city)).to eq(['Berlin'])
+  end
+
   def it_should_persist value
     c = Comment.new :title => value
     CouchPotato.database.save_document! c

data/spec/unit/attributes_spec.rb

@@ -10,6 +10,7 @@ class Plant
   include CouchPotato::Persistence
   property :leaf_count
   property :typed_leaf_count, type: Fixnum
+  property :integer_something, type: Integer
   property :typed_leaf_size,  type: Float
   property :branch, type: Branch
 end
@@ -40,6 +41,7 @@ describe 'attributes' do
       plant = Plant.new(leaf_count: 1)
 
       expect(plant.attributes).to eq('leaf_count' => 1, 'created_at' => nil,
+        'integer_something' => nil,
         'updated_at' => nil, 'typed_leaf_count' => nil,
         'typed_leaf_size' => nil, 'branch' => nil)
     end
@@ -109,6 +111,57 @@ describe 'attributes' do
       end
     end
 
+    describe 'integer' do
+      it 'rounds a float to a fixnum' do
+        @plant.integer_something = 4.5
+
+        expect(@plant.integer_something).to eq(5)
+      end
+
+      it 'converts a string into a fixnum' do
+        @plant.integer_something = '4'
+
+        expect(@plant.integer_something).to eq(4)
+      end
+
+      it 'converts a string into a negative fixnum' do
+        @plant.integer_something = '-4'
+
+        expect(@plant.integer_something).to eq(-4)
+      end
+
+      it 'leaves a fixnum as is' do
+        @plant.integer_something = 4
+
+        expect(@plant.integer_something).to eq(4)
+      end
+
+      it 'leaves nil as is' do
+        @plant.integer_something = nil
+
+        expect(@plant.integer_something).to be_nil
+      end
+
+      it 'sets the attributes to zero if a string given' do
+        @plant.integer_something = 'x'
+
+        expect(@plant.integer_something).to eq(0)
+      end
+
+      it 'parses numbers out of a string' do
+        @plant.integer_something = 'x123'
+
+        expect(@plant.integer_something).to eq(123)
+      end
+
+      it 'sets the attributes to nil if given a blank string' do
+        @plant.integer_something = ''
+
+        expect(@plant.integer_something).to be_nil
+      end
+    end
+
+
     describe 'fixnum' do
       it 'rounds a float to a fixnum' do
         @plant.typed_leaf_count = 4.5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couch_potato
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Alexander Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,28 +30,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc3
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc3
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +104,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 description: Ruby persistence layer for CouchDB
 email: alex@upstre.am
 executables: []
@@ -128,6 +134,7 @@ files:
 - gemfiles/active_support_4_0
 - gemfiles/active_support_4_1
 - gemfiles/active_support_4_2
+- gemfiles/active_support_5_0
 - init.rb
 - lib/core_ext/date.rb
 - lib/core_ext/time.rb
@@ -223,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby persistence layer for CouchDB
@@ -270,4 +277,3 @@ test_files:
 - spec/update_spec.rb
 - spec/view_updates_spec.rb
 - spec/views_spec.rb
-has_rdoc: