stretchy-model 0.3.0 → 0.5.0

data/lib/stretchy/attributes.rb

@@ -0,0 +1,30 @@
+module Stretchy
+  module Attributes
+    extend ActiveSupport::Concern
+
+    def [](attribute)
+      self.send(attribute)
+    end
+
+    def []=(attribute, value)
+        self.send("#{attribute}=", value)
+    end
+
+    def inspect
+      "#<#{self.class.name} #{attributes.map { |k,v| "#{k}: #{v.blank? ? 'nil' : v}" }.join(', ')}>"
+    end
+
+    class_methods do
+      def inspect
+        "#<#{self.name} #{attribute_types.map { |k,v| "#{k}: #{v.type}" }.join(', ')}>"
+      end
+    end
+
+    def self.register!
+      ActiveModel::Type.register(:array, Stretchy::Attributes::Type::Array)
+      ActiveModel::Type.register(:hash, Stretchy::Attributes::Type::Hash)
+      ActiveModel::Type.register(:keyword, Stretchy::Attributes::Type::Keyword)
+      ActiveModel::Type.register(:text, Stretchy::Attributes::Type::Text)
+    end
+  end
+end

data/lib/stretchy/common.rb

@@ -2,11 +2,10 @@ module Stretchy
     module Common
         extend ActiveSupport::Concern
 
-        def inspect
-            "#<#{self.class.name} #{attributes.map { |k,v| "#{k}: #{v.blank? ? 'nil' : v}" }.join(', ')}>"
+        def highlights_for(attribute)
+            highlights[attribute.to_s]
         end
 
-
         class_methods do
 
             # Set the default sort key to be used in sort operations

data/lib/stretchy/delegation/gateway_delegation.rb

@@ -28,11 +28,17 @@ module Stretchy
           if @index_name.respond_to?(:call)
             @index_name.call
           else
-            @index_name || base_class.model_name.collection
+            @index_name || base_class.model_name.collection.parameterize.underscore
           end
       end
 
+      def reload_gateway_configuration!
+        @gateway = nil
+      end
+
       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

data/lib/stretchy/model/serialization.rb

@@ -9,6 +9,7 @@ module Stretchy
 
             def deserialize(document)
                 attribs = ActiveSupport::HashWithIndifferentAccess.new(document['_source']).deep_symbolize_keys
+                attribs[:_highlights] = document["highlight"] if document["highlight"]
                 _id = __get_id_from_document(document)
                 attribs[:id] = _id if _id
                 klass.new attribs

data/lib/stretchy/querying.rb

@@ -1,11 +1,12 @@
 module Stretchy
   module Querying
     delegate :first, :first!, :last, :last!, :exists?, :has_field, :any?, :many?, to: :all
-    delegate :order, :limit, :size, :sort, :where, :rewhere, :eager_load, :includes,  :create_with, :none, :unscope, to: :all
-    delegate :or_filter, :filter, :fields, :source, :highlight, :aggregation, to: :all
-    delegate :skip_callbacks, :routing, to: :all
-    delegate :search_options, :routing, to: :all
-    delegate :must, :must_not, :should, :where_not, :query_string, to: :all
+    delegate :order, :limit, :size, :sort, :rewhere, :eager_load, :includes,  :create_with, :none, :unscope, to: :all
+    delegate :or_filter, :fields, :source, :highlight, to: :all
+    delegate *Stretchy::Relations::AggregationMethods::AGGREGATION_METHODS, to: :all
+
+    delegate :skip_callbacks, :routing, :search_options, to: :all
+    delegate :must, :must_not, :should, :where_not, :where, :filter_query, :query_string, :regexp, to: :all
 
     def fetch_results(es)
       unless es.count?

data/lib/stretchy/record.rb

@@ -14,11 +14,6 @@ module Stretchy
                 include ActiveModel::Conversion
                 include ActiveModel::Serialization
                 include ActiveModel::Serializers::JSON
-                include ActiveModel::Validations
-                include ActiveModel::Validations::Callbacks
-                extend ActiveModel::Callbacks
-
-
 
                 include Stretchy::Model::Callbacks
                 include Stretchy::Indexing::Bulk
@@ -28,6 +23,8 @@ module Stretchy
                 include Stretchy::Common
                 include Stretchy::Scoping
                 include Stretchy::Utils
+                include Stretchy::SharedScopes
+                include Stretchy::Attributes
 
                 extend Stretchy::Delegation::DelegateCache
                 extend Stretchy::Querying
@@ -44,11 +41,13 @@ module Stretchy
                 # overriden by #size
                 default_size 10000
 
-            end
+                attr_accessor :highlights
+
+                def initialize(attributes = {})
+                    @highlights = attributes.delete(:_highlights) 
+                    super(attributes)
+                end
 
-            def initialize(attributes = {})
-                self.assign_attributes(attributes) if attributes
-                super()
             end
 
         end

data/lib/stretchy/relation.rb

@@ -3,20 +3,16 @@ module Stretchy
     # It provides methods for querying and manipulating the documents.
     class Relation
 
-        # These methods can accept multiple values.
-        MULTI_VALUE_METHODS  = [:order, :where, :or_filter, :filter, :bind, :extending, :unscope, :skip_callbacks]
-
-        # These methods can accept a single value.
-        SINGLE_VALUE_METHODS = [:limit, :offset, :routing, :size]
-
         # These methods cannot be used with the `delete_all` method.
         INVALID_METHODS_FOR_DELETE_ALL = [:limit, :offset]
 
-        # All value methods.
-        VALUE_METHODS = MULTI_VALUE_METHODS + SINGLE_VALUE_METHODS
-
         # Include modules.
-        include Relations::FinderMethods, Relations::SpawnMethods, Relations::QueryMethods, Relations::SearchOptionMethods, Delegation
+        include Relations::FinderMethods, 
+                Relations::SpawnMethods, 
+                Relations::QueryMethods, 
+                Relations::AggregationMethods, 
+                Relations::SearchOptionMethods, 
+                Delegation
 
         # Getters.
         attr_reader :klass, :loaded
@@ -49,14 +45,13 @@ module Stretchy
         #
         # @return [Array] The results of the relation.
         def to_a
-
           load
           @records
         end
         alias :results :to_a
 
         def response
-          to_a.response
+          results.response
         end
 
         # Returns the results of the relation as a JSON object.
@@ -64,7 +59,7 @@ module Stretchy
         # @param options [Hash] The options to pass to the `as_json` method.
         # @return [Hash] The results of the relation as a JSON object.
         def as_json(options = nil)
-          to_a.as_json(options)
+          results.as_json(options)
         end
 
         # Returns the Elasticsearch query for the relation.
@@ -98,7 +93,6 @@ module Stretchy
         # @return [Relation] The relation object.
         def load
           exec_queries unless loaded?
-
           self
         end
         alias :fetch :load
@@ -146,8 +140,8 @@ module Stretchy
           begin
             entries = to_a.results.take([size_value.to_i + 1, 11].compact.min).map!(&:inspect)
             message = {}
-            message = {total: to_a.total, max: to_a.total}
-            message.merge!(aggregations: results.response.aggregations.keys) unless results.response.aggregations.nil?
+            message = {total: results.total, max: results.total}
+            message.merge!(aggregations: response.aggregations.keys) unless response.aggregations.nil?
             message = message.each_pair.collect { |k,v|  "#{k}: #{v}" }
             message.unshift entries.join(', ') unless entries.size.zero?
             "#<#{self.class.name} #{message.join(', ')}>"
@@ -162,7 +156,7 @@ module Stretchy
         #
         # @return [QueryBuilder] The query builder for the relation.
         def query_builder
-          Relations::QueryBuilder.new(values)
+          Relations::QueryBuilder.new(values, klass.attribute_types)
         end
 
     end