stretchy-model 0.5.0 → 0.6.0

data/lib/stretchy/common.rb

@@ -15,8 +15,9 @@ module Stretchy
                 @default_sort_key
             end
 
-            def default_size(size = 10000)
-                @default_size = size
+            def default_size(size = nil)
+                @default_size = size unless size.nil?
+                @default_size
             end
 
             private

data/lib/stretchy/delegation/gateway_delegation.rb

@@ -18,8 +18,6 @@ module Stretchy
                 :count,
         to: :gateway
 
-      include Rails::Instrumentation::Publishers::Record
-
       def index_name(name=nil, &block)
           if name || block_given?
             return (@index_name = name || block)
@@ -39,8 +37,8 @@ module Stretchy
       def gateway(&block)
           reload_gateway_configuration! if @gateway && @gateway.client != Stretchy.configuration.client
             
-          @gateway ||= Stretchy::Repository.create(client: Stretchy.configuration.client, index_name: index_name, klass: base_class)
-          block.arity < 1 ? @gateway.instance_eval(&block) : block.call(@gateway) if block_given?
+          @gateway ||= Stretchy::Repository.create(client: Stretchy.configuration.client, index_name: index_name, klass: base_class, mapping: base_class.attribute_mappings.merge(dynamic: true)) 
+          # block.arity < 1 ? @gateway.instance_eval(&block) : block.call(@gateway) if block_given?
           @gateway
       end
 

data/lib/stretchy/querying.rb

@@ -9,10 +9,10 @@ module Stretchy
     delegate :must, :must_not, :should, :where_not, :where, :filter_query, :query_string, :regexp, to: :all
 
     def fetch_results(es)
-      unless es.count?
-        base_class.search(es.to_elastic, es.search_options)
-      else
+      if es.count?
         base_class.count(es.to_elastic, es.search_options)
+      else
+        base_class.search(es.to_elastic, es.search_options)
       end
     end
 

data/lib/stretchy/record.rb

@@ -30,7 +30,7 @@ module Stretchy
                 extend Stretchy::Querying
 
                 # Set up common attributes
-                attribute :id, :string #, default: lambda { SecureRandom.uuid }
+                attribute :id, :keyword #, default: lambda { SecureRandom.uuid }
                 attribute :created_at, :datetime, default: lambda {  Time.now.utc }
                 attribute :updated_at, :datetime, default: lambda { Time.now.utc }
 

data/lib/stretchy/relation.rb

@@ -28,7 +28,7 @@ module Stretchy
         # @param values [Hash] The initial values for the relation.
         def initialize(klass, values={})
             @klass  = klass
-            @values = values
+            @values = values.merge(default_size: klass.default_size)
             @offsets = {}
             @loaded = false
         end

data/lib/stretchy/relations/finder_methods.rb

@@ -39,14 +39,31 @@ module Stretchy
           self
         end
 
+        # size is not permitted to the count API but queries are.
+        #
+        # if a query is supplied with `.count` then the user wants a count of the results
+        # matching the query
+        #  
+        # however, the default_size is used to limit the number of results returned
+        # so we remove the size from the query and then call `.count` API
+        #
+        # but if the user supplies a limit, then we should assume they want a count of the results
+        # which could lead to some confusion 
+        # suppose the user calls `.size(100).count` and the default_size is 100
+        # if we remove size from the query, then the count could be greater than 100
+        # 
+        # I think the best way to handle this is to remove the size from the query only if it was  
+        # applied by the default_size
+        # If the user supplies a limit, then we should assume they want a count of the results
+        # 
+        # if size is called with a limit,
         def count
-          return results.count if @loaded
+          return results.count if @loaded || @values[:size].present?
           spawn.count!
         end
 
         def count!
           @values[:count] = true
-          @values.delete(:size)
           spawned = spawn
           spawned.order_values.clear
           spawned.results

data/lib/stretchy/relations/query_builder.rb

@@ -2,11 +2,12 @@ module Stretchy
   module Relations
     class QueryBuilder
 
-      attr_reader :structure, :values, :attribute_types
+      attr_reader :structure, :values, :attribute_types, :default_size
 
       def initialize(values, attribute_types = nil)
         @attribute_types = attribute_types
         @structure = Jbuilder.new ignore_nil: true
+        @default_size = values.delete(:default_size)
         @values = values
       end
 
@@ -208,6 +209,11 @@ module Stretchy
       end
 
       def extra_search_options
+        unless self.count?
+          values[:size] = size.present? ? size : values[:default_size]
+        else 
+          values[:size] = nil
+        end
         [:size].inject(Hash.new) { |h,k| h[k] = self.send(k) unless self.send(k).nil?; h}
       end
 

data/lib/stretchy/scoping/named.rb

@@ -8,7 +8,7 @@ module Stretchy
           if current_scope
             current_scope.clone
           else
-            default_scoped.size(default_size)
+            default_scoped
           end
         end
 

data/lib/stretchy/version.rb

@@ -1,3 +1,3 @@
 module Stretchy
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/lib/stretchy.rb

@@ -12,7 +12,6 @@ require_relative "stretchy/version"
 require_relative "rails/instrumentation/railtie" if defined?(Rails)
 
 
-
 module Stretchy
 
   def self.loader
@@ -21,6 +20,7 @@ module Stretchy
       loader.tag = File.basename(__FILE__, ".rb")
       loader.inflector = Zeitwerk::GemInflector.new(__FILE__)
       loader.push_dir(__dir__)
+      loader.inflector.inflect("ip" => "IP")
       loader
     end
   end
@@ -30,6 +30,10 @@ module Stretchy
     Stretchy::Attributes.register!
   end
 
+  def self.instrument!
+    Stretchy::Delegation::GatewayDelegation.send(:include, Rails::Instrumentation::Publishers::Record)
+  end
+
   module Errors
     class QueryOptionMissing < StandardError; end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretchy-model
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Spencer Markowski
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-14 00:00:00.000000000 Z
+date: 2024-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -233,9 +233,52 @@ files:
 - lib/stretchy/attributes.rb
 - lib/stretchy/attributes/transformers/keyword_transformer.rb
 - lib/stretchy/attributes/type/array.rb
+- lib/stretchy/attributes/type/base.rb
+- lib/stretchy/attributes/type/binary.rb
+- lib/stretchy/attributes/type/boolean.rb
+- lib/stretchy/attributes/type/completion.rb
+- lib/stretchy/attributes/type/constant_keyword.rb
+- lib/stretchy/attributes/type/date_time.rb
+- lib/stretchy/attributes/type/dense_vector.rb
+- lib/stretchy/attributes/type/flattened.rb
+- lib/stretchy/attributes/type/geo_point.rb
+- lib/stretchy/attributes/type/geo_shape.rb
 - lib/stretchy/attributes/type/hash.rb
+- lib/stretchy/attributes/type/histogram.rb
+- lib/stretchy/attributes/type/ip.rb
+- lib/stretchy/attributes/type/join.rb
 - lib/stretchy/attributes/type/keyword.rb
+- lib/stretchy/attributes/type/match_only_text.rb
+- lib/stretchy/attributes/type/nested.rb
+- lib/stretchy/attributes/type/numeric/base.rb
+- lib/stretchy/attributes/type/numeric/byte.rb
+- lib/stretchy/attributes/type/numeric/double.rb
+- lib/stretchy/attributes/type/numeric/float.rb
+- lib/stretchy/attributes/type/numeric/half_float.rb
+- lib/stretchy/attributes/type/numeric/integer.rb
+- lib/stretchy/attributes/type/numeric/long.rb
+- lib/stretchy/attributes/type/numeric/scaled_float.rb
+- lib/stretchy/attributes/type/numeric/short.rb
+- lib/stretchy/attributes/type/numeric/unsigned_long.rb
+- lib/stretchy/attributes/type/percolator.rb
+- lib/stretchy/attributes/type/point.rb
+- lib/stretchy/attributes/type/range/base.rb
+- lib/stretchy/attributes/type/range/date_range.rb
+- lib/stretchy/attributes/type/range/double_range.rb
+- lib/stretchy/attributes/type/range/float_range.rb
+- lib/stretchy/attributes/type/range/integer_range.rb
+- lib/stretchy/attributes/type/range/ip_range.rb
+- lib/stretchy/attributes/type/range/long_range.rb
+- lib/stretchy/attributes/type/rank_feature.rb
+- lib/stretchy/attributes/type/rank_features.rb
+- lib/stretchy/attributes/type/search_as_you_type.rb
+- lib/stretchy/attributes/type/shape.rb
+- lib/stretchy/attributes/type/sparse_vector.rb
+- lib/stretchy/attributes/type/string.rb
 - lib/stretchy/attributes/type/text.rb
+- lib/stretchy/attributes/type/token_count.rb
+- lib/stretchy/attributes/type/version.rb
+- lib/stretchy/attributes/type/wildcard.rb
 - lib/stretchy/common.rb
 - lib/stretchy/delegation/delegate_cache.rb
 - lib/stretchy/delegation/gateway_delegation.rb