rao-query 0.0.32.pre → 0.0.33.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5795dd9ae311311c889c61a81ab543e61decdcfea1ce011e05346bc64c126e4
-  data.tar.gz: 3fb69a168ff65f63da380e006aeb4391e3ca11aaffc7dfbe18a82e4aa64bfcb3
+  metadata.gz: 5bf02e4d6062bd64bb3206afd970320b7dc2d284ac792f538d3207cf5bd648bd
+  data.tar.gz: 3835923ea7e41165c576769a9e5b415278eda5ee3a3d804cf85064c452f60cd4
 SHA512:
-  metadata.gz: 2fd993ebe26edd4536958915445be9ac3fcbbeeec8a97b32a5b84566db5e8a5cd16041b2f5018db3a51292f8e2496ed0fb44576cc1f3b31a58ce61ad6d73a8e2
-  data.tar.gz: 6865d09949f5ee67486e204f569d5382165f32938d45897c0a93ee5edda03cb23db63cc0cb5dd865b3f9aab760f8affad01d6be279f11b98de911c8f09e5d43b
+  metadata.gz: 1932ba6136ccc01c9652515782a838ae17837ea2f395a097ace5d791c6638060498dfc1e72a6fd73b6b6087007ac353edceb0052be3b94d5dbfc2dd414893b50
+  data.tar.gz: 58b279a8c3706ae7f1748342eef84661d1649f8080522184211e66568556ef9d529ca305740d9d7f6e4de38f82bef2534cb6440884cf00f3fb73c8b4304d286b

data/Rakefile

@@ -14,12 +14,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
+Bundler::GemHelper.install_tasks
 
-
-load 'rails/tasks/statistics.rake'
-
-
-
-require 'bundler/gem_tasks'
+require 'rails/dummy/tasks'

data/app/concerns/rao/query/controller/query_concern.rb

@@ -60,10 +60,8 @@ module Rao
         end
 
         def normalize_key(key)
-          splitted_key = key.split('_')
-          predicate = splitted_key.last
-          attribute = splitted_key[0..-2].join('_')
-          "#{attribute}(#{predicate})"
+          attribute_name, predicate = Rao::Query::Operators.extract_attribute_name_and_predicate_from_name(key)
+          "#{attribute_name}(#{predicate})"
         end
       end
     end

data/app/form_builders/rao/query/form_builder.rb

@@ -2,7 +2,7 @@ module Rao
   module Query
     class FormBuilder < SimpleForm::FormBuilder
       def boolean(name, options = {})
-        translated_label = translate_label_for_boolean(name)
+        translated_label = translate_label_for_boolean(name, options.delete(:association))
         options.reverse_merge!(collection: [[I18n.t("rao.query.form_builder.yes"), 1], [I18n.t("rao.query.form_builder.no"), 0]], include_blank: true, label: translated_label)
         input name, options
       end
@@ -32,9 +32,7 @@ module Rao
       private
 
       def translate_label(name, association = nil)
-        splitted_name = name.to_s.split('_')
-        attribute_name = splitted_name[0..-2].join('_')
-        predicate = splitted_name.last
+        attribute_name, predicate = extract_attribute_name_and_predicate_from_name(name)
         translated_attribute_name = if association.nil?
           klass_name = object.original_model_class_name
           klass_name.constantize.human_attribute_name(attribute_name)
@@ -46,10 +44,8 @@ module Rao
         I18n.t("rao.query.form_builder.predicates.#{predicate}", attribute_name: translated_attribute_name)
       end
 
-      def translate_label_for_boolean(name)
-        splitted_name = name.to_s.split('_')
-        attribute_name = splitted_name[0..-2].join('_')
-        predicate = splitted_name.last
+      def translate_label_for_boolean(name, association = nil)
+        attribute_name, predicate = extract_attribute_name_and_predicate_from_name(name)
         if association.nil?
           klass_name = object.original_model_class_name
         else
@@ -58,6 +54,10 @@ module Rao
         translated_attribute_name = klass_name.constantize.human_attribute_name(attribute_name)
         I18n.t("rao.query.form_builder.boolean_label", attribute_name: translated_attribute_name)
       end
+
+      def extract_attribute_name_and_predicate_from_name(name)
+        Rao::Query::Operators.extract_attribute_name_and_predicate_from_name(name)
+      end
     end
   end
 end

data/app/parsers/rao/query/condition_parser.rb

@@ -1,18 +1,6 @@
 module Rao
   module Query
     class ConditionParser
-      OPERATOR_MAP = {
-        gt:       :>,
-        gt_or_eq: :>=,
-        eq:       :'=',
-        not_eq:   :'<>',
-        lt_or_eq: :<=,
-        lt:       :<,
-        null:     :is_null,
-        not_null: :is_not_null,
-        cont:     :like
-      }
-
       def initialize(scope, field, condition)
         @scope, @field, @condition = scope, field, condition
       end
@@ -26,18 +14,12 @@ module Rao
       def build_condition_statement(parent_key, condition, nested = false)
         if is_a_condition?(parent_key) && !nested
           table, column, operator = extract_table_column_and_operator(parent_key)
-          return handle_null_condition(column, operator) if is_null_operator?(operator)
-          # binding.pry
+          return handle_null_condition(column, operator, condition) if is_null_operator?(operator)
           if operator == 'cont'
             return ["#{table}.#{column} LIKE ?", "%#{normalized_condition(table, column, condition)}%"]
           else
             return ["#{table}.#{column} = ?", normalized_condition(table, column, condition)]
           end
-          # if column_is_boolean?(column)
-          #   ["#{column} = ?", to_boolean(condition)]
-          # else
-          #   ["#{column} = ?", condition]
-          # end
         else
           if nested
             column = extract_column(parent_key)
@@ -52,11 +34,18 @@ module Rao
         %w(null not_null).include?(operator)
       end
 
-      def handle_null_condition(column, operator)
-        case operator.to_sym
-        when :null
+      # We build the condition for booleans here.
+      #
+      # | operator   | condition | result        |
+      # | 'null'     | true      | 'IS NULL'     |
+      # | 'null'     | false     | 'IS NOT NULL' |
+      # | 'not_null' | true      | 'IS NOT NULL' |
+      # | 'not_null' | false     | 'IS NULL'     |
+      #
+      def handle_null_condition(column, operator, condition)
+        if (operator == "null" && to_boolean(condition) == true) || (operator == "not_null" && to_boolean(condition) == false)
           "#{column} IS NULL"
-        when :not_null
+        else
           "#{column} IS NOT NULL"
         end
       end
@@ -98,7 +87,7 @@ module Rao
       end
 
       def operator_map
-        OPERATOR_MAP
+        Rao::Query::Operators::MAP
       end
 
       def column_is_boolean?(table_name, column_name)
@@ -126,7 +115,7 @@ module Rao
       end
 
       def to_boolean(string)
-        result = case
+        case
         when Rails.version < '4.2'
           ::ActiveRecord::ConnectionAdapters::Column.value_to_boolean(string)
         when Rails.version < '5.0'
@@ -134,7 +123,6 @@ module Rao
         else
           ::ActiveRecord::Type::Boolean.new.cast(string)
         end
-        result.gsub('"', '')
       end
 
       def normalized_condition(table, column, condition)

data/config/locales/de.yml

@@ -2,8 +2,13 @@ de:
   rao:
     query:
       form_builder:
+        boolean_label: "%{attribute_name}?"
         predicates:
           cont: "%{attribute_name} enthält"
           eq: "%{attribute_name} ist"
+          'null': "%{attribute_name} ist leer"
+          not_null: "%{attribute_name} ist nicht leer"
         reset: "Zurücksetzen"
-        submit: "Suchen"
+        submit: "Suchen"
+        'yes': Ja
+        'no': nein

data/config/locales/en.yml

@@ -2,8 +2,13 @@ en:
   rao:
     query:
       form_builder:
+        boolean_label: "%{attribute_name}?"
         predicates:
           cont: "%{attribute_name} contains"
           eq: "%{attribute_name} equals"
+          'null': "%{attribute_name} is present"
+          not_null: "%{attribute_name} is not present"
         reset: "Reset"
-        submit: "Search"
+        submit: "Search"
+        'yes': "Yes"
+        'no': "No"

data/lib/rao/query.rb

@@ -3,6 +3,7 @@ require "rao-view_helper"
 require "rao/query/version"
 require "rao/query/configuration"
 require "rao/query/engine"
+require "rao/query/operators"
 
 module Rao
   module Query

data/lib/rao/query/operators.rb

@@ -0,0 +1,31 @@
+module Rao
+  module Query
+    module Operators
+      # The not operators have to go first. Else the matching will detect _null
+      # or _eq before _not_null and _not_eq.
+      MAP = {
+        not_eq:   :'<>',
+        not_null: :is_not_null,
+
+        gt:       :>,
+        gt_or_eq: :>=,
+        eq:       :'=',
+        lt_or_eq: :<=,
+        lt:       :<,
+        null:     :is_null,
+        cont:     :like
+      }
+
+      def self.extract_attribute_name_and_predicate_from_name(name)
+        MAP.keys.each do |predicate|
+          if name.to_s.end_with?(predicate.to_s)
+            attribute_name = name[0..-(predicate.length + 2)]
+            return attribute_name, predicate
+          end
+        end
+        
+        raise "Could not extract attribute name and predicate from #{name}"
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rao-query
 version: !ruby/object:Gem::Version
-  version: 0.0.32.pre
+  version: 0.0.33.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,6 +122,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-coolline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-dummy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bootsnap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - roberto@vasquez-angel.de
@@ -145,6 +201,7 @@ files:
 - lib/rao/query.rb
 - lib/rao/query/configuration.rb
 - lib/rao/query/engine.rb
+- lib/rao/query/operators.rb
 - lib/rao/query/version.rb
 homepage: https://github.com/rao
 licenses: