user_preferences 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 15615015e9ccb0efd6e0db7e176c1d13c8699d71
-  data.tar.gz: 9d62fe5e9b60512492121e22f93e0fa892ed1344
+SHA256:
+  metadata.gz: 45e53fad3262e5c0df4eb853eba0a557ad3ed55fe588f85512f54a5b50ce382c
+  data.tar.gz: 8d4187da04472dc2a57177e80ac57bc1091bf537cebf442913e3907613b1c38b
 SHA512:
-  metadata.gz: da8293ea1bbfd7cef25c5aa5ca68f77e3789f7e65e04651792f37a0a2e894dbb5c6f99962eaba85689c8be3437169628fc3f1bfd3e900459f6f347845431bb4c
-  data.tar.gz: e0017a948a1eafaad7e20f80fe9eadcf6d3ec1e81c11f610e661dcc9c011a172aa908bfd8dc0275d00492b190ad61b2fb3913d36b21db2aa3a1cea0c49f8c05d
+  metadata.gz: 9e18df71224835df0d6dcdd4adf7a17832126388bf5df8d34ee3d08701ed37701851b9b716023463fa22b3865b178a04925450e533b7294538f8a6864e30628a
+  data.tar.gz: 6c94676556bd128a20b6cf05f53817ae883908523b9ec661f1378893c20b345d49ba2a182e6ba2944e7271abca1a011a8f992a52c58fd58c2ba9351cdee5baaa

data/.travis.yml

@@ -1,7 +1,17 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.2.6
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
 gemfile:
   - gemfiles/rails_4.gemfile
   - gemfiles/rails_5.gemfile
+  - gemfiles/rails_6.gemfile
+matrix:
+  exclude:
+    - rvm: 2.3
+      gemfile: gemfiles/rails_6.gemfile
+    - rvm: 2.4
+      gemfile: gemfiles/rails_6.gemfile

data/Appraisals

@@ -1,7 +1,14 @@
 appraise "rails-4" do
   gem "rails", "~> 4"
+  gem "sprockets", "~> 3.7"
+  gem "sqlite3", "~> 1.3.6"
 end
 
 appraise "rails-5" do
   gem "rails", "~> 5.0"
+  gem "sprockets", "~> 3.7"
+end
+
+appraise "rails-6" do
+  gem "rails", "~> 6.0"
 end

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.1 2019-10-17
+* Fix compatibility with Rails 6
+* Support modern Ruby versions
+
 ## 1.0.0 2017-02-13
 
 * Fix compatibility with Rails 5

data/README.md

@@ -35,9 +35,27 @@ Finally, run the database migrations:
 $ rake db:migrate
 ```
 
+## Add preferences to your model
+
+Assuming you have a model called `User`, you can associate it with preferences as
+follows:
+
+```ruby
+class User < ActiveRecord::Base
+
+  has_preferences
+
+  # the rest of your code ...
+end
+```
+
+This declaration takes no arguments, and simply sets up the correct associations
+along with making available the rest of the methods described in the _API_ section
+below.
+
 ## Defining preferences
 
-Your preferences are defined in ``config/user_preferences.yml``. You define each of your
+Your preferences, along with their default values, are defined in ``config/user_preferences.yml``. You define each of your
 preferences within a category. This example definition for a binary preference implies that users receive emails notifications by default but not newsletters:
 ```yaml
 emails:
@@ -107,7 +125,7 @@ user.preferences(:emails).reload # => { notifications: 'instant', newsletter: tr
 ```ruby
   newsletter_users = User.with_preference(:email, :newsletter, true) #=> an ActiveRecord::Relation
 ```
-Note: this _will_ include users who have not overriden the default value if the value incidentally matches the default value.
+Note: this _will_ include users who have not overridden the default value if the value incidentally matches the default value.
 
 ## Other useful stuff
 
@@ -134,4 +152,4 @@ $ rake test
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull Request

data/gemfiles/rails_4.gemfile

@@ -3,5 +3,7 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4"
+gem "sprockets", "~> 3.7"
+gem "sqlite3", "~> 1.3.6"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.0"
+gem "sprockets", "~> 3.7"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_6.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0"
+
+gemspec path: "../"

data/lib/user_preferences/preference.rb

@@ -8,7 +8,7 @@ class UserPreferences::Preference < ActiveRecord::Base
   delegate :binary?, :default, :permitted_values, :lookup, :to_db, to: :definition
 
   def update_value!(v)
-    update_attributes!(value: v)
+    update!(value: v)
   end
 
   def value

data/lib/user_preferences/version.rb

@@ -1,3 +1,3 @@
 module UserPreferences
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/migrations/001_create_users.rb

@@ -1,11 +1,11 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < (ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def self.up
     create_table :users do |t|
-      t.timestamps
+      t.timestamps null: false
     end
   end
 
   def self.down
     drop_table :users
   end
-end
+end

data/spec/migrations/002_create_preferences.rb

@@ -1,11 +1,11 @@
-class CreatePreferences < ActiveRecord::Migration
+class CreatePreferences < (ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def self.up
     create_table :preferences do |t|
       t.integer :user_id, null: false
       t.string  :category, null: false
       t.string  :name, null: false
       t.integer :value, null: false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :preferences, :user_id
@@ -16,4 +16,4 @@ class CreatePreferences < ActiveRecord::Migration
   def self.down
     drop_table :preferences
   end
-end
+end

data/spec/spec_helper.rb

@@ -5,7 +5,12 @@ require 'active_record/connection_adapters/sqlite3_adapter'
 RSpec.configure do |config|
   $stdout = StringIO.new # silence migrations
   ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
-  ActiveRecord::Migrator.migrate(File.expand_path('../migrations', __FILE__))
+  if ActiveRecord::VERSION::MAJOR >= 5
+    ActiveRecord::Migrator.migrations_paths = File.expand_path('../migrations', __FILE__)
+    ActiveRecord::Base.connection.migration_context.migrate
+  else
+    ActiveRecord::Migrator.migrate(File.expand_path('../migrations', __FILE__))
+  end
   $stdout = STDOUT
 
   # prevent deprecation warnings
@@ -21,4 +26,4 @@ end
 
 class User < ActiveRecord::Base
   include UserPreferences::HasPreferences
-end
+end

data/user_preferences.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'rspec', '~> 2.14'
-  spec.add_development_dependency 'sqlite3', '~> 1.3'
+  spec.add_development_dependency 'sqlite3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: user_preferences
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andy Dust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -84,16 +84,16 @@ dependencies:
   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'
 description: "user_preference is a small library for setting and getting categorized
   user preferences.\n                      Supports both binary and multivalue preferences
   and default values. "
@@ -113,6 +113,7 @@ files:
 - Rakefile
 - gemfiles/rails_4.gemfile
 - gemfiles/rails_5.gemfile
+- gemfiles/rails_6.gemfile
 - lib/generators/user_preferences/install_generator.rb
 - lib/generators/user_preferences/templates/migration.rb
 - lib/generators/user_preferences/templates/user_preferences.yml
@@ -154,8 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: User preferences gem for Rails.