ledermann-rails-settings 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ff4a6ba546d2daf89db23836a41e7a4e387afe8
-  data.tar.gz: 1131ffb90652265e634619fe33aa41c492d1b80b
+  metadata.gz: be934fefff4c87ca3858e881e4c094e256af5381
+  data.tar.gz: f13141fd1154045b71a0bd332288309a916ceba9
 SHA512:
-  metadata.gz: 5713e46631870b7f3f9e6df62893bc1ca6fa43d07f3c4f4dee3100a2c0abed752e68f21b284003a462937ba92704afd8a99651198f16b5d567cb4a8882c0a631
-  data.tar.gz: 8f714acf90e0db2ad9e0786f734c6d87983d4b7af8153e94b368e10185fdf18f85f7db3ccde672b454094184d96999fafebc515cde71b0237c517c7996f43857
+  metadata.gz: b8b17fd4dd288c307233a26f1ae2c29aee029fc77fee738545c59e3f1fc6906a182786d737b894d89581d774ed62274db7b55f24ec6f21b828116b31e79a04d6
+  data.tar.gz: 171041cbb7fb74001ac6bfb756bb3819fbd31a03adfc1696998afb4f6194d849ea547077a4c59779dea04225833f08e69a2f1cad19bf63e218ca698a5aab76fa

data/.travis.yml

@@ -1,11 +1,11 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
 gemfile:
   - ci/Gemfile.rails-3.1.x
   - ci/Gemfile.rails-3.2.x
+  - ci/Gemfile.rails-4.0.x
 env:
   - DB=sqlite
   - DB=mysql

data/Changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Version 2.1.0 (2013-09-13)
+
+- Support for Rails 4
+- Removed support for Ruby 1.8.7
+
+
 ## Version 2.0.3 (2013-04-16)
 
 - Fixed bug with setting getter when settings are booleans and default is true (thanks to @mduong)

data/README.md

@@ -1,4 +1,4 @@
-# Settings for Rails 3
+# Settings for Rails
 
 [![Build Status](https://travis-ci.org/ledermann/rails-settings.png?branch=master)](https://travis-ci.org/ledermann/rails-settings)
 [![Code Climate](https://codeclimate.com/github/ledermann/rails-settings.png)](https://codeclimate.com/github/ledermann/rails-settings)
@@ -96,8 +96,8 @@ User.without_settings_for(:calendar)
 
 ## Requirements
 
-* Ruby 1.8.7, 1.9.3 or 2.0.0
-* Rails 3.1.x or 3.2.x
+* Ruby 1.9.3 or 2.0.0
+* Rails 3.1 or greater (including Rails 4)
 
 
 ## Installation

data/ci/Gemfile.rails-4.0.x

@@ -0,0 +1,7 @@
+source :rubygems
+
+gem 'activerecord', '~> 4.0.0'
+gem 'sqlite3', '~> 1.3'
+gem 'mysql2', '>= 0.3.6'
+gem 'rake', '~> 10.0'
+gem 'rspec', '~> 2.13'

data/lib/rails-settings/base.rb

@@ -12,7 +12,11 @@ module RailsSettings
           raise ArgumentError unless var.is_a?(Symbol)
           raise ArgumentError.new("Unknown key: #{var}") unless self.class.default_settings[var]
 
-          setting_objects.detect { |s| s.var == var.to_s } || setting_objects.build({ :var => var.to_s }, :without_protection => true)
+          if ActiveRecord::VERSION::MAJOR < 4
+            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)
+          end
         end
 
         def settings=(value)

data/lib/rails-settings/setting_object.rb

@@ -15,7 +15,9 @@ module RailsSettings
 
     # attr_protected can not be here used because it touches the database which is not connected yet.
     # So allow no attributes and override <tt>#sanitize_for_mass_assignment</tt>
-    attr_accessible
+    if ActiveRecord::VERSION::MAJOR < 4
+      attr_accessible
+    end
 
     REGEX_SETTER = /\A([a-z]\w+)=\Z/i
     REGEX_GETTER = /\A([a-z]\w+)\Z/i
@@ -28,7 +30,9 @@ module RailsSettings
       if block_given?
         super
       else
-        if method_name.to_s =~ REGEX_SETTER && args.size == 1
+        if attribute_names.include?(method_name.to_s.sub('=',''))
+          super
+        elsif method_name.to_s =~ REGEX_SETTER && args.size == 1
           _set_value($1, args.first)
         elsif method_name.to_s =~ REGEX_GETTER && args.size == 0
           _get_value($1)
@@ -39,9 +43,11 @@ module RailsSettings
     end
 
   protected
-    # 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')
+    if ActiveRecord::VERSION::MAJOR < 4
+      # 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')
+      end
     end
 
   private
@@ -69,10 +75,17 @@ module RailsSettings
       target_type.constantize
     end
 
-    def update(*)
-      # Patch ActiveRecord to save serialized attributes only if they are changed
+    # Patch ActiveRecord to save serialized attributes only if they are changed
+    if ActiveRecord::VERSION::MAJOR < 4
       # https://github.com/rails/rails/blob/3-2-stable/activerecord/lib/active_record/attribute_methods/dirty.rb#L70
-      super(changed) if changed?
+      def update(*)
+        super(changed) if changed?
+      end
+    else
+      # https://github.com/rails/rails/blob/4-0-stable/activerecord/lib/active_record/attribute_methods/dirty.rb#L73
+      def update_record(*)
+        super(keys_for_partial_write) if changed?
+      end
     end
   end
 end

data/lib/rails-settings/version.rb

@@ -1,3 +1,3 @@
 module RailsSettings
-  VERSION = '2.0.3'
+  VERSION = '2.1.0'
 end

data/rails-settings.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'activerecord', '~> 3.1'
+  gem.add_dependency 'activerecord', '>= 3.1'
 
-  gem.add_development_dependency 'rake', '~> 10.0'
-  gem.add_development_dependency 'sqlite3', '~> 1.3'
-  gem.add_development_dependency 'mysql2', '~> 0.3.11'
-  gem.add_development_dependency 'rspec', '~> 2.13'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'sqlite3'
+  gem.add_development_dependency 'mysql2'
+  gem.add_development_dependency 'rspec'
 end

data/spec/setting_object_spec.rb

@@ -2,8 +2,14 @@ require 'spec_helper'
 
 describe RailsSettings::SettingObject do
   let(:user) { User.create! :name => 'Mr. Pink' }
-  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) }
+
+  if ActiveRecord::VERSION::MAJOR < 4
+    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
+    let(:new_setting_object) { user.setting_objects.build({ :var => 'dashboard'}) }
+    let(:saved_setting_object) { user.setting_objects.create!({ :var => 'dashboard', :value => { 'theme' => 'pink', 'filter' => false}}) }
+  end
 
   describe "serialization" do
     it "should have a hash default" do
@@ -106,11 +112,13 @@ describe RailsSettings::SettingObject do
       new_setting_object.update_attributes({}).should be_false
     end
 
-    it 'should not allow changing protected attributes' do
-      new_setting_object.update_attributes!(:var => 'calendar', :foo => 42)
+    if ActiveRecord::VERSION::MAJOR < 4
+      it 'should not allow changing protected attributes' do
+        new_setting_object.update_attributes!(:var => 'calendar', :foo => 42)
 
-      new_setting_object.var.should eq('dashboard')
-      new_setting_object.foo.should eq(42)
+        new_setting_object.var.should eq('dashboard')
+        new_setting_object.foo.should eq(42)
+      end
     end
   end
 

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: ledermann-rails-settings
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0'
 description: Settings gem for Ruby on Rails
 email:
 - mail@georg-ledermann.de
@@ -96,6 +96,7 @@ files:
 - Rakefile
 - ci/Gemfile.rails-3.1.x
 - ci/Gemfile.rails-3.2.x
+- ci/Gemfile.rails-4.0.x
 - lib/generators/rails_settings/migration/migration_generator.rb
 - lib/generators/rails_settings/migration/templates/migration.rb
 - lib/rails-settings.rb
@@ -134,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
 summary: Ruby gem to handle settings for ActiveRecord instances by storing them as