ledermann-rails-settings 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56218461e173338b8cd2b34d67ba7e0a311520f0
-  data.tar.gz: e71e1f8c6b46649cc3bbf5f3579aa464aa780fa1
+  metadata.gz: d1756804df911c376bd8148e110cc61cb6ddbccd
+  data.tar.gz: b60ca60dabb0980b32e4994e23657c50439aee15
 SHA512:
-  metadata.gz: dd0f3484d470061f28df5a448163a72da41deecdb9d539ff5ef43002fc5c740333d87736c7e48463dd14d66f9086e5194f4e95027b084102bdcaad1cf63f84c1
-  data.tar.gz: 27ba22de825494fd3757558692260837a0bbb79e4b954fb30a2f23a8d11d2f7704bf56d4f1b2af293e9c0c3eb726ade13d3941dc3655b8a0ae946550c5e843c5
+  metadata.gz: cfdb4f1e2290109d941d192585df3743b11daffa6ca2fbbf8dad83c94063e9a53db886341b5886f3fc917129dc9aa4ecad4661c8eb883773a2048594e2e03ff1
+  data.tar.gz: e0079aa1a2e667254c50dbeec82be481f41b024b28e0e2e11860303bd08f78205cb8e45b24abedca935b8521eef3cf91d48da9c9a6828ba0d7d73a455f6c3618

data/.travis.yml

@@ -2,9 +2,9 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
 gemfile:
   - ci/Gemfile-rails-3-1
   - ci/Gemfile-rails-3-2
@@ -14,10 +14,13 @@ gemfile:
   - ci/Gemfile-rails-5-0
 matrix:
   include:
-    - rvm: 2.2.4
-      gemfile: ci/Gemfile-rails-4-2
+    - rvm: 2.2.5
+      gemfile: ci/Gemfile-rails-4-0
+      env: PROTECTED_ATTRIBUTES=true
+    - rvm: 2.2.5
+      gemfile: ci/Gemfile-rails-4-1
       env: PROTECTED_ATTRIBUTES=true
-    - rvm: 2.3.0
+    - rvm: 2.2.5
       gemfile: ci/Gemfile-rails-4-2
       env: PROTECTED_ATTRIBUTES=true
   exclude:
@@ -25,15 +28,15 @@ matrix:
       gemfile: ci/Gemfile-rails-5-0
     - rvm: 2.0.0
       gemfile: ci/Gemfile-rails-5-0
-    - rvm: 2.1.8
+    - rvm: 2.1.10
       gemfile: ci/Gemfile-rails-5-0
-    - rvm: 2.2.4
+    - rvm: 2.2.5
       gemfile: ci/Gemfile-rails-3-1
-    - rvm: 2.3.0
+    - rvm: 2.3.1
       gemfile: ci/Gemfile-rails-3-1
-    - rvm: 2.2.4
+    - rvm: 2.2.5
       gemfile: ci/Gemfile-rails-3-2
-    - rvm: 2.3.0
+    - rvm: 2.3.1
       gemfile: ci/Gemfile-rails-3-2
 before_install: gem update bundler
 sudo: false

data/ci/Gemfile-rails-5-0

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '5.0.0.beta3'
+gem 'activerecord', '5.0.0.rc2'
 gem 'sqlite3'
 gem 'rake'
 gem 'rspec'

data/lib/generators/rails_settings/migration/templates/migration.rb

@@ -1,4 +1,10 @@
-class RailsSettingsMigration < ActiveRecord::Migration
+MIGRATION_BASE_CLASS = if ActiveRecord::VERSION::MAJOR >= 5
+  ActiveRecord::Migration[5.0]
+else
+  ActiveRecord::Migration
+end
+
+class RailsSettingsMigration < MIGRATION_BASE_CLASS
   def self.up
     create_table :settings do |t|
       t.string     :var,    :null => false

data/lib/rails-settings.rb

@@ -1,3 +1,12 @@
+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)
+  end
+end
+
 require 'rails-settings/setting_object'
 require 'rails-settings/configuration'
 require 'rails-settings/base'

data/lib/rails-settings/base.rb

@@ -12,7 +12,7 @@ module RailsSettings
           raise ArgumentError unless var.is_a?(Symbol)
           raise ArgumentError.new("Unknown key: #{var}") unless self.class.default_settings[var]
 
-          if defined?(ProtectedAttributes)
+          if RailsSettings.can_protect_attributes?
             setting_objects.detect { |s| s.var == var.to_s } || setting_objects.build({ :var => var.to_s }, :without_protection => true)
           else
             setting_objects.detect { |s| s.var == var.to_s } || setting_objects.build(:var => var.to_s, :target => self)

data/lib/rails-settings/setting_object.rb

@@ -15,9 +15,9 @@ module RailsSettings
 
     serialize :value, Hash
 
-    # attr_protected can not be used here because it touches the database which is not connected yet.
-    # So allow no attributes and override <tt>#sanitize_for_mass_assignment</tt>
-    if defined?(ProtectedAttributes)
+    if RailsSettings.can_protect_attributes?
+      # attr_protected can not be used here because it touches the database which is not connected yet.
+      # So allow no attributes and override <tt>#sanitize_for_mass_assignment</tt>
       attr_accessible
     end
 
@@ -25,7 +25,7 @@ module RailsSettings
     REGEX_GETTER = /\A([a-z]\w+)\Z/i
 
     def respond_to?(method_name, include_priv=false)
-      super || method_name.to_s =~ REGEX_SETTER
+      super || method_name.to_s =~ REGEX_SETTER || _setting?(method_name)
     end
 
     def method_missing(method_name, *args, &block)
@@ -45,7 +45,7 @@ module RailsSettings
     end
 
   protected
-    if defined?(ProtectedAttributes)
+    if RailsSettings.can_protect_attributes?
       # Simulate attr_protected by removing all regular attributes
       def sanitize_for_mass_assignment(attributes, role = nil)
         attributes.except('id', 'var', 'value', 'target_id', 'target_type', 'created_at', 'updated_at')
@@ -76,5 +76,9 @@ module RailsSettings
     def _target_class
       target_type.constantize
     end
+
+    def _setting?(method_name)
+      _target_class.default_settings[var.to_sym].keys.include?(method_name.to_s)
+    end
   end
 end

data/lib/rails-settings/version.rb

@@ -1,3 +1,3 @@
 module RailsSettings
-  VERSION = '2.4.1'
+  VERSION = '2.4.2'
 end

data/spec/setting_object_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe RailsSettings::SettingObject do
   let(:user) { User.create! :name => 'Mr. Pink' }
 
-  if defined?(ProtectedAttributes)
+  if RailsSettings.can_protect_attributes?
     let(:new_setting_object) { user.setting_objects.build({ :var => 'dashboard'}, :without_protection => true) }
     let(:saved_setting_object) { user.setting_objects.create!({ :var => 'dashboard', :value => { 'theme' => 'pink', 'filter' => false}}, :without_protection => true) }
   else
@@ -52,6 +52,12 @@ describe RailsSettings::SettingObject do
         expect(new_setting_object.filter).to eq(true)
       end
 
+      it "should return defaults when using `try`" do
+        expect(new_setting_object.try(:theme)).to eq('blue')
+        expect(new_setting_object.try(:view)).to eq('monthly')
+        expect(new_setting_object.try(:filter)).to eq(true)
+      end
+
       it "should store different objects to value hash" do
         new_setting_object.integer = 42
         new_setting_object.float   = 1.234
@@ -112,7 +118,7 @@ describe RailsSettings::SettingObject do
       expect(new_setting_object.update_attributes({})).to be_truthy
     end
 
-    if defined?(ProtectedAttributes)
+    if RailsSettings.can_protect_attributes?
       it 'should not allow changing protected attributes' do
         new_setting_object.update_attributes!(:var => 'calendar', :foo => 42)
 

data/spec/spec_helper.rb

@@ -76,7 +76,12 @@ def setup_db
   ActiveRecord::Base.configurations = YAML.load_file(File.dirname(__FILE__) + '/database.yml')
   ActiveRecord::Base.establish_connection(:sqlite)
   ActiveRecord::Migration.verbose = false
-  puts "Testing with ActiveRecord #{ActiveRecord::VERSION::STRING} #{defined?(ProtectedAttributes) ? 'with' : 'without'} protected_attributes"
+
+  print "Testing with ActiveRecord #{ActiveRecord::VERSION::STRING}"
+  if ActiveRecord::VERSION::MAJOR == 4
+    print " #{defined?(ProtectedAttributes) ? 'with' : 'without'} gem `protected_attributes`"
+  end
+  puts
 
   require File.expand_path('../../lib/generators/rails_settings/migration/templates/migration.rb', __FILE__)
   RailsSettingsMigration.migrate(:up)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ledermann-rails-settings
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-13 00:00:00.000000000 Z
+date: 2016-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Ruby gem to handle settings for ActiveRecord instances by storing them as