forest_liana 1.3.19 → 1.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a6ef592b7aec3837d2dc0e9aa0c0e53ef769edc
-  data.tar.gz: 73a6c573d1e7b47e6a20a41c3e79d98d603c8f75
+  metadata.gz: d22129c084d7e29d002d3f9eceafaa226f5adfcd
+  data.tar.gz: b43171af7d808adcde2fe004639333ef17f546db
 SHA512:
-  metadata.gz: 0f756eaac706fc386c56804745e04dc07ce576bc9553528b5b7979b4928e91f2eb892b901412878e797045032a926f271dc94604903ae5bff4e950be237545ba
-  data.tar.gz: b33f900ac08db1e5c24d977be7658ac83b710339e7394697bd7f63c11a6df0d95d7609ca1df7b5268ae2d4b4592a70c38aacfccfda8d7d6a3a4a70dd1723b685
+  metadata.gz: 3e53ec6f00d69104392fb8bf673bbadc1e4770e310a69c42ab6c508dd6229039c998419d97cabac8d423802935a8c938dad78535446d8666f59b2575052a6f80
+  data.tar.gz: f9b2ace7f66785970d20b753d36c580803d4db8d4b25706161179a053223121faace6128b47e95a383ca34ffacb43c2707c57323cbd1bbccf065af9151abd576

data/app/services/forest_liana/operator_value_parser.rb

@@ -37,6 +37,11 @@ module ForestLiana
         filter = operator_date_interval_parser.get_interval_date_filter()
         query = query.where("#{field_name} #{filter}")
       else
+        # NOTICE: Set the integer value instead of a string if "enum" type
+        if resource.defined_enums.has_key?(field)
+          value = resource.defined_enums[field][value]
+        end
+
         where = "#{field_name} #{operator}"
         where += " '#{value}'" if value
         query = query.where(where)

data/app/services/forest_liana/schema_adapter.rb

@@ -160,7 +160,8 @@ module ForestLiana
     end
 
     def get_schema_for_column(column)
-      { field: column.name, type: get_type_for(column) }
+      schema = { field: column.name, type: get_type_for(column) }
+      add_enum_values_if_is_enum(schema, column)
     end
 
     def get_schema_for_association(association)
@@ -173,6 +174,8 @@ module ForestLiana
     end
 
     def get_type_for(column)
+      return 'Enum' if @model.defined_enums.has_key?(column.name)
+
       case column.type
       when :integer
         'Number'
@@ -193,6 +196,17 @@ module ForestLiana
       end
     end
 
+    def add_enum_values_if_is_enum(column_schema, column)
+      if column_schema[:type] == 'Enum'
+        column_schema[:enums] = []
+        @model.defined_enums[column.name].each do |name, value|
+          column_schema[:enums] << name
+        end
+      end
+
+      column_schema
+    end
+
     def get_ref_for(association)
       if association.options[:polymorphic] == true
         '*.id'

data/app/services/forest_liana/search_query_builder.rb

@@ -23,10 +23,15 @@ module ForestLiana
           if column.name == 'id'
             conditions << "#{@resource.table_name}.id =
               #{@params[:search].to_i}"
+          elsif @resource.defined_enums.has_key?(column.name) &&
+            !@resource.defined_enums[column.name][@params[:search].downcase].nil?
+            conditions << "\"#{@resource.table_name}\".\"#{column.name}\" =
+              #{@resource.defined_enums[column.name][@params[:search].downcase]}"
           elsif !column.array && (column.type == :string ||
                                   column.type == :text)
             conditions <<
-              "\"#{@resource.table_name}\".\"#{column.name}\" ILIKE '%#{@params[:search].downcase}%'"
+              "LOWER(\"#{@resource.table_name}\".\"#{column.name}\") LIKE " +
+              "'%#{@params[:search].downcase}%'"
           end
         end
 
@@ -35,7 +40,7 @@ module ForestLiana
           resource.klass.columns.each do |column|
             if !column.array && (column.type == :string || column.type == :text)
               conditions <<
-                "\"#{resource.table_name}\".\"#{column.name}\" ILIKE " +
+                "LOWER(\"#{resource.table_name}\".\"#{column.name}\") LIKE " +
                 "'%#{@params[:search].downcase}%'"
             end
           end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.3.19"
+  VERSION = "1.3.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.3.19
+  version: 1.3.20
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails