criteria_operator-ui_component 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5df43b494f1d8c12c418c8bf7de70991f67e8b7c
-  data.tar.gz: 759434c28b1944a01d3184c21f9a105499693b56
+  metadata.gz: '099998db6c3f2319e47d93dc94df7a36201e19cd'
+  data.tar.gz: a588ba19e36cacbec22dc94b2548de7627ad260e
 SHA512:
-  metadata.gz: 97e8c0ac85db87d23dfc218605d7c698c5031186f02ab1cf9071bc76044c4385a8e25cd77cc4c9c48772c6af242b81fe4b516865cfa3c95b47ae1e1902371bda
-  data.tar.gz: 2eece0daaacbf20b16aa771aa224c35d57b3117fa9a3cf2df6bf429cf3886bc01bb189fee25ecdf8392a4639a6327a1fa73990d0ad055311da104ac26da76b1a
+  metadata.gz: 0bbdbed1f6b76c54db5450f00f2e305648efe8f29bdec2eb8047ef29ff4a8cd552426118dad8ba2b1413136a06e7c2748ef2ea7ef399af153e3cf75b7298d98a
+  data.tar.gz: f73ed0d0581b6145190ca34d7f7e0f4c27f049b30c3db2e4a405e9722e1c928c986d941731a247d9d285a9a9a5e119a724097f957a39e255a43a3496ce2ebd0d

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

@@ -1,5 +1,5 @@
 <div class="criteria_editor">
   <span class="criteria_editor_header">This is the header</span>
-  <%= cell('criteria_operator/ui_component/group', model).(:show, allow_delete: false) %>
+  <%= cell('criteria_operator/ui_component/group', @operator).(:show, allow_delete: false) %>
   <input type="hidden" id="<%= input_id %>" name="<%= input_name %>" class="criteria_editor_root_operator" value="<%= serialized_operator %>" />
 </div>

data/app/cells/criteria_operator/ui_component/criteria_editor_cell.rb

@@ -8,6 +8,8 @@ module CriteriaOperator
         @input_id = options[:id] if options.has_key? :id
         @input_name = options[:name] if options.has_key? :name
         # TODO: provide support for read_only
+
+        @operator = model.is_a?(String) ? BaseOperator.deserialize(model) : model
         render
       end
 
@@ -30,7 +32,7 @@ module CriteriaOperator
       end
 
       def serialized_operator
-        YAML.dump(model) if model.is_a? BaseOperator
+        @operator.serialize if @operator.is_a? BaseOperator
       end
     end
   end

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

@@ -62,7 +62,7 @@ module CriteriaOperator
       end
 
       def root_op_from_params
-        YAML.safe_load ajax_params[:root_operator], (ObjectSpace.each_object(Class).select { |klass| klass < BaseOperator })
+        BaseOperator.deserialize ajax_params[:root_operator]
       end
 
       def new_locator

data/criteria_operator-ui_component.gemspec

@@ -45,7 +45,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "cells-rails", "~> 0.0"
   spec.add_dependency "cells-erb", "~> 0.1"
   spec.add_dependency "jquery-rails", "~> 4.3"
-  spec.add_dependency "criteria_operator", "~> 0.2"
+  spec.add_dependency "criteria_operator", "~> 0.3"
 
   # let yard run on install
   spec.metadata["yard.run"] = "yri"

data/lib/criteria_operator/ui_component/version.rb

@@ -1,5 +1,5 @@
 module CriteriaOperator
   module UiComponent
-    VERSION = '0.2.2'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: criteria_operator-ui_component
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Florian Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 description: This gem provides ui components for Rails Applicaitons based on Cells,
   that can be used to edit the criteria_operator expression trees.
 email: