Filter properties in the database instead of in memory

lib/rails-properties.rb

@@ -1,12 +1,3 @@
-module RailsProperties
-  # In Rails 3, attributes can be protected by `attr_accessible` and `attr_protected`
-  # In Rails 4, attributes can be protected by using the gem `protected_attributes`
-  # In Rails 5, protecting attributes is obsolete (there are `StrongParameters` only)
-  def self.can_protect_attributes?
-    (ActiveRecord::VERSION::MAJOR == 3) || defined?(ProtectedAttributes)
-  end
-end
-
 require 'rails-properties/property_object'
 require 'rails-properties/configuration'
 require 'rails-properties/base'

lib/rails-properties/base.rb

@@ -12,11 +12,7 @@ def properties(var)
           raise ArgumentError unless var.is_a?(Symbol)
           raise ArgumentError.new("Unknown key: #{var}") unless self.class.default_properties[var]
 
-          if RailsProperties.can_protect_attributes?
-            property_objects.detect { |s| s.var == var.to_s } || property_objects.build({ :var => var.to_s }, :without_protection => true)
-          else
-            property_objects.detect { |s| s.var == var.to_s } || property_objects.build(:var => var.to_s, :target => self)
-          end
+          cached_properties[var] ||= property_objects.find_or_initialize_by(var: var)
         end
 
         def properties=(value)
@@ -42,6 +38,12 @@ def to_properties_hash
           end
           properties_hash
         end
+
+        private
+
+        def cached_properties
+          @cached_properties ||= {}
+        end
       end
     end
   end

lib/rails-properties/property_object.rb

@@ -15,12 +15,6 @@ class PropertyObject < ActiveRecord::Base
 
     serialize :value, Hash
 
-    if RailsProperties.can_protect_attributes?
-      # attr_protected can not be used here because it touches the database which is not connected yet.
-      # So allow no attributes and override <tt>#sanitize_for_mass_assignment</tt>
-      attr_accessible
-    end
-
     REGEX_SETTER = /\A([a-z]\w+)=\Z/i
     REGEX_GETTER = /\A([a-z]\w+)\Z/i
 
@@ -44,14 +38,6 @@ def method_missing(method_name, *args, &block)
       end
     end
 
-  protected
-    if RailsProperties.can_protect_attributes?
-      # Simulate attr_protected by removing all regular attributes
-      def sanitize_for_mass_assignment(attributes, role = nil)
-        attributes.except('id', 'var', 'value', 'target_id', 'target_type', 'created_at', 'updated_at')
-      end
-    end
-
   private
     def _get_value(name)
       if value[name].nil?

lib/rails-properties/version.rb

@@ -1,3 +1,3 @@
 module RailsProperties
-  VERSION = '3.4.3'
+  VERSION = '4.0.0'
 end

rails-properties.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'activerecord', '>= 3.1'
+  gem.add_dependency 'activerecord', '>= 6.0'
 
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'sqlite3'
+  gem.add_development_dependency 'sqlite3', "~> 1.4"
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'coveralls'
   gem.add_development_dependency 'simplecov', RUBY_VERSION < '2' ? '~> 0.11.2' : '>= 0.11.2'

spec/properties_spec.rb

@@ -145,7 +145,7 @@
   end
 
   it "should add properties" do
-    user.properties(:dashboard).update_attributes! :smart => true
+    user.properties(:dashboard).update! :smart => true
 
     user.reload
     expect(user.properties(:dashboard).smart).to eq(true)
@@ -179,7 +179,7 @@
   end
 
   it "should update properties" do
-    user.properties(:dashboard).update_attributes! :smart => true
+    user.properties(:dashboard).update! :smart => true
     user.reload
 
     expect(user.properties(:dashboard).smart).to eq(true)

spec/property_object_spec.rb

@@ -3,13 +3,8 @@
 describe RailsProperties::PropertyObject do
   let(:user) { User.create! :name => 'Mr. Pink' }
 
-  if RailsProperties.can_protect_attributes?
-    let(:new_property_object) { user.property_objects.build({ :var => 'dashboard'}, :without_protection => true) }
-    let(:saved_property_object) { user.property_objects.create!({ :var => 'dashboard', :value => { 'theme' => 'pink', 'filter' => false}}, :without_protection => true) }
-  else
-    let(:new_property_object) { user.property_objects.build({ :var => 'dashboard'}) }
-    let(:saved_property_object) { user.property_objects.create!({ :var => 'dashboard', :value => { 'theme' => 'pink', 'filter' => false}}) }
-  end
+  let(:new_property_object) { user.property_objects.build({ :var => 'dashboard'}) }
+  let(:saved_property_object) { user.property_objects.create!({ :var => 'dashboard', :value => { 'theme' => 'pink', 'filter' => false}}) }
 
   describe "serialization" do
     it "should have a hash default" do
@@ -105,7 +100,7 @@
 
   describe "update_attributes" do
     it 'should save' do
-      expect(new_property_object.update_attributes(:foo => 42, :bar => 'string')).to be_truthy
+      expect(new_property_object.update(:foo => 42, :bar => 'string')).to be_truthy
       new_property_object.reload
 
       expect(new_property_object.foo).to eq(42)
@@ -115,16 +110,7 @@
     end
 
     it 'should not save blank hash' do
-      expect(new_property_object.update_attributes({})).to be_truthy
-    end
-
-    if RailsProperties.can_protect_attributes?
-      it 'should not allow changing protected attributes' do
-        new_property_object.update_attributes!(:var => 'calendar', :foo => 42)
-
-        expect(new_property_object.var).to eq('dashboard')
-        expect(new_property_object.foo).to eq(42)
-      end
+      expect(new_property_object.update({})).to be_truthy
     end
   end
 

spec/queries_spec.rb

@@ -51,7 +51,7 @@
         user.properties(:dashboard).bar = 'string'
         user.properties(:calendar).bar = 'string'
         user.save!
-      }.to perform_queries(3)
+      }.to perform_queries(4)
     end
   end
 
@@ -94,7 +94,7 @@
 
     it "should update properties by one SQL query" do
       expect {
-        user.properties(:dashboard).update_attributes! :foo => 'bar'
+        user.properties(:dashboard).update! :foo => 'bar'
       }.to perform_queries(1)
     end
   end

spec/serialize_spec.rb

@@ -25,7 +25,7 @@
 
   describe 'updated properties' do
     it 'should be serialized' do
-      user.properties(:dashboard).update_attributes! :smart => true
+      user.properties(:dashboard).update! :smart => true
 
       dashboard_properties = user.property_objects.where(:var => 'dashboard').first
       calendar_properties = user.property_objects.where(:var => 'calendar').first