azahara_schema 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f7f9fca28c48e48db64c1fff3f830700b6e3c52
-  data.tar.gz: e0fbdebd3f9656fbb739684d4d37da76a8825d84
+  metadata.gz: 4390fbc505e535b317928c28dae0a13d99ec7997
+  data.tar.gz: 8fab75c50ea5623a6f29f812d6575a7e03177da4
 SHA512:
-  metadata.gz: a6804635de61f3adf1ebefec3476052195dd507231083906f163abe8e0dd80a6e41dc2518216f561de9a132117bb759c25b481616d0ddac4ea43141d9b8666cf
-  data.tar.gz: d9d8df57a99ce9a9cae33299015448153f688dd68a5d023847c1c33e14b55f72143c23ff486d8f2841f1999fb4a187b7caf3424e10a81375921007645416a376
+  metadata.gz: e318854db84d703d99076e572909ccc09480b632f62bcc0f8306eb35e00371e803b1ae52b8be64f0b1a90bc0628802b614b2613d7e87744e00d5b6bc9245e483
+  data.tar.gz: dde84cf9dc5573525fc7b2b2f740b162ba339fc8a686f1c906d3873e782af4b8e26b154df91a81ca9288e75cc6b2ad54af994e11e4eda0debb289a17a6dd07ea

data/lib/azahara_schema/attribute.rb

@@ -1,3 +1,5 @@
+require 'azahara_schema/field_format'
+
 module AzaharaSchema
   class Attribute
     attr_accessor :name, :format, :model
@@ -58,15 +60,18 @@ module AzaharaSchema
     end
 
     def add_statement(scope, operator, values)
+      values = [values] unless values.is_a?(Array)
       case operator
       when '='
-        scope.where( arel_field.eq(values) )
+        scope.where( arel_field.in(values) )
       when '~'
-        scope.where( arel_field.matches("%#{values}%") )
+        arl = arel_field.matches("%#{values[0]}%")
+        values[1..-1].each{|v| arl = arl.or( arel_field.matches("%#{v}%") ) }
+        scope.where( arl )
       when '>='
-        scope.where( arel_field.gteq(values) )
+        scope.where( arel_field.gteq(values.map(&:to_f).min) )
       when '<='
-        scope.where( arel_field.lteq(values) )
+        scope.where( arel_field.lteq(values.map(&:to_f).max) )
       else
         throw 'Unknown operator ' + operator.to_s
       end

data/lib/azahara_schema/field_format.rb

@@ -1,3 +1,7 @@
+require 'singleton'
+require 'active_support' #class_attribute
+require 'active_support/core_ext' #class_attribute
+
 module AzaharaSchema
   module FieldFormat
     def self.add(name, klass)

data/lib/azahara_schema/schema.rb

@@ -83,10 +83,11 @@ module AzaharaSchema
     def add_short_filter(name, str)
       attrs = str.split('|')
       if attrs.size == 2
-        add_filter(name, attrs.first, attrs.second)
+        operator, values = attrs
       elsif attrs.size == 1
-        add_filter(name, '=', attrs.first)
+        operator, values = '=', attrs.first
       end
+      add_filter(name, operator, values.split('\\'))
     end
 
     def add_filter(name, operator, values)
@@ -156,8 +157,8 @@ module AzaharaSchema
 
     def available_associations
       @available_associations ||= model.reflect_on_all_associations.select do |association|
-        association.klass != model &&
-          !association.options[:polymorphic] &&
+        !association.options[:polymorphic] &&
+          association.klass != model &&
           !association_path.include?( association.name.to_s.singularize.to_sym ) &&
           !association_path.include?( association.name.to_s.pluralize.to_sym )
       end.collect do |association|

data/lib/azahara_schema/version.rb

@@ -1,3 +1,3 @@
 module AzaharaSchema
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azahara_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails