tramway-core 1.5.5.2 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e8703832cc6c58c0f12a36a5d54ca98d3a720678c2808c8c72726a2d148e1b2
-  data.tar.gz: dbeaae9bd58c6279c3ad4579696452ba1f643b469810a81151a866390e5cdfff
+  metadata.gz: a7e6b600208a0aac1aac49df14d744385891acb532898ecf27dbac1cab935c40
+  data.tar.gz: cbe160a3e54769372c33a1c890e79cd47335cc245715648688f3b9ea8a6f6210
 SHA512:
-  metadata.gz: c321c73b6818ca94ceded5f3a27196684b33b74e0d864bdd98222210f87e0a2ccbb35d9e2f8f6c4f26228dab1c2a7e3ada6b6be1f255b46a996cdee6fdd9fa23
-  data.tar.gz: 17da4f4e51a4219c955daa841686c302762867aa03e1786afe4beb514d25a5c09253b44381d29cbb712c9c302592983e1368a342efbbc1b065a1f6a05d01dfc5
+  metadata.gz: c8619069ed2f4b3f01aad7a0521e1f1c8d8aa6f657da86520e875eeb06f7bf517e15e6d371cc06397f7dd40002e6ed03e95fea6707e61379c7b6b7f532df2212
+  data.tar.gz: a14f0760eccb8d942547e3e35028537c314f474c15944d1f1bf4d201d7dcf429156de1cf5f30206f2f7629b376f8ee189866cdc2ca97c0a40c480b3180742d84

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

@@ -2,6 +2,9 @@ module Tramway::Core
   class ApplicationForm < ::Reform::Form
     def initialize(object)
       super(object).tap do
+        @@model_class = object.class
+        @@enumerized_attributes = object.class.enumerized_attributes
+
         @@associations&.each do |association|
           options = object.class.reflect_on_all_associations(:belongs_to).select do |a|
             a.name == association.to_sym
@@ -26,7 +29,7 @@ module Tramway::Core
     end
 
     def properties
-      @form_properties
+      @form_properties || []
     end
 
     class << self
@@ -35,6 +38,14 @@ module Tramway::Core
         @@associations ||= []
         @@associations << property
       end
+      
+      def enumerized_attributes
+        @@enumerized_attributes
+      end
+
+      def reflect_on_association(*args)
+        @@model_class.reflect_on_association(*args)
+      end
     end
   end
 end

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

@@ -1,6 +1,6 @@
 class Tramway::Core::ExtendableForm
   class << self
-    def new(name, *more_properties)
+    def new(name, **more_properties)
       if Object.const_defined? name
         name.constantize
       else
@@ -13,9 +13,17 @@ class Tramway::Core::ExtendableForm
             super params
           end
 
+          define_method 'properties' do
+            more_properties.reduce({}) do |hash, property|
+              hash.merge! property[0] => {
+                extended_form_property: property[1]
+              }
+            end
+          end
+
           more_properties.each do |property|
-            define_method property do 
-              model.values[property] if model.values
+            define_method property[0] do 
+              model.values[property[0]] if model.values
             end
           end
         end)

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

@@ -0,0 +1,5 @@
+class Tramway::Core::FormCreator
+  def self.create_form_class
+    raise 'Please, implement `create_form_class` for your class'
+  end
+end

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

@@ -0,0 +1,19 @@
+- value = defined?(value).present? ? value : ''
+- case field.field_type
+- when 'text', 'string', 'numeric', 'date_picker'
+  - if value.present?
+    = 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}]", value: value }
+  - 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']
+    - 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
+      = 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}]" }
+  - else
+    - if value.present?
+      = f.input field.title.to_sym, as: :select, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }, selected: value
+    - else
+      = f.input field.title.to_sym, as: :select, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }

data/lib/tramway/core/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Core
-    VERSION = '1.5.5.2'
+    VERSION = '1.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.5.5.2
+  version: '1.6'
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -227,12 +227,14 @@ files:
 - app/decorators/tramway/core/application_decorator.rb
 - app/forms/tramway/core/application_form.rb
 - app/forms/tramway/core/extendable_form.rb
+- app/forms/tramway/core/form_creator.rb
 - app/inputs/date_picker_input.rb
 - app/models/tramway/core/application_record.rb
 - app/uploaders/application_uploader.rb
 - app/uploaders/file_uploader.rb
 - app/uploaders/image_defaults.rb
 - app/uploaders/photo_uploader.rb
+- app/views/tramway/core/shared/_input_extended.html.haml
 - app/views/tramway/core/shared/_messages.html.haml
 - config/initializers/assets.rb
 - config/locales/ru/dates.yml
@@ -250,7 +252,6 @@ files:
 - lib/tramway/core/generators/templates/initializers/simple_form.rb
 - lib/tramway/core/generators/templates/initializers/simple_form_bootstrap.rb
 - lib/tramway/core/version.rb
-- lib/tramway/generators/install_generator.rb
 homepage: https://github.com/kalashnikovisme/tramway-core
 licenses:
 - MIT

data/lib/tramway/generators/install_generator.rb

@@ -1,25 +0,0 @@
-require 'rails/generators'
-
-module Tramway
-  module Core
-    module Generators
-      class InstallGenerator < ::Rails::Generators::Base
-        source_root File.expand_path('../templates', __FILE__)
-
-        def run_other_generators
-          generate 'audited:install'
-        end
-
-        def self.next_migration_number(path)
-          next_migration_number = current_migration_number(path) + 1
-          ActiveRecord::Migration.next_migration_number next_migration_number
-        end
-
-        def copy_initializer
-          copy_file "/#{File.dirname __dir__}/generators/templates/initializers/simple_form.rb", 'config/initializers/simple_form.rb'
-          copy_file "/#{File.dirname __dir__}/generators/templates/initializers/simple_form_bootstrap.rb", 'config/initializers/simple_form_bootstrap.rb'
-        end
-      end
-    end
-  end
-end