ledermann-rails-settings 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36a283476edb425a05d5ab93dd84917961c1f7f1
-  data.tar.gz: 2edc040a3634bba291c15467b83e34a9652ce3ad
+  metadata.gz: 71d258f55435ac0936befafa014944f3a3ae72da
+  data.tar.gz: 0f9f767391fad56c4ff44a7ff44494ad4b6c09b6
 SHA512:
-  metadata.gz: 7175a627b62d0fcbbaa771e76a08b1c6cd5e352c65fd6e70e1c9d4cb2374f18bc03d4844b1d659319aaed75f7fc944664f392f8332f9c5183402b611b1035a8c
-  data.tar.gz: c4823aad4b4edd91f116cbb21de4a180ef4932ad705923fa9cf56764b42fd3dd0c0eacef746218ef4bd6c6c3c1fd99db4449228721f15e95c0fb58e04c5aaa32
+  metadata.gz: d621905d20eab2e0962c943242286d0eb9097731f3eb4f7d23edb3102494ce774e5eaf64cff455ff2c7f49461050976f4c44b6af4550888955f39ed8d83feac6
+  data.tar.gz: 378399bc595e654aa79323d51cdc963b778024427713332f9c93aff0a25595146be562604299681f931fd644fbb230208c07ca7e6164ebde5b64c0d8dea9d895

data/.travis.yml

@@ -2,11 +2,12 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
 gemfile:
   - ci/Gemfile-rails-3-1
   - ci/Gemfile-rails-3-2
   - ci/Gemfile-rails-4-0
+  - ci/Gemfile-rails-4-1
 env:
   - DB=sqlite
   - DB=mysql

data/README.md

@@ -5,6 +5,27 @@
 
 Ruby gem to handle settings for ActiveRecord instances by storing them as serialized Hash in a separate database table. Namespaces and defaults included.
 
+## Requirements
+
+* Ruby 1.9.3 or newer
+* Rails 3.1 or greater (including Rails 4)
+
+
+## Installation
+
+Include the gem in your Gemfile and run `bundle` to install it:
+
+```ruby
+gem 'ledermann-rails-settings'
+```
+
+Generate and run the migration:
+
+```shell
+rails g rails_settings:migration
+rake db:migrate
+```
+
 
 ## Usage
 
@@ -76,6 +97,15 @@ user.settings(:calendar).scope
 # => 'all'
 ```
 
+### Delete settings
+
+```ruby
+user = User.find(1)
+user.settings(:dashboard).update_attributes! :theme => nil
+
+user.settings(:dashboard).view = nil
+user.settings(:dashboard).save!
+```
 
 ### Using scopes
 
@@ -94,27 +124,6 @@ User.without_settings_for(:calendar)
 ```
 
 
-## Requirements
-
-* Ruby 1.9.3 or newer
-* Rails 3.1 or greater (including Rails 4)
-
-
-## Installation
-
-Include the gem in your Gemfile and run `bundle` to install it:
-
-```ruby
-gem 'ledermann-rails-settings', :require => 'rails-settings'
-```
-
-Generate and run the migration:
-
-```shell
-rails g rails_settings:migration
-rake db:migrate
-```
-
 ## Compatibility
 
 Version 2 is a complete rewrite and has a new DSL, so it's **not** compatible with Version 1. In addition, Rails 2.3 is not supported anymore. But the database schema is unchanged, so you can continue to use the data created by 1.x, no conversion is needed.

data/ci/Gemfile-rails-3-1

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 3.1.0'
+gem 'activerecord', '~> 3.1.12'
 gem 'sqlite3', '~> 1.3'
 gem 'mysql2', '>= 0.3.6'
 gem 'rake', '~> 10.0'

data/ci/Gemfile-rails-3-2

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 3.2.0'
+gem 'activerecord', '~> 3.2.17'
 gem 'sqlite3', '~> 1.3'
 gem 'mysql2', '>= 0.3.6'
 gem 'rake', '~> 10.0'

data/ci/Gemfile-rails-4-0

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 4.0.0'
+gem 'activerecord', '~> 4.0.4'
 gem 'sqlite3', '~> 1.3'
 gem 'mysql2', '>= 0.3.6'
 gem 'rake', '~> 10.0'

data/ci/Gemfile-rails-4-1

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

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

@@ -9,7 +9,7 @@ module RailsSettings
     source_root File.expand_path('../templates', __FILE__)
 
     def create_migration_file
-      migration_template 'migration.rb', 'db/migrate/rails_settings_migration'
+      migration_template 'migration.rb', 'db/migrate/rails_settings_migration.rb'
     end
 
     def self.next_migration_number(dirname)

data/lib/ledermann-rails-settings.rb

@@ -0,0 +1 @@
+require 'rails-settings'

data/lib/rails-settings/setting_object.rb

@@ -4,8 +4,10 @@ module RailsSettings
 
     belongs_to :target, :polymorphic => true
 
-    validates_presence_of :var, :value, :target_type
+    validates_presence_of :var, :target_type
     validate do
+      errors.add(:value, "Invalid setting value") unless value.is_a? Hash
+
       unless _target_class.default_settings[var.to_sym]
         errors.add(:var, "#{var} is not defined!")
       end

data/lib/rails-settings/version.rb

@@ -1,3 +1,3 @@
 module RailsSettings
-  VERSION = '2.2.1'
+  VERSION = '2.3.0'
 end

data/spec/setting_object_spec.rb

@@ -109,7 +109,7 @@ describe RailsSettings::SettingObject do
     end
 
     it 'should not save blank hash' do
-      new_setting_object.update_attributes({}).should be_false
+      new_setting_object.update_attributes({}).should be_true
     end
 
     if ActiveRecord::VERSION::MAJOR < 4

data/spec/settings_spec.rb

@@ -39,6 +39,23 @@ describe 'Objects' do
       account.settings(:portal).value.should eq({})
     end
 
+    it 'should allow saving a blank value' do
+      account.save!
+      account.settings(:portal).save.should be_true
+    end
+
+    it 'should allow removing all values' do
+      account.settings(:portal).premium = true
+      account.settings(:portal).fee = 42.5
+      account.save!
+
+      account.settings(:portal).premium = nil
+      account.save.should be_true
+
+      account.settings(:portal).fee = nil
+      account.save.should be_true
+    end
+
     it 'should not add settings on saving' do
       account.save!
       RailsSettings::SettingObject.count.should eq(0)

data/spec/spec_helper.rb

@@ -59,25 +59,14 @@ end
 def setup_db
   ActiveRecord::Base.configurations = YAML.load_file(File.dirname(__FILE__) + '/database.yml')
   db_name = ENV['DB'] || 'sqlite'
-  ActiveRecord::Base.establish_connection(db_name)
-
+  ActiveRecord::Base.establish_connection(db_name.to_sym)
   ActiveRecord::Migration.verbose = false
-  ActiveRecord::Base.connection.tables.each do |table|
-    next if table == 'schema_migrations'
-    ActiveRecord::Base.connection.execute("DROP TABLE #{table}")
-  end
-
   puts "Testing on #{db_name} with ActiveRecord #{ActiveRecord::VERSION::STRING}"
 
-  ActiveRecord::Schema.define(:version => 1) do
-    create_table :settings do |t|
-      t.string     :var,    :null => false
-      t.text       :value
-      t.references :target, :null => false, :polymorphic => true
-      t.timestamps
-    end
-    add_index :settings, [ :target_type, :target_id, :var ], :unique => true
+  require File.expand_path('../../lib/generators/rails_settings/migration/templates/migration.rb', __FILE__)
+  RailsSettingsMigration.migrate(:up)
 
+  ActiveRecord::Schema.define(:version => 1) do
     create_table :users do |t|
       t.string :type
       t.string :name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ledermann-rails-settings
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -96,8 +96,10 @@ files:
 - ci/Gemfile-rails-3-1
 - ci/Gemfile-rails-3-2
 - ci/Gemfile-rails-4-0
+- ci/Gemfile-rails-4-1
 - lib/generators/rails_settings/migration/migration_generator.rb
 - lib/generators/rails_settings/migration/templates/migration.rb
+- lib/ledermann-rails-settings.rb
 - lib/rails-settings.rb
 - lib/rails-settings/base.rb
 - lib/rails-settings/configuration.rb
@@ -134,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby gem to handle settings for ActiveRecord instances by storing them as