rao-query 0.0.10.pre → 0.0.11.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcd71ecb39df9be9f1b4bb16009f9bad6622225b
-  data.tar.gz: e7c9ff4ed20d98a64a63442101f41f4244339473
+  metadata.gz: 701230b194df896ecad0d3c8d97992a780dc2ff4
+  data.tar.gz: 2a2f775ffe426e9fb3243703e05e5bfce8cd516c
 SHA512:
-  metadata.gz: 6a89c9252f3a47ed943a11519507ce320ea622c726d305316ff29e5736fe4f96d1f861702cb6e571bad7470513743b369cfd99b0b939a72c376c18067351eed1
-  data.tar.gz: 5f40b638661b73b8898e65495ba9ec08ad89726d090e13ad4a557c4614771f5ad819af21a51d6d9abf7ea6f09ef81eb3e783d5cc732b435edd009303c4b3fbdd
+  metadata.gz: 564988704e3c7cab85150fed4d1b0a7828fa474a9e55303a29af16c8aff2bca652569fae5ff59e52990f4e7afd64df19fb72a4e2da39571eede4755a1972e0e6
+  data.tar.gz: 99bb315ceba2c7ade86aeb4363d58742760fed756778b857eae74f89f417b0b364f85c004f4d130d0762d88441598e59d43dfe06cc5759c476f98c9418c99223

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

@@ -0,0 +1,63 @@
+module Rao
+  module Query
+    class FormBuilder < SimpleForm::FormBuilder
+      def boolean(name, options = {})
+        translated_label = translate_label_for_boolean(name)
+        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
+
+      def input(name, options = {})
+        if association = options.delete(:association)
+          translated_label = translate_label(name, association)
+          input_name = "#{association}.#{name}"
+        else
+          translated_label = translate_label(name)
+          input_name = name
+        end
+        super(input_name, options.reverse_merge(label: translated_label))
+      end
+
+      def submit(title = nil, options = {})
+        title ||= I18n.t('rao.query.form_builder.submit')
+        super(title, options)
+      end
+
+      def reset(title = nil, options = {})
+        title ||= I18n.t('rao.query.form_builder.reset')
+        link_html = options.delete(:link_html) || {}
+        template.link_to(title, template.url_for(), link_html)
+      end
+
+      private
+
+      def translate_label(name, association = nil)
+        splitted_name = name.to_s.split('_')
+        attribute_name = splitted_name[0..-2].join('_')
+        predicate = splitted_name.last
+        translated_attribute_name = if association.nil?
+          klass_name = object.original_model_class_name
+          klass_name.constantize.human_attribute_name(attribute_name)
+        else
+          klass_name = object.original_model_class.reflect_on_association(association).klass.name
+          klass = klass_name.constantize
+          "#{klass.model_name.human} #{klass.human_attribute_name(attribute_name)}"
+        end
+        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
+        if association.nil?
+          klass_name = object.original_model_class_name
+        else
+          klass_name = object.original_model_class.reflect_on_association(association).klass
+        end
+        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
+    end
+  end
+end

data/app/view_helpers/rao/query/application_helper.rb

@@ -14,6 +14,7 @@ module Rao
       #
       #     # app/views/posts/index.html.haml
       #     = query_helper(self).form_for(@posts, url: posts_path, method: :get) do |f|
+      #       = f.input :email_cont, association: :author
       #       = f.input :title_cont
       #       = f.input :body_cont
       #       = f.boolean :published_eq
@@ -34,67 +35,7 @@ module Rao
       def form_for(collection, options = {}, &block)
         handle_simple_form_missing unless c.respond_to?(:simple_form_for)
         wrapped_collection = SearchableCollection.new(collection, c.params[:q])
-        c.simple_form_for(wrapped_collection, options.reverse_merge(as: :q, url: c.collection_path, method: :get, builder: SearchFormBuilder), &block)
-      end
-
-      class SearchFormBuilder < SimpleForm::FormBuilder
-        def boolean(name, options = {})
-          translated_label = translate_label_for_boolean(name)
-          options.reverse_merge!(collection: [[I18n.t("search_form_builder.yes"), 1], [I18n.t("search_form_builder.no"), 0]], include_blank: true, label: translated_label)
-          input name, options
-        end
-
-        def input(name, options = {})
-          if association = options.delete(:association)
-            translated_label = translate_label(name, association)
-            input_name = "#{association}.#{name}"
-          else
-            translated_label = translate_label(name)
-            input_name = name
-          end
-          super(input_name, options.reverse_merge(label: translated_label))
-        end
-
-        def submit(title = nil, options = {})
-          title ||= I18n.t('search_form_builder.submit')
-          super(title, options)
-        end
-
-        def reset(title = nil, options = {})
-          title ||= I18n.t('search_form_builder.reset')
-          link_html = options.delete(:link_html) || {}
-          template.link_to(title, template.url_for(), link_html)
-        end
-
-        private
-
-        def translate_label(name, association = nil)
-          splitted_name = name.to_s.split('_')
-          attribute_name = splitted_name[0..-2].join('_')
-          predicate = splitted_name.last
-          translated_attribute_name = if association.nil?
-            klass_name = object.original_model_class_name
-            klass_name.constantize.human_attribute_name(attribute_name)
-          else
-            klass_name = object.original_model_class.reflect_on_association(association).klass.name
-            klass = klass_name.constantize
-            "#{klass.model_name.human} #{klass.human_attribute_name(attribute_name)}"
-          end
-          I18n.t("search_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
-          if association.nil?
-            klass_name = object.original_model_class_name
-          else
-            klass_name = object.original_model_class.reflect_on_association(association).klass
-          end
-          translated_attribute_name = klass_name.constantize.human_attribute_name(attribute_name)
-          I18n.t("search_form_builder.boolean_label", attribute_name: translated_attribute_name)
-        end
+        c.simple_form_for(wrapped_collection, options.reverse_merge(as: :q, url: c.collection_path, method: :get, builder: Rao::Query::FormBuilder), &block)
       end
 
       class SearchableCollection

data/config/locales/de.yml

@@ -0,0 +1,7 @@
+de:
+  rao:
+    query:
+      form_builder:
+        predicates:
+          cont: "%{attribute_name} enthält"
+          eq: "%{attribute_name} ist"

data/config/locales/en.yml

@@ -0,0 +1,7 @@
+en:
+  rao:
+    query:
+      form_builder:
+        predicates:
+          cont: "%{attribute_name} contains"
+          eq: "%{attribute_name} equals"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rao-query
 version: !ruby/object:Gem::Version
-  version: 0.0.10.pre
+  version: 0.0.11.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,8 +134,11 @@ files:
 - Rakefile
 - app/concerns/rao/query/controller/query_concern.rb
 - app/concerns/rao/query/controller/query_form_concern.rb~
+- app/form_builders/rao/query/form_builder.rb
 - app/parsers/rao/query/condition_parser.rb
 - app/view_helpers/rao/query/application_helper.rb
+- config/locales/de.yml
+- config/locales/en.yml
 - lib/rao-query.rb
 - lib/rao/query.rb
 - lib/rao/query/configuration.rb