visual_condition_builder 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21b282ae1f76851c3fa269f704e7bce918948b35
-  data.tar.gz: ff210a4140a81bb4c3d4da3b3a24df682b0c172f
+  metadata.gz: 639abf269b7370702e88934eefc01fc5f6292f80
+  data.tar.gz: 93bcd1e3a0c9ff762184ab51e97f8c8d92e024e6
 SHA512:
-  metadata.gz: e74f401deb7f39c547daa37b2fe48a61a3ec8d839fa9fb6b81686ed0efe014b9d4d37533b6bd44206db5a4eb28682685c37b6e2e0e8517a59a4b1ff6bb12c9eb
-  data.tar.gz: 4bbfa1aa0b1ea8033d832710443037963250a6eb70c86ffd0c2b993586adfe818f9dd421a97b56fde09beb7d33f79098197c0b0a19ab10d62e2deee2000f5e6d
+  metadata.gz: fa73289dcaa864aff9e537d962aa5ac20ab1626318fb77ce547d9b8d7afb78d15eed9dd66e610fb9478c2a1cafba55f0a9e7379f8771e583d5d13c1b790308df
+  data.tar.gz: 513d33a4de95f3332b77c5fdc3eef2eb170ec0a2ef5e0c361b575c357dabb8a580eb977b828627940cf6eb484d1b6eb5b6202d2a57b0bc10fca9844bba4a9e8e

data/README.md

@@ -1,6 +1,6 @@
-# Search Builder 
+# Visual Condition Builder 
 
-A great and easy search builder to your rails project
+A great and easy condition builder to your rails project
 
 ## How to install
 
@@ -27,12 +27,15 @@ Add it to your **app/assets/javascripts/application.js**
 
 ## Dependency
 
-Antes de iniciar o plugin você precisa ter o jQuery adicionado no seu application.js
+To work properly, the builder needs your project to have:
 
-Caso você tenha os seguintes plugins jQuery indicados no seu application.js, você deve remover:
+- jQuery
+
+The builder already has some plugins that can conflict with your current plugins:
 
 - [select2](https://github.com/select2/select2)
 - [autoNumeric](https://github.com/BobKnothe/autoNumeric#default-settings--supported-options)
+- [Sortable](https://github.com/RubaXa/Sortable)
 
 ### Select2 Languages
 
@@ -44,15 +47,13 @@ Select2 supports multiple languages by simply including the right language JS fi
 
 ## Dictionaries
 
-As informações do gerador de condições são baseadas em um dicionário, portanto é necessário que você crie seus dicionários de acordo com o necessário.
-
-Para gerar um novo dicionário use o comando:
+The condition builder information is based on a dictionary, so you need to create your dictionaries as needed.
 
+To generate the dictionary structure run:
 ```sh
 $ rails g visual_condiction_builder:dictionary example
 ```
-
-Será criado um arquivo na pasta `app/condition_dictionaries/example_dictionary.rb` com a seguinte estrutura:
+Will be created a file `app/condition_dictionaries/example_dictionary.rb`:
 
 ```ruby
 class ExampleDictionary < VisualConditionBuilder::Dictionary
@@ -64,7 +65,7 @@ class ExampleDictionary < VisualConditionBuilder::Dictionary
 end
 ```
 
-Você pode criar multiplos contextos para esse dicionário:
+You can create multiple contexts for a dictionary, so give it a name:
 ```ruby
   dictionary :simple do
     param :name
@@ -78,8 +79,8 @@ Você pode criar multiplos contextos para esse dicionário:
 
 ### Params
 
-Você não tem restrição ao uso dos parametros, pois eles não tem ligação com model ou qualquer outro elemento da aplicação.
-Ao informar os parametros você pode passar argumentos para personalizar a forma como o gerador de condições será criado:
+You have no restrictions on the use of parameters, they have no binding with models or any element of the application.
+You can pass arguments to customize how the condition generator will be created:
 
 ```ruby
   dictionary do
@@ -90,13 +91,19 @@ Ao informar os parametros você pode passar argumentos para personalizar a forma
   end
 ```
 
-Veja abaixo todos os argumentos que você pode usar na construção dos operadores:
+See below all the arguments you can use:
 
-**TABELA DE PARAMETROS DE OPERADORES**
+Param | Description
+--- | ----
+label | Label of the field, if not informed, will search in the file.yml (ver i18n) 
+type | Type of the field. Responsible for defining how the values will be inserted (DatePicker, Numeric Mask, ...)
+operators | Defines which operators you want to use, if not informed, the default operators will be used
+values | Sets the default values for this field, restricting the user to those values.
+group | Creates a separation in the field list by grouping the fields with this group
 
-Por padrão, o gerador de condições implementa alguns operadores e argumentos, possibilitando que você informe apenas o nome do operador `operators: [:eq, :between]` 
+By default, the condition builder implements some operators and arguments, allowing you to enter only the operator name, like: `operators: [:eq, :between]` 
 
-Lista de operadores padrões do gerador de condições
+List of default operators:
 
 Operator | Description | Default Arguments
 --- | --- | ---
@@ -136,8 +143,8 @@ blank | Opposite :present | no_value: true, multiple: false
 null | where a field is null | no_value: true, multiple: false
 not_null | Opposite :null  | no_value: true, multiple: false
 
-Caso você não informe os operadores, o gerador de condições irá selecionar os operadores baseado no tipo informado:
-*Se um tipo não for informado, será considerado STRING*
+if you dont fill the operators, the builder will use the operators by field type.
+*If a type is not informed, it will be considered STRING*
 
 Type | Default Operators
 --- | ---
@@ -147,18 +154,18 @@ DECIMAL, INTEGER | eq, between
 STRING | cont, eq, start, end, present, blank
 ... | eq
 
-Também é possível informar listas de valores ou valores pré-definidos para que o gerador de condições para carregar esses valores por padrão:
+The values parameter must be informed to the constructor so the user can make a selection between them.
 
 ```ruby
   dictionary do
     param :status, values: [{id: 1, label: 'Active', id: 2, label: 'Inactive'}]
     param :status_list, values: MyStatus.all.dictionary_values(:code, :title)
-    param :status_proc, values: -> { MyService.get_status }
-    param :status_ajax, values: ajax_my_status_path
+    param :status_proc, values: -> { current_user.get_status }
+    param :status_ajax, values: -> { ajax_my_status_path }
   end
 ```
 
-Em todos os exemplos acima o resultado deve sempre seguir a estrutura :
+In all the above examples the result must always follow the structure:
 
 ```ruby
 [
@@ -169,11 +176,11 @@ Em todos os exemplos acima o resultado deve sempre seguir a estrutura :
 ]
 ```
 
-Quando for utilizar uma chamada AJAX o gerador de condições fará requisições passando dois tipos de parametros: **init** ou **key**, onde:
-* init - é o parametro com o valor inicial da lista. Quando o plugin tenta carregar a lista ele deverá mostrar um valor inicial antes da busca feita pelo usuário, portanto esse valor inicial deve ser retornado através do parametro init:
-* key - é o parametro com o valor digitado pelo usuário para efetuar o retorno dos valores da lista.
+When using an AJAX call, the condition generator will make requests by passing two types of parameters: ** init ** or ** key **:
+* init - is the parameter with the initial value of the list. When the plugin tries to load the list it should show an initial value before the search made by the user, so this initial value must be returned through the parameter init
+* key - is the parameter with the value entered by the user to return the values from the list.
 
-O retorno deverá seguir a estrutua padrão de valores do dicionário e retornar em formato JSON. Exemplo de um controller que implementa essa função:
+The return must follow the standard dictionary value structure and return in JSON format. Example of a controller that implements this function:
 ```ruby
 class CitiesController < ApplicationController
   def ajax
@@ -192,6 +199,7 @@ end
 Dictionary Class have public methods to get informations about self:
 * fields(dictionary_context_name)
 * dictionary(dictionary_context_name)
+* .new(rails_context).dictionary(dictionary_context_name)
 * dictionaries
 
 ```ruby
@@ -206,6 +214,10 @@ class ExampleDictionary < VisualConditionBuilder::Dictionary
     param :name
     param :age
   end
+  
+  dictionary :with_app_request do
+    param :cities, values: -> { ajax_cities_path }
+  end
 
 end
 
@@ -223,13 +235,20 @@ ExampleDictionary.dictionary(:complex)
 # =>  [{:type=>"STRING", :operators=>[{:operator=>:cont, :multiple=>false, :no_value=>false, :label=>"Contém"}, {:operator=>:eq, :multiple=>false, :no_value=>false, :label=>"Igual"}, {:operator=>:start, :multiple=>false, :no_value=>false, :label=>"Começa com"}, {:operator=>:end, :multiple=>false, :no_value=>false, :label=>"Termina com"}, {:operator=>:present, :no_value=>true, :multiple=>false, :label=>"Presente"}, {:operator=>:blank, :no_value=>true, :multiple=>false, :label=>"Não Presente"}], :values=>[], :group=>"", :label=>"Name", :field=>:name}, {:type=>"STRING", :operators=>[{:operator=>:cont, :multiple=>false, :no_value=>false, :label=>"Contém"}, {:operator=>:eq, :multiple=>false, :no_value=>false, :label=>"Igual"}, {:operator=>:start, :multiple=>false, :no_value=>false, :label=>"Começa com"}, {:operator=>:end, :multiple=>false, :no_value=>false, :label=>"Termina com"}, {:operator=>:present, :no_value=>true, :multiple=>false, :label=>"Presente"}, {:operator=>:blank, :no_value=>true, :multiple=>false, :label=>"Não Presente"}], :values=>[], :group=>"", :label=>"Age", :field=>:age}] 
 
 ExampleDictionary.dictionaries
-# =>  {:default=>[{:type=>"STRING", :operators=>[{:operator=>:cont, :multiple=>false, :no_value=>false, :label=>"Contém"}, {:operator=>:eq, :multiple=>false, :no_value=>false, :label=>"Igual"}, {:operator=>:start, :multiple=>false, :no_value=>false, :label=>"Começa com"}, {:operator=>:end, :multiple=>false, :no_value=>false, :label=>"Termina com"}, {:operator=>:present, :no_value=>true, :multiple=>false, :label=>"Presente"}, {:operator=>:blank, :no_value=>true, :multiple=>false, :label=>"Não Presente"}], :values=>[], :group=>"", :label=>"Name", :field=>:name}], :padrao=>[{:type=>"STRING", :operators=>[{:operator=>:cont, :multiple=>false, :no_value=>false, :label=>"Contém"}, {:operator=>:eq, :multiple=>false, :no_value=>false, :label=>"Igual"}, {:operator=>:start, :multiple=>false, :no_value=>false, :label=>"Começa com"}, {:operator=>:end, :multiple=>false, :no_value=>false, :label=>"Termina com"}, {:operator=>:present, :no_value=>true, :multiple=>false, :label=>"Presente"}, {:operator=>:blank, :no_value=>true, :multiple=>false, :label=>"Não Presente"}], :values=>[], :group=>"", :label=>"Name", :field=>:name}, {:type=>"STRING", :operators=>[{:operator=>:cont, :multiple=>false, :no_value=>false, :label=>"Contém"}, {:operator=>:eq, :multiple=>false, :no_value=>false, :label=>"Igual"}, {:operator=>:start, :multiple=>false, :no_value=>false, :label=>"Começa com"}, {:operator=>:end, :multiple=>false, :no_value=>false, :label=>"Termina com"}, {:operator=>:present, :no_value=>true, :multiple=>false, :label=>"Presente"}, {:operator=>:blank, :no_value=>true, :multiple=>false, :label=>"Não Presente"}], :values=>[], :group=>"", :label=>"Age", :field=>:age}]} 
+# =>  {:default=>[{:type=>"STRING", :operators=>[{:operator=>:cont, :multiple=>false, :no_value=>false, :label=>"Contém"}, {:operator=>:eq, :multiple=>false, :no_value=>false, :label=>"Igual"}, {:operator=>:start, :multiple=>false, :no_value=>false, :label=>"Começa com"}, {:operator=>:end, :multiple=>false, :no_value=>false, :label=>"Termina com"}, {:operator=>:present, :no_value=>true, :multiple=>false, :label=>"Presente"}, {:operator=>:blank, :no_value=>true, :multiple=>false, :label=>"Não Presente"}], :values=>[], :group=>"", :label=>"Name", :field=>:name}], :padrao=>[{:type=>"STRING", :operators=>[{:operator=>:cont, :multiple=>false, :no_value=>false, :label=>"Contém"}, {:operator=>:eq, :multiple=>false, :no_value=>false, :label=>"Igual"}, {:operator=>:start, :multiple=>false, :no_value=>false, :label=>"Começa com"}, {:operator=>:end, :multiple=>false, :no_value=>false, :label=>"Termina com"}, {:operator=>:present, :no_value=>true, :multiple=>false, :label=>"Presente"}, {:operator=>:blank, :no_value=>true, :multiple=>false, :label=>"Não Presente"}], :values=>[], :group=>"", :label=>"Name", :field=>:name}, {:type=>"STRING", :operators=>[{:operator=>:cont, :multiple=>false, :no_value=>false, :label=>"Contém"}, {:operator=>:eq, :multiple=>false, :no_value=>false, :label=>"Igual"}, {:operator=>:start, :multiple=>false, :no_value=>false, :label=>"Começa com"}, {:operator=>:end, :multiple=>false, :no_value=>false, :label=>"Termina com"}, {:operator=>:present, :no_value=>true, :multiple=>false, :label=>"Presente"}, {:operator=>:blank, :no_value=>true, :multiple=>false, :label=>"Não Presente"}], :values=>[], :group=>"", :label=>"Age", :field=>:age}]}
+
+ExampleDictionary.dictionary(:with_app_request)
+# => [{:values=>#<Proc:0x00000008ddffb0@/path_to_project/app/condition_dictionaries/example_dictionary.rb:12 (lambda)>, :type=>"STRING", ...
+
+ExampleDictionary.new(rails_app_request).dictionary(:with_app_context)
+# =>  [{:values=>"/municipios/ajax", :type=>"STRING", ...
 ```
 
 ## Helpers
 
 #### (class) dictionary_values(param_id, param_label)
-Deve ser utilizado em objetos do tipo: Array ou ActiveRecord::Relation e usa o primeiro parametro como **id** e o segundo como **label** na construção da estrutura de valores para o dicionário
+It should be used in objects of type: **Array** or **ActiveRecord::Relation**, the first parameter is **id** and the second is **label** for the dictionary
+
 ```ruby
 dictionary do
   param :book_id, values: Book.all.dictionary_values(:code, :title)
@@ -239,7 +258,10 @@ end
 ```
 
 #### (view) conditions_fields(name_of_dictionary)
+
+Creates a field selector in a dropdown element (bootstrap).
 Cria um seletor de campos em um elemento dropdown (bootstrap).
+
 ```haml
 = conditions_fields :example
 -# with context:

data/app/assets/javascripts/visual_condition_builder/condition_builder.js

@@ -42,32 +42,33 @@
                 return;
             }
 
+            var new_id = new Date().getTime();
+
             //BLOCK ELEMENTS HTML
-            var block = $('<div class="group-conditions clearfix"></div>');
+            var block = $('<div id="group_conditions_'+new_id+'" data-id="'+new_id+'" class="group-conditions clearfix"></div>');
             block.append('<span class="conditions-move"></span>');
             var field_label = fieldObj.label;
             if (!is_blank(fieldObj.group)) {
                 field_label = Object.values(fieldObj.group)[0] + ' : ' + field_label;
             }
-            block.append('<input type="hidden" class="field form-control" value="' + fieldObj.field + '" data-type="' + fieldObj.type + '" />');
-            block.append('<span class="field_name label label-info">' + field_label + ' <a href="" class="remove-condition">&#10006;</a></span>');
-            block.append('<select class="operators hide form-control"></select>');
-            block.append('<span class="fixed_operator hide form-control"></span>');
-            block.append('<select class="values hide form-control"></select>');
-            block.append('<input class="fixed_value hide form-control" />');
+            block.append('<input id="field_'+new_id+'" data-group-id="'+new_id+'" type="hidden" class="field form-control" value="' + fieldObj.field + '" data-type="' + fieldObj.type + '" />');
+            block.append('<span id="field_name_'+new_id+'" data-group-id="'+new_id+'" class="field_name label label-info">' + field_label + ' <a href="" id="remove_condition_'+new_id+'" data-group-id="'+new_id+'" class="remove-condition">&#10006;</a></span>');
+            block.append('<select id="operators_'+new_id+'" data-group-id="'+new_id+'" class="operators hide form-control"></select>');
+            block.append('<span id="fixed_operator_'+new_id+'" data-group-id="'+new_id+'" class="fixed_operator hide form-control"></span>');
+            block.append('<select id="values_'+new_id+'" data-group-id="'+new_id+'" class="values hide form-control"></select>');
+            block.append('<input id="fixed_value_'+new_id+'" data-group-id="'+new_id+'" class="fixed_value hide form-control" />');
             if (plugin.parameters.debug == true) {
                 block.append('<p class="expression help-block"></p>');
             }
-            $elField = block.find('.field');
-            $elOperators = block.find('.operators');
-            $elValues = block.find('.values, .fixed_value');
+            $elField = block.find('#field_'+new_id);
+            $elOperators = block.find('#operators_'+new_id);
+            $elValues = block.find('#values_'+new_id+', #fixed_value_'+new_id);
 
             //EVENTS
-            block.find('.remove-condition').on('click', event_remove_condition);
+            block.find('#remove_condition_'+new_id).on('click', event_remove_condition);
             $elOperators.on('change', event_load_values);
 
             $element.append(block);
-            $element.trigger('change');
 
             //LOAD OPERATORS
             plugin.load_operators($elField);
@@ -85,16 +86,16 @@
 
         plugin.load_operators = function (fieldEl) {
             var $fieldElement = $(fieldEl);
+            var groupConditionId = $fieldElement.attr('data-group-id');
             var field_name = getFieldValue($fieldElement);
             var field = getFieldByName(field_name);
-            var $groupConditions = $fieldElement.closest('.group-conditions');
-            var $operators = $groupConditions.find('.operators');
-            var $fixedOperator = $groupConditions.find('.fixed_operator');
-            var $values = $groupConditions.find('.values');
-            var $fixedValue = $groupConditions.find('.fixed_value');
+            var $operators = $('#operators_'+groupConditionId);
+            var $fixedOperator = $('#fixed_operator_'+groupConditionId);
+            var $values = $('.values_'+groupConditionId);
+            var $fixedValue = $('.fixed_value_'+groupConditionId);
             var operators = field.operators;
 
-            remove_plugins_elements($groupConditions);
+            remove_plugins_elements(groupConditionId);
             $operators.html('').addClass('hide');
             $fixedOperator.val('').addClass('hide');
             $values.html('').addClass('hide');
@@ -113,8 +114,9 @@
             $operators.trigger('change');
         };
 
-        plugin.fill_condition = function (groupConditions, data) {
-            if (data != undefined && data.length > 0 && groupConditions != undefined) {
+        plugin.fill_condition = function (groupConditionId, data) {
+            if (data != undefined && data.length > 0 && groupConditionId != undefined) {
+                var groupConditions = getGroupConditionById(groupConditionId)
                 $elOperators = getOperatorElement(groupConditions);
                 $elOperators.val(data[1]).trigger('change');
 
@@ -136,6 +138,7 @@
                             }
                         });
                         $elValues.val(values).trigger('change');
+                        triggerEl = false;
                     }
                 } else {
                     $elValues.val(data[2]);
@@ -152,7 +155,6 @@
                 if ($elInput.length > 0) {
                     plugin.parameters.values = JSON.parse($elInput.val());
                 }
-                console.log(plugin.parameters.values);
             } else {
                 plugin.parameters.values = values;
             }
@@ -187,6 +189,10 @@
         }; //END getResult;
 
         //~~~ PRIVATE
+        var getGroupConditionById = function (groupConditionId) {
+            return $('#group_conditions_'+groupConditionId);
+        }; //END getFieldElement
+
         var getFieldByName = function (field_name) {
             var f = $.map(plugin.parameters.dictionary, function (h, i) {
                 if (h.field == field_name) {
@@ -286,12 +292,14 @@
         }; //END event_remove_condition
 
         var event_load_values = function (ev) {
-            var $groupConditions = $(this).closest('.group-conditions');
+            var $target = $(ev.target);
+            var groupConditionId = $target.attr('data-group-id');
+            var $groupConditions = getGroupConditionById(groupConditionId);
             var field_name = getFieldValue($groupConditions);
             var field = getFieldByName(field_name);
-            var op_el = $(this).hasClass('operators') ? $(this).find('option:selected') : $(this);
+            var op_el = $target.hasClass('operators') ? $target.find('option:selected') : $target;
             var values = field.values;
-            build_values(op_el, values);
+            build_values(op_el, values, groupConditionId);
         }; //END event_load_values
 
         var event_build_expression = function (ev) {
@@ -313,13 +321,14 @@
                 $.each(plugin.parameters.values, function (i, data) {
                     var field = data[0];
                     var groupConditions = plugin.add_condition(field);
-                    plugin.fill_condition(groupConditions, data);
+                    var groupConditionId = groupConditions.attr('data-id');
+                    plugin.fill_condition(groupConditionId, data);
                 });
             }
         };
 
-        var build_values = function (op_el, values) {
-            var $groupConditions = $(op_el).closest('.group-conditions');
+        var build_values = function (op_el, values, groupConditionId) {
+            var $groupConditions = getGroupConditionById(groupConditionId);
             var no_value = op_el.attr('data-no-value');
             var $values = $groupConditions.find('.values');
             var $fixedValue = $groupConditions.find('.fixed_value');
@@ -364,19 +373,21 @@
                 }
             }
 
-            validate_multiple_values($groupConditions);
-            normalize_values_type($groupConditions, list_with_item, multiple);
+            validate_multiple_values(groupConditionId);
+            normalize_values_type(groupConditionId, list_with_item, multiple);
         }; //END build_values
 
-        var validate_multiple_values = function (groupConditions) {
-            var $groupConditions = $(groupConditions);
+        var validate_multiple_values = function(groupConditionId) {
+            var $groupConditions = getGroupConditionById(groupConditionId);
             var $operatorEl = getOperatorElement($groupConditions);
             var $valueEl = getValueElement($groupConditions);
             if ($operatorEl.hasClass('operators')) {
                 $operatorEl = $operatorEl.find('option:selected');
             }
             var multiple = $operatorEl.attr('data-multiple');
-            remove_plugins_elements(groupConditions);
+
+            remove_plugins_elements(groupConditionId);
+
             if (!isNaN(multiple)) {
                 for (var i = 1; i < parseInt(multiple); i++) {
                     var $valueElClone = $valueEl.clone();
@@ -389,18 +400,18 @@
             $valueEl.attr('multiple', multiple == 'true');
         }; //END validate_multiple_values
 
-        var remove_plugins_elements = function (groupConditions) {
-            $groupConditions = $(groupConditions);
+        var remove_plugins_elements = function (groupConditionId) {
+            $groupConditions = getGroupConditionById(groupConditionId);
             $groupConditions.find('.fixed_value[class*="select2-"], .values[class*="select2-"]').select2('destroy');
             $groupConditions.find('.values.clone, .fixed_value.clone').remove();
         }; //END remove_plugins_elements
 
-        var normalize_values_type = function (groupConditions, list_with_item, multiple) {
-            var $groupConditions = $(groupConditions);
+        var normalize_values_type = function (groupConditionId, list_with_item, multiple) {
+            var $groupConditions = getGroupConditionById(groupConditionId);
             var $fieldEl = getFieldElement($groupConditions);
             var $valueEl = getValueElement($groupConditions);
             var uTypeField = $fieldEl.attr('data-type'); //.toUpperCase();
-            var field_name = getFieldValue(groupConditions);
+            var field_name = getFieldValue($groupConditions);
 
             $.each($valueEl, function (i, el) {
                 var $el = $(el);
@@ -506,7 +517,6 @@
                         if (cb != undefined && typeof cb == 'function') {
                             cb(dates)
                         }
-                        ;
                     }, errorr: function (errorr) {
                         alert("Could not load url " + url);
                     }
@@ -518,9 +528,10 @@
         var build_select2_element = function (el, tags) {
             if (tags == undefined) tags = true;
             var $el = $(el);
-            var select2Config = plugin.parameters.select2Config;
+            var select2Config = $.extend({},plugin.parameters.select2Config);
             var ajax_url = $el.attr('data-ajax-values');
-            if (ajax_url != undefined) {
+
+            if (ajax_url !== undefined) {
                 $.extend(select2Config, {
                     ajax: {
                         url: ajax_url,
@@ -552,7 +563,7 @@
                                 data: {init: initVal}
                             }).done(function (data) {
                                 var row = $.isArray(data) ? data[0] : data;
-                                if (!is_blank(row.id) && !is_blank(row.label)) {
+                                if (row!==undefined && row.id!==undefined && row.label!==undefined) {
                                     callback({id: row.id, text: row.label});
                                 } else {
                                     callback({id: initVal, text: initVal});
@@ -567,13 +578,11 @@
             var totalItems = $el.find('option').length;
             if ($el.hasClass('operators')) {
                 $.extend(select2Config, {placeholder: plugin.parameters.placeholder.operators});
-            }
-            if ($el.hasClass('values')) {
+            } else if ($el.hasClass('values')) {
                 $.extend(select2Config, {placeholder: plugin.parameters.placeholder.values});
             }
-
             if (tags == true) {
-                $.extend(select2Config, {tags: true, tokenSeparators: [',', ';']});
+                $.extend(select2Config, {tags: true, tokenSeparators: [',',';']});
             }
 
             $.fn.select2.defaults.set("theme", (select2Config.theme || 'bootstrap'));

data/app/controllers/application_dictionary.rb

@@ -0,0 +1,22 @@
+class ApplicationDictionary < ::ApplicationController
+  include VisualConditionBuilder::ApplicationHelper
+
+  def initialize(request)
+    self.request = request
+  end
+
+  def dictionary(dictionar_klass_name, context)
+    @klass = Object.const_get "#{dictionar_klass_name}".classify
+    dictionary = @klass.dictionary(context)
+    dictionary.each do |field|
+      if field[:values].present? && field[:values].is_a?(Proc)
+        field[:values] = self.instance_exec(&field[:values])
+      end
+      if field[:operators].present? && field[:operators].is_a?(Proc)
+        field[:operators] = self.instance_exec(&field[:operators])
+      end
+    end
+    dictionary
+  end
+
+end

data/app/helpers/visual_condition_builder/application_helper.rb

@@ -9,7 +9,7 @@ module VisualConditionBuilder
       hArgs = normalize_placeholder_label(hArgs)
 
       builder_options = {
-          dictionary: ObrigacaoDictionary.dictionary
+          dictionary: ObrigacaoDictionary.dictionary(get_dictionary_context(dictionary), self.request)
       }.deep_merge(hArgs)
 
       capture do

data/lib/visual_condition_builder/dictionary.rb

@@ -9,11 +9,15 @@ module VisualConditionBuilder
         end
       end
 
-      def dictionary(name=:default, &block)
+      def dictionary(name=:default, request=nil, &block)
         (self.dictionaries ||= {})[name] ||= []
         @dictionary_name = name
         block.call if block_given?
-        self.dictionaries[name]
+        if request.present?
+          ApplicationDictionary.new(request).send(:dictionary, self.name, name)
+        else
+          self.dictionaries[name]
+        end
       end
 
       def fields(dictionary_name=:default)
@@ -47,9 +51,6 @@ module VisualConditionBuilder
           args[:label] ||= I18n.t(attr.to_sym, default: attr.to_s.humanize, scope: [:condition_dictionaries, dictionary_name])
           args[:field] ||= attr
         end
-        if args[:values].present? && args[:values].is_a?(Proc)
-          args[:values] = args[:values].call
-        end
         if normalized_name(args[:type])==:boolean && args[:label] !~ /\?$/
           args[:label]+='?'
         end

data/lib/visual_condition_builder/engine.rb

@@ -1,5 +1,4 @@
 module VisualConditionBuilder
   class Engine < ::Rails::Engine
-
   end
 end

data/lib/visual_condition_builder/version.rb

@@ -1,3 +1,3 @@
 module VisualConditionBuilder
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visual_condition_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Bruno Porto
@@ -78,9 +78,8 @@ files:
 - app/assets/stylesheets/visual_condition_builder/condition_builder.css
 - app/assets/stylesheets/visual_condition_builder/select2-bootstrap.css
 - app/assets/stylesheets/visual_condition_builder/select2.css
-- app/controllers/application_widget.rb
+- app/controllers/application_dictionary.rb
 - app/controllers/visual_condition_builder/application_controller.rb
-- app/controllers/visual_condition_builder/widgets_controller.rb
 - app/helpers/visual_condition_builder/application_helper.rb
 - app/models/visual_condition_builder/user.rb
 - app/views/visual_condition_builder/widgets/_widgets_list.html.erb

data/app/controllers/application_widget.rb

@@ -1,56 +0,0 @@
-class ApplicationWidget < ::ApplicationController
-  include SingletonHelper
-
-  attr_singleton :refresh_interval, 0
-
-  def initialize(request)
-    self.request = request
-  end
-
-  def render_template(view_file=nil, *args)
-    args << {template: view_file}
-    render_to_string *args
-  end
-
-  def view(view_file=nil, klass=nil)
-    class_caller = klass || (caller[0].match(/(\b\w+)\.rb/)[1] rescue '')
-    action_caller = view_file || (caller[0].match(/`(.*)'/)[1] rescue '')
-    view_file = "widgets/#{class_caller.to_s.sub('_widget','')}/#{action_caller}" unless lookup_context.find_all(view_file).any?
-    instance_variable_set(:@view_file, view_file)
-  end
-
-  def self.name?
-    instance_variable_defined?(:@widget_name) ? instance_variable_get(:@widget_name) : ''
-  end
-
-  def self.name!(value)
-    # define_singleton_method(:widget_name) {value}
-    instance_variable_set(:@widget_name, value)
-  end
-
-  def self.description?(attr=nil)
-    attr='widget' if attr.nil?
-    instance_variable_defined?("@description_#{attr}") ? instance_variable_get("@description_#{attr}") : ''
-  end
-
-  def self.description!(*args)
-    if args.size == 1
-      instance_variable_set(:@description_widget, args[0])
-    elsif args.size == 2
-      instance_variable_set("@description_#{args[0]}", args[1])
-    end
-  end
-
-  def self.widgets
-    # ApplicationWidget.descendants.map do |klass| #Não estava carregando no primeiro load...
-    Dir["#{Rails.root}/app/widgets/*.rb"].map do |file_path|
-      file_name = File.basename(file_path, ".rb")
-      klass = Object.const_get file_name.classify
-      actions = klass.instance_methods(false).map do |action|
-        {name: action, description: klass.description?(action)}
-      end
-      {code: klass.to_s.tableize.sub('_widgets',''), name: klass.name?, description: klass.description?, actions: actions}
-    end
-  end
-
-end

data/app/controllers/visual_condition_builder/widgets_controller.rb

@@ -1,45 +0,0 @@
-require_dependency "visual_condition_builder/application_controller"
-
-module VisualConditionBuilder
-  class WidgetsController < ApplicationController
-
-    def load
-      widget = VisualConditionBuilder::Widget.new(params[:widget_name], self.request)
-      content = widget.html(params[:widget_action])
-    rescue Exception => e
-      content = e.message
-    ensure
-      render html: content, layout: false
-    end
-
-    def user
-      user_id = params[:id] || current_user.id
-      @widgets_code = VisualConditionBuilder::User.where(user_id: user_id).pluck(:widget, :action).map{|r| "#{r[0]}_#{r[1]}"}
-      render partial: 'widgets_list'
-    end
-
-    def index
-    end
-
-    def save
-      user_id = params[:user_id] || current_user.id
-      widgets = params[:widgets]
-      widget_name_user = []
-      action_user = []
-      if widgets.present?
-        widgets.each do |widget|
-          widget_name, action = widget.split('|')
-          if widget_name && action
-            widget_name_user << widget_name
-            action_user << action
-            VisualConditionBuilder::User.find_or_create_by(widget: widget_name, action: action, user_id: user_id)
-          end
-        end
-      end
-      VisualConditionBuilder::User.where(user_id: user_id).where.not(widget: widget_name_user, action: action_user).destroy_all
-      flash[:success] = 'Alterações foram salvas com sucesso!'
-      redirect_to visual_condition_builder_path
-    end
-
-  end
-end