tramway-landing 1.7.2 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d36e3af967158a8cefe4840a639d0632561de68adc357b33d2cb4de2e205577a
-  data.tar.gz: 768cd52781f9a780755c39a1099ab1372e333c6ef6880bd609c2ff85e2825ef8
+  metadata.gz: e74664af83fb56c8127c0ccb38dcfe389dda475a82b0b555bda93b7d94d56094
+  data.tar.gz: a95df8d21c49dfc28fa6b5652fdae5e2f54ace6d7511de1091e70b22d5638cf9
 SHA512:
-  metadata.gz: b91e2bdce4414b1a0d2337cc8da4a594ae951f600ec960b520cb58b53f2cd852d22149b14d6b185f65bd506cbc776e3a60816393e48efe1726881c2101acf4e0
-  data.tar.gz: eed621db462d3129d99484ffe6077a19540a735e9901aaa2b37b0a64283e1f62c525e866c9bf4cffa497270b01c2abc065d608e99ace4898ec252d6d5dd34cda
+  metadata.gz: d13d3a202bec874c370ca73d378c74895442ede071e74c7aa2924668ecf0f9760adca4b70cb4ca45a0887fbec7867965033f1deb274040e7f24a2047f1c30ea0
+  data.tar.gz: faa355ec8ff76a08ec3de1ce1120619288f47a0fcd0eba76e6c9c5a62495150234bab7518624af08c050676f4017fa7130145e61712e2fca31b1a580a1d2c0d1

data/app/decorators/tramway/landing/block_decorator.rb

@@ -17,6 +17,7 @@ class Tramway::Landing::BlockDecorator < ::Tramway::Core::ApplicationDecorator
   delegate :anchor, to: :object
   delegate :description, to: :object
   delegate :anchor, to: :object
+  delegate :view_name, to: :object
   
   def block_type
     object.block_type_text

data/app/forms/tramway/landing/block_form.rb

@@ -1,20 +1,33 @@
 class Tramway::Landing::BlockForm < ::Tramway::Core::ExtendedApplicationForm
-  properties :title, :background, :view_state, :block_type, :position, :navbar_link, :anchor, :description, :link_object_type, :link_object_id, :button_title, :button_link
+  properties :title,
+    :background,
+    :view_state,
+    :block_type,
+    :position,
+    :navbar_link,
+    :anchor,
+    :description,
+    :link_object_type,
+    :link_object_id,
+    :button_title,
+    :button_link,
+    :view_name
 
   def initialize(object = nil)
-    form_object = super object
-    form_properties title: :string,
-                    background: :file,
-                    position: :numeric,
-                    block_type: :default,
-                    navbar_link: :default,
-                    anchor: :string,
-                    description: :ckeditor,
-                    link_object_type: :default,
-                    link_object_id: :numeric,
-                    button_title: :string,
-                    button_link: :string
-    form_object
+    super(object).tap do
+      form_properties title: :string,
+        background: :file,
+        position: :numeric,
+        block_type: :default,
+        navbar_link: :default,
+        anchor: :string,
+        description: :ckeditor,
+        link_object_type: :default,
+        link_object_id: :numeric,
+        button_title: :string,
+        button_link: :string,
+        view_name: :string
+    end
   end
 
   def button_title

data/app/models/tramway/landing/block.rb

@@ -1,5 +1,17 @@
 class Tramway::Landing::Block < ::Tramway::Landing::ApplicationRecord
-  enumerize :block_type, in: [ :header, :footer, :page, :cards, :features, :contacts, :news, :link, :page_with_button, :just_text ]
+  enumerize :block_type, in: [
+    :header,
+    :footer,
+    :page,
+    :cards,
+    :features,
+    :contacts,
+    :news,
+    :link,
+    :page_with_button,
+    :just_text,
+    :view
+  ]
   enumerize :navbar_link, in: [ :exist, :not_exist ], default: :not_exist
   enumerize :link_object_type, in: [ 'Tramway::SportSchool::Document', 'Tramway::Page::Page' ]
 

data/app/views/tramway/landing/blocks/block_types/_view.html.haml

@@ -0,0 +1 @@
+= render "tramway/landing/blocks/views/#{block.view_name}"

data/config/locales/models.yml

@@ -16,6 +16,7 @@ ru:
         link_object_id: ID объекта, на который делается ссылка
         button_title: Наименование кнопки
         button_link: Ссылка кнопки
+        view_name: Название вьюхи
   cases:
     tramway/landing/block:
       plural: Блоки
@@ -33,6 +34,7 @@ ru:
         news: Блок новостей
         link: Ссылка на объект
         just_text_with_button: Просто текст
+        view: Вьюха (программируется)
       navbar_link:
         exist: Присутствует
         not_exist: Отсутствует

data/lib/tramway/landing/generates/install_generator.rb

@@ -19,7 +19,8 @@ module Tramway::Landing::Generators
         :add_description_to_tramway_landing_blocks,
         :add_link_object_id_to_tramway_landing_blocks,
         :add_link_object_type_to_tramway_landing_blocks,
-        :add_button_to_tramway_landing_blocks
+        :add_button_to_tramway_landing_blocks,
+        :add_view_name_to_tramway_landing_blocks
       ]
 
       migrations.each do |migration|

data/lib/tramway/landing/generates/templates/add_view_name_to_tramway_landing_blocks.rb

@@ -0,0 +1,5 @@
+class AddViewNameToTramwayLandingBlocks < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_landing_blocks, :view_name, :text
+  end
+end

data/lib/tramway/landing/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Landing
-    VERSION = '1.7.2'
+    VERSION = '1.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: '1.8'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies: []
 description: Landing Engine for your Rails projects
 email:
@@ -53,6 +53,7 @@ files:
 - app/views/tramway/landing/blocks/block_types/_link.html.haml
 - app/views/tramway/landing/blocks/block_types/_page.html.haml
 - app/views/tramway/landing/blocks/block_types/_page_with_button.html.haml
+- app/views/tramway/landing/blocks/block_types/_view.html.haml
 - app/views/tramway/landing/blocks/templates/_features_list.html.haml
 - app/views/tramway/landing/blocks/templates/_full_page.html.haml
 - app/views/tramway/landing/blocks/templates/_section_with_image_and_text.html.haml
@@ -72,6 +73,7 @@ files:
 - lib/tramway/landing/generates/templates/add_link_object_id_to_tramway_landing_blocks.rb
 - lib/tramway/landing/generates/templates/add_link_object_type_to_tramway_landing_blocks.rb
 - lib/tramway/landing/generates/templates/add_navbar_link_to_tramway_landing_blocks.rb
+- lib/tramway/landing/generates/templates/add_view_name_to_tramway_landing_blocks.rb
 - lib/tramway/landing/generates/templates/create_tramway_landing_blocks.rb
 - lib/tramway/landing/version.rb
 homepage: https://github.com/kalashnikovisme/tramway-landing