azahara_schema 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eef15c0c5196c94a0e0620ab5cfc9f651b95137d070155311f435d7eea2a2aa
-  data.tar.gz: 2e32dfd0f89bc3d5a86cd752df9a92dc45c2e8a475534a1f12dfea430c6b74c2
+  metadata.gz: 8f0db3b78bc382f903651efa08c761043b41b275a8083e80abd8312a469f4ebc
+  data.tar.gz: c04982362bae33d86ca54871434b4c1bb505736693474ad0d524b0b660e72b51
 SHA512:
-  metadata.gz: 655ebda633024e86f39c2cd8bc88ac5ac4b8452c27f2929c96e42a1d6145248cf424c8985bbc61b137be3be8b9ccd6639b28d2596a3d094100903b59a96a306e
-  data.tar.gz: 2561c92dd7dcf913289b9250662b259c3b3bf89bddb7c6009a174ff69503b0acb445597264845e3ab99fbfe3fad4921ac5cdc8f28da46cd2441cd992b39b13bb
+  metadata.gz: 306733e9ee95f23c196722090ef685803fe70362e7ea53926086ff06585ba7572c30203bf59213be4f4983a72a55346fc06b1e97e034e55c800ee363822d99d2
+  data.tar.gz: 1671a967d34d162d9afb2ed3f7712be43f11efb275241c597787395e289aa023cf5868a160fa73f125af7486eda3b0f832187a6fa9642638d56f12aed2043f78

data/lib/azahara_schema/association_attribute.rb

@@ -46,7 +46,8 @@ module AzaharaSchema
       if association.macro == :has_many
         parent.public_send(association.name).collect{|record| attribute.value( record )}.flatten
       else
-        attribute.value( parent.public_send(association.name) )
+        entity = parent.public_send(association.name)
+        attribute.value( entity ) if entity
       end
     end
 
@@ -54,6 +55,10 @@ module AzaharaSchema
       { association.name => attribute.association_hash }
     end
 
+    def arel_statement(operator, values)
+      attribute.arel_statement(operator, values)
+    end
+
     def add_join(scope)
       scope.includes(association_hash).references(association_hash)
     end

data/lib/azahara_schema/attribute.rb

@@ -63,14 +63,15 @@ module AzaharaSchema
       record.public_send(name)
     end
 
+    # values has to be array!
     def arel_statement(operator, values)
-      values = [values] unless values.is_a?(Array)
       case operator
       when '='
         arel_field.in(values)
       when '~'
-        arl = arel_field.matches("%#{values[0]}%")
-        values[1..-1].each{|v| arl = arl.or( arel_field.matches("%#{v}%") ) }
+        vals = values.collect{|v| v.split }.flatten
+        arl = arel_field.matches("%#{vals[0]}%")
+        vals[1..-1].each{|v| arl = arl.or( arel_field.matches("%#{v}%") ) }
         arl
       when '>='
         arel_field.gteq(values.map(&:to_f).min)
@@ -81,11 +82,16 @@ module AzaharaSchema
       end
     end
 
+    def add_join(scope)
+      scope
+    end
+
     def add_preload(scope)
       scope
     end
 
     def add_statement(scope, operator, values)
+      values = [values] unless values.is_a?(Array)
       scope.where(arel_statement(operator, values))
     end
 

data/lib/azahara_schema/derived_attribute.rb

@@ -0,0 +1,88 @@
+# Author::    Ondřej Ezr  (mailto:oezr@msp.justice.cz)
+# Copyright:: Copyright (c) 2017 Ministry of Justice
+# License::   Distributes under license Open Source Licence pro Veřejnou Správu a Neziskový Sektor v.1
+
+module AzaharaSchema
+
+  # The class is attribute for derivateve attribute, it is used for working with combination of attributes as one attribute.
+  class DerivedAttribute < Attribute
+
+    attr_accessor :derivation_method
+    attr_accessor :attribute_names
+
+    def initialize(model, name, derivation_method, *attribute_names, **options)
+      self.attribute_names = attribute_names
+      self.derivation_method = derivation_method.to_sym
+      @options = options
+      super(model, name, type)
+    end
+
+    # ------------------| MY METHODS |----------------------
+
+    # TODO: check if attributes support derivation method
+    def attribute_names=(names)
+      @attributes = nil
+      @attribute_names = names
+    end
+
+    def attributes
+      @attributes ||= options[:attributes] || options[:schema].available_attributes_hash.slice(*attribute_names).values
+    end
+
+    def concat_divider
+      options[:divider] || ' '
+    end
+
+    def options
+      @options || {}
+    end
+
+    # -------------------| OVERRIDES |---------------------
+
+    def type
+      case derivation_method
+      when :concat
+        'string'
+      else
+        raise "DerivedAttribute(#{name}) - derivation_method '#{derivation_method}' is not supported"
+      end
+    end
+
+    def arel_field
+      case derivation_method
+      when :concat
+        arel_fields = attributes.collect{|a| a.arel_field}
+        (1..arel_fields.length-1).to_a.reverse.each{|i| arel_fields.insert(i, Arel::Nodes::SqlLiteral.new("'#{concat_divider}'")) }
+        Arel::Nodes::NamedFunction.new 'CONCAT', arel_fields
+      else
+        raise "DerivedAttribute(#{name}) - derivation_method '#{derivation_method}' is not supported"
+      end
+    end
+
+    def value(record)
+      attributes.collect{|a| a.value(record) }.join(concat_divider)
+    end
+
+    def arel_statement(operator, values)
+      case operator
+      when '~'
+        arl = attributes[0].arel_statement(operator, values)
+        attributes[1..-1].each{|att| arl = arl.or( att.arel_statement(operator, values) ) }
+        arl
+      else
+        super
+      end
+    end
+
+    def add_join(scope)
+      attributes.each{ scope = add_join(scope) }
+      scope
+    end
+
+    def add_preload(scope)
+      attributes.each{ scope = add_preload(scope) }
+      scope
+    end
+
+  end
+end

data/lib/azahara_schema/engine.rb

@@ -2,6 +2,7 @@ require 'azahara_schema/field_format'
 require 'azahara_schema/attribute'
 require 'azahara_schema/association_attribute'
 require 'azahara_schema/aggregation_attribute'
+require 'azahara_schema/derived_attribute'
 require 'azahara_schema/attribute_name'
 require 'azahara_schema/outputs'
 require 'azahara_schema/output'

data/lib/azahara_schema/schema.rb

@@ -211,6 +211,7 @@ module AzaharaSchema
         scope = att.add_sort(scope, order) if att
       end
       if (tokens = tokenize_search_query)
+        searchable_attributes.each{|a| scope = a.add_join(scope) }
         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)
@@ -227,8 +228,17 @@ module AzaharaSchema
       attr_hash = entity.as_json(options)
       # TODO serializable_add_includes(options) do |association, records, opts|
       columns.each do |col|
-        attr_hash[col.name] = col.available_values.detect{|l, v| v == attr_hash[col.name] }.try(:[], 0) if col.type == 'love'
-        attr_hash[col.name] = col.value(entity) if col.is_a?(AzaharaSchema::AggregationAttribute)
+        col_sub_hash = attr_hash
+        sub_col = col
+        while sub_col.is_a?(AzaharaSchema::AssociationAttribute)
+          col_sub_hash = (col_sub_hash[sub_col.association.name.to_s] ||= {})
+          sub_col = sub_col.attribute
+        end
+        if col.type == 'love'
+          col_sub_hash[sub_col.name] = sub_col.available_values.detect{|l, v| v == col_sub_hash[sub_col.name] }.try(:[], 0)
+        else
+          col_sub_hash[sub_col.name] = col.value(entity)
+        end
       end
       attr_hash
     end
@@ -261,7 +271,7 @@ module AzaharaSchema
       params = {}
       params[:f] = {}
       filters.each do |fname, attrs|
-        params[:f][fname] = "#{attrs[:o]}|#{attrs[:v]}"
+        params[:f][fname] = "#{attrs[:o]}|#{attrs[:v].is_a?(Array) ? attrs[:v].collect{|v| v.to_s}.join('\\') : attrs[:v]}"
       end
       params[:c] = column_names
       params[:q] = search_query if params[:q]

data/lib/azahara_schema/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azahara_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -69,6 +69,7 @@ files:
 - lib/azahara_schema/association_attribute.rb
 - lib/azahara_schema/attribute.rb
 - lib/azahara_schema/attribute_name.rb
+- lib/azahara_schema/derived_attribute.rb
 - lib/azahara_schema/engine.rb
 - lib/azahara_schema/field_format.rb
 - lib/azahara_schema/model_schema.rb