stretchy-model 0.3.0 → 0.4.0

data/lib/stretchy/relations/finder_methods.rb

@@ -9,7 +9,15 @@ module Stretchy
         end
 
         def first!
-          spawn.sort(Hash[default_sort_key, :asc]).spawn.size(1)
+          spawned = spawn
+          if spawned.order_values.length.zero? 
+            spawn.sort(Hash[default_sort_key, :asc]).spawn.size(1)
+          elsif spawned.order_values.length >= 1
+            first_order_value = spawned.order_values.shift
+            new_direction = Hash[first_order_value.keys.first, :asc] 
+            spawned.order_values.unshift(new_direction)
+            spawned.size(1)
+          end
           self
         end
 
@@ -19,7 +27,15 @@ module Stretchy
         end
 
         def last!
-          spawn.sort(Hash[default_sort_key, :desc]).spawn.size(1)
+          spawned = spawn
+          if spawned.order_values.length.zero?
+            spawn.sort(Hash[default_sort_key, :desc]).spawn.size(1)
+          elsif spawned.order_values.length >= 1
+            first_order_value = spawned.order_values.shift
+            new_direction = Hash[first_order_value.keys.first, :desc] 
+            spawned.order_values.unshift(new_direction)
+            spawned.size(1)
+          end
           self
         end
 
@@ -31,7 +47,9 @@ module Stretchy
         def count!
           @values[:count] = true
           @values.delete(:size)
-          spawn.results
+          spawned = spawn
+          spawned.order_values.clear
+          spawned.results
         end
 
       end

data/lib/stretchy/relations/merger.rb

@@ -50,7 +50,7 @@ module Stretchy
           @other    = other
         end
 
-        NORMAL_VALUES = [:where, :first, :last, :filter]
+        NORMAL_VALUES = [:where, :first, :last, :filter_query]
 
         def normal_values
           NORMAL_VALUES
@@ -67,7 +67,7 @@ module Stretchy
             unless value.nil? || (value.blank? && false != value)
               if name == :select
                 relation._select!(*value)
-              elsif name == :filter
+              elsif name == :filter_query
                 values.each do |v|
                   relation.send("#{name}!", v.first, v.last)
                 end
@@ -114,19 +114,19 @@ module Stretchy
           lhs_wheres = relation.where_values
           rhs_wheres = values[:where] || []
 
-          lhs_filters = relation.filter_values
-          rhs_filters = values[:filter] || []
+          lhs_filters = relation.filter_query_values
+          rhs_filters = values[:filter_query] || []
 
           removed, kept = partition_overwrites(lhs_wheres, rhs_wheres)
 
           where_values = kept + rhs_wheres
 
           filters_removed, filters_kept = partition_overwrites(lhs_wheres, rhs_wheres)
-          filter_values =  rhs_filters
+          filter_query_values =  rhs_filters
 
 
           relation.where_values = where_values.empty? ? nil : where_values
-          relation.filter_values = filter_values.empty? ? nil : filter_values
+          relation.filter_query_values = filter_query_values.empty? ? nil : filter_query_values
 
           if values[:reordering]
             # override any order specified in the original relation

data/lib/stretchy/relations/query_builder.rb

@@ -2,9 +2,10 @@ module Stretchy
   module Relations
     class QueryBuilder
 
-      attr_reader :structure, :values
+      attr_reader :structure, :values, :attribute_types
 
-      def initialize(values)
+      def initialize(values, attribute_types = nil)
+        @attribute_types = attribute_types
         @structure = Jbuilder.new ignore_nil: true
         @values = values
       end
@@ -14,7 +15,7 @@ module Stretchy
       end
 
       def filters
-        values[:filter]
+        values[:filter_query]
       end
 
       def or_filters
@@ -58,7 +59,7 @@ module Stretchy
       end
 
       def query_filters
-        values[:filter]
+        values[:filter_query]
       end
 
       def search_options
@@ -149,7 +150,7 @@ module Stretchy
       end
 
       def build_sort
-        structure.sort sort.flatten #.inject(Hash.new) { |h,v| h.merge(v) }
+        structure.sort sort.map { |arg| keyword_transformer.transform(arg) }.flatten
       end
 
       def build_highlights
@@ -165,7 +166,7 @@ module Stretchy
       def build_aggregations
         structure.aggregations do
           aggregations.each do |agg|
-            structure.set! agg[:name], aggregation(agg[:name], agg[:args])
+            structure.set! agg[:name], aggregation(agg[:name], keyword_transformer.transform(agg[:args], :name))
           end
         end
       end
@@ -199,13 +200,23 @@ module Stretchy
       def as_must(q)
         _must = []
         q.each do |arg|
-          arg.each_pair { |k,v| _must << (v.is_a?(Array) ? {terms: Hash[k,v]} : {term: Hash[k,v]}) } if arg.class == Hash
-          _must << {term: Hash[[arg.split(/:/).collect(&:strip)]]} if arg.class == String
-          _must << arg.first if arg.class == Array
+          case arg
+          when Hash
+            arg = keyword_transformer.transform(arg)
+            arg.each_pair do |k,v| 
+              # If v is an array, we build a terms query otherwise a term query
+              _must << (v.is_a?(Array) ? {terms: Hash[k,v]} : {term: Hash[k,v]}) 
+            end
+          when String
+            _must << {term: Hash[[arg.split(/:/).collect(&:strip)]]}
+          when Array
+            _must << arg.first
+          end
         end
         _must.length == 1 ? _must.first : _must
       end
 
+
       def as_query_string(q)
         _and = []
 
@@ -260,6 +271,9 @@ module Stretchy
         end
       end
 
+      def keyword_transformer
+        @keyword_transformer ||= Stretchy::Attributes::Transformers::KeywordTransformer.new(@attribute_types)
+      end
     end
   end
 end

data/lib/stretchy/relations/query_methods.rb

@@ -15,7 +15,7 @@ module Stretchy
         :query_string,
         :aggregation,
         :search_option,
-        :filter, 
+        :filter_query, 
         :or_filter,
         :extending,
         :skip_callbacks
@@ -308,7 +308,7 @@ module Stretchy
 
 
 
-      # @deprecated in elasticsearch 7.x+ use {#filter} instead
+      # @deprecated in elasticsearch 7.x+ use {#filter_query} instead
       def or_filter(name, options = {}, &block)
         spawn.or_filter!(name, options, &block)
       end
@@ -322,53 +322,27 @@ module Stretchy
       #
       # This method supports all filters supported by Elasticsearch.
       #
-      # @overload filter(type, opts)
+      # @overload filter_query(type, opts)
       #   @param type [Symbol] the type of filter to add (:range, :term, etc.)
       #   @param opts [Hash] a hash containing the attribute and value to filter by
       #
       # @example
-      #   Model.filter(:range, age: {gte: 30})
-      #   Model.filter(:term, color: :blue)
+      #   Model.filter_query(:range, age: {gte: 30})
+      #   Model.filter_query(:term, color: :blue)
       #
       # @return [Stretchy::Relation] a new relation, which reflects the filter
-      def filter(name, options = {}, &block)
-        spawn.filter!(name, options, &block)
+      def filter_query(name, options = {}, &block)
+        spawn.filter_query!(name, options, &block)
       end
 
-      def filter!(name, options = {}, &block) # :nodoc:
-        self.filter_values += [{name: name, args: options}]
+      def filter_query!(name, options = {}, &block) # :nodoc:
+        self.filter_query_values += [{name: name, args: options}]
         self
       end
 
 
 
-      # Adds an aggregation to the query.
-      #
-      # @param name [Symbol, String] the name of the aggregation
-      # @param options [Hash] a hash of options for the aggregation
-      # @param block [Proc] an optional block to further configure the aggregation
-      #
-      # @example
-      #   Model.aggregation(:avg_price, field: :price)
-      #   Model.aggregation(:price_ranges) do
-      #     range field: :price, ranges: [{to: 100}, {from: 100, to: 200}, {from: 200}]
-      #   end
-      #
-      # Aggregation results are available in the `aggregations` method of the results under name provided in the aggregation.
-      #
-      # @example
-      #  results = Model.where(color: :blue).aggregation(:avg_price, field: :price)
-      #  results.aggregations.avg_price
-      #
-      # @return [Stretchy::Relation] a new relation
-      def aggregation(name, options = {}, &block)
-        spawn.aggregation!(name, options, &block)
-      end
 
-      def aggregation!(name, options = {}, &block) # :nodoc:
-        self.aggregation_values += [{name: name, args: assume_keyword_field(options)}]
-        self
-      end
 
 
 
@@ -430,7 +404,7 @@ module Stretchy
       #
       # @return [ActiveRecord::Relation] a new relation, which reflects the exists filter
       def has_field(field)
-        spawn.filter(:exists, {field: field})
+        spawn.filter_query(:exists, {field: field})
       end
 
 

data/lib/stretchy/utils.rb

@@ -2,6 +2,27 @@ module Stretchy
     module Utils
         extend ActiveSupport::Concern
 
+            concerning :ConsoleMethods do
+                def reload!
+                    Stretchy.loader.reload
+                end
+
+                def banner
+                    banner = <<~BANNER
+                                    
+                                                                    d8b                
+                               d8P                     d8P          ?88                
+                            d888888P                d888888P         88b               
+                     .d888b,  ?88'    88bd88b d8888b  ?88'   d8888b  888888b ?88   d8P 
+                     ?8b,     88P     88P'  `d8b_,dP  88P   d8P' `P  88P `?8bd88   88  
+                       `?8b   88b    d88     88b      88b   88b     d88   88P?8(  d88  
+                    `?888P'   `?8b  d88'     `?888P'  `?8b  `?888P'd88'   88b`?88P'?8b 
+                                                                                    )88
+                                                                                   ,d8P
+                                                                                `?888P'
+                    BANNER
+                end
+            end
 
             def self.to_curl(klass, arguments = {}, end_point = "_search")
                 host = klass.gateway.client.transport.transport.hosts&.first || klass.gateway.client.transport.transport.options[:url]

data/lib/stretchy/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Stretchy
-  VERSION = "0.3.0"
+  VERSION = '0.4.0'
 end

data/lib/stretchy.rb

@@ -10,13 +10,28 @@ require 'active_support/all'
 require 'active_model/type/array'
 require 'active_model/type/hash'
 
-ActiveModel::Type.register(:array, ActiveModel::Type::Array)
-ActiveModel::Type.register(:hash, ActiveModel::Type::Hash)
-
 require_relative "stretchy/version"
 require_relative "rails/instrumentation/railtie" if defined?(Rails)
 
+
+
 module Stretchy
+
+  def self.loader
+    @loader ||= begin
+      loader = Zeitwerk::Loader.new
+      loader.tag = File.basename(__FILE__, ".rb")
+      loader.inflector = Zeitwerk::GemInflector.new(__FILE__)
+      loader.push_dir(__dir__)
+      loader
+    end
+  end
+
+  def self.boot!
+    loader.setup
+    Stretchy::Attributes.register!
+  end
+
   module Errors
     class QueryOptionMissing < StandardError; end
   end
@@ -61,12 +76,9 @@ module Stretchy
     end
   end
 
-end
 
+end
 
+Stretchy.loader.enable_reloading if defined?(Rails) && Rails.env.development? || ENV['RACK_ENV'] == 'development'
+Stretchy.boot!
 
-loader = Zeitwerk::Loader.new
-loader.tag = File.basename(__FILE__, ".rb")
-loader.inflector = Zeitwerk::GemInflector.new(__FILE__)
-loader.push_dir(__dir__)
-loader.setup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretchy-model
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Spencer Markowski
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-06 00:00:00.000000000 Z
+date: 2024-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -178,6 +178,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.20'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.20'
+- !ruby/object:Gem::Dependency
+  name: versionomy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 description: Provides a familiar ActiveRecord-like interface for working with Elasticsearch
 email:
 - spencer.markowski@theablefew.com
@@ -204,6 +232,9 @@ files:
 - lib/stretchy/associations.rb
 - lib/stretchy/associations/associated_validator.rb
 - lib/stretchy/associations/elastic_relation.rb
+- lib/stretchy/attributes.rb
+- lib/stretchy/attributes/transformers/keyword_transformer.rb
+- lib/stretchy/attributes/type/keyword.rb
 - lib/stretchy/common.rb
 - lib/stretchy/delegation/delegate_cache.rb
 - lib/stretchy/delegation/gateway_delegation.rb
@@ -217,6 +248,7 @@ files:
 - lib/stretchy/record.rb
 - lib/stretchy/refreshable.rb
 - lib/stretchy/relation.rb
+- lib/stretchy/relations/aggregation_methods.rb
 - lib/stretchy/relations/finder_methods.rb
 - lib/stretchy/relations/merger.rb
 - lib/stretchy/relations/query_builder.rb
@@ -257,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Rails ORM for Elasticsearch