has_calculated_fields 1.0.3.2 → 1.0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d3ea6225ba6315220787cc8182604663b03acb695342072a707c7710ab015aa
-  data.tar.gz: c70fbf60a71b26f946313e3cc4f0a22de31da55f92653c011ef50fe323495457
+  metadata.gz: 5a19bc37b89db9ad306518d885b96897f2bbcda5471a3035ae04c5ee7ba30429
+  data.tar.gz: 6044d0bc9cff905e0c48e123595f387f601d32f859719bae47655fa45b18866e
 SHA512:
-  metadata.gz: 2980b8f0942749902f3d9c22e61b6d73706229142c4cf05bbdccad83520560d04dec6e8d131f56a6f445e3de32ab12c8158fc4d27f4118f499cdc592ee200b8b
-  data.tar.gz: b62d335f136953751f7bcfea723cacd850fe6c1dc18b1402eeff402984ec1df838eae4a59fede58e7905b75386f6149c93ec79121068ef689765c4c02d9710b6
+  metadata.gz: 7872e4d93d3febee83c3245108d14dda74dcab6bac04d1a450c0013dbfaca7e38b8b0d3ddd67c7a2deaf8eec7c4203977b68bc2508182ddfd25d9d443a9b73f4
+  data.tar.gz: 90ae2e5dd0ded0c0248c90f5d02e7f8a91fbfc7c7c5041ddeadfb4483460224d2ec363e50b6877cc0494d386491cf0edb1c48ebe33a3fc7dd56fe9ae500c7ef3

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    has_calculated_fields (1.0.0)
+    has_calculated_fields (1.0.3.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    active_model_serializers (0.9.7)
+    active_model_serializers (0.9.8)
       activemodel (>= 3.2)
       concurrent-ruby (~> 1.0)
     activemodel (4.2.11.1)
@@ -21,44 +21,42 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    appraisal (2.2.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
     arel (6.0.4)
-    ast (2.4.0)
-    builder (3.2.3)
-    byebug (11.0.1)
-    concurrent-ruby (1.1.5)
-    database_cleaner (1.7.0)
-    diff-lcs (1.3)
+    ast (2.4.2)
+    builder (3.2.4)
+    byebug (11.1.3)
+    concurrent-ruby (1.1.10)
+    database_cleaner (1.99.0)
+    diff-lcs (1.5.0)
     docile (1.1.5)
-    factory_bot (4.11.1)
-      activesupport (>= 3.0.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (2.2.0)
-    minitest (5.11.3)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
+    json (2.6.1)
+    minitest (5.15.0)
+    parallel (1.22.1)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    powerpack (0.1.3)
     rainbow (2.2.2)
       rake
-    rake (12.3.3)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rake (13.0.6)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -66,18 +64,18 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.1)
+    ruby-progressbar (1.11.0)
     simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     sqlite3 (1.3.13)
-    thor (0.20.3)
+    thor (1.2.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.8.0)
 
 PLATFORMS
   ruby
@@ -88,7 +86,6 @@ DEPENDENCIES
   appraisal (~> 2.2)
   byebug
   database_cleaner
-  factory_bot (~> 4.8)
   has_calculated_fields!
   rspec (~> 3.6)
   rubocop (~> 0.49.1)
@@ -96,4 +93,4 @@ DEPENDENCIES
   sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.16.6
+   1.17.2

data/has_calculated_fields.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "has_calculated_fields"
-  s.version     = "1.0.3.2"
+  s.version     = "1.0.3.6"
   s.platform    = Gem::Platform::RUBY
   s.author      = ["Adrian Fernandez"]
   s.email       = ["adrianfernandez85@gmail.com"]
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simplecov", "~> 0.15.0"
   s.add_development_dependency "appraisal", "~> 2.2"
   s.add_development_dependency "byebug"
-  s.add_development_dependency "factory_bot", "~> 4.8"
   s.add_development_dependency "database_cleaner"
   s.add_development_dependency "active_model_serializers", "~> 0.9.3"
 end

data/lib/has_calculated_fields/has_calculated_fields.rb

@@ -206,14 +206,7 @@ module HasCalculatedFields
     end
 
     def _process_data(data)
-      if data.key?(:if_changed)
-        return unless changes.keys.include?(data[:if_changed])
-      end
-
-      if data.key?(:unless_changed)
-        return if changes.keys.include?(data[:unless_changed])
-      end
-
+      # return true unless _should_calculate_data?(data)
       attr_equal = "#{data[:calculated_field]}="
 
       value = case data[:type]
@@ -261,6 +254,16 @@ module HasCalculatedFields
         value
       end
     end
+
+    def _should_calculate_data?(data)
+      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])
+
+      false
+    end
   end
 end
 

data/spec/has_calculated_fields_spec.rb

@@ -5,7 +5,7 @@ describe HasCalculatedFields do
   describe "runs before_save callbacks" do
     let(:name) { "name" }
     let(:created_at) { Time.find_zone("Madrid").parse("2019-05-03 2pm") }
-    let(:obj) { create(:sample_model, created_at: created_at, name: name) }
+    let(:obj) { SampleModel.create(created_at: created_at, name: name) }
 
     context "using time" do
       context "when attribute has value" do
@@ -18,15 +18,6 @@ describe HasCalculatedFields do
             .to("Sat, 04 May 2019 16:00:00 +0200")
         end
       end
-
-      context "when attribute hasn't value" do
-        let(:created_at) { nil }
-        it "assigns formatted time attribute" do
-          expect { obj.save }.to change { obj.calculated_created_at }
-            .from(I18n.l(Time.current))
-            .to(I18n.l(Time.current.in_time_zone("UTC")))
-        end
-      end
     end
 
     context "using method" do
@@ -37,6 +28,25 @@ describe HasCalculatedFields do
           .from("name calculated!")
           .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!")
+      end
+
+      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!")
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,12 +3,9 @@
 $LOAD_PATH << File.join(File.dirname(__FILE__), "..", "lib")
 require "sqlite3"
 require "has_calculated_fields"
-require "factory_bot"
 require 'database_cleaner'
 require "active_model_serializers"
 
-Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
-
 RSpec.configure do |config|
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
@@ -24,13 +21,16 @@ end
 
 ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
 
-ActiveRecord::Schema.define(version: 1) do
+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
 
@@ -48,6 +48,22 @@ class SampleModel < ActiveRecord::Base
       method: Proc.new do |obj|
         obj.name + " calculated!"
       end
+    },
+    {
+      calculated_field: :calculated_conditional_if,
+      type: :method,
+      if_changed: :random_attribute,
+      method: Proc.new do |obj|
+        obj.name + " calculated!"
+      end
+    },
+    {
+      calculated_field: :calculated_conditional_unless,
+      type: :method,
+      unless_changed: :random_attribute,
+      method: Proc.new do |obj|
+        obj.name + " calculated!"
+      end
     }
   ]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_calculated_fields
 version: !ruby/object:Gem::Version
-  version: 1.0.3.2
+  version: 1.0.3.6
 platform: ruby
 authors:
 - Adrian Fernandez
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: factory_bot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -168,10 +154,8 @@ files:
 - lib/has_calculated_fields/.DS_Store
 - lib/has_calculated_fields/has_calculated_fields.rb
 - spec/.DS_Store
-- spec/factories/other_event.rb
 - spec/has_calculated_fields_spec.rb
 - spec/spec_helper.rb
-- spec/support/factory_bot.rb
 homepage: http://github.com/adrian-fernandez/has_calculated_fields
 licenses:
 - MIT
@@ -196,7 +180,5 @@ signing_key:
 specification_version: 4
 summary: Rails gem to allow models to save auto calculated fields
 test_files:
-- spec/factories/other_event.rb
 - spec/has_calculated_fields_spec.rb
 - spec/spec_helper.rb
-- spec/support/factory_bot.rb

data/spec/factories/other_event.rb

@@ -1,6 +0,0 @@
-#frozen_string_literal: true
-
-FactoryBot.define do
-  factory :sample_model do
-  end
-end

data/spec/support/factory_bot.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.configure do |config|
-  config.include FactoryBot::Syntax::Methods
-
-  config.before(:suite) do
-    FactoryBot.find_definitions
-  end
-end