criteria_operator-ui_component 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e59209173c826deb5e89edbd128dc8875980a835
-  data.tar.gz: 9a6b936f6fd41493dfe9d8e4ee581a4c7d3198c1
+  metadata.gz: 34d248889761e6d31e3148506b089f3ea88481f6
+  data.tar.gz: 511d5fb6743d803453c4311f6b3cbea841ccaf48
 SHA512:
-  metadata.gz: 5b5f5596ee42e83b0a33f38309ff529aaf98e7b02b983d59d6b1993f2528a517c909d1666606530ecaf6be0f5b5f32ebf0c27856994d271ca7531e53f30e7177
-  data.tar.gz: 57340e412354213ef57c2753d289c08aa0a2f1a74333c8626dfafdb2843c9fcc7cc8e52662bff3fc2a37d1a44b861aab45083061eb73e90c692b1d3c2d046f2b
+  metadata.gz: 529c2e61693320dacc0444ecb9d1e58f15c862a965ed756cb83783262679a417908f94f07d15062a240f09930b474057b0651ea1b84ccf4ac704b8ae31941703
+  data.tar.gz: 48a4434e5a24b909ed3477356f2258d37976a17266ca0775b364d373b0f5233ef8c61909cef2a7ba760840e243231181ee242a310c125451355816dca4904d8c

data/app/assets/stylesheets/criteria_operator/ui_component/application.css

@@ -13,37 +13,3 @@
  *= require_tree .
  *= require_self
  */
-
-.criteria_editor {
-    border: dashed #2E2F30 thin;
-    padding: 5px;
-}
-
-.criteria_editor_header {
-    font-size: large;
-    font-weight: bold;
-    margin-bottom: 10px;
-}
-
-.criteria_group_row {
-    border: dashed #666666 thin;
-}
-
-.criteria_group_row_header {
-    font-size: medium;
-    font-weight: bold;
-}
-
-.criteria_expression_row {
-    border: dotted #999999 thin;
-}
-
-.criteria_editor_empty_placeholder {
-    color: #999999;
-    padding: 15px;
-    border: dashed #999999;
-}
-
-.criteria_editor_row_wrapper {
-    margin-left: 10px;
-}

data/app/assets/stylesheets/criteria_operator/ui_component/criteria_editor.css

@@ -0,0 +1,33 @@
+.criteria_editor {
+    border: dashed #2E2F30 thin;
+    padding: 5px;
+}
+
+.criteria_editor_header {
+    font-size: large;
+    font-weight: bold;
+    margin-bottom: 10px;
+}
+
+.criteria_group_row {
+    border: dashed #666666 thin;
+}
+
+.criteria_group_row_header {
+    font-size: medium;
+    font-weight: bold;
+}
+
+.criteria_expression_row {
+    border: dotted #999999 thin;
+}
+
+.criteria_editor_empty_placeholder {
+    color: #999999;
+    padding: 15px;
+    border: dashed #999999;
+}
+
+.criteria_editor_row_wrapper {
+    margin-left: 10px;
+}

data/app/cells/criteria_operator/ui_component/group/show.erb

@@ -1,4 +1,4 @@
-<div class="criteria_group_row" data-locator="<%= @locator %>" data-childcount="<%= @group.operand_collection.count %>">
+<div class="criteria_group_row" data-locator="<%= @locator %>" data-childcount="<%= @group.nil? ? 0 : @group.operand_collection.count %>">
   <select class="criteria_operator_type_input group_operator_type">
     <% operators.each do |op| %>
         <option value="<%= op[:value] %>" <% if op[:value] == operator_type %>selected<% end %>><%= op[:text] %></option>

data/app/controllers/criteria_operator/ui_component/ajax_controller.rb

@@ -1,146 +1,146 @@
-require_dependency "criteria_operator/ui_component/application_controller"
-require 'cell'
-require 'cell/erb'
-require 'yaml'
-
-module CriteriaOperator
-  module UiComponent
-    class AjaxController < ApplicationController
-      def create_expression
-        return unless ajax_params.has_key? :root_operator
-        root_operator = root_op_from_params
-        operator = BinaryOperator.new
-        add_sub_operator root_operator, operator, ajax_params[:locator]
-        html = ExpressionCell.call(operator).call(:show, locator: new_locator)
-        render json: { html: html, operator: YAML.dump(root_operator) }
-      end
-
-      def create_group
-        return unless ajax_params.has_key? :root_operator
-        root_operator = root_op_from_params
-        operator = GroupOperator.new
-        add_sub_operator root_operator, operator, ajax_params[:locator]
-        html = GroupCell.call(operator).call(:show, locator: new_locator)
-        render json: { html: html, operator: YAML.dump(root_operator) }
-      end
-
-      def delete_element
-        return unless (ajax_params.has_key? :root_operator) && (ajax_params.has_key? :locator)
-        root_operator = root_op_from_params
-        remove_sub_operator root_operator, ajax_params[:locator]
-        render json: { operator: YAML.dump(root_operator) }
-      end
-
-      def operand_change
-        return unless (ajax_params.has_key? :root_operator) && (ajax_params.has_key? :locator)
-        root_operator = root_op_from_params
-        op = locate_sub_operator root_operator, ajax_params[:locator]
-        op.left_operand = OperandProperty.new(ajax_params[:operand_value]) if ajax_params[:operand_type] == 'left'
-        op.right_operand = OperandValue.new(ajax_params[:operand_value]) if ajax_params[:operand_type] == 'right'
-        render json: { operator: YAML.dump(root_operator) }
-      end
-
-      def expression_type_change
-        return unless (ajax_params.has_key? :root_operator) && (ajax_params.has_key? :locator)
-        root_operator = root_op_from_params
-        op = locate_sub_operator root_operator, ajax_params[:locator]
-        op.operator_type = ajax_params[:operator_type_value]
-        render json: { operator: YAML.dump(root_operator) }
-      end
-
-      def group_type_change
-        return unless (ajax_params.has_key? :root_operator) && (ajax_params.has_key? :locator)
-        root_operator = root_op_from_params
-        root_operator = change_sub_group_type root_operator, ajax_params[:locator], ajax_params[:operator_type_value].to_i
-        render json: { operator: YAML.dump(root_operator) }
-      end
-
-      private
-
-      def ajax_params
-        params.permit :root_operator, :locator, :child_count, :operand_type, :operand_value, :operator_type_value
-      end
-
-      def root_op_from_params
-        YAML.safe_load ajax_params[:root_operator], (ObjectSpace.each_object(Class).select { |klass| klass < BaseOperator })
-      end
-
-      def new_locator
-        if ajax_params.has_key? :child_count
-          ajax_params[:child_count].to_s
-        else
-          '0'
-        end
-      end
-
-      def locate_sub_operator(operator, locator)
-        op = get_negated_group_if_exist operator
-        locator.split(',').map(&:to_i).each do |pos|
-          # TODO: some kind of error handling beside cancelling?
-          return nil unless op.is_a? GroupOperator
-          op = op.operand_collection[pos]
-          op = get_negated_group_if_exist op
-        end
-        op
-      end
-
-      def add_sub_operator(root_op, extend_op, locator)
-        op = locate_sub_operator root_op, locator
-        op.operand_collection << extend_op
-      end
-
-      def remove_sub_operator(root_op, locator)
-        locator_array = locator.split(',')
-        pos = locator_array.pop
-        op = root_op
-        unless locator_array.empty?
-          op = locate_sub_operator op, locator_array.join(',')
-        end
-        op = get_negated_group_if_exist op
-        op.operand_collection.delete_at pos.to_i
-      end
-
-      def change_sub_group_type(root_op, locator, op_type)
-        op = root_op
-        last_pos = -1
-        parent_op = nil
-        locator_array = locator.split(',')
-        locator_array.map(&:to_i).each do |pos|
-          op = get_negated_group_if_exist op
-          last_pos = pos
-          parent_op = op
-          op = op.operand_collection[pos]
-        end
-
-        if negation? op
-          if op_type > 0
-            parent_op.operand_collection[last_pos] = op.operand
-            op.operand.operator_type = op_type
-          else
-            op.operand.operator_type = op_type * -1
-          end
-        else
-          if op_type < 0
-            parent_op.operand_collection[last_pos] = UnaryOperator.new op, UnaryOperatorType::NOT
-            op.operator_type = op_type * -1
-          else
-            op.operator_type = op_type
-          end
-        end
-        root_op
-      end
-
-      def get_negated_group_if_exist(op)
-        if negation? op
-          op.operand
-        else
-          op
-        end
-      end
-
-      def negation?(op)
-        op.is_a?(UnaryOperator) && (op.operator_type == UnaryOperatorType::NOT)
-      end
-    end
-  end
-end
+require_dependency "criteria_operator/ui_component/application_controller"
+require 'cell'
+require 'cell/erb'
+require 'yaml'
+
+module CriteriaOperator
+  module UiComponent
+    class AjaxController < ApplicationController
+      def create_expression
+        return unless ajax_params.has_key? :root_operator
+        root_operator = root_op_from_params
+        operator = BinaryOperator.new
+        add_sub_operator root_operator, operator, ajax_params[:locator]
+        html = ExpressionCell.call(operator).call(:show, locator: new_locator)
+        render json: { html: html, operator: YAML.dump(root_operator) }
+      end
+
+      def create_group
+        return unless ajax_params.has_key? :root_operator
+        root_operator = root_op_from_params
+        operator = GroupOperator.new
+        add_sub_operator root_operator, operator, ajax_params[:locator]
+        html = GroupCell.call(operator).call(:show, locator: new_locator)
+        render json: { html: html, operator: YAML.dump(root_operator) }
+      end
+
+      def delete_element
+        return unless (ajax_params.has_key? :root_operator) && (ajax_params.has_key? :locator)
+        root_operator = root_op_from_params
+        remove_sub_operator root_operator, ajax_params[:locator]
+        render json: { operator: YAML.dump(root_operator) }
+      end
+
+      def operand_change
+        return unless (ajax_params.has_key? :root_operator) && (ajax_params.has_key? :locator)
+        root_operator = root_op_from_params
+        op = locate_sub_operator root_operator, ajax_params[:locator]
+        op.left_operand = OperandProperty.new(ajax_params[:operand_value]) if ajax_params[:operand_type] == 'left'
+        op.right_operand = OperandValue.new(ajax_params[:operand_value]) if ajax_params[:operand_type] == 'right'
+        render json: { operator: YAML.dump(root_operator) }
+      end
+
+      def expression_type_change
+        return unless (ajax_params.has_key? :root_operator) && (ajax_params.has_key? :locator)
+        root_operator = root_op_from_params
+        op = locate_sub_operator root_operator, ajax_params[:locator]
+        op.operator_type = ajax_params[:operator_type_value]
+        render json: { operator: YAML.dump(root_operator) }
+      end
+
+      def group_type_change
+        return unless (ajax_params.has_key? :root_operator) && (ajax_params.has_key? :locator)
+        root_operator = root_op_from_params
+        root_operator = change_sub_group_type root_operator, ajax_params[:locator], ajax_params[:operator_type_value].to_i
+        render json: { operator: YAML.dump(root_operator) }
+      end
+
+      private
+
+      def ajax_params
+        params.permit :root_operator, :locator, :child_count, :operand_type, :operand_value, :operator_type_value
+      end
+
+      def root_op_from_params
+        YAML.safe_load ajax_params[:root_operator], (ObjectSpace.each_object(Class).select { |klass| klass < BaseOperator })
+      end
+
+      def new_locator
+        if ajax_params.has_key? :child_count
+          ajax_params[:child_count].to_s
+        else
+          '0'
+        end
+      end
+
+      def locate_sub_operator(operator, locator)
+        op = get_negated_group_if_exist operator
+        locator.split(',').map(&:to_i).each do |pos|
+          # TODO: some kind of error handling beside cancelling?
+          return nil unless op.is_a? GroupOperator
+          op = op.operand_collection[pos]
+          op = get_negated_group_if_exist op
+        end
+        op
+      end
+
+      def add_sub_operator(root_op, extend_op, locator)
+        op = locate_sub_operator root_op, locator
+        op.operand_collection << extend_op
+      end
+
+      def remove_sub_operator(root_op, locator)
+        locator_array = locator.split(',')
+        pos = locator_array.pop
+        op = root_op
+        unless locator_array.empty?
+          op = locate_sub_operator op, locator_array.join(',')
+        end
+        op = get_negated_group_if_exist op
+        op.operand_collection.delete_at pos.to_i
+      end
+
+      def change_sub_group_type(root_op, locator, op_type)
+        op = root_op
+        last_pos = -1
+        parent_op = nil
+        locator_array = locator.split(',')
+        locator_array.map(&:to_i).each do |pos|
+          op = get_negated_group_if_exist op
+          last_pos = pos
+          parent_op = op
+          op = op.operand_collection[pos]
+        end
+
+        if negation? op
+          if op_type > 0
+            parent_op.operand_collection[last_pos] = op.operand
+            op.operand.operator_type = op_type
+          else
+            op.operand.operator_type = op_type * -1
+          end
+        else
+          if op_type < 0
+            parent_op.operand_collection[last_pos] = UnaryOperator.new op, UnaryOperatorType::NOT
+            op.operator_type = op_type * -1
+          else
+            op.operator_type = op_type
+          end
+        end
+        root_op
+      end
+
+      def get_negated_group_if_exist(op)
+        if negation? op
+          op.operand
+        else
+          op
+        end
+      end
+
+      def negation?(op)
+        op.is_a?(UnaryOperator) && (op.operator_type == UnaryOperatorType::NOT)
+      end
+    end
+  end
+end

data/lib/criteria_operator/ui_component.rb

@@ -1,8 +1,8 @@
-require 'criteria_operator/ui_component/engine'
-require 'cells/rails'
-
-module CriteriaOperator
-  module UiComponent
-    # Your code goes here...
-  end
-end
+require 'criteria_operator/ui_component/engine'
+require 'cells/rails'
+
+module CriteriaOperator
+  module UiComponent
+    # Your code goes here...
+  end
+end

data/lib/criteria_operator/ui_component/version.rb

@@ -1,5 +1,5 @@
-module CriteriaOperator
-  module UiComponent
-    VERSION = '0.2.0'
-  end
-end
+module CriteriaOperator
+  module UiComponent
+    VERSION = '0.2.1'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: criteria_operator-ui_component
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Florian Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -199,6 +199,7 @@ files:
 - app/assets/javascripts/criteria_operator/ui_component/application.js
 - app/assets/javascripts/criteria_operator/ui_component/criteria_editor.js
 - app/assets/stylesheets/criteria_operator/ui_component/application.css
+- app/assets/stylesheets/criteria_operator/ui_component/criteria_editor.css
 - app/cells/criteria_operator/ui_component/base_cell.rb
 - app/cells/criteria_operator/ui_component/criteria_editor/show.erb
 - app/cells/criteria_operator/ui_component/criteria_editor_cell.rb