azahara_schema 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbcc60cb930db0856a0b272a556e1e5c26104f3d7d0034b069898cc638271f81
-  data.tar.gz: cbc108bfbf03eec4893f1ccf54ee81193f5482ff3c89f9dffa8a3c7c46d86a62
+  metadata.gz: 10b335d3ec510ba75c370ef57465b556b0677a701ccf48b0ac4897caa69badde
+  data.tar.gz: c19c73e6b9b01aa4a4d391b0f95e0c4a93789864fb8a07f8bb1707b4261d278b
 SHA512:
-  metadata.gz: 4221ea1d965bd950d2cd58580a3031581cd8b6d5dc17ed5afc959b32fad061d1fea05b9d9dd2be99144873565710a32e56b71e095d0eebfde2fecdb08e1f0651
-  data.tar.gz: ae2806c220f03f5164a98d1f86e4399060bd11c09643a29c867c9967a01ea9b199378b8f1d976308a6b0626718fba78b34b60bafaec7aea05430b06947f372a7
+  metadata.gz: e1fc19074a8cf5e26fcc158788c1575fedc278d5809a8556f9878cc1a08c30a65565ef49f579b0696d1eb19e31db060cdc91d7dd80a937bd58b34fb92dd78d4b
+  data.tar.gz: 4a663f5fb26982a963eb503d0cb1dad1357152a92181ab78b95ae8f6c785fcd6c50fadc047072d8c7257435f4a199ef617a9755140f4a6f226ecd2e3b9bb065c

data/lib/arel/azahara_postgres_exts.rb

@@ -0,0 +1,19 @@
+module Arel
+  module Predications
+    def contains(right)
+      Arel::Nodes::Contains.new(self, quoted_node(right))
+    end
+  end
+
+  class Nodes::Contains < Nodes::Binary
+    def operator; :"@>" end
+  end
+
+  class Visitors::PostgreSQL
+    private
+    def visit_Arel_Nodes_Contains o, collector
+      infix_value o, collector, " #{Nodes::Contains.new(nil, nil).operator} "
+    end
+  end
+
+end

data/lib/azahara_schema/attribute.rb

@@ -92,6 +92,9 @@ module AzaharaSchema
         arel_field.gteq(values.map(&:to_f).min)
       when '<='
         arel_field.lteq(values.map(&:to_f).max)
+      when '@>'
+        require 'arel/azahara_postgres_exts'
+        arel_field.contains(values)
       else
         throw 'Unknown operator ' + operator.to_s
       end

data/lib/azahara_schema/model_schema.rb

@@ -32,11 +32,11 @@ module AzaharaSchema
 
     # dummy implementations for rewrite
     def uncollapsable_filters
-      available_filters.select{|name, filter| always_visible_filters.include?(name) }
+      user_available_filters.select{|name, filter| always_visible_filters.include?(name) }
     end
 
     def collapsable_filters
-      available_filters.select{|name, filter| !always_visible_filters.include?(name) }
+      user_available_filters.select{|name, filter| !always_visible_filters.include?(name) }
     end
 
     # rendering

data/lib/azahara_schema/schema.rb

@@ -192,7 +192,11 @@ module AzaharaSchema
     end
 
     def available_filters
-      @available_filters ||= available_attributes_hash.slice(*enabled_filter_names)
+      @available_filters ||= available_attributes_hash
+    end
+
+    def user_available_filters
+      available_filters.slice(*enabled_filter_names)
     end
 
     def association_path

data/lib/azahara_schema/version.rb

@@ -1,3 +1,3 @@
 module AzaharaSchema
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azahara_schema
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,7 @@ files:
 - app/views/layouts/action_schema/application.html.erb
 - config/locales/cs.yml
 - config/routes.rb
+- lib/arel/azahara_postgres_exts.rb
 - lib/azahara_schema.rb
 - lib/azahara_schema/aggregation_attribute.rb
 - lib/azahara_schema/association_attribute.rb