setler 0.0.13 → 0.0.15

data/gemfiles/rails_edge.gemfile.lock

@@ -0,0 +1,320 @@
+GIT
+  remote: https://github.com/rails/rails
+  revision: f73b7f173b3004ec9e920b99dafaaf029887847a
+  specs:
+    actioncable (8.2.0.alpha)
+      actionpack (= 8.2.0.alpha)
+      activesupport (= 8.2.0.alpha)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (8.2.0.alpha)
+      actionpack (= 8.2.0.alpha)
+      activejob (= 8.2.0.alpha)
+      activerecord (= 8.2.0.alpha)
+      activestorage (= 8.2.0.alpha)
+      activesupport (= 8.2.0.alpha)
+      mail (>= 2.8.0)
+    actionmailer (8.2.0.alpha)
+      actionpack (= 8.2.0.alpha)
+      actionview (= 8.2.0.alpha)
+      activejob (= 8.2.0.alpha)
+      activesupport (= 8.2.0.alpha)
+      mail (>= 2.8.0)
+      rails-dom-testing (~> 2.2)
+    actionpack (8.2.0.alpha)
+      actionview (= 8.2.0.alpha)
+      activesupport (= 8.2.0.alpha)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actiontext (8.2.0.alpha)
+      action_text-trix (~> 2.1.15)
+      actionpack (= 8.2.0.alpha)
+      activerecord (= 8.2.0.alpha)
+      activestorage (= 8.2.0.alpha)
+      activesupport (= 8.2.0.alpha)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (8.2.0.alpha)
+      activesupport (= 8.2.0.alpha)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (8.2.0.alpha)
+      activesupport (= 8.2.0.alpha)
+      globalid (>= 0.3.6)
+    activemodel (8.2.0.alpha)
+      activesupport (= 8.2.0.alpha)
+    activerecord (8.2.0.alpha)
+      activemodel (= 8.2.0.alpha)
+      activesupport (= 8.2.0.alpha)
+      timeout (>= 0.4.0)
+    activestorage (8.2.0.alpha)
+      actionpack (= 8.2.0.alpha)
+      activejob (= 8.2.0.alpha)
+      activerecord (= 8.2.0.alpha)
+      activesupport (= 8.2.0.alpha)
+      marcel (~> 1.0)
+    activesupport (8.2.0.alpha)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      json
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    rails (8.2.0.alpha)
+      actioncable (= 8.2.0.alpha)
+      actionmailbox (= 8.2.0.alpha)
+      actionmailer (= 8.2.0.alpha)
+      actionpack (= 8.2.0.alpha)
+      actiontext (= 8.2.0.alpha)
+      actionview (= 8.2.0.alpha)
+      activejob (= 8.2.0.alpha)
+      activemodel (= 8.2.0.alpha)
+      activerecord (= 8.2.0.alpha)
+      activestorage (= 8.2.0.alpha)
+      activesupport (= 8.2.0.alpha)
+      bundler (>= 1.15.0)
+      railties (= 8.2.0.alpha)
+    railties (8.2.0.alpha)
+      actionpack (= 8.2.0.alpha)
+      activesupport (= 8.2.0.alpha)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
+      zeitwerk (~> 2.6)
+
+PATH
+  remote: ..
+  specs:
+    setler (0.0.15)
+      activerecord (>= 3.0.0)
+      rails (>= 3.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    action_text-trix (2.1.15)
+      railties
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.3)
+    base64 (0.3.0)
+    bigdecimal (3.3.1)
+    brakeman (5.4.1)
+    builder (3.3.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.4)
+    crass (1.0.6)
+    date (3.4.1)
+    docile (1.4.1)
+    drb (2.2.3)
+    erb (5.1.1)
+    erubi (1.13.1)
+    globalid (1.3.0)
+      activesupport (>= 6.1)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    io-console (0.8.1)
+    irb (1.15.2)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.15.1)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    loofah (2.24.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.9.0)
+      logger
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.1.0)
+    mini_mime (1.1.5)
+    minitest (5.26.0)
+    net-imap (0.5.12)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.1)
+      net-protocol
+    nio4r (2.7.4)
+    nokogiri (1.18.10-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.10-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.10-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.10-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.10-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.10-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.10-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.10-x86_64-linux-musl)
+      racc (~> 1.4)
+    panolint (0.1.6)
+      brakeman (>= 4.8, < 6.0)
+      rubocop (>= 0.83, < 2.0)
+      rubocop-performance (~> 1.5)
+      rubocop-rails (~> 2.5)
+      rubocop-rake (~> 0.5)
+      rubocop-rspec (~> 2.0)
+    parallel (1.27.0)
+    parser (3.3.10.0)
+      ast (~> 2.4.1)
+      racc
+    pp (0.6.3)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.6.0)
+    psych (5.2.6)
+      date
+      stringio
+    racc (1.8.1)
+    rack (3.2.3)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rackup (2.2.1)
+      rack (>= 3)
+    rails-dom-testing (2.3.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    rainbow (3.1.1)
+    rake (13.3.0)
+    rdoc (6.15.0)
+      erb
+      psych (>= 4.0.0)
+      tsort
+    regexp_parser (2.11.3)
+    reline (0.6.2)
+      io-console (~> 0.5)
+    rubocop (1.81.6)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.47.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-factory_bot (2.27.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-performance (1.26.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
+    rubocop-rails (2.33.4)
+      activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
+      rack (>= 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (2.31.0)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.29.1)
+      rubocop (~> 1.61)
+    ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.2)
+    simplecov_json_formatter (0.1.4)
+    sqlite3 (2.7.4-aarch64-linux-gnu)
+    sqlite3 (2.7.4-aarch64-linux-musl)
+    sqlite3 (2.7.4-arm-linux-gnu)
+    sqlite3 (2.7.4-arm-linux-musl)
+    sqlite3 (2.7.4-arm64-darwin)
+    sqlite3 (2.7.4-x86_64-darwin)
+    sqlite3 (2.7.4-x86_64-linux-gnu)
+    sqlite3 (2.7.4-x86_64-linux-musl)
+    stringio (3.1.7)
+    thor (1.4.0)
+    timeout (0.4.3)
+    tsort (0.2.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
+    uri (1.0.4)
+    useragent (0.16.11)
+    websocket-driver (0.8.0)
+      base64
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.7.3)
+
+PLATFORMS
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
+
+DEPENDENCIES
+  appraisal
+  minitest
+  panolint
+  rails!
+  rake
+  rubocop (~> 1.39)
+  rubocop-rake
+  setler!
+  simplecov
+  sqlite3
+
+BUNDLED WITH
+   2.6.9

data/lib/generators/setler/templates/migration.rb

@@ -9,6 +9,7 @@ class SetlerCreate<%= table_name.camelize %> < ActiveRecord::Migration
     end
 
     add_index :<%= table_name %>, [ :thing_type, :thing_id, :var ], unique: true
+    add_index :<%= table_name %>, :var, unique: true, where: "thing_id IS NULL AND thing_type is NULL"
   end
 
   def self.down

data/lib/setler/settings.rb

@@ -28,9 +28,9 @@ module Setler
         super(method, *args, &block)
       else
         method_name = method.to_s
-        if method_name.ends_with?("=")
+        if method_name.end_with?("=")
           self[method_name[0..-2]] = args.first
-        elsif method_name.ends_with?("?")
+        elsif method_name.end_with?("?")
           self[method_name[0..-2]].present?
         else
           self[method_name]
@@ -48,16 +48,24 @@ module Setler
       # thing_scoped.find_or_create_by_var(method_name[0..-2]) should work but doesnt for some reason
       # When @object is present, thing_scoped sets the where scope for the polymorphic association
       # but the find_or_create_by wasn't using the thing_type and thing_id
-      thing_scoped.find_or_create_by(
-        var: var.to_s,
-        thing_type: @object.try(:class).try(:base_class).try(:to_s),
-        thing_id: @object.try(:id)
-      ).update_attributes({ :value => value })
+      if Rails::VERSION::MAJOR == 3
+        thing_scoped.find_or_create_by_var_and_thing_type_and_thing_id(
+          var.to_s,
+          @object.try(:class).try(:base_class).try(:to_s),
+          @object.try(:id)
+        ).update({ :value => value })
+      else
+        thing_scoped.find_or_create_by(
+          var: var.to_s,
+          thing_type: @object.try(:class).try(:base_class).try(:to_s),
+          thing_id: @object.try(:id)
+        ).update({ :value => value })
+      end
     end
 
     def self.destroy(var_name)
       var_name = var_name.to_s
-      if setting = self.find_by_var(var_name)
+  if (setting = self.find_by_var(var_name))
         setting.destroy
         true
       else

data/lib/setler/version.rb

@@ -1,3 +1,3 @@
 module Setler
-  VERSION = "0.0.13"
+  VERSION = "0.0.15"
 end

data/setler.gemspec

@@ -7,21 +7,38 @@ Gem::Specification.new do |s|
   s.version     = Setler::VERSION
   s.authors     = ["Chris Kelly"]
   s.email       = ["ckdake@ckdake.com"]
+  s.license     = 'MIT'
   s.homepage    = "https://github.com/ckdake/setler"
   s.summary     = %q{Settler lets you use the 'Feature Flags' pettern or add settings to models.}
   s.description = %q{Setler is a Gem that lets one easily implement the "Feature Flags" pattern, or add settings to individual models. This is a cleanroom implementation of what the 'rails-settings' gem does. It's been forked all over the place, and my favorite version of it doesn't have any tests and doesn't work with settings associated with models.}
 
-  s.rubyforge_project = "setler"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  supported_ruby_requirements = [
+    Gem::Requirement.new(["~> 2.6", ">= 2.6.10"]),
+    Gem::Requirement.new(["~> 2.7", ">= 2.7.8"]),
+    Gem::Requirement.new("~> 3.0"),
+    Gem::Requirement.new("~> 3.1"),
+    Gem::Requirement.new("~> 3.2"),
+    Gem::Requirement.new("~> 3.3"),
+    Gem::Requirement.new("~> 3.4"),
+    Gem::Requirement.new([">= 3.5.0.pre", "< 3.6"])
+  ].freeze
+
+  s.metadata['supported_ruby_requirements'] = supported_ruby_requirements.map(&:to_s).join(', ')
+  s.required_ruby_version = Gem::Requirement.new([">= 2.6.10"]) 
+
   s.add_dependency('activerecord', '>=3.0.0')
   s.add_dependency('rails',        '>=3.0.0')
 
-  s.add_development_dependency('sqlite3')
   s.add_development_dependency('rake')
   s.add_development_dependency('minitest')
+  s.add_development_dependency('simplecov')
+  s.add_development_dependency('appraisal')
+  s.add_development_dependency('rubocop', '~> 1.39')
+  s.add_development_dependency('rubocop-rake')
+  s.add_development_dependency('panolint')
 end

data/test/settings_test.rb

@@ -60,7 +60,7 @@ class ::SettingsTest < Minitest::Test
   def test_update_with_nil_and_default_not_nil
     ::Settings.defaults[:foo] = :test
     ::Settings.foo = nil
-    assert_equal nil, ::Settings.foo
+    assert_nil ::Settings.foo
   end
 
   def test_update_with_array_syntax
@@ -76,8 +76,20 @@ class ::SettingsTest < Minitest::Test
     assert_equal '123', ::Settings.onetwothree
   end
 
+  def test_multithreaded_create
+    s1 = Settings.new var: :conflict, value: 1
+    s2 = Settings.new var: :conflict, value: 2
+    s1.save!
+    exc = assert_raises ActiveRecord::RecordNotUnique, ActiveRecord::StatementInvalid do
+        s2.save!
+    end
+    unless exc.is_a?(ActiveRecord::RecordNotUnique)
+      assert exc.message.match(/UNIQUE/)
+    end
+  end
+
   def test_complex_serialization
-    complex = [1, '2', {:three => true}]
+    complex = [1, '2', {"three" => true}]
     ::Settings.complex = complex
     assert_equal complex, ::Settings.complex
   end
@@ -167,7 +179,7 @@ class ::SettingsTest < Minitest::Test
     ::Preferences.create var: 'test',  value: 'preferences foo'
     ::Preferences.create var: 'test2', value: 'preferences bar'
 
-    refute_match ::Settings.all_settings, ::Preferences.all_settings
+    refute_equal ::Settings.all_settings, ::Preferences.all_settings
 
     assert_equal 'foo', ::Settings[:test]
     assert_equal 'bar', ::Settings[:test2]

data/test/test_helper.rb

@@ -1,5 +1,8 @@
 require 'rubygems'
 
+require 'simplecov'
+SimpleCov.start 'rails'
+
 require 'bundler'
 begin
   Bundler.setup(:default, :development)
@@ -34,18 +37,20 @@ def setup_db
       t.text   :value, :null => true
       t.integer :thing_id, :null => true
       t.string :thing_type, :limit => 30, :null => true
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :settings, [ :thing_type, :thing_id, :var ], :unique => true
+    add_index :settings, :var, unique: true, where: "thing_id IS NULL AND thing_type is NULL"
 
     create_table :preferences do |t|
       t.string :var, :null => false
       t.text   :value, :null => true
       t.integer :thing_id, :null => true
       t.string :thing_type, :limit => 30, :null => true
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :preferences, [ :thing_type, :thing_id, :var ], :unique => true
+    add_index :preferences, :var, unique: true, where: "thing_id IS NULL AND thing_type is NULL"
 
     create_table :users do |t|
       t.string :name