user_preferences 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9497008fda8a61268850e1d143b06ef8a3fbb86c3522743937f24c2b52c4ce19
-  data.tar.gz: 608d6887848c262643377b31e9fe9a0945d74de1fdfb1942cbe9e064fc325a44
+  metadata.gz: 56630a9e0cda0587b9e48a3a792348a1d7fba4ca896912a402440637c5d6953a
+  data.tar.gz: 85fbca242599c833fc51fa2c40ea0f76e9818456457c1eae59aaec289b96a985
 SHA512:
-  metadata.gz: c1cde706556602fecf88ef7d0e79d9529380fd59ced9afedd9e692b8f51b52212d87ddb97c85f7bfadb6587d6bb59991fa079f9652b9a77a782a6b02acc4df83
-  data.tar.gz: 7390f2ab4cab54c6762af39328909999ac9f3ec1c637eba83cd7e0dd6ae3b1ac78b371269de5c68f7475e3bd1b8fc4f54c9ffbc9f9b2310b057a12948e9b8ad1
+  metadata.gz: 348794170b9f325025af4312da74700d5ab49770a6bcc196ced62d32cc65e5e11aa31ca4d16633821e43e3b3d56112779ffe7bb02e330f4deb300d080f2cd76c
+  data.tar.gz: 0c0b17c199fe59db5d9e3e072ba665759dcde53a29186124ebae29afe23e2223a5e021d5db5711d3140fd1516a808de69f163eed5494a29b9f25b7ec07c86ce2

data/.github/workflows/ruby.yml

@@ -0,0 +1,34 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['3.3', '3.4', '4.0']
+        gemfile:
+          - rails_8.0
+          - rails_8.1
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rake

data/Appraisals

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

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.1.0 2026-07-22
+* Add `acts_as_binary` support for multi-value preferences while preserving binary input compatibility
+* Fix setting binary preferences with integer values on Ruby 3.2 and later
+* Support Rails 8.0 and 8.1 and Ruby 3.3 through 4.0
+
 ## 1.0.1 2019-10-17
 * Fix compatibility with Rails 6
 * Support modern Ruby versions

data/README.md

@@ -77,6 +77,22 @@ emails:
   newsletters: false
 ```
 
+Binary preferences can be enhanced to support multiple values while maintaining backwards compatibility on the API side:
+
+```yaml
+emails:
+  notifications:
+    default: true
+    acts_as_binary: true
+    values:
+      - false
+      - true
+      - email
+      - push
+```
+
+This will support setting the preference using integers, booleans, and strings for the first 2 values.
+
 You can add as many categories as you like:
 
 ```yaml

data/gemfiles/{rails_6.gemfile → rails_8.0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0"
+gem "rails", "~> 8.0.0"
 
 gemspec path: "../"

data/gemfiles/{rails_5.gemfile → rails_8.1.gemfile}

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0"
-gem "sprockets", "~> 3.7"
+gem "rails", "~> 8.1.0"
 
 gemspec path: "../"

data/lib/user_preferences/preference_definition.rb

@@ -24,12 +24,23 @@ module UserPreferences
       binary? ? @definition : @definition[:default]
     end
 
+    def acts_as_binary?
+      !binary? && @definition[:acts_as_binary] == true
+    end
+
     def lookup(index)
       permitted_values[index] if index
     end
 
     def to_db(value)
-      value = to_bool(value) if binary?
+      value = if binary?
+                to_bool_force(value)
+              elsif acts_as_binary?
+                to_bool_maybe(value)
+              else
+                value
+             end
+
       permitted_values.index(value)
     end
 
@@ -37,11 +48,23 @@ module UserPreferences
 
     def to_bool(value)
       return true if value == 1
-      return true if value == true || value =~ (/^(true|t|yes|y|1)$/i)
+      return true if value == true || value.to_s =~ (/^(true|t|yes|y|1)$/i)
 
       return false if value == 0
-      return false if value == false || value.blank? || value =~ (/^(false|f|no|n|0)$/i)
-      raise ArgumentError.new("invalid value for Boolean: \"#{value}\"")
+      return false if value == false || value.blank? || value.to_s =~ (/^(false|f|no|n|0)$/i)
+    end
+
+    def to_bool_force(value)
+      value = to_bool(value)
+      raise ArgumentError.new("invalid value for Boolean: \"#{value}\"") if value.nil?
+
+      value
+    end
+
+    def to_bool_maybe(value)
+      boolean = to_bool(value)
+
+      boolean.nil? ? value : boolean
     end
   end
 end

data/lib/user_preferences/version.rb

@@ -1,3 +1,3 @@
 module UserPreferences
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/spec/fixtures/user_preferences.yml

@@ -17,3 +17,12 @@ food:
       - red
       - white
 
+notifications:
+  followed_user:
+    acts_as_binary: true
+    default: true
+    values:
+      - false
+      - true
+      - email
+      - push

data/spec/spec_helper.rb

@@ -5,12 +5,8 @@ require 'active_record/connection_adapters/sqlite3_adapter'
 RSpec.configure do |config|
   $stdout = StringIO.new # silence migrations
   ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
-  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
+  migrations_paths = File.expand_path('../migrations', __FILE__)
+  ActiveRecord::MigrationContext.new(migrations_paths).migrate
   $stdout = STDOUT
 
   # prevent deprecation warnings

data/spec/user_preferences/defaults_spec.rb

@@ -16,6 +16,9 @@ describe UserPreferences::Defaults do
             a_la_carte: true,
             courses: 2,
             wine: 'red'
+          },
+          notifications: {
+            followed_user: true
           }
         }
       )
@@ -30,4 +33,4 @@ describe UserPreferences::Defaults do
       end
     end
   end
-end
+end

data/spec/user_preferences/preference_definition_spec.rb

@@ -87,4 +87,36 @@ describe UserPreferences::PreferenceDefinition do
       end
     end
   end
-end
+
+  context 'non-binary preference acting as binary' do
+    subject(:preference) do
+      definition = UserPreferences.definitions[:notifications][:followed_user]
+      UserPreferences::PreferenceDefinition.new(definition, :notifications, :followed_user)
+    end
+
+    describe '#binary?' do
+      it 'is false' do
+        expect(preference.binary?).to eq(false)
+      end
+    end
+
+    describe '#default' do
+      it 'returns the default preference value' do
+        expect(preference.default).to eq(true)
+      end
+    end
+
+    describe '#to_db' do
+      it 'casts the first 2 values to booleans' do
+        expect(preference.to_db(0)).to eq(0)
+        expect(preference.to_db(1)).to eq(1)
+        expect(preference.to_db(2)).to eq(nil)
+      end
+
+      it 'casts true/false strings to booleans' do
+        expect(preference.to_db('false')).to eq(0)
+        expect(preference.to_db('true')).to eq(1)
+      end
+    end
+  end
+end

data/user_preferences.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activerecord', '>= 4.0'
+  spec.add_dependency 'activerecord', '>= 5.0'
 
-  spec.add_development_dependency "appraisal"
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 12.3.3"
-  spec.add_development_dependency 'rspec', '~> 3.9.0'
+  spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
   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.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Andy Dust
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2026-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -42,44 +42,44 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -103,17 +103,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails_4.gemfile
-- gemfiles/rails_5.gemfile
-- gemfiles/rails_6.gemfile
+- gemfiles/rails_8.0.gemfile
+- gemfiles/rails_8.1.gemfile
 - lib/generators/user_preferences/install_generator.rb
 - lib/generators/user_preferences/templates/migration.rb
 - lib/generators/user_preferences/templates/user_preferences.yml
@@ -140,7 +139,7 @@ homepage: http://github.com/mubi/user_preferences
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -155,8 +154,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: User preferences gem for Rails.
 test_files:

data/.travis.yml

@@ -1,17 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 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/gemfiles/rails_4.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4"
-gem "sprockets", "~> 3.7"
-gem "sqlite3", "~> 1.3.6"
-
-gemspec path: "../"