has_calculated_fields 1.0.3.4 → 1.0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0afedc16cbc98af23216b3d921975247b1852fb83ada078232ae8878605ecd40
-  data.tar.gz: 0c527a880f8dc6164fdfc2328475b6de0327c0bbb172b21940e5ec0f1344f8ec
+  metadata.gz: f6cf158f78752207c08624fc9f0a78e61fe23bce35345390c68199f8a60ed38e
+  data.tar.gz: c5f79aacc2c41741e52f9916cfd5b7aef7196c9088d13a6c70ba122d1adcb24e
 SHA512:
-  metadata.gz: '081c4f56ed1bd82af9a4fa15a40320d91c57546970681889152f7589832311fb7a6ef582b12587d0143c29cac4f78de4baee31d1a59e6c570408cf996a2c8bfa'
-  data.tar.gz: 1954e0f1faf6b0e7bfe0d7c716d9e8e550745015f8217c0b383498b0d7a1811637053984008b632dd25ed69ecef3c5977fe03ad3219715d1d22c5bc7290bd8cf
+  metadata.gz: 7c2ccaefb0403244e27280e269078f5356024092af4c71c3d3e08b191ec583ce0717558c6cd3200c89c6d1ff505714ea560bcf1f2c7c09a634c879f210505ad4
+  data.tar.gz: 11e1c6edd54e3d9c8d6ff9660eaaa52d660e67ea4aecb40428639936acd70b70acd3873daed4211d3abc82bb9ddf822951913a3f871c052478c0ad1c557b6117

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    has_calculated_fields (1.0.3.4)
+    has_calculated_fields (1.0.3.7)
 
 GEM
   remote: https://rubygems.org/

data/has_calculated_fields.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "has_calculated_fields"
-  s.version     = "1.0.3.4"
+  s.version     = "1.0.3.7"
   s.platform    = Gem::Platform::RUBY
   s.author      = ["Adrian Fernandez"]
   s.email       = ["adrianfernandez85@gmail.com"]

data/lib/has_calculated_fields/has_calculated_fields.rb

@@ -206,7 +206,8 @@ module HasCalculatedFields
     end
 
     def _process_data(data)
-      # return true unless _should_calculate_data?(data)
+      return true unless _should_calculate_data?(data)
+
       attr_equal = "#{data[:calculated_field]}="
 
       value = case data[:type]
@@ -255,12 +256,17 @@ module HasCalculatedFields
       end
     end
 
-    def _should_calculate_data?(data)
+    def _should_calculate_data?(data = {})
+      if_changed = data.fetch(:if_changed, nil)
+      unless_changed = data.fetch(:unless_changed, nil)
+
+      changed_keys = changes.keys.map(&:to_sym) || []
+
       return true if data.blank?
       return true if !data.has_key?(:if_changed) && !data.has_key?(:unless_changed)
 
-      return true if data.has_key?(:if_changed) && changes.keys.map(&:to_sym).include?(data[:if_changed])
-      return true if data.has_key?(:unless_changed) && !changes.keys.map(&:to_sym).include?(data[:unless_changed])
+      return true if data.has_key?(:if_changed) && changed_keys.include?(if_changed)
+      return true if data.has_key?(:unless_changed) && !changed_keys.include?(unless_changed)
 
       false
     end

data/lib/has_calculated_fields.rb

@@ -2,7 +2,6 @@
 
 require "active_record"
 require "active_support/inflector"
-require "active_model_serializers"
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 

data/spec/has_calculated_fields_spec.rb

@@ -29,23 +29,42 @@ describe HasCalculatedFields do
           .to("new name calculated!")
       end
 
-      it "assigns conditional when condition is matched" do
-        obj.name = "conditional name"
-        obj.random_attribute = "4"
-
-        expect { obj.save }.to change {
-          obj.calculated_conditional_unless
-        }.and change { obj.calculated_conditional_if }
-          .to("conditional name calculated!")
+      context "if_changed" do
+        it "assigns conditional when condition is matched" do
+          obj.name = "conditional name"
+          obj.random_attribute = "4"
+
+          expect { obj.save }.to change {
+            obj.calculated_conditional_if
+          }
+        end
+
+        it "does not assign conditional when condition is matched" do
+          obj.name = "conditional name"
+          obj.random_attribute = "4"
+
+          expect { obj.save }.not_to change {
+            obj.calculated_conditional_if
+          }
+        end
       end
 
-      it "assigns conditional when condition is matched" do
-        obj.name = "conditional name"
+      context "unless_changed" do
+        it "assigns conditional when condition is matched" do
+          obj.name = "conditional name"
 
-        expect { obj.save }.to change {
-          obj.calculated_conditional_if
-        }.and change { obj.calculated_conditional_unless }
-          .to("conditional name calculated!")
+          expect { obj.save }.to change {
+            obj.calculated_conditional_unless
+          }
+        end
+
+        it "does not assign conditional when condition is matched" do
+          obj.name = "conditional name"
+
+          expect { obj.save }.not_to change {
+            obj.calculated_conditional_unless
+          }
+        end
       end
     end
   end

data/spec/schema.rb

@@ -0,0 +1,12 @@
+ActiveRecord::Schema.define(version: 2022_05_07_120518) do
+  create_table :sample_models do |t|
+    t.string :name
+    t.string :random_attribute
+    t.datetime :created_at
+
+    t.string :calculated_name
+    t.string :calculated_created_at
+    t.string :calculated_conditional_if
+    t.string :calculated_conditional_unless
+  end
+end

data/spec/spec_helper.rb

@@ -4,7 +4,6 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), "..", "lib")
 require "sqlite3"
 require "has_calculated_fields"
 require 'database_cleaner'
-require "active_model_serializers"
 
 RSpec.configure do |config|
   config.before(:suite) do
@@ -19,20 +18,9 @@ RSpec.configure do |config|
   end
 end
 
-ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
-
-ActiveRecord::Schema.define(version: 3) do
-  create_table :sample_models do |t|
-    t.string :name
-    t.string :random_attribute
-    t.datetime :created_at
-
-    t.string :calculated_name
-    t.string :calculated_created_at
-    t.string :calculated_conditional_if
-    t.string :calculated_conditional_unless
-  end
-end
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+ActiveRecord::Schema.verbose = true
+load "spec/schema.rb"
 
 class SampleModel < ActiveRecord::Base
   has_calculated_fields on_before_save: [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_calculated_fields
 version: !ruby/object:Gem::Version
-  version: 1.0.3.4
+  version: 1.0.3.7
 platform: ruby
 authors:
 - Adrian Fernandez
@@ -155,6 +155,7 @@ files:
 - lib/has_calculated_fields/has_calculated_fields.rb
 - spec/.DS_Store
 - spec/has_calculated_fields_spec.rb
+- spec/schema.rb
 - spec/spec_helper.rb
 homepage: http://github.com/adrian-fernandez/has_calculated_fields
 licenses:
@@ -181,4 +182,5 @@ specification_version: 4
 summary: Rails gem to allow models to save auto calculated fields
 test_files:
 - spec/has_calculated_fields_spec.rb
+- spec/schema.rb
 - spec/spec_helper.rb