tramway-core 1.6.4 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7a31d83fb7b26555a3b8576ca1b95e411be1b37cdf17a06fd799e2a07623201
-  data.tar.gz: 0f6f62ec9a9e36575747947c55932dedbab9292c77e05012d5dd66020f29aa8d
+  metadata.gz: 5d7036cd15efb8465dd098b71750d1b38767611545fe8a58796030a7670db1f2
+  data.tar.gz: 1f12dad57781d6604b1c28f78a9ba9612561f0ca16154a2ade685f60f4ff42c4
 SHA512:
-  metadata.gz: 6d5166de9d1a332ccc120d027d6563c93fcbdbb499236bf01e8019add7cdb3900e72c3551a5c0761fcd0b0f1169b1511a24e5d1c13fa9149cc078bc4f0283b55
-  data.tar.gz: ffa7418423d002e5efb9809db865bdcd6132d92485968f79876ba729bcfc1f05d5c0ad41f1f2236e0c6e9c127b41e29b9f02ea7093a933e42249cc09b05d48d5
+  metadata.gz: 34cb3bab7fbcc827765b97f944484212a2a3706d5abdac64dcd4cf14425478af4fefd24ff239685b466eac760379ae9a8c641a176151878c15161a985544e507
+  data.tar.gz: f266e1d01de459a2e73e9025daff5540c961bcec2911458006c4595c8f1360cee29bed82e3e7ea497eb7aa8abdc6eb4d217a1011fd40e1117f0be925b2c00dd2

data/app/forms/tramway/core/extendable_form.rb

@@ -1,21 +1,30 @@
 class Tramway::Core::ExtendableForm
   class << self
-    def new(name, **more_properties)
+    def new(name, simple_properties: {}, **more_properties)
       if Object.const_defined? name
         name.constantize
       else
         Object.const_set(name, Class.new(::Tramway::Core::ApplicationForm) do
+          properties(*simple_properties.keys) if simple_properties.keys.any?
+
           define_method 'submit' do |params|
             model.values ||= {}
-            model.values = params.permit!.to_h.reduce({}) do |hash, pair|
+            extended_params = params.except(*simple_properties.keys)
+            model.values = extended_params.permit!.to_h.reduce(model.values) do |hash, pair|
               hash.merge! pair[0] => pair[1]
             end
             super params
           end
 
           define_method 'properties' do
-            more_properties.reduce({}) do |hash, property|
-              hash.merge! property[0] => {
+            hash = simple_properties.reduce({}) do |h, property|
+              unless model.class.state_machines.keys.include?(property[0])
+                h.merge! property[0] => property[1]
+              end
+              h
+            end
+            more_properties.reduce(hash) do |h, property|
+              h.merge! property[0] => {
                 extended_form_property: property[1]
               }
             end

data/app/views/tramway/core/shared/_input_extended.html.haml

@@ -6,8 +6,8 @@
   - else
     = f.input field.title.to_sym, as: field.field_type, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }
 - when 'select'
-  - parsed_json = JSON.parse(field.options) unless field.options == ''
-  - if parsed_json && parsed_json['collection']['name']
+  - parsed_json = field.options.is_a?(Hash) ? field.options : (JSON.parse(field.options) unless field.options == '')
+  - if parsed_json && parsed_json.dig('collection', 'name')
     - if value.present?
       = f.input field.title.to_sym, as: :select, collection: collection_list_by(name: parsed_json['collection']['name']), input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, selected: value
     - else

data/lib/tramway/core/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Core
-    VERSION = '1.6.4'
+    VERSION = '1.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: '1.7'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-07 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reform-rails