visual_condition_builder 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f82b832c1d6f0be7ab2ad7a6c4d025ba89b27a2c
-  data.tar.gz: a14f601b2bf2d7fef39b8e2382c0ec25f28ec738
+  metadata.gz: 8f5efbc1e1e60c13d256b4fec51886eb21f209c1
+  data.tar.gz: b4c2d18b2e3ede0ae1a0c48ad86fd36de2b409c8
 SHA512:
-  metadata.gz: c88f8576de543bcd9a27caabaf5f70e472045d11711bae5d7cd56e0cc17631b9b4a1b1bfce8acef2af470bf1acf53ab51697bf489a267e796838754649b72d74
-  data.tar.gz: 8433a51f5b221621c0b8f0adadf85966010d04d67a16e0885ed214eac8dd79176a3205cec6b65440b7d1d4792adee5dfc803d2365d8384c487e29d2a38d4a4b0
+  metadata.gz: 07cbfd797610edb9b85ee44c05da413c496bc28888aea3563c11d6b013e000067df56f05d7d2c8aec0507a2dc3abb33eeb04269222866c6b0c6fedc101f70949
+  data.tar.gz: 83b5ec6de8d1f239908e932a7f33c7bcfef7cf3ecae69637230f8b3968d74865817bf04118b31fde339727ae8cbcb61adaa40a92f6500cec38e938efea35e1dc

data/README.md

@@ -2,10 +2,6 @@
 
 A great and easy condition builder to your rails project
 
-**BOOTSTRAP 3** : Version 0. ~ 1.
-
-**BOOTSTRAP 4** : Version 2. +
-
 ## How to install
 
 Add it to your **Gemfile**: 

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

@@ -52,11 +52,11 @@
                 field_label = Object.values(fieldObj.group)[0] + ' : ' + field_label;
             }
             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 tag tag-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 form-control" style="display: none"></select>');
-            block.append('<span id="fixed_operator_'+new_id+'" data-group-id="'+new_id+'" class="fixed_operator form-control" style="display: none"></span>');
-            block.append('<select id="values_'+new_id+'" data-group-id="'+new_id+'" class="values form-control" style="display: none"></select>');
-            block.append('<input id="fixed_value_'+new_id+'" data-group-id="'+new_id+'" class="fixed_value form-control" style="display: none" />');
+            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>');
             }
@@ -96,10 +96,10 @@
             var operators = field.operators;
 
             remove_plugins_elements(groupConditionId);
-            $operators.html('').hide();
-            $fixedOperator.val('').hide();
-            $values.html('').hide();
-            $fixedValue.val('').hide();
+            $operators.html('').addClass('hide');
+            $fixedOperator.val('').addClass('hide');
+            $values.html('').addClass('hide');
+            $fixedValue.val('').addClass('hide');
 
             operators = normalize_operators(operators);
             $.each(operators, function (op_i, op_el) {
@@ -107,9 +107,9 @@
                 $operators.append(op_option);
             });
             if (operators != undefined && operators.length == 1) {
-                $fixedOperator.html(getLabel(operators[0])).show();
+                $fixedOperator.html(getLabel(operators[0])).removeClass('hide');
             } else {
-                $operators.show();
+                $operators.removeClass('hide');
             }
             $operators.trigger('change');
         };
@@ -243,7 +243,7 @@
 
         var getValueElement = function (groupConditions) {
             var element = $(groupConditions).find('.values');
-            if (element.is(":hidden")) {
+            if (element.hasClass('hide')) {
                 element = $(groupConditions).find('.fixed_value');
             }
             return element;
@@ -321,10 +321,8 @@
                 $.each(plugin.parameters.values, function (i, data) {
                     var field = data[0];
                     var groupConditions = plugin.add_condition(field);
-                    if (!is_blank(groupConditions)) {
-                        var groupConditionId = groupConditions.attr('data-id');
-                        plugin.fill_condition(groupConditionId, data);
-                    }
+                    var groupConditionId = groupConditions.attr('data-id');
+                    plugin.fill_condition(groupConditionId, data);
                 });
             }
         };
@@ -336,8 +334,8 @@
             var $fixedValue = $groupConditions.find('.fixed_value');
             var multiple = op_el.attr('data-multiple');
             multiple = (multiple == 'true' ? 'true' : 'false');
-            $values.html('').removeAttr('data-ajax-values').hide();
-            $fixedValue.removeAttr('data-ajax-values').hide();
+            $values.html('').removeAttr('data-ajax-values').addClass('hide');
+            $fixedValue.removeAttr('data-ajax-values').addClass('hide');
 
             if (typeof values === 'string') {
                 $values.attr('data-ajax-values', values);
@@ -362,14 +360,14 @@
                         }
                         $values.append('<option data-index="' + val_i + '" value="' + _id + '">' + _label + '</option>');
                     });
-                    $values.show();
+                    $values.removeClass('hide');
                     $values.trigger('change');
                 } else {
                     if (multiple == 'true') {
-                        $values.show();
+                        $values.removeClass('hide');
                         $values.trigger('change');
                     } else {
-                        $fixedValue.show();
+                        $fixedValue.removeClass('hide');
                         $fixedValue.trigger('change');
                     }
                 }
@@ -393,7 +391,7 @@
             if (!isNaN(multiple)) {
                 for (var i = 1; i < parseInt(multiple); i++) {
                     var $valueElClone = $valueEl.clone();
-                    $valueElClone.addClass('clone').show();
+                    $valueElClone.addClass('clone').removeClass('hide');
                     $valueElClone.insertAfter($valueEl);
                 }
             } else {
@@ -469,7 +467,7 @@
                     console.log(field_name, uTypeField);
                     $el.parent().append('<i class="type_field" style="font-size: 10px; color: #ccc;"><br>' + uTypeField + '</i>');
                 }
-                if (($el.hasClass('values') && $el.is(":visible"))) {
+                if (($el.hasClass('values') && !$el.hasClass('hide'))) {
                     // build_select2_element($el, (!list_with_item && multiple == 'true'));
                     build_select2_element($el);
                 }

data/app/assets/stylesheets/visual_condition_builder/condition_builder.css

@@ -17,6 +17,10 @@
     vertical-align: middle;
 }
 
+.condition-builder .hide {
+    display: none !important;
+}
+
 .add-condition {
     display: inline-block;
 }
@@ -27,6 +31,16 @@
     overflow-x: hidden;
 }
 
+.add-condition-menu > li > a {
+    display: block;
+    padding: 3px 20px;
+    clear: both;
+    font-weight: 400;
+    line-height: 1.42857143;
+    color: #333;
+    white-space: nowrap;
+}
+
 .condition-builder .remove-condition {
     margin-left: 5px;
     font-size: 16px;

data/app/helpers/visual_condition_builder/application_helper.rb

@@ -34,7 +34,7 @@ txtjs
             concat(I18n.t(:dropdown, default: ['Fields'], scope: [:condition_builder]))
             concat(content_tag(:span, nil, class:'caret'))
           end)
-          concat(content_tag(:div, class: 'dropdown-menu add-condition-menu') do
+          concat(content_tag(:ul, class: 'dropdown-menu add-condition-menu') do
             create_conditions_fields_item(dictionary_klass.fields(get_dictionary_context(dictionary)))
           end)
         end
@@ -46,10 +46,10 @@ txtjs
       fields.each do |field, attrs|
         if field.is_a?(Hash) #GROUP
           group_label = field.values.first
-          concat(content_tag(:h6, group_label, class: 'dropdown-header'))
+          concat(content_tag(:li, group_label, class: 'dropdown-header'))
           create_conditions_fields_item(attrs)
         else
-          concat(link_to(attrs[:label], 'javascript:void(0)', class: 'dropdown-item add-condition-field', data: {field: field}))
+          concat(content_tag(:li, link_to(attrs[:label], '#', class: 'add-condition-field', data: {field: field})))
         end
       end
     end

data/config/initializers/visual_condition_builder.rb

@@ -1,7 +1,7 @@
-class Railtie < ::Rails::Railtie
-  initializer 'activeservice.autoload', :before => :set_autoload_paths do |app|
-    app.config.autoload_paths << "#{Rails.application.config.root}/app/condition_dictionaries"
-  end
-end
-
+# class Railtie < ::Rails::Railtie
+#   initializer 'activeservice.autoload', :before => :set_autoload_paths do |app|
+#     app.config.autoload_paths << "#{Rails.application.config.root}/app/condition_dictionaries"
+#   end
+# end
+#
 

data/lib/visual_condition_builder.rb

@@ -1,4 +1,4 @@
-# require 'haml'
+require 'haml'
 require 'visual_condition_builder/engine'
 require 'visual_condition_builder/helper'
 require 'visual_condition_builder/converter'

data/lib/visual_condition_builder/helper.rb

@@ -1,7 +1,7 @@
 module VisualConditionBuilder
   module Helper
     def dictionary_values(id_field, label_field)
-      self.map{|r| {id: r[id_field], label: r[label_field]} }
+      self.map {|r| {id: r[id_field], label: r[label_field]}}
     end
   end
 end
@@ -12,8 +12,19 @@ class Array
 end
 
 #INJETANDO METODO para_* em um conjunto de registros ActiveRecord::Relation
-module ActiveRecord
-  class Relation
-    include VisualConditionBuilder::Helper
+if defined?(ActiveRecord)
+  module ActiveRecord
+    class Relation
+      include VisualConditionBuilder::Helper
+    end
+  end
+end
+
+#INJETANDO METODO para_* em um conjunto de registros Mongoid::Criteria
+if defined?(Mongoid)
+  module Mongoid
+    class Criteria
+      include VisualConditionBuilder::Helper
+    end
   end
 end

data/lib/visual_condition_builder/version.rb

@@ -1,3 +1,3 @@
 module VisualConditionBuilder
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: visual_condition_builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Bruno Porto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
-dependencies: []
+date: 2017-08-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 description: A great and easy visual condition builder to your rails project
 email:
 - brunotporto@gmail.com
@@ -19,7 +39,6 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- Rakefile
 - app/assets/javascripts/visual_condition_builder.js
 - app/assets/javascripts/visual_condition_builder/Sortable.js
 - app/assets/javascripts/visual_condition_builder/autoNumeric-2.0-BETA.js
@@ -96,7 +115,8 @@ files:
 homepage: https://github.com/brunoporto/visual_condition_builder
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -113,8 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
-summary: A great and easy visual condition builder to your rails project
+summary: Visual Condition Builder to your rails project
 test_files: []

data/Rakefile

@@ -1,34 +0,0 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-# require 'rdoc/task'
-# RDoc::Task.new(:rdoc) do |rdoc|
-#   rdoc.rdoc_dir = 'rdoc'
-#   rdoc.title    = 'VisualConditionBuilder'
-#   rdoc.options << '--line-numbers'
-#   rdoc.rdoc_files.include('README.rdoc')
-#   rdoc.rdoc_files.include('lib/**/*.rb')
-# end
-
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-
-load 'rails/tasks/statistics.rake'
-
-Bundler::GemHelper.install_tasks
-
-# require 'rake/testtask'
-#
-# Rake::TestTask.new(:test) do |t|
-#   t.libs << 'lib'
-#   t.libs << 'test'
-#   t.pattern = 'test/**/*_test.rb'
-#   t.verbose = false
-# end
-#
-#
-# task default: :test