couch_potato 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a7bdcd820492f1ac93c757f8438d2659610ed06dc8b6dd2dcb62d6bcfa8434f
-  data.tar.gz: 4d3d52005c4d7647291d35f1437c7be05326526f71ab3232d46556f398b2d0fe
+  metadata.gz: c36fc0534a7564b1fcf3b2a59ca91e3e4e97452c2a74d77e30540eb4b7617211
+  data.tar.gz: b1583818a743459e8ab86d88350f7ad5c6953c058c3b49c8b90da50610bdd197
 SHA512:
-  metadata.gz: ac20227b8dfb0288d09e70dc515e90f0625660606ab130b0d0b8433591a2fd3247030b88c6137e60f20cf9e87862fa683276143ddfee3c8f7016e42deb69ea9d
-  data.tar.gz: 4c57160eb81d99070ee30bcb53723ece6de752af76b97ea7349f1bd0a5266bdd27f50b71461203d9b57799891a5f933333689a18a53e0badc1d304957d70337b
+  metadata.gz: ceffb27b13b2cf9825cd5fcf507bb0e13a6ed9b5caa612fd1f5f27ba98934eb9dae34c4f4dc70835352a9176bc4562e49da12d489b925ebbeb37a3c9eaa964f4
+  data.tar.gz: c5e01a2d0d83ea11b14a618f218fe3ff66af35be893a4d74644089938b852045c52a8e1d8ecf31b53e70396737f9db0a8849ef0fbacd843c89137ec4d8bfc0e2

data/.github/workflows/ruby.yml

@@ -16,18 +16,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7, "3.0", "3.1", "jruby"]
+        ruby: ["3.0", "3.1", "3.2", "jruby"]
         gemfile:
-          - "active_support_6_0"
-          - "active_support_6_1"
           - "active_support_7_0"
+          - "active_support_7_1"
         exclude:
           - ruby: "jruby"
             gemfile: "active_support_7_0"
-          - ruby: "3.0"
-            gemfile: "active_support_6_0"
-          - ruby: "3.1"
-            gemfile: "active_support_6_0"
     steps:
       - uses: actions/checkout@v2
       - name: Set up CouchDB

data/CHANGES.md

@@ -1,5 +1,16 @@
 ## Changes
 
+# 1.13.0
+
+- add Ruby 3.2 support
+- remove Ruby 2.7 support
+- add active_support 7.1 support
+- remove active_support 6.x support
+
+# 1.12.1
+
+- re-enable aliases when parsing config yaml file
+
 # 1.12.0
 
 - remove active_support 5.x

data/Rakefile

@@ -26,8 +26,8 @@ end
 
 desc 'Run all specs for all gemfiles'
 task :spec do
-  %w(7_0 6_1 6_0 5_2 5_1 5_0).each do |version|
-    Bundler.with_clean_env do
+  %w(7_1 7_0).each do |version|
+    Bundler.with_original_env do
       puts "Running tests with ActiveSupport #{version.sub('_', '.')}"
       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"

data/couch_potato-rspec.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.version     = CouchPotato::RSPEC_VERSION
   s.platform    = Gem::Platform::RUBY
 
-  s.add_dependency 'rspec', '~>3.4'
+  s.add_dependency 'rspec', '~>3.12'
   s.add_development_dependency 'rake'
   s.add_dependency 'execjs', '~>2.7'
 

data/couch_potato.gemspec

@@ -13,12 +13,12 @@ Gem::Specification.new do |s|
   s.version     = CouchPotato::VERSION
   s.platform    = Gem::Platform::RUBY
 
-  s.add_dependency 'activemodel', ['>= 5.0', '< 7.1']
+  s.add_dependency 'activemodel', ['>= 5.0', '< 8.0']
   s.add_dependency 'couchrest', '~>2.0.0'
   s.add_dependency 'json', '~> 2.3'
 
   s.add_development_dependency 'rake', '~>12.0'
-  s.add_development_dependency 'rspec', '~>3.10.0'
+  s.add_development_dependency 'rspec', '~>3.12.0'
   s.add_development_dependency 'timecop'
   s.add_development_dependency 'tzinfo'
 

data/gemfiles/active_support_7_0

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'railties', '~>7.0.4'
+gem 'railties', '~>7.0.8'
 gem 'activemodel'
 gem 'execjs'
 

data/gemfiles/{active_support_6_1 → active_support_7_1}

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'railties', '~>6.1'
+gem 'railties', '~>7.1.3'
 gem 'activemodel'
 gem 'execjs'
 

data/lib/couch_potato/persistence/properties.rb

@@ -93,7 +93,11 @@ module CouchPotato
           active_support_module.module_eval do
             undef_method(name) if instance_methods.include?(name)
           end
-          cache = send(:attribute_method_matchers_cache)
+          cache = if respond_to?(:attribute_method_matchers_cache, true) # activemodel 7.0
+            send(:attribute_method_matchers_cache) 
+          else # activemodel 7.1
+            send(:attribute_method_patterns_cache) 
+          end
           cache.delete(name)
 
           define_attribute_method name

data/lib/couch_potato/persistence/simple_property.rb

@@ -15,12 +15,13 @@ module CouchPotato
     end
 
     class SimpleProperty  #:nodoc:
-      attr_accessor :name, :type
+      attr_accessor :name, :type, :default_value
 
       def initialize(owner_clazz, name, options = {})
         self.name = name
         @setter_name = "#{name}="
         self.type = options[:type]
+        self.default_value = options[:default]
         @type_caster = TypeCaster.new
         owner_clazz.send :include, PropertyMethods unless owner_clazz.ancestors.include?(PropertyMethods)
 

data/lib/couch_potato/persistence/type_caster.rb

@@ -32,7 +32,7 @@ module CouchPotato
       def cast_native(value, type)
         if type && !value.is_a?(type)
 
-          if %w[Integer Bignum Fixnum].include?(type.to_s)
+          if %w[Integer Bignum].include?(type.to_s)
             value.to_s.scan(NUMBER_REGEX).join.to_d.round unless value.blank?
           elsif type == Float
             value.to_s.scan(NUMBER_REGEX).join.to_f unless value.blank?

data/lib/couch_potato/railtie.rb

@@ -11,6 +11,7 @@ module CouchPotato
       config = YAML.safe_load(
         ERB.new(File.read(path)).result, 
         permitted_classes: [Symbol], 
+        aliases: true
       )[Rails.env]
       CouchPotato.configure(config)
     else

data/lib/couch_potato/version.rb

@@ -1,4 +1,4 @@
 module CouchPotato
-  VERSION = '1.12.0'.freeze
-  RSPEC_VERSION = '4.0.2'.freeze
+  VERSION = '1.13.0'.freeze
+  RSPEC_VERSION = '4.1.0'.freeze
 end

data/spec/railtie_spec.rb

@@ -100,4 +100,19 @@ describe "railtie" do
 
     CouchPotato.rails_init
   end
+
+  it 'processes aliases' do
+    allow(File).to receive_messages(:read => <<~YAML)
+      default: &default
+        default_language: :javascript
+      test:
+        <<: *default
+        database: couch_potato_test
+    YAML
+
+    expect(CouchPotato::Config).to receive(:default_language=).with(:javascript)
+    expect(CouchPotato::Config).to receive(:database_name=).with('couch_potato_test')
+
+    CouchPotato.rails_init
+  end
 end

data/spec/unit/attributes_spec.rb

@@ -9,7 +9,6 @@ end
 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
@@ -42,7 +41,7 @@ describe 'attributes' do
 
       expect(plant.attributes).to eq('leaf_count' => 1, 'created_at' => nil,
         'integer_something' => nil,
-        'updated_at' => nil, 'typed_leaf_count' => nil,
+        'updated_at' => nil,
         'typed_leaf_size' => nil, 'branch' => nil)
     end
 
@@ -112,25 +111,25 @@ describe 'attributes' do
     end
 
     describe 'integer' do
-      it 'rounds a float to a fixnum' do
+      it 'rounds a float to an integer' do
         @plant.integer_something = 4.5
 
         expect(@plant.integer_something).to eq(5)
       end
 
-      it 'converts a string into a fixnum' do
+      it 'converts a string into an integer' do
         @plant.integer_something = '4'
 
         expect(@plant.integer_something).to eq(4)
       end
 
-      it 'converts a string into a negative fixnum' do
+      it 'converts a string into a negative integer' do
         @plant.integer_something = '-4'
 
         expect(@plant.integer_something).to eq(-4)
       end
 
-      it 'leaves a fixnum as is' do
+      it 'leaves an integer as is' do
         @plant.integer_something = 4
 
         expect(@plant.integer_something).to eq(4)
@@ -161,57 +160,6 @@ describe 'attributes' do
       end
     end
 
-
-    describe 'fixnum' do
-      it 'rounds a float to a fixnum' do
-        @plant.typed_leaf_count = 4.5
-
-        expect(@plant.typed_leaf_count).to eq(5)
-      end
-
-      it 'converts a string into a fixnum' do
-        @plant.typed_leaf_count = '4'
-
-        expect(@plant.typed_leaf_count).to eq(4)
-      end
-
-      it 'converts a string into a negative fixnum' do
-        @plant.typed_leaf_count = '-4'
-
-        expect(@plant.typed_leaf_count).to eq(-4)
-      end
-
-      it 'leaves a fixnum as is' do
-        @plant.typed_leaf_count = 4
-
-        expect(@plant.typed_leaf_count).to eq(4)
-      end
-
-      it 'leaves nil as is' do
-        @plant.typed_leaf_count = nil
-
-        expect(@plant.typed_leaf_count).to be_nil
-      end
-
-      it 'sets the attributes to zero if a string given' do
-        @plant.typed_leaf_count = 'x'
-
-        expect(@plant.typed_leaf_count).to eq(0)
-      end
-
-      it 'parses numbers out of a string' do
-        @plant.typed_leaf_count = 'x123'
-
-        expect(@plant.typed_leaf_count).to eq(123)
-      end
-
-      it 'sets the attributes to nil if given a blank string' do
-        @plant.typed_leaf_count = ''
-
-        expect(@plant.typed_leaf_count).to be_nil
-      end
-    end
-
     context 'float' do
       it 'converts a number in a string with a decimal place' do
         @plant.typed_leaf_size = '0.5001'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couch_potato
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Alexander Lang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -19,7 +19,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: couchrest
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -130,9 +130,8 @@ files:
 - Rakefile
 - couch_potato-rspec.gemspec
 - couch_potato.gemspec
-- gemfiles/active_support_6_0
-- gemfiles/active_support_6_1
 - gemfiles/active_support_7_0
+- gemfiles/active_support_7_1
 - init.rb
 - lib/core_ext/date.rb
 - lib/core_ext/time.rb
@@ -231,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: Ruby persistence layer for CouchDB

data/gemfiles/active_support_6_0

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'railties', '~>6.0.2.2'
-gem 'activemodel'
-gem 'execjs'
-
-gemspec name: 'couch_potato', path: '..'