azahara_schema 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fce09b13b68a342872733bbcc7fe3b18907a62af
-  data.tar.gz: 67f2b89be27832d8881b9f19409991bd63801331
+SHA256:
+  metadata.gz: 1eef15c0c5196c94a0e0620ab5cfc9f651b95137d070155311f435d7eea2a2aa
+  data.tar.gz: 2e32dfd0f89bc3d5a86cd752df9a92dc45c2e8a475534a1f12dfea430c6b74c2
 SHA512:
-  metadata.gz: 4e38cac517db7b62ce49c2c02d94a886dc970d4765743cee6288901b06e007a81aad43feaa9a7b4307a41ae8bd16e8dbeb974515475807d10c1bf21b897b7561
-  data.tar.gz: 49677a40199bcbf7e699351ca131225348d48fe82a96a503ccbd0045c23f72362f55de3f4d35b792687fd55f17059f4f731accbeba1abd1356ac3ca8603c074c
+  metadata.gz: 655ebda633024e86f39c2cd8bc88ac5ac4b8452c27f2929c96e42a1d6145248cf424c8985bbc61b137be3be8b9ccd6639b28d2596a3d094100903b59a96a306e
+  data.tar.gz: 2561c92dd7dcf913289b9250662b259c3b3bf89bddb7c6009a174ff69503b0acb445597264845e3ab99fbfe3fad4921ac5cdc8f28da46cd2441cd992b39b13bb

data/lib/azahara_schema/aggregation_attribute.rb

@@ -12,6 +12,10 @@ module AzaharaSchema
       super(model, 'sum:'+attribute.name, attribute.type)
     end
 
+    def searchable?
+      false
+    end
+
     def arel_field
       attribute.arel_field.sum
     end

data/lib/azahara_schema/association_attribute.rb

@@ -38,6 +38,10 @@ module AzaharaSchema
       association.macro == :belongs_to
     end
 
+    def searchable?
+      false
+    end
+
     def value(parent)
       if association.macro == :has_many
         parent.public_send(association.name).collect{|record| attribute.value( record )}.flatten

data/lib/azahara_schema/attribute.rb

@@ -55,32 +55,40 @@ module AzaharaSchema
       format.aggregable?
     end
 
-    def value(record)
-      record.public_send(name)
+    def searchable?
+      format.searchable?
     end
 
-    def add_preload(scope)
-      scope
+    def value(record)
+      record.public_send(name)
     end
 
-    def add_statement(scope, operator, values)
+    def arel_statement(operator, values)
       values = [values] unless values.is_a?(Array)
       case operator
       when '='
-        scope.where( arel_field.in(values) )
+        arel_field.in(values)
       when '~'
         arl = arel_field.matches("%#{values[0]}%")
         values[1..-1].each{|v| arl = arl.or( arel_field.matches("%#{v}%") ) }
-        scope.where( arl )
+        arl
       when '>='
-        scope.where( arel_field.gteq(values.map(&:to_f).min) )
+        arel_field.gteq(values.map(&:to_f).min)
       when '<='
-        scope.where( arel_field.lteq(values.map(&:to_f).max) )
+        arel_field.lteq(values.map(&:to_f).max)
       else
         throw 'Unknown operator ' + operator.to_s
       end
     end
 
+    def add_preload(scope)
+      scope
+    end
+
+    def add_statement(scope, operator, values)
+      scope.where(arel_statement(operator, values))
+    end
+
     def add_sort(scope, order)
       scope.order( arel_sort_field.public_send(order) )
     end

data/lib/azahara_schema/field_format.rb

@@ -51,6 +51,10 @@ module AzaharaSchema
       def aggregable?
         false
       end
+
+      def searchable?
+        false
+      end
     end
 
     class NumberFormat < Base
@@ -85,6 +89,10 @@ module AzaharaSchema
       def available_operators
         super.concat(['~'])
       end
+
+      def searchable?
+        true
+      end
     end
 
     class ListFormat < StringFormat

data/lib/azahara_schema/schema.rb

@@ -30,6 +30,7 @@ module AzaharaSchema
     end
 
     attr_accessor :model, :association, :parent_schema
+    attr_accessor :search_query
 
     def initialize(model, **attributes)
       @model = model
@@ -38,6 +39,10 @@ module AzaharaSchema
       @column_names = attributes[:columns]
     end
 
+    def searchable_attributes
+      @searchable_attributes ||= available_attributes.select{|a| a.searchable? }
+    end
+
     def column_names=(values)
       @column_names = values
       @columns = nil
@@ -189,6 +194,10 @@ module AzaharaSchema
       Outputs.new(self)
     end
 
+    def tokenize_search_query(query=search_query)
+      query.split if query
+    end
+
     def entities
       scope = model.respond_to?(:visible) ? model.visible : model.all
       columns.each do |col|
@@ -201,6 +210,11 @@ module AzaharaSchema
         att = attribute(name)
         scope = att.add_sort(scope, order) if att
       end
+      if (tokens = tokenize_search_query)
+        arl = searchable_attributes[0].arel_statement('~', tokens) if searchable_attributes.any?
+        Array(searchable_attributes[1..-1]).each{|att| arl = arl.or( att.arel_statement('~', tokens) ) }
+        scope = scope.where(arl)
+      end
       scope
     end
 
@@ -240,6 +254,7 @@ module AzaharaSchema
           add_sort(sort[:path], sort['desc'] == 'true' ? :desc : :asc )
         end
       end
+      self.search_query = params[:q] if params[:q]
     end
 
     def to_param
@@ -249,6 +264,7 @@ module AzaharaSchema
         params[:f][fname] = "#{attrs[:o]}|#{attrs[:v]}"
       end
       params[:c] = column_names
+      params[:q] = search_query if params[:q]
       params
     end
 

data/lib/azahara_schema/version.rb

@@ -1,3 +1,3 @@
 module AzaharaSchema
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azahara_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.0
 signing_key: 
 specification_version: 4
 summary: Gem to support developement of rails application with schema over an entity