ledermann-rails-settings 2.4.3 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54028088f04ee8257a762eb477193f71f0e04b3c6a8eddcbc573c8af673dfeb9
-  data.tar.gz: 6a7de3c087fa34df61adf6e507763fc614ee3f2e7ee76071aacb1feeff8dfba9
+  metadata.gz: d35191c6b15823ec6934c9b66a8cf4291aa552c79bfe1ac6e24b2298a3bf6942
+  data.tar.gz: 1dabb6089d5894acc9f16aa57637daded9e9751c590b924fe3a8d3e074e01ac8
 SHA512:
-  metadata.gz: d39055f26f4772b7195a58f715948ded863581fbc5801bd05439964fa5ea2cf8b50b59f9947ded0ee01ccfd93e7170fe0951cb24155c4474f4e42cb8fdfaef5c
-  data.tar.gz: 9594e0e206154db02d57ddcdc14088b678b4bb5c128940da0ac61b59145de372fcd915f7242c87cf6785d63c7f96f96e4623259fdb227842d5d11d2ed957e43c
+  metadata.gz: 2556adc7367efd4acd8a208d342d4f485ea356a79b1bac8971785bb2d3ab9ea3d31ec13b2008fe4e58171eb181090e7d7b18f3a242ee220fee9703777c7ca387
+  data.tar.gz: b391a6f0c86c8abab56b8b68b20161fbe4981c7d08acfa5766416d097d0c2ada7c77db29182b46b62853f0e822b77cc21ae300b3f42657c50cdebc7d83bdf4a8

data/.travis.yml

@@ -1,74 +1,17 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.10
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
 gemfile:
-  - ci/Gemfile-rails-3-1
-  - ci/Gemfile-rails-3-2
-  - ci/Gemfile-rails-4-0
-  - ci/Gemfile-rails-4-1
   - ci/Gemfile-rails-4-2
   - ci/Gemfile-rails-5-0
   - ci/Gemfile-rails-5-1
   - ci/Gemfile-rails-5-2
+  - ci/Gemfile-rails-6-0
 matrix:
-  include:
-    - rvm: 2.2.9
-      gemfile: ci/Gemfile-rails-4-0
-      env: PROTECTED_ATTRIBUTES=true
-    - rvm: 2.2.9
-      gemfile: ci/Gemfile-rails-4-1
-      env: PROTECTED_ATTRIBUTES=true
-    - rvm: 2.2.9
-      gemfile: ci/Gemfile-rails-4-2
-      env: PROTECTED_ATTRIBUTES=true
   exclude:
-    - rvm: 1.9.3
-      gemfile: ci/Gemfile-rails-5-0
-    - rvm: 1.9.3
-      gemfile: ci/Gemfile-rails-5-1
-    - rvm: 1.9.3
-      gemfile: ci/Gemfile-rails-5-2
-    - rvm: 2.0.0
-      gemfile: ci/Gemfile-rails-5-0
-    - rvm: 2.0.0
-      gemfile: ci/Gemfile-rails-5-1
-    - rvm: 2.0.0
-      gemfile: ci/Gemfile-rails-5-2
-    - rvm: 2.1.10
-      gemfile: ci/Gemfile-rails-5-0
-    - rvm: 2.1.10
-      gemfile: ci/Gemfile-rails-5-1
-    - rvm: 2.1.10
-      gemfile: ci/Gemfile-rails-5-2
-    - rvm: 2.2.9
-      gemfile: ci/Gemfile-rails-3-1
-    - rvm: 2.3.6
-      gemfile: ci/Gemfile-rails-3-1
-    - rvm: 2.4.3
-      gemfile: ci/Gemfile-rails-3-1
-    - rvm: 2.5.0
-      gemfile: ci/Gemfile-rails-3-1
-    - rvm: 2.2.9
-      gemfile: ci/Gemfile-rails-3-2
-    - rvm: 2.3.6
-      gemfile: ci/Gemfile-rails-3-2
-    - rvm: 2.4.3
-      gemfile: ci/Gemfile-rails-3-2
-    - rvm: 2.4.3
-      gemfile: ci/Gemfile-rails-4-0
-    - rvm: 2.4.3
-      gemfile: ci/Gemfile-rails-4-1
-    - rvm: 2.5.0
-      gemfile: ci/Gemfile-rails-3-2
-    - rvm: 2.5.0
-      gemfile: ci/Gemfile-rails-4-0
-    - rvm: 2.5.0
-      gemfile: ci/Gemfile-rails-4-1
+    - rvm: 2.4.6
+      gemfile: ci/Gemfile-rails-6-0
 before_install: gem update bundler
 sudo: false

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2018 Georg Ledermann
+Copyright (c) 2012-2019 Georg Ledermann
 
 MIT License
 

data/README.md

@@ -8,8 +8,8 @@ Ruby gem to handle settings for ActiveRecord instances by storing them as serial
 
 ## Requirements
 
-* Ruby 1.9.3 or newer
-* Rails 3.1 or newer (including Rails 5.2)
+* Ruby 2.4 or newer
+* Rails 4.2 or newer (including Rails 6)
 
 
 ## Installation
@@ -65,6 +65,26 @@ class ProjectSettingObject < RailsSettings::SettingObject
 end
 ```
 
+In case you need to define settings separatedly for the same models, you can use the persistent option
+
+```ruby
+module UserDashboardConcern
+  extend ActiveSupport::Concern
+
+  included do
+    has_settings persistent: true do |s|
+      s.key :dashboard
+    end
+  end
+end
+
+class User < ActiveRecord::Base
+  has_settings persistent: true do |s|
+    s.key :calendar
+  end
+end
+```
+
 ### Set settings
 
 ```ruby
@@ -79,8 +99,8 @@ or
 
 ```ruby
 user = User.find(1)
-user.settings(:dashboard).update_attributes! :theme => 'black'
-user.settings(:calendar).update_attributes! :scope => 'all', :display => 'daily'
+user.settings(:dashboard).update! :theme => 'black'
+user.settings(:calendar).update! :scope => 'all', :display => 'daily'
 ```
 
 
@@ -102,7 +122,7 @@ user.settings(:calendar).scope
 
 ```ruby
 user = User.find(1)
-user.settings(:dashboard).update_attributes! :theme => nil
+user.settings(:dashboard).update! :theme => nil
 
 user.settings(:dashboard).view = nil
 user.settings(:dashboard).save!
@@ -118,7 +138,7 @@ User.without_settings
 # => all users without having any setting
 
 User.with_settings_for(:calendar)
-# => all users having a setting for 'calender'
+# => all users having a setting for 'calendar'
 
 User.without_settings_for(:calendar)
 # => all users without having settings for 'calendar'
@@ -146,6 +166,6 @@ See https://github.com/ledermann/rails-settings/releases
 
 MIT License
 
-Copyright (c) 2012-2018 [Georg Ledermann](http://www.georg-ledermann.de)
+Copyright (c) 2012-2019 [Georg Ledermann](http://www.georg-ledermann.de)
 
 This gem is a complete rewrite of [rails-settings](https://github.com/Squeegy/rails-settings) by [Alex Wayne](https://github.com/Squeegy)

data/ci/Gemfile-rails-4-2

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 4.2.1'
+gem 'activerecord', '~> 4.2.11'
 gem 'protected_attributes' if ENV['PROTECTED_ATTRIBUTES'] == 'true'
+gem 'sqlite3', '~> 1.3.6'
 
 gemspec :path => "../"

data/ci/Gemfile-rails-5-0

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 5.0.0'
+gem 'activerecord', '~> 5.0.7'
+gem 'sqlite3', '~> 1.3.6'
 
 gemspec :path => "../"

data/ci/Gemfile-rails-5-1

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 5.1.0'
+gem 'activerecord', '~> 5.1.7'
+gem "sqlite3", "~> 1.3", ">= 1.3.6"
 
 gemspec :path => "../"

data/ci/Gemfile-rails-5-2

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 5.2.0.rc1'
+gem 'activerecord', '~> 5.2.3'
+gem "sqlite3", "~> 1.3", ">= 1.3.6"
 
 gemspec :path => "../"

data/ci/{Gemfile-rails-3-1 → Gemfile-rails-6-0}

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 3.1.12'
+gem 'activerecord', '~> 6.0.0'
+gem "sqlite3", "~> 1.4"
 
 gemspec :path => "../"

data/lib/rails-settings.rb

@@ -1,9 +1,8 @@
 module RailsSettings
-  # In Rails 3, attributes can be protected by `attr_accessible` and `attr_protected`
   # In Rails 4, attributes can be protected by using the gem `protected_attributes`
   # In Rails 5, protecting attributes is obsolete (there are `StrongParameters` only)
   def self.can_protect_attributes?
-    (ActiveRecord::VERSION::MAJOR == 3) || defined?(ProtectedAttributes)
+    defined?(ProtectedAttributes)
   end
 end
 
@@ -20,4 +19,3 @@ ActiveRecord::Base.class_eval do
     extend RailsSettings::Scopes
   end
 end
-

data/lib/rails-settings/configuration.rb

@@ -8,8 +8,15 @@ module RailsSettings
       raise ArgumentError unless klass
 
       @klass = klass
-      @klass.class_attribute :default_settings, :setting_object_class_name
-      @klass.default_settings = {}
+
+      if options[:persistent]
+        @klass.class_attribute :default_settings unless @klass.methods.include?(:default_settings)
+      else
+        @klass.class_attribute :default_settings
+      end
+
+      @klass.class_attribute :setting_object_class_name
+      @klass.default_settings ||= {}
       @klass.setting_object_class_name = options[:class_name] || 'RailsSettings::SettingObject'
 
       if block_given?

data/lib/rails-settings/version.rb

@@ -1,3 +1,3 @@
 module RailsSettings
-  VERSION = '2.4.3'
+  VERSION = '2.5.0'
 end

data/rails-settings.gemspec

@@ -12,18 +12,18 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Settings gem for Ruby on Rails}
   gem.summary       = %q{Ruby gem to handle settings for ActiveRecord instances by storing them as serialized Hash in a separate database table. Namespaces and defaults included.}
   gem.homepage      = 'https://github.com/ledermann/rails-settings'
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 2.4'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'activerecord', '>= 3.1'
+  gem.add_dependency 'activerecord', '>= 4.2'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'coveralls'
-  gem.add_development_dependency 'simplecov', RUBY_VERSION < '2' ? '~> 0.11.2' : '>= 0.11.2'
+  gem.add_development_dependency 'simplecov', '>= 0.11.2'
 end

data/spec/configuration_spec.rb

@@ -61,6 +61,18 @@ module RailsSettings
       expect(Dummy.default_settings).to eq({ :dashboard => {}, :calendar => {} })
       expect(Dummy.setting_object_class_name).to eq('MyClass')
     end
+
+    context 'persistent' do
+      it "should keep settings between multiple configurations initialization" do
+        Configuration.new(Dummy, :persistent => true) do |c|
+          c.key :dashboard, :defaults => { :theme => 'red' }
+        end
+
+        Configuration.new(Dummy, :calendar, :persistent => true)
+
+        expect(Dummy.default_settings).to eq({ :dashboard => { 'theme' => 'red' }, :calendar => {} })
+      end
+    end
   end
 
   describe Configuration, 'failure' do

data/spec/queries_spec.rb

@@ -94,7 +94,7 @@ describe 'Queries performed' do
 
     it "should update settings by one SQL query" do
       expect {
-        user.settings(:dashboard).update_attributes! :foo => 'bar'
+        user.settings(:dashboard).update! :foo => 'bar'
       }.to perform_queries(1)
     end
   end

data/spec/serialize_spec.rb

@@ -25,7 +25,7 @@ describe "Serialization" do
 
   describe 'updated settings' do
     it 'should be serialized' do
-      user.settings(:dashboard).update_attributes! :smart => true
+      user.settings(:dashboard).update! :smart => true
 
       dashboard_settings = user.setting_objects.where(:var => 'dashboard').first
       calendar_settings = user.setting_objects.where(:var => 'calendar').first

data/spec/setting_object_spec.rb

@@ -103,9 +103,9 @@ describe RailsSettings::SettingObject do
     end
   end
 
-  describe "update_attributes" do
+  describe "update" do
     it 'should save' do
-      expect(new_setting_object.update_attributes(:foo => 42, :bar => 'string')).to be_truthy
+      expect(new_setting_object.update(:foo => 42, :bar => 'string')).to be_truthy
       new_setting_object.reload
 
       expect(new_setting_object.foo).to eq(42)
@@ -115,12 +115,12 @@ describe RailsSettings::SettingObject do
     end
 
     it 'should not save blank hash' do
-      expect(new_setting_object.update_attributes({})).to be_truthy
+      expect(new_setting_object.update({})).to be_truthy
     end
 
     if RailsSettings.can_protect_attributes?
       it 'should not allow changing protected attributes' do
-        new_setting_object.update_attributes!(:var => 'calendar', :foo => 42)
+        new_setting_object.update!(:var => 'calendar', :foo => 42)
 
         expect(new_setting_object.var).to eq('dashboard')
         expect(new_setting_object.foo).to eq(42)

data/spec/settings_spec.rb

@@ -145,7 +145,7 @@ describe "Object without settings" do
   end
 
   it "should add settings" do
-    user.settings(:dashboard).update_attributes! :smart => true
+    user.settings(:dashboard).update! :smart => true
 
     user.reload
     expect(user.settings(:dashboard).smart).to eq(true)
@@ -179,7 +179,7 @@ describe "Object with settings" do
   end
 
   it "should update settings" do
-    user.settings(:dashboard).update_attributes! :smart => true
+    user.settings(:dashboard).update! :smart => true
     user.reload
 
     expect(user.settings(:dashboard).smart).to eq(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ledermann-rails-settings
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.5.0
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2019-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,14 +107,11 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- ci/Gemfile-rails-3-1
-- ci/Gemfile-rails-3-2
-- ci/Gemfile-rails-4-0
-- ci/Gemfile-rails-4-1
 - ci/Gemfile-rails-4-2
 - ci/Gemfile-rails-5-0
 - ci/Gemfile-rails-5-1
 - ci/Gemfile-rails-5-2
+- ci/Gemfile-rails-6-0
 - lib/generators/rails_settings/migration/migration_generator.rb
 - lib/generators/rails_settings/migration/templates/migration.rb
 - lib/ledermann-rails-settings.rb
@@ -147,15 +144,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Ruby gem to handle settings for ActiveRecord instances by storing them as

data/ci/Gemfile-rails-3-2

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 3.2.22'
-
-gemspec :path => "../"

data/ci/Gemfile-rails-4-0

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 4.0.13'
-gem 'protected_attributes' if ENV['PROTECTED_ATTRIBUTES'] == 'true'
-
-gemspec :path => "../"

data/ci/Gemfile-rails-4-1

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 4.1.10'
-gem 'protected_attributes' if ENV['PROTECTED_ATTRIBUTES'] == 'true'
-
-gemspec :path => "../"