cuprum-collections 0.5.1 → 0.6.0.rc.1

data/lib/cuprum/collections/rspec/deferred/scopes.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'cuprum/collections/rspec/deferred'
+
+module Cuprum::Collections::RSpec::Deferred
+  # Namespace for deferred example groups for validating scopes.
+  module Scopes; end
+end

data/lib/cuprum/collections/scope.rb

@@ -20,8 +20,8 @@ module Cuprum::Collections
     #   @yield the query block.
     #
     #   @yieldreturn [Hash] a Hash with String keys.
-    def initialize(*args, inverted: false, &block)
-      criteria = self.class.parse(*args, &block)
+    def initialize(*, inverted: false, &)
+      criteria = self.class.parse(*, &)
 
       super(criteria:, inverted:)
     end

data/lib/cuprum/collections/scopes/container.rb

@@ -5,10 +5,11 @@ require 'cuprum/collections/scopes'
 module Cuprum::Collections::Scopes
   # Functionality for implementing a scope container.
   module Container
-    # @param scopes [Array<Scope>] the scopes wrapped by the scope.
-    # @param options [Hash] additional options for the scope.
-    def initialize(scopes:, **options)
-      super(**options)
+    # @overload initialize(scopes:, **options)
+    #   @param scopes [Array<Scope>] the scopes wrapped by the scope.
+    #   @param options [Hash] additional options for the scope.
+    def initialize(scopes:, **)
+      super(**)
 
       @scopes = scopes
     end

data/lib/cuprum/collections/scopes/criteria/parser.rb

@@ -63,63 +63,40 @@ module Cuprum::Collections::Scopes::Criteria
       end
       alias ne not_equal
 
+      def not_null
+        OperatorExpression.new(
+          Cuprum::Collections::Queries::Operators::NOT_NULL,
+          nil
+        )
+      end
+
       def not_one_of(*values)
         OperatorExpression.new(
           Cuprum::Collections::Queries::Operators::NOT_ONE_OF,
-          values.flatten
+          flatten_values(values)
         )
       end
 
-      def one_of(*values)
+      def null
         OperatorExpression.new(
-          Cuprum::Collections::Queries::Operators::ONE_OF,
-          values.flatten
+          Cuprum::Collections::Queries::Operators::NULL,
+          nil
         )
       end
-    end
 
-    # @deprecated v0.5.0 Implicit receivers are deprecated. Remove this class
-    #   when removing the functionality.
-    class ImplicitReceiver
-      ERROR_MESSAGE =
-        'Pass a block with one parameter to #parse: { |scope| { ' \
-        'scope.%s: value } }'
-      private_constant :ERROR_MESSAGE
-
-      OPERATORS = %i[
-        eq
-        equal
-        equals
-        greater_than
-        greater_than_or_equal_to
-        gt
-        gte
-        less_than
-        less_than_or_equal_to
-        lt
-        lte
-        ne
-        not_equal
-        not_one_of
-        one_of
-      ].freeze
-      private_constant :OPERATORS
-
-      OPERATORS.each do |operator|
-        define_method(operator) do |*args, **kwargs, &block|
-          tools.core_tools.deprecate(
-            '#parse with implicit receiver',
-            message: format(ERROR_MESSAGE, operator)
-          )
-
-          BlockParser.instance.send(operator, *args, **kwargs, &block)
-        end
+      def one_of(*values)
+        OperatorExpression.new(
+          Cuprum::Collections::Queries::Operators::ONE_OF,
+          flatten_values(values)
+        )
       end
 
       private
 
-      def tools
-        SleepingKingStudios::Tools::Toolbelt.instance
+      def flatten_values(values)
+        values
+          .map { |item| item.is_a?(Set) ? item.to_a : item }
+          .flatten
       end
     end
 
@@ -173,6 +150,8 @@ module Cuprum::Collections::Scopes::Criteria
     def parse(value = UNKNOWN, &)
       if block_given? && value != UNKNOWN
         parse_hash(value) + parse_block(&)
+      elsif value.is_a?(Proc)
+        parse_block(&value)
       elsif value == UNKNOWN
         parse_block(&)
       else
@@ -229,13 +208,10 @@ module Cuprum::Collections::Scopes::Criteria
 
     private
 
-    # @deprecated v0.5.0 Implicit receivers are deprecated.
     def evaluate_block(&block)
-      receiver = ImplicitReceiver.new
-
-      return receiver.instance_exec(&block) if block.arity.zero?
+      return block.call if block.arity.zero?
 
-      receiver.instance_exec(BlockParser.instance, &block)
+      block.call(BlockParser.instance)
     end
   end
 end

data/lib/cuprum/collections/scopes/criteria.rb

@@ -43,12 +43,13 @@ module Cuprum::Collections::Scopes
       end
     end
 
-    # @param criteria [Array] the criteria used for filtering query data.
-    # @param inverted [Boolean] if true, the criteria are inverted and should
-    #   match on any criterion (per DeMorgan's Laws).
-    # @param options [Hash] additional options for the scope.
-    def initialize(criteria:, inverted: false, **options)
-      super(**options)
+    # @overload initialize(criteria:, inverted: false, **options)
+    #   @param criteria [Array] the criteria used for filtering query data.
+    #   @param inverted [Boolean] if true, the criteria are inverted and should
+    #     match on any criterion (per DeMorgan's Laws).
+    #   @param options [Hash] additional options for the scope.
+    def initialize(criteria:, inverted: false, **)
+      super(**)
 
       @criteria = criteria
       @inverted = inverted

data/lib/cuprum/collections/version.rb

@@ -11,13 +11,13 @@ module Cuprum
       # Major version.
       MAJOR = 0
       # Minor version.
-      MINOR = 5
+      MINOR = 6
       # Patch version.
-      PATCH = 1
+      PATCH = 0
       # Prerelease version.
-      PRERELEASE = nil
+      PRERELEASE = :rc
       # Build metadata.
-      BUILD = nil
+      BUILD = 1
 
       class << self
         # Generates the gem version string from the Version constants.

data/lib/cuprum/collections.rb

@@ -6,6 +6,9 @@ require 'cuprum'
 module Cuprum
   # A data abstraction layer based on the Cuprum library.
   module Collections
+    autoload :Adaptable,         'cuprum/collections/adaptable'
+    autoload :Adapter,           'cuprum/collections/adapter'
+    autoload :Adapters,          'cuprum/collections/adapters'
     autoload :Association,       'cuprum/collections/association'
     autoload :Associations,      'cuprum/collections/associations'
     autoload :Basic,             'cuprum/collections/basic'
@@ -13,6 +16,7 @@ module Cuprum
     autoload :CollectionCommand, 'cuprum/collections/collection_command'
     autoload :Commands,          'cuprum/collections/commands'
     autoload :Errors,            'cuprum/collections/errors'
+    autoload :Queries,           'cuprum/collections/queries'
     autoload :Query,             'cuprum/collections/query'
     autoload :Relation,          'cuprum/collections/relation'
     autoload :Relations,         'cuprum/collections/relations'
@@ -29,7 +33,7 @@ module Cuprum
       __dir__.sub(pattern, '')
     end
 
-    # @return [String] The current version of the gem.
+    # @return [String] the current version of the gem.
     def self.version
       VERSION
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuprum-collections
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0.rc.1
 platform: ruby
 authors:
 - Rob "Merlin" Smith
@@ -15,28 +15,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: sleeping_king_studios-tools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: stannum
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 description: An adapter library to provide a consistent interface between data stores.
 email:
 - merlin@sleepingkingstudios.com
@@ -51,6 +83,19 @@ files:
 - README.md
 - config/locales/en.rb
 - lib/cuprum/collections.rb
+- lib/cuprum/collections/adaptable.rb
+- lib/cuprum/collections/adaptable/collection.rb
+- lib/cuprum/collections/adaptable/command.rb
+- lib/cuprum/collections/adaptable/commands.rb
+- lib/cuprum/collections/adaptable/commands/abstract_assign_one.rb
+- lib/cuprum/collections/adaptable/commands/abstract_build_one.rb
+- lib/cuprum/collections/adaptable/commands/abstract_validate_one.rb
+- lib/cuprum/collections/adaptable/query.rb
+- lib/cuprum/collections/adapter.rb
+- lib/cuprum/collections/adapters.rb
+- lib/cuprum/collections/adapters/data_adapter.rb
+- lib/cuprum/collections/adapters/entity_adapter.rb
+- lib/cuprum/collections/adapters/hash_adapter.rb
 - lib/cuprum/collections/association.rb
 - lib/cuprum/collections/associations.rb
 - lib/cuprum/collections/associations/belongs_to.rb
@@ -128,12 +173,7 @@ files:
 - lib/cuprum/collections/resource.rb
 - lib/cuprum/collections/rspec.rb
 - lib/cuprum/collections/rspec/contracts.rb
-- lib/cuprum/collections/rspec/contracts/association_contracts.rb
-- lib/cuprum/collections/rspec/contracts/basic.rb
-- lib/cuprum/collections/rspec/contracts/collection_contracts.rb
-- lib/cuprum/collections/rspec/contracts/command_contracts.rb
 - lib/cuprum/collections/rspec/contracts/query_contracts.rb
-- lib/cuprum/collections/rspec/contracts/relation_contracts.rb
 - lib/cuprum/collections/rspec/contracts/repository_contracts.rb
 - lib/cuprum/collections/rspec/contracts/scope_contracts.rb
 - lib/cuprum/collections/rspec/contracts/scopes.rb
@@ -142,6 +182,7 @@ files:
 - lib/cuprum/collections/rspec/contracts/scopes/criteria_contracts.rb
 - lib/cuprum/collections/rspec/contracts/scopes/logical_contracts.rb
 - lib/cuprum/collections/rspec/deferred.rb
+- lib/cuprum/collections/rspec/deferred/adapter_examples.rb
 - lib/cuprum/collections/rspec/deferred/association_examples.rb
 - lib/cuprum/collections/rspec/deferred/collection_examples.rb
 - lib/cuprum/collections/rspec/deferred/command_examples.rb
@@ -155,8 +196,20 @@ files:
 - lib/cuprum/collections/rspec/deferred/commands/insert_one_examples.rb
 - lib/cuprum/collections/rspec/deferred/commands/update_one_examples.rb
 - lib/cuprum/collections/rspec/deferred/commands/validate_one_examples.rb
+- lib/cuprum/collections/rspec/deferred/query_examples.rb
 - lib/cuprum/collections/rspec/deferred/relation_examples.rb
+- lib/cuprum/collections/rspec/deferred/repository_examples.rb
 - lib/cuprum/collections/rspec/deferred/resource_examples.rb
+- lib/cuprum/collections/rspec/deferred/scope_examples.rb
+- lib/cuprum/collections/rspec/deferred/scopes.rb
+- lib/cuprum/collections/rspec/deferred/scopes/all_examples.rb
+- lib/cuprum/collections/rspec/deferred/scopes/builder_examples.rb
+- lib/cuprum/collections/rspec/deferred/scopes/composition_examples.rb
+- lib/cuprum/collections/rspec/deferred/scopes/conjunction_examples.rb
+- lib/cuprum/collections/rspec/deferred/scopes/criteria_examples.rb
+- lib/cuprum/collections/rspec/deferred/scopes/disjunction_examples.rb
+- lib/cuprum/collections/rspec/deferred/scopes/none_examples.rb
+- lib/cuprum/collections/rspec/deferred/scopes/parser_examples.rb
 - lib/cuprum/collections/rspec/fixtures.rb
 - lib/cuprum/collections/scope.rb
 - lib/cuprum/collections/scopes.rb
@@ -182,6 +235,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/sleepingkingstudios/cuprum-collections/issues
+  homepage_uri: http://sleepingkingstudios.com
   source_code_uri: https://github.com/sleepingkingstudios/cuprum-collections
   rubygems_mfa_required: 'true'
 rdoc_options: []
@@ -189,9 +243,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '3.2'
+  - - "<"
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="