testingrecord 1.0.1 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 228079a525e184348661a215f33fcae6daf628c54592793343f41525b15ea717
-  data.tar.gz: f95a3e63f583936668b4ccebe7eae1186605f47e53895fd2e72e1019955b05e1
+  metadata.gz: 72145033dd89e4249cf60d2b07eca3020e335e43134ea1ff02a0be99b626b29f
+  data.tar.gz: d8e459e3e0a03ca7ce79daaa2bccd66d2d9d682f4fa088c046725df48643ec00
 SHA512:
-  metadata.gz: b8c1e5f2a892e41ee591422a9febeca1e52c8a6043f3010b564496f072bb0cb5183f67d16f5afcc58d16655f8a179f00271ccf168124d7c3d0bddec3471a0823
-  data.tar.gz: 2d1ffd7be42bed6f2a483d5adb46cf1cfec4c465f0b62ff805ca0a1a0280248e7984c1a3220609d13c686c307fcf020c466c2ce087164451c8eede24a471d006
+  metadata.gz: 98350263e6164ed2711ab2e065d39805f404b42de3fb74f31cbc4d5440eda3125d784cdb0e1f8cac72290679bb9032651beeddfab7b91fa6a47d29d80a30f20e
+  data.tar.gz: 8d06c3d1c6a1f8bee5a3d48a51c7be36cc6d1c0e0a8afd1325fd202346abb70a3f3f7c01abe857d3a06efef2e2487746c5ecc1a7d68bdebbeef8ab675bc060f8

data/lib/testing_record/dsl/builder/filters.rb

@@ -6,6 +6,8 @@ module TestingRecord
       # [TestingRecord::DSL::Builder::Filters]
       # Ways in which we can filter our collection to find specific models
       module Filters
+        include DSL::Validation::Input
+
         # Checks to see whether an entity exists with the provided attributes
         #
         # @return [Boolean]
@@ -13,12 +15,31 @@ module TestingRecord
           find_by(attributes).any?
         end
 
+        # Finds all entities that match specified attribute values
+        #   attributes (Hash) -> The attributes you wish to filter on, each is iterated through sequentially
+        #   :logic (Symbol) -> Whether to use `and` (Intersection), or `or` (Union), logic to combine each key in attributes hash
+        #
+        # @return [Array<TestingRecord::Model>]
+        def find_by(attributes, logic: :and)
+          raise Error::InvalidArgumentError, 'Invalid filtering logic option, must be `:and` or `:or`' unless filter_logic_valid?(logic)
+
+          TestingRecord.logger.debug("Filtering Entity: '#{self}' list by #{attributes}. Logic: '#{logic}'")
+          if logic == :and
+            find_by_and(attributes)
+          else
+            find_by_or(attributes)
+          end
+        end
+
         # Finds an entity with the provided email address
         #   If one is found, set it as the current entity
         #
         # @return [TestingRecord::Model, nil]
         def with_email(email_address)
-          find_by({ email_address: })&.first&.tap { |entity| entity.class.current = entity }
+          find_by(
+            { email_address: email_address, email: email_address, 'email-address': email_address },
+            logic: :or
+          )&.first&.tap { |entity| entity.class.current = entity }
         end
 
         # Checks to see whether an entity exists with the provided id
@@ -53,17 +74,20 @@ module TestingRecord
 
         private
 
-        # Finds all entities that match specified attribute values
-        #
-        # @return [Array<TestingRecord::Model>]
-        def find_by(attributes)
-          pool = all
-          attributes.each do |key, value|
-            TestingRecord.logger.debug("Current user pool size: #{pool.length}")
-            TestingRecord.logger.debug("Filtering User list by #{key}: #{value}")
-            pool = pool.select { |entity| entity.attributes[key] == value }
+        def find_by_and(attributes)
+          all.select do |entity|
+            attributes.all? do |key, value|
+              entity.attributes[key] == value
+            end
+          end
+        end
+
+        def find_by_or(attributes)
+          all.select do |entity|
+            attributes.any? do |key, value|
+              entity.attributes[key] == value
+            end
           end
-          pool
         end
       end
     end

data/lib/testing_record/dsl/builder/settings.rb

@@ -24,7 +24,7 @@ module TestingRecord
         #
         # @return [Symbol]
         def caching(option)
-          raise Error::InvalidConfigurationError, 'Invalid caching option, must be :enabled or :disabled' unless caching_valid?(option)
+          raise Error::InvalidConfigurationError, 'Invalid caching option, must be `:enabled` or `:disabled`' unless caching_valid?(option)
           return unless option == :enabled
 
           instance_variable_set(:@all, [])

data/lib/testing_record/dsl/validation/input.rb

@@ -10,12 +10,12 @@ module TestingRecord
         #
         # @return [Boolean]
         def caching_valid?(input)
-          enabled_or_disabled.include?(input)
+          %i[enabled disabled].include?(input)
         end
 
-        private
-
-        def enabled_or_disabled = %i[enabled disabled]
+        def filter_logic_valid?(input)
+          %i[and or].include?(input)
+        end
       end
     end
   end

data/lib/testing_record/dsl.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'dsl/builder'
+# Must be loaded before builder as some validations are needed during build phase
 require_relative 'dsl/validation'
+
+require_relative 'dsl/builder'

data/lib/testing_record/error.rb

@@ -5,5 +5,6 @@ module TestingRecord
     class AttributeError < StandardError; end
     class EntityError < StandardError; end
     class InvalidConfigurationError < StandardError; end
+    class InvalidArgumentError < StandardError; end
   end
 end

data/lib/testing_record/model.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'automation_helpers/extensions/string'
+
 require_relative 'dsl'
 
 module TestingRecord
@@ -11,8 +12,6 @@ module TestingRecord
     extend DSL::Builder::Helpers
     extend DSL::Builder::Settings
 
-    attr_reader :attributes
-
     class << self
       attr_reader :current
 
@@ -25,7 +24,7 @@ module TestingRecord
       #
       # @return [TestingRecord::Model]
       def create(attributes)
-        attributes.transform_keys!(&:to_sym)
+        attributes.transform_keys! { |key| key.to_s.tr('-', '_').to_sym }
         if respond_to?(:all)
           create_with_caching(attributes)
         else
@@ -110,6 +109,8 @@ module TestingRecord
       end
     end
 
+    attr_reader :attributes
+
     def initialize(attributes = {})
       @attributes = attributes
     end
@@ -135,7 +136,7 @@ module TestingRecord
     #
     # @return [TestingRecord::Model]
     def update(attrs)
-      attrs.transform_keys(&:to_sym).each do |key, value|
+      attrs.transform_keys! { |key| key.to_s.tr('-', '_').to_sym }.each do |key, value|
         attributes[key] = value
         instance_variable_set("@#{key}", value)
         TestingRecord.logger.info("Updated '#{key}' on the #{self.class} entity to be '#{value}'")

data/lib/testing_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TestingRecord
-  VERSION = '1.0.1'
+  VERSION = '1.1'
 end

data/lib/testing_record.rb

@@ -18,6 +18,7 @@ module TestingRecord
     # Configure a default primary key for all TestingRecord models
     def default_primary_key=(value)
       raise InvalidConfigurationError, 'Invalid primary key value, must be a Symbol' unless value.is_a?(Symbol)
+      raise InvalidConfigurationError, 'Primary key value cannot contain `-` please use `_` instead' if value.to_s.include?('-')
 
       @default_primary_key = value
       TestingRecord::Model.primary_key value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testingrecord
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: '1.1'
 platform: ruby
 authors:
 - Luke Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-05-05 00:00:00.000000000 Z
+date: 2026-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automation_helpers
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Thread based caching system to store and edit records