forest_liana 5.4.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e1a93b16b8c079a92000891ac73f8794fa87c2b6411e99a6e160d7f5e88e64d
-  data.tar.gz: 0b6853a6eda1fef9f395fa9f247b90273fef74fe8eb9e621ed4647d43832dc03
+  metadata.gz: 8e6b91f8b65d70c711aa9f0f20e5efaf8ee6eddc7324b09629cab67ddbc7534b
+  data.tar.gz: c21d927739263c46975a51e67bbbe51c00affcb82db53ea5895bd18f107dc864
 SHA512:
-  metadata.gz: 3e7aa35686573cce22819ea583a20c9d93afd39b72187aae0c618fd0e67e1494475435ae0ca9c8c892b7bbe3015c0e6ac0f220ca75b2526f66883f5a491f54f7
-  data.tar.gz: ffdcfcf09b90001e66bff1910a86d635def03cf718a9e13282061d4f9d5c4b0780058ba7462106ea6c4deb299e388bb3c32a3eec624d51bfd7b0420a85a60167
+  metadata.gz: e160240b6a18c405861906143eb1fc121eb97317f0ee3a826ba07b7f93509a43ed906d03a91dccc978f3fa5432702b7d13d47afaa3e4109a46afb732bc3a4659
+  data.tar.gz: 3470dbf5dab1b67904d00eb183f63b70a511f158427fcedc8d2b63aad6080ce38dda979859eb5f5a5fd28cfbb97b3e7e4c132c776bd4c5cb1efb34b4d60674e4

data/app/controllers/forest_liana/actions_controller.rb

@@ -55,10 +55,20 @@ module ForestLiana
       # Apply result on fields (transform the object back to an array), preserve order.
       fields = action.fields.map do |field|
         updated_field = result[field[:field]]
+
         # Reset `value` when not present in `enums` (which means `enums` has changed).
-        if updated_field[:enums].is_a?(Array) && !updated_field[:enums].include?(updated_field[:value])
-          updated_field[:value] = nil
+        if updated_field[:enums].is_a?(Array)
+          # `value` can be an array if the type of fields is `[x]`
+          if updated_field[:type].is_a?(Array) && updated_field[:value].is_a?(Array) && !(updated_field[:value] - updated_field[:enums]).empty?
+            updated_field[:value] = nil
+          end
+
+          # `value` can be any other value
+          if !updated_field[:type].is_a?(Array) && !updated_field[:enums].include?(updated_field[:value])
+            updated_field[:value] = nil
+          end
         end
+
         updated_field
       end
 

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "5.4.0"
+  VERSION = "5.4.1"
 end

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1 @@
+{}

data/spec/dummy/config/application.rb

@@ -20,7 +20,7 @@ module Dummy
     # config.i18n.default_locale = :de
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
+    # config.active_record.raise_in_transactional_callbacks = true
   end
 end
 

data/spec/dummy/db/migrate/20190226172951_create_user.rb

@@ -1,4 +1,4 @@
-class CreateUser < ActiveRecord::Migration
+class CreateUser < ActiveRecord::Migration[4.2]
   def change
     create_table :users do |t|
       t.string :name

data/spec/dummy/db/migrate/20190226173051_create_isle.rb

@@ -1,4 +1,4 @@
-class CreateIsle < ActiveRecord::Migration
+class CreateIsle < ActiveRecord::Migration[4.2]
   def change
     create_table :isle do |t|
       t.string :name

data/spec/dummy/db/migrate/20190226174951_create_tree.rb

@@ -1,4 +1,4 @@
-class CreateTree < ActiveRecord::Migration
+class CreateTree < ActiveRecord::Migration[4.2]
   def change
     create_table :trees do |t|
       t.string :name

data/spec/dummy/db/migrate/20190716130830_add_age_to_tree.rb

@@ -1,4 +1,4 @@
-class AddAgeToTree < ActiveRecord::Migration
+class AddAgeToTree < ActiveRecord::Migration[4.2]
   def up
     add_column :trees, :age, :integer
   end

data/spec/dummy/db/migrate/20190716135241_add_type_to_user.rb

@@ -1,4 +1,4 @@
-class AddTypeToUser < ActiveRecord::Migration
+class AddTypeToUser < ActiveRecord::Migration[4.2]
   def up
     add_column :users, :title, :integer
   end

data/spec/dummy/db/schema.rb

@@ -1,44 +1,42 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20190716135241) do
+ActiveRecord::Schema.define(version: 2019_07_16_135241) do
 
   create_table "isle", force: :cascade do |t|
-    t.string   "name"
-    t.binary   "map"
+    t.string "name"
+    t.binary "map"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "trees", force: :cascade do |t|
-    t.string   "name"
-    t.integer  "owner_id"
-    t.integer  "cutter_id"
-    t.integer  "island_id"
+    t.string "name"
+    t.integer "owner_id"
+    t.integer "cutter_id"
+    t.integer "island_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "age"
+    t.integer "age"
+    t.index ["cutter_id"], name: "index_trees_on_cutter_id"
+    t.index ["island_id"], name: "index_trees_on_island_id"
+    t.index ["owner_id"], name: "index_trees_on_owner_id"
   end
 
-  add_index "trees", ["cutter_id"], name: "index_trees_on_cutter_id"
-  add_index "trees", ["island_id"], name: "index_trees_on_island_id"
-  add_index "trees", ["owner_id"], name: "index_trees_on_owner_id"
-
   create_table "users", force: :cascade do |t|
-    t.string   "name"
+    t.string "name"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "title"
+    t.integer "title"
   end
 
 end

data/spec/requests/actions_controller_spec.rb

@@ -35,6 +35,11 @@ describe 'Requesting Actions routes', :type => :request  do
         type: 'Enum',
         enums: %w[a b c],
     }
+    multiple_enum = {
+        field: 'multipleEnum',
+        type: ['Enum'],
+        enums: %w[a b c],
+    }
 
     action_definition = {
         name: 'my_action',
@@ -95,34 +100,50 @@ describe 'Requesting Actions routes', :type => :request  do
         }
       }
     }
+
+    multiple_enums_action_definition = {
+        name: 'multiple_enums_action',
+        fields: [foo, multiple_enum],
+        hooks: {
+            :change => {
+                'foo' => -> (context) {
+                  fields = context[:fields]
+                  fields['multipleEnum'][:enums] = %w[c d z]
+                  return fields
+                }
+            }
+        }
+    }
+
     action = ForestLiana::Model::Action.new(action_definition)
     fail_action = ForestLiana::Model::Action.new(fail_action_definition)
     cheat_action = ForestLiana::Model::Action.new(cheat_action_definition)
     enums_action = ForestLiana::Model::Action.new(enums_action_definition)
+    multiple_enums_action = ForestLiana::Model::Action.new(multiple_enums_action_definition)
     island = ForestLiana.apimap.find {|collection| collection.name.to_s == ForestLiana.name_for(Island)}
-    island.actions = [action, fail_action, cheat_action, enums_action]
+    island.actions = [action, fail_action, cheat_action, enums_action, multiple_enums_action]
 
     describe 'call /load' do
       params = {recordIds: [1], collectionName: 'Island'}
 
       it 'should respond 200' do
-        post '/forest/actions/my_action/hooks/load', JSON.dump(params), 'CONTENT_TYPE' => 'application/json'
+        post '/forest/actions/my_action/hooks/load', params: JSON.dump(params), headers: { 'CONTENT_TYPE' => 'application/json' }
         expect(response.status).to eq(200)
         expect(JSON.parse(response.body)).to eq({'fields' => [foo.merge({:value => nil}).stringify_keys]})
       end
 
       it 'should respond 500 with bad params' do
-        post '/forest/actions/my_action/hooks/load', {}
+        post '/forest/actions/my_action/hooks/load', params: {}
         expect(response.status).to eq(500)
       end
 
       it 'should respond 500 with bad hook result type' do
-        post '/forest/actions/fail_action/hooks/load', JSON.dump(params), 'CONTENT_TYPE' => 'application/json'
+        post '/forest/actions/fail_action/hooks/load', params: JSON.dump(params), headers: { 'CONTENT_TYPE' => 'application/json' }
         expect(response.status).to eq(500)
       end
 
       it 'should respond 500 with bad hook result data structure' do
-        post '/forest/actions/cheat_action/hooks/load', JSON.dump(params), 'CONTENT_TYPE' => 'application/json'
+        post '/forest/actions/cheat_action/hooks/load', params: JSON.dump(params), headers: { 'CONTENT_TYPE' => 'application/json' }
         expect(response.status).to eq(500)
       end
     end
@@ -132,7 +153,7 @@ describe 'Requesting Actions routes', :type => :request  do
       params = {recordIds: [1], fields: [updated_foo], collectionName: 'Island', changedField: 'foo'}
 
       it 'should respond 200' do
-        post '/forest/actions/my_action/hooks/change', JSON.dump(params), 'CONTENT_TYPE' => 'application/json'
+        post '/forest/actions/my_action/hooks/change', params: JSON.dump(params), headers: { 'CONTENT_TYPE' => 'application/json' }
         expect(response.status).to eq(200)
         expected = updated_foo.clone.merge({:value => 'baz'})
         expected[:widgetEdit] = nil
@@ -141,24 +162,24 @@ describe 'Requesting Actions routes', :type => :request  do
       end
 
       it 'should respond 500 with bad params' do
-        post '/forest/actions/my_action/hooks/change', {}
+        post '/forest/actions/my_action/hooks/change', params: {}
         expect(response.status).to eq(500)
       end
 
       it 'should respond 500 with bad hook result type' do
-        post '/forest/actions/fail_action/hooks/change', JSON.dump(params), 'CONTENT_TYPE' => 'application/json'
+        post '/forest/actions/fail_action/hooks/change', params: JSON.dump(params), headers: { 'CONTENT_TYPE' => 'application/json' }
         expect(response.status).to eq(500)
       end
 
       it 'should respond 500 with bad hook result data structure' do
-        post '/forest/actions/cheat_action/hooks/change', JSON.dump(params), 'CONTENT_TYPE' => 'application/json'
+        post '/forest/actions/cheat_action/hooks/change', params: JSON.dump(params), headers: { 'CONTENT_TYPE' => 'application/json' }
         expect(response.status).to eq(500)
       end
 
       it 'should reset value when enums has changed' do
         updated_enum = enum.clone.merge({:previousValue => nil, :value => 'a'}) # set value to a
         p = {recordIds: [1], fields: [updated_foo, updated_enum], collectionName: 'Island', changedField: 'foo'}
-        post '/forest/actions/enums_action/hooks/change', JSON.dump(p), 'CONTENT_TYPE' => 'application/json'
+        post '/forest/actions/enums_action/hooks/change', params: JSON.dump(p), headers: { 'CONTENT_TYPE' => 'application/json' }
         expect(response.status).to eq(200)
 
         expected_enum = updated_enum.clone.merge({ :enums => %w[c d e], :value => nil, :widgetEdit => nil})
@@ -169,6 +190,33 @@ describe 'Requesting Actions routes', :type => :request  do
         expect(JSON.parse(response.body)).to eq({'fields' => [expected_foo.stringify_keys, expected_enum.stringify_keys]})
       end
 
+      it 'should not reset value when every enum values are in the enums definition' do
+        updated_multiple_enum = multiple_enum.clone.merge({:previousValue => nil, :value => %w[c]})
+        p = {recordIds: [1], fields: [foo, updated_multiple_enum], collectionName: 'Island', changedField: 'foo'}
+        post '/forest/actions/multiple_enums_action/hooks/change', params: JSON.dump(p), headers: { 'CONTENT_TYPE' => 'application/json' }
+        expect(response.status).to eq(200)
+
+        expected_multiple_enum = updated_multiple_enum.clone.merge({ :enums => %w[c d z], :widgetEdit => nil, :value => %w[c]})
+        expected_multiple_enum.delete(:widget)
+        expected_foo = foo.clone.merge({ :widgetEdit => nil})
+        expected_foo.delete(:widget)
+
+        expect(JSON.parse(response.body)).to eq({'fields' => [expected_foo.stringify_keys, expected_multiple_enum.stringify_keys]})
+      end
+
+      it 'should reset value when one of the enum values is not in the enums definition' do
+        wrongly_updated_multiple_enum = multiple_enum.clone.merge({:previousValue => nil, :value => %w[a b]})
+        p = {recordIds: [1], fields: [foo, wrongly_updated_multiple_enum], collectionName: 'Island', changedField: 'foo'}
+        post '/forest/actions/multiple_enums_action/hooks/change', params: JSON.dump(p), headers: { 'CONTENT_TYPE' => 'application/json' }
+        expect(response.status).to eq(200)
+
+        expected_multiple_enum = wrongly_updated_multiple_enum.clone.merge({ :enums => %w[c d z], :widgetEdit => nil, :value => nil })
+        expected_multiple_enum.delete(:widget)
+        expected_foo = foo.clone.merge({ :widgetEdit => nil})
+        expected_foo.delete(:widget)
+
+        expect(JSON.parse(response.body)).to eq({'fields' => [expected_foo.stringify_keys, expected_multiple_enum.stringify_keys]})
+      end
     end
   end
-end
+end

data/spec/requests/resources_spec.rb

@@ -46,12 +46,12 @@ describe 'Requesting Tree resources', :type => :request  do
       }
 
       it 'should respond 200' do
-        get '/forest/Tree', params, headers
+        get '/forest/Tree', params: params, headers: headers
         expect(response.status).to eq(200)
       end
 
       it 'should respond the tree data' do
-        get '/forest/Tree', params, headers
+        get '/forest/Tree', params: params, headers: headers
         expect(JSON.parse(response.body)).to eq({
           "data" => [{
             "type" => "Tree",
@@ -83,12 +83,12 @@ describe 'Requesting Tree resources', :type => :request  do
       }
 
       it 'should respond 200' do
-        get '/forest/Tree', params, headers
+        get '/forest/Tree', params: params, headers: headers
         expect(response.status).to eq(200)
       end
 
       it 'should respond the tree data' do
-        get '/forest/Tree', params, headers
+        get '/forest/Tree', params: params, headers: headers
         expect(JSON.parse(response.body)).to eq({
           "data" => [{
             "type" => "Tree",

data/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1 @@
+{}

data/test/dummy/config/application.rb

@@ -20,7 +20,7 @@ module Dummy
     # config.i18n.default_locale = :de
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
+    # config.active_record.raise_in_transactional_callbacks = true
   end
 end
 

data/test/dummy/db/migrate/20150608130516_create_date_field.rb

@@ -1,4 +1,4 @@
-class CreateDateField < ActiveRecord::Migration
+class CreateDateField < ActiveRecord::Migration[4.2]
   def change
     create_table :date_fields do |t|
       t.date :field

data/test/dummy/db/migrate/20150608131430_create_integer_field.rb

@@ -1,4 +1,4 @@
-class CreateIntegerField < ActiveRecord::Migration
+class CreateIntegerField < ActiveRecord::Migration[4.2]
   def change
     create_table :integer_fields do |t|
       t.integer :field

data/test/dummy/db/migrate/20150608131603_create_decimal_field.rb

@@ -1,4 +1,4 @@
-class CreateDecimalField < ActiveRecord::Migration
+class CreateDecimalField < ActiveRecord::Migration[4.2]
   def change
     create_table :decimal_fields do |t|
       t.decimal :field

data/test/dummy/db/migrate/20150608131610_create_float_field.rb

@@ -1,4 +1,4 @@
-class CreateFloatField < ActiveRecord::Migration
+class CreateFloatField < ActiveRecord::Migration[4.2]
   def change
     create_table :float_fields do |t|
       t.float :field

data/test/dummy/db/migrate/20150608132159_create_boolean_field.rb

@@ -1,4 +1,4 @@
-class CreateBooleanField < ActiveRecord::Migration
+class CreateBooleanField < ActiveRecord::Migration[4.2]
   def change
     create_table :boolean_fields do |t|
       t.boolean :field

data/test/dummy/db/migrate/20150608132621_create_string_field.rb

@@ -1,4 +1,4 @@
-class CreateStringField < ActiveRecord::Migration
+class CreateStringField < ActiveRecord::Migration[4.2]
   def change
     create_table :string_fields do |t|
       t.string :field

data/test/dummy/db/migrate/20150608133038_create_belongs_to_field.rb

@@ -1,4 +1,4 @@
-class CreateBelongsToField < ActiveRecord::Migration
+class CreateBelongsToField < ActiveRecord::Migration[4.2]
   def change
     create_table :belongs_to_fields do |t|
       t.references :has_one_field, index: true

data/test/dummy/db/migrate/20150608133044_create_has_one_field.rb

@@ -1,4 +1,4 @@
-class CreateHasOneField < ActiveRecord::Migration
+class CreateHasOneField < ActiveRecord::Migration[4.2]
   def change
     create_table :has_one_fields do |t|
       t.boolean :checked

data/test/dummy/db/migrate/20150608150016_create_has_many_field.rb

@@ -1,4 +1,4 @@
-class CreateHasManyField < ActiveRecord::Migration
+class CreateHasManyField < ActiveRecord::Migration[4.2]
   def change
     create_table :has_many_fields do |t|
       t.references :has_many_through_field, index: true

data/test/dummy/db/migrate/20150609114636_create_belongs_to_class_name_field.rb

@@ -1,4 +1,4 @@
-class CreateBelongsToClassNameField < ActiveRecord::Migration
+class CreateBelongsToClassNameField < ActiveRecord::Migration[4.2]
   def change
     create_table :belongs_to_class_name_fields do |t|
       t.references :foo, index: true

data/test/dummy/db/migrate/20150612112520_create_has_and_belongs_to_many_field.rb

@@ -1,4 +1,4 @@
-class CreateHasAndBelongsToManyField < ActiveRecord::Migration
+class CreateHasAndBelongsToManyField < ActiveRecord::Migration[4.2]
   def change
     create_table :has_and_belongs_to_many_fields do |t|
     end

data/test/dummy/db/migrate/20150616150629_create_polymorphic_field.rb

@@ -1,4 +1,4 @@
-class CreatePolymorphicField < ActiveRecord::Migration
+class CreatePolymorphicField < ActiveRecord::Migration[4.2]
   def change
     create_table :polymorphic_fields do |t|
       t.references :has_one_field, index: true

data/test/dummy/db/migrate/20150623115554_create_has_many_class_name_field.rb

@@ -1,4 +1,4 @@
-class CreateHasManyClassNameField < ActiveRecord::Migration
+class CreateHasManyClassNameField < ActiveRecord::Migration[4.2]
   def change
     create_table :has_many_class_name_fields do |t|
     end

data/test/dummy/db/migrate/20150814081918_create_has_many_through_field.rb

@@ -1,4 +1,4 @@
-class CreateHasManyThroughField < ActiveRecord::Migration
+class CreateHasManyThroughField < ActiveRecord::Migration[4.2]
   def change
     create_table :has_many_through_fields do |t|
     end

data/test/dummy/db/migrate/20160627172810_create_owner.rb

@@ -1,4 +1,4 @@
-class CreateOwner < ActiveRecord::Migration
+class CreateOwner < ActiveRecord::Migration[4.2]
   def change
     create_table :owners do |t|
       t.string :name

data/test/dummy/db/migrate/20160627172951_create_tree.rb

@@ -1,4 +1,4 @@
-class CreateTree < ActiveRecord::Migration
+class CreateTree < ActiveRecord::Migration[4.2]
   def change
     create_table :trees do |t|
       t.string :name

data/test/dummy/db/migrate/20160628173505_add_timestamps.rb

@@ -1,4 +1,4 @@
-class AddTimestamps < ActiveRecord::Migration
+class AddTimestamps < ActiveRecord::Migration[4.2]
   def change
     add_column :owners, :created_at, :datetime
     add_column :owners, :updated_at, :datetime

data/test/dummy/db/migrate/20170614141921_create_serialize_field.rb

@@ -1,4 +1,4 @@
-class CreateSerializeField < ActiveRecord::Migration
+class CreateSerializeField < ActiveRecord::Migration[4.2]
   def change
     create_table :serialize_fields do |t|
       t.string :field

data/test/dummy/db/migrate/20181111162121_create_references_table.rb

@@ -1,4 +1,4 @@
-class CreateReferencesTable < ActiveRecord::Migration
+class CreateReferencesTable < ActiveRecord::Migration[4.2]
   def change
     create_table :references do |t|
     end

data/test/services/forest_liana/resources_getter_test.rb

@@ -106,7 +106,7 @@ module ForestLiana
           conditions: [{
             field: 'created_at',
             operator: 'after',
-            value: '2015-06-18 08:00:00',
+            value: "#{Time.now.year - 5}-06-18 08:00:00",
           }, {
             field: 'owner:name',
             operator: 'equal',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.1
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -302,6 +302,7 @@ files:
 - lib/tasks/send_apimap.rake
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/config/routes.rb
@@ -357,6 +358,7 @@ files:
 - spec/spec_helper.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -510,6 +512,7 @@ test_files:
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/Rakefile
 - test/dummy/bin/rake
@@ -580,6 +583,7 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/config/routes.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/Rakefile