azahara_schema 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a243c727640b3870ddb7d121dec13b0f73908f076a3134916919baa6974a55d4
-  data.tar.gz: 822beaa0827d42da8c1ab255bdc28e6448d1c5ed19647e503e4943b4b7bf403e
+  metadata.gz: a14e9a8c3362597472cda8ccc365c47e818fb89f905c8ab6aa682763c329536d
+  data.tar.gz: 7b42eaacf12b867c599eaecd3a5d8f5bf6203dbeab5b178b029392a2b4164c98
 SHA512:
-  metadata.gz: 4dfb95a06ce4a2ce673e5107e8a8f2caeddb7d1598b8b8e8050c9fd14ba90556125cd09150223787925519819cf0362d5c061adfc9b438267adc49f469f68b0e
-  data.tar.gz: 4db13b53f6c44d6c1252cd9bd214e115f80851f65b702d0b07d2baae5d5f80289f3c7d5eb29f75c1a6a8c47387d173340bb5abef529933e4fc6de7425eff7d3a
+  metadata.gz: b25f86081f3b3985bd4840695d8f41bcc4c673228db1a394df1aa095f106fe82884e33873723a481ae02d6b4881fdac6459e5451981f3d09aad246b65b1aae82
+  data.tar.gz: 22da5b868389f86c35e7af515673494416c4a3ac8ecbf25d47a361f7dac30a5b349bdc00a77628dfe760e7cd09b91c5a269b296bb46f34358d72dd8a5bd97178

data/app/assets/stylesheets/azahara_schema/schema_options.scss

@@ -19,7 +19,7 @@
       margin-bottom: 1.5rem;
       .control-label {
         // text-align: right;
-        padding-top: $input-padding-y;
+        // padding-top: $input-padding-y;
       }
     }
   }

data/lib/azahara_schema/attribute.rb

@@ -69,9 +69,15 @@ module AzaharaSchema
 
     # values has to be array!
     def arel_statement(operator, values)
+      values = values.collect{|v| format.sanitize_value(v) }
       case operator
       when '='
-        arel_field.in(values)
+        condition = arel_field.in(values.compact) if values.compact.any?
+        if values.include?(nil)
+          c_nil = arel_field.eq(nil)
+          condition = condition ? condition.or(c_nil) : c_nil
+        end
+        condition
       when '~'
         vals = values.collect{|v| v.split }.flatten
         arl = arel_field.matches("%#{vals[0]}%")

data/lib/azahara_schema/field_format.rb

@@ -55,6 +55,10 @@ module AzaharaSchema
       def searchable?
         false
       end
+
+      def sanitize_value(value)
+        value
+      end
     end
 
     class NumberFormat < Base
@@ -69,6 +73,10 @@ module AzaharaSchema
 
     class IntegerFormat < NumberFormat
       add 'integer'
+
+      def sanitize_value(value)
+        value.to_s.present? ? value.to_s.to_i : nil
+      end
     end
 
     class FloatFormat < NumberFormat
@@ -93,6 +101,10 @@ module AzaharaSchema
       def searchable?
         true
       end
+
+      def sanitize_value(value)
+        value.to_s.presence
+      end
     end
 
     class ListFormat < StringFormat

data/lib/azahara_schema/version.rb

@@ -1,3 +1,3 @@
 module AzaharaSchema
-  VERSION = '0.1.16'
+  VERSION = '0.1.17'
 end

metadata

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