ledermann-rails-settings 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b32592febac17831f730dd18e33ef0af56c1251
-  data.tar.gz: 6c4c04520451889bf5ad7ca407d53530415aa7e6
+  metadata.gz: 56218461e173338b8cd2b34d67ba7e0a311520f0
+  data.tar.gz: e71e1f8c6b46649cc3bbf5f3579aa464aa780fa1
 SHA512:
-  metadata.gz: 71033242a7e5ff5cc1d6c1da91fc968aae2df1513e83678cd7fb7d199b71fa6f42b4354dd35cfaa8c70671a552adff2041cb7cb65920878b61e42ba0e83f9398
-  data.tar.gz: dcb7360d13a853702e90efe91329ae3db9c052c8c4062164b68a170a9d97411fc8136c8ced228fad2d30bde7e871c36c257d456cb67bfb579b90ba93b8d738c8
+  metadata.gz: dd0f3484d470061f28df5a448163a72da41deecdb9d539ff5ef43002fc5c740333d87736c7e48463dd14d66f9086e5194f4e95027b084102bdcaad1cf63f84c1
+  data.tar.gz: 27ba22de825494fd3757558692260837a0bbb79e4b954fb30a2f23a8d11d2f7704bf56d4f1b2af293e9c0c3eb726ade13d3941dc3655b8a0ae946550c5e843c5

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+coverage/*

data/.travis.yml

@@ -2,22 +2,38 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.5
-  - 2.2.1
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
 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
 matrix:
   include:
-    - rvm: 2.2.1
+    - rvm: 2.2.4
+      gemfile: ci/Gemfile-rails-4-2
+      env: PROTECTED_ATTRIBUTES=true
+    - rvm: 2.3.0
       gemfile: ci/Gemfile-rails-4-2
       env: PROTECTED_ATTRIBUTES=true
   exclude:
-    - rvm: 2.2.1
+    - rvm: 1.9.3
+      gemfile: ci/Gemfile-rails-5-0
+    - rvm: 2.0.0
+      gemfile: ci/Gemfile-rails-5-0
+    - rvm: 2.1.8
+      gemfile: ci/Gemfile-rails-5-0
+    - rvm: 2.2.4
       gemfile: ci/Gemfile-rails-3-1
-    - rvm: 2.2.1
+    - rvm: 2.3.0
+      gemfile: ci/Gemfile-rails-3-1
+    - rvm: 2.2.4
+      gemfile: ci/Gemfile-rails-3-2
+    - rvm: 2.3.0
       gemfile: ci/Gemfile-rails-3-2
 before_install: gem update bundler
+sudo: false

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2015 Georg Ledermann
+Copyright (c) 2012-2016 Georg Ledermann
 
 MIT License
 

data/README.md

@@ -1,14 +1,15 @@
 # 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)
+[![Build Status](https://travis-ci.org/ledermann/rails-settings.svg?branch=master)](https://travis-ci.org/ledermann/rails-settings)
+[![Code Climate](https://codeclimate.com/github/ledermann/rails-settings.svg)](https://codeclimate.com/github/ledermann/rails-settings)
+[![Coverage Status](https://coveralls.io/repos/ledermann/rails-settings/badge.svg?branch=master)](https://coveralls.io/r/ledermann/rails-settings?branch=master)
 
 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)
+* Rails 3.1 or newer (including Rails 4.x and Rails 5)
 
 
 ## Installation
@@ -123,6 +124,11 @@ User.without_settings_for(:calendar)
 # => all users without having settings for 'calendar'
 ```
 
+### Eager Loading
+```ruby
+User.includes(:setting_objects)
+# => Eager load setting_objects when querying many users
+```
 
 ## Compatibility
 
@@ -140,6 +146,6 @@ See https://github.com/ledermann/rails-settings/releases
 
 MIT License
 
-Copyright (c) 2012-2015 [Georg Ledermann](http://www.georg-ledermann.de)
+Copyright (c) 2012-2016 [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-3-1

@@ -4,3 +4,4 @@ gem 'activerecord', '~> 3.1.12'
 gem 'sqlite3'
 gem 'rake'
 gem 'rspec'
+gem 'coveralls'

data/ci/Gemfile-rails-3-2

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 3.2.17'
+gem 'activerecord', '~> 3.2.22'
 gem 'sqlite3'
 gem 'rake'
 gem 'rspec'
+gem 'coveralls'

data/ci/Gemfile-rails-4-0

@@ -5,3 +5,4 @@ gem 'protected_attributes' if ENV['PROTECTED_ATTRIBUTES'] == 'true'
 gem 'sqlite3'
 gem 'rake'
 gem 'rspec'
+gem 'coveralls'

data/ci/Gemfile-rails-4-1

@@ -5,3 +5,4 @@ gem 'protected_attributes' if ENV['PROTECTED_ATTRIBUTES'] == 'true'
 gem 'sqlite3'
 gem 'rake'
 gem 'rspec'
+gem 'coveralls'

data/ci/Gemfile-rails-4-2

@@ -5,3 +5,4 @@ gem 'protected_attributes' if ENV['PROTECTED_ATTRIBUTES'] == 'true'
 gem 'sqlite3'
 gem 'rake'
 gem 'rspec'
+gem 'coveralls'

data/ci/Gemfile-rails-5-0

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

data/lib/rails-settings/scopes.rb

@@ -1,8 +1,13 @@
 module RailsSettings
   module Scopes
     def with_settings
-      joins("INNER JOIN settings ON #{settings_join_condition}").
-      uniq
+      result = joins("INNER JOIN settings ON #{settings_join_condition}")
+
+      if ActiveRecord::VERSION::MAJOR < 5
+        result.uniq
+      else
+        result.distinct
+      end
     end
 
     def with_settings_for(var)

data/lib/rails-settings/version.rb

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

data/rails-settings.gemspec

@@ -6,11 +6,13 @@ require 'rails-settings/version'
 Gem::Specification.new do |gem|
   gem.name          = 'ledermann-rails-settings'
   gem.version       = RailsSettings::VERSION
+  gem.licenses      = ['MIT']
   gem.authors       = ['Georg Ledermann']
   gem.email         = ['mail@georg-ledermann.de']
   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.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -22,4 +24,6 @@ Gem::Specification.new do |gem|
   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', '~> 0.11.0'
 end

data/spec/settings_spec.rb

@@ -203,6 +203,13 @@ describe "Object with settings" do
 
     expect(user.settings?).to eq(false)
   end
+
+  it "should raise exception on assigning other than nil" do
+    expect {
+      user.settings = :foo
+      user.save!
+    }.to raise_error(ArgumentError)
+  end
 end
 
 describe "Customized SettingObject" do

data/spec/spec_helper.rb

@@ -1,3 +1,14 @@
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+])
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
@@ -18,6 +29,10 @@ RSpec.configure do |config|
   config.before(:each) do
     clear_db
   end
+
+  config.after :suite do
+    RailsSettingsMigration.migrate(:down)
+  end
 end
 
 require 'active_record'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ledermann-rails-settings
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
 description: Settings gem for Ruby on Rails
 email:
 - mail@georg-ledermann.de
@@ -84,6 +112,7 @@ files:
 - ci/Gemfile-rails-4-0
 - ci/Gemfile-rails-4-1
 - ci/Gemfile-rails-4-2
+- ci/Gemfile-rails-5-0
 - lib/generators/rails_settings/migration/migration_generator.rb
 - lib/generators/rails_settings/migration/templates/migration.rb
 - lib/ledermann-rails-settings.rb
@@ -105,7 +134,8 @@ files:
 - spec/support/matchers/perform_queries.rb
 - spec/support/query_counter.rb
 homepage: https://github.com/ledermann/rails-settings
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -115,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -123,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Ruby gem to handle settings for ActiveRecord instances by storing them as