built_in_data 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f76763097ab596cdc8993a507e28d53ed4cc58efaba3c8fad8ac202498fa0429
-  data.tar.gz: e7ac337759999e488b7bb1c531c0f6b70649a38acb6e54c761b0fdb9e550001e
+  metadata.gz: 1dcb3fbcceaeff5cb4d43a1bc0c08edb3b375324ad4797c1ffcf24923913f0cd
+  data.tar.gz: 2b2195a4b426b877bb80cfb36c51e4244e05540ed71e8cb853c9eb0175373cde
 SHA512:
-  metadata.gz: fd963620a173fb9cc213ce414c9d9126ac509bb57a75b951a7e0c44c2a75919864c5fb8cee7b622fe625d3e801cf4963a3943646a243b546209ffe449b9225e2
-  data.tar.gz: 23420031c980b6e3fc420176dc50f84af1ef756bf6335d07f116cdf275b078b256da284771d926d7ed7968be8d01f552a4f653c4624c5e750e3135c42137fd49
+  metadata.gz: 8252552d62e0f142c16f51465205ff986e11f5f30d23c4af1db7d45359e36b90a32814d66d277fdb29cb982fadaee65e6a2419352a97c19c3c5b1efde5a59e8c
+  data.tar.gz: 973e5ec125c4e846c63ec464de0e3a3824491f5704d478d2dedab136ba269a4b8e0a0e00d387ceaf548c812fb75dacc631e239f44d2e431a0163e7c4db0d6638

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012-2022 Brightways Learning https://www.brightwayslearning.org
+Copyright 2012-2023 Brightways Learning https://www.brightwayslearning.org
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -53,3 +53,6 @@ Use **built_in?** to check if an object was loaded by BuiltInData:
 ```ruby
 object.built_in?
 ```
+
+## License
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/setup"
 
 require "bundler/gem_tasks"

data/lib/built_in_data/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BuiltInData
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/lib/built_in_data.rb

@@ -1,32 +1,29 @@
+# frozen_string_literal: true
+
 require "built_in_data/version"
 
 module BuiltInData
   extend ActiveSupport::Concern
 
   included do
-    # all built in data objects should have a built_in_key, model objects without a key will not be modified or removed
+    # All built in data objects should have a built_in_key, model objects without a key will not be modified or removed
     validates_uniqueness_of :built_in_key, allow_nil: true, case_sensitive: false
 
-    scope :built_in, -> { where "#{table_name}.built_in_key IS NOT NULL" }
+    scope :built_in, -> { where.not(built_in_key: nil) }
   end
 
   module ClassMethods
+    # Inserts new, updates existing, and destorys removed built_in objects
     def load_built_in_data!(hash = nil)
       objects_hash = prepare_objects_hash(hash)
-      Array.new.tap do |updated_objects|
-
-        objects_hash.each do |key, attributes|
-          updated_objects << create_or_update!(key, attributes)
-        end
+      destroy_removed_built_in_objects!(objects_hash.keys)
 
-        # destroy any built_in objects that have been removed from built_in_data_attributes
-        self.built_in.each do |object|
-          object.destroy unless objects_hash.has_key?(object.built_in_key)
-        end
+      objects_hash.map do |key, attributes|
+        create_or_update!(key, attributes)
       end
     end
 
-    # cached database id for fixture files
+    # Cached database id for fixture files
     def built_in_object_id(key)
       built_in_object_ids[key]
     end
@@ -39,20 +36,25 @@ module BuiltInData
     private
 
     def prepare_objects_hash(hash)
-      return hash.nil? ? load_yaml_data : hash.with_indifferent_access
+      hash.nil? ? load_yaml_data : hash.with_indifferent_access
     end
 
     def load_yaml_data
       # allow a standard key to be used for defaults in YAML files
       YAML.safe_load(
         read_and_erb_process_yaml_file,
-        permitted_classes:  [Date],
-        aliases:            true
-      ).except('DEFAULTS')
+        permitted_classes: [Date],
+        aliases:           true
+      ).except("DEFAULTS")
     end
 
     def read_and_erb_process_yaml_file
-      ERB.new(File.read(Rails.root.join('db', 'built_in_data', "#{table_name}.yml"))).result
+      ERB.new(Rails.root.join("db", "built_in_data", "#{table_name}.yml").read).result
+    end
+
+    # Destroys built_in objects with a built_in_key not present in built_in_keys array
+    def destroy_removed_built_in_objects!(built_in_keys)
+      built_in.where.not(built_in_key: built_in_keys).destroy_all
     end
 
     def create_or_update!(key, attributes)
@@ -62,15 +64,15 @@ module BuiltInData
       end
     end
 
-    # memoized hash of built in object ids
+    # Memoized hash of built in object ids
     def built_in_object_ids
       @built_in_object_ids ||= Hash.new do |hash, key|
-        hash[key] = where(built_in_key: key).pluck(:id).first
+        hash[key] = where(built_in_key: key).pick(:id)
       end
     end
   end
 
   def built_in?
-    !built_in_key.blank?
+    built_in_key.present?
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: built_in_data
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Aaron Baldwin
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-27 00:00:00.000000000 Z
+date: 2023-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: Data management for Rails models.