tramway-landing 3.3.0.6 → 3.3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca3d58fd243219a91f5d911e478fbe72472b992603db8305e220c7071e2d484c
-  data.tar.gz: 7c8363d0ab002d40d05a7ac6850c67c39339f385ef66a322b50a7849936f56d5
+  metadata.gz: 34f2185899baf27445a519bb7fa32f77338526892d0959f0eb1a03f30766eb4f
+  data.tar.gz: 6742876e89fa349697fa76194c0ebbc695d75685287186c8db8164dc93fd32b1
 SHA512:
-  metadata.gz: 7c2554a06476684f2fce75c3e48732e173aa82f2c88586bbbbd133a8b1debf341baec3f1988badd614989de6cfb2ffddeff0950f43bf5318a6f1cc5ba834b252
-  data.tar.gz: dfdbec98a7ae2228767665c98039b210f74015788c578f125b5bc6e3a56692c2a7808bd45f7981d877279b633716d382eab061cf50c3e0e1e4cb59e56286f4be
+  metadata.gz: 12e89e03f13a6144f9aba19d3a2137d168fb3440ba7b0bf718f58d4a7968fe92a7f1fd52833d271612834e21d6fad77dacf590967de5a250ea3a5010ca7a2898
+  data.tar.gz: 82ca79395ec2aa9a29d982e69b1ff7bd3ac233ffc535b80fb74e08f9ee6edf4902358905c81ba184749f10c45b36ced84c1c71b75d2e753120df0ff5339d1712

data/README.md

@@ -45,8 +45,8 @@ rails db:migrate
 
 *config/initializers/tramway.rb*
 ```ruby
-Tramway::Admin.set_available_models ::Tramway::Landing::Block, project: #{project_name_which_you_use_in_the_application}
-Tramway::Admin.navbar_structure ::Tramway::Landing::Block
+Tramway.set_available_models ::Tramway::Landing::Block, project: #{project_name_which_you_use_in_the_application}
+Tramway.navbar_structure ::Tramway::Landing::Block
 ```
 
 #### 4. Add `PhotoVersions` to middleware (will be removed soon)
@@ -103,7 +103,7 @@ class Web::WelcomeController < ApplicationController
   private
   
   def application
-    @application = ::Tramway::Core.application_object
+    @application = ::Tramway.application_object
   end
 end
 ```
@@ -240,13 +240,13 @@ How create blocks you can find here
 
 *config/initializers/tramway.rb*
 ```ruby
-Tramway::Admin.set_available_models(
+Tramway.set_available_models(
   ::Tramway::Landing::Block,
   ::Tramway::Landing::Tool,
   project: #{project_name_which_you_use_in_the_application}
 )
 
-Tramway::Admin.navbar_structure(
+Tramway.navbar_structure(
   ::Tramway::Landing::Block,
   ::Tramway::Landing::Tool
 )
@@ -271,7 +271,7 @@ class Web::WelcomeController < ApplicationController
   private
   
   def application
-    @application = ::Tramway::Core.application_object
+    @application = ::Tramway.application_object
   end
 end
 ```

data/app/assets/javascripts/tramway/landing/application.js

@@ -1,4 +1,4 @@
-//= require tramway/core/application
+//= require tramway/application
 //= require_tree .
 
 $(document).ready(function() {

data/app/assets/stylesheets/tramway/landing/application.sass

@@ -4,7 +4,7 @@
  */
 
 @import 'bootstrap'
-@import "tramway/core/application"
+@import "tramway/application"
 @import "tramway/landing/collage"
 @import "tramway/landing/justified"
 

data/app/controllers/tramway/landing/application_controller.rb

@@ -7,8 +7,8 @@ module Tramway
       before_action :application
 
       def application
-        if ::Tramway::Core.application
-          @application = Tramway::Core.application&.model_class&.first || Tramway::Core.application
+        if ::Tramway.application
+          @application = Tramway.application&.model_class&.first || Tramway.application
         end
       end
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Landing::BlockDecorator < ::Tramway::Core::ApplicationDecorator
+class Tramway::Landing::BlockDecorator < ::Tramway::ApplicationDecorator
   class << self
     def collections
       [:all]

data/app/decorators/tramway/landing/block_types/cards_decorator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Landing::BlockTypes::CardsDecorator < ::Tramway::Core::ApplicationDecorator
+class Tramway::Landing::BlockTypes::CardsDecorator < ::Tramway::ApplicationDecorator
   def image; end
 
   def title; end

data/app/decorators/tramway/landing/block_types/features_decorator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Landing::BlockTypes::FeaturesDecorator < ::Tramway::Core::ApplicationDecorator
+class Tramway::Landing::BlockTypes::FeaturesDecorator < ::Tramway::ApplicationDecorator
   def icon; end
 
   def image; end

data/app/decorators/tramway/landing/block_types/page_with_button_decorator.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-class Tramway::Landing::PageWithButtonDecorator < ::Tramway::Core::ApplicationDecorator
+class Tramway::Landing::PageWithButtonDecorator < ::Tramway::ApplicationDecorator
 end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-class Tramway::Landing::FormDecorator < ::Tramway::Core::ApplicationDecorator
+class Tramway::Landing::FormDecorator < ::Tramway::ApplicationDecorator
   delegate_attributes :title, :form_name, :url
 end

data/app/decorators/tramway/landing/navbar/link_decorator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Landing::Navbar::LinkDecorator < Tramway::Core::ApplicationDecorator
+class Tramway::Landing::Navbar::LinkDecorator < Tramway::ApplicationDecorator
   def title
     object[:title]
   end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Landing::NavbarDecorator < ::Tramway::Core::ApplicationDecoratedCollection
+class Tramway::Landing::NavbarDecorator < ::Tramway::ApplicationDecoratedCollection
   def initialize(array)
     original = if array.any? { |obj| obj.is_a? Hash }
                  get_original_array array

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

@@ -1,3 +1,3 @@
-class Tramway::Landing::ToolDecorator < Tramway::Core::ApplicationDecorator
+class Tramway::Landing::ToolDecorator < Tramway::ApplicationDecorator
   delegate_attributes :title, :account_id
 end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Admin::Tramway::Landing::BlockForm < ::Tramway::Core::ExtendedApplicationForm
+class Admin::Tramway::Landing::BlockForm < ::Tramway::ExtendedApplicationForm
   association :page
 
   properties :title, :background, :view_state_event, :block_type, :position, :navbar_link, :anchor, :description,

data/app/forms/admin/tramway/landing/form_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Admin::Tramway::Landing::FormForm < Tramway::Core::ApplicationForm
+class Admin::Tramway::Landing::FormForm < Tramway::ApplicationForm
   association :block
 
   properties :title, :url, :form_name, :position

data/app/forms/admin/tramway/landing/tool_form.rb

@@ -1,4 +1,4 @@
-class Admin::Tramway::Landing::ToolForm < Tramway::Core::ApplicationForm
+class Admin::Tramway::Landing::ToolForm < Tramway::ApplicationForm
   properties :title, :account_id
 
   def initialize(object)

data/app/helpers/tramway/landing/application_helper.rb

@@ -3,7 +3,7 @@
 module Tramway
   module Landing
     module ApplicationHelper
-      include Tramway::Admin::RussianCasesHelper
+      include Tramway::RussianCasesHelper
       include Tramway::Profiles::LinksHelper if defined?(::Tramway::Profiles)
       include ::FontAwesome5::Rails::IconHelper
 

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

@@ -2,7 +2,7 @@
 
 module Tramway
   module Landing
-    class ApplicationRecord < ::Tramway::Core::ApplicationRecord
+    class ApplicationRecord < ::Tramway::ApplicationRecord
       self.abstract_class = true
     end
   end

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

@@ -10,7 +10,7 @@ class Tramway::Landing::Block < ::Tramway::Landing::ApplicationRecord
 
   uploader :background, :photo, extensions: %i[jpg jpeg gif png]
 
-  aasm :view_state do
+  aasm :view_state, column: :view_state do
     state :published, initial: true
     state :hidden
 
@@ -23,6 +23,10 @@ class Tramway::Landing::Block < ::Tramway::Landing::ApplicationRecord
     end
   end
 
+  aasm do
+    state :hack
+  end
+
   store_accessor :button, :button_link
   store_accessor :button, :button_title
 

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

@@ -1,4 +1,4 @@
-class Tramway::Landing::Tool < Tramway::Core::ApplicationRecord
+class Tramway::Landing::Tool < Tramway::ApplicationRecord
   enumerize :title, in: [ :google_tag_manager, :google_analytics, :yandex_direct ]
 
   def with_body_fragment?

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

@@ -47,7 +47,7 @@
                     = hidden_field_tag :success_redirect, request.path
                     = hidden_field_tag :error_redirect, request.path
                     - current_form.properties.each do |property|
-                      = render 'tramway/core/shared/input', property: property[0], object: :user, type: property[1], form: f, destination: :landing, record: current_form, value: (params[:record].present? ? params[:record][property[0]] : '')
+                      = render 'tramway/shared/input', property: property[0], object: :user, type: property[1], form: f, destination: :landing, record: current_form, value: (params[:record].present? ? params[:record][property[0]] : '')
                     = f.button :submit, current_form.submit_message
 :javascript
   $(document).ready(function() {

data/app/views/tramway/landing/blocks/block_types/contacts/_with_map.html.haml

@@ -21,7 +21,7 @@
 .row
   - if defined?(::Tramway::Profiles)
     .col-lg-5.col-md-12
-      - social_networks = (@application.social_networks.active if @application.respond_to?(:social_networks)) unless social_networks
+      - social_networks = (@application.social_networks if @application.respond_to?(:social_networks)) unless social_networks
       - social_networks&.each do |profile|
         %ul.list-group
           %li.list-group-item

data/app/views/tramway/landing/blocks/block_types/contacts/_without_map.html.haml

@@ -1,6 +1,6 @@
 - records_in_the_row = 4
 - if defined?(::Tramway::Profiles)
-  - social_networks = (@application.social_networks.active if @application.respond_to?(:social_networks)) unless social_networks
+  - social_networks = (@application.social_networks if @application.respond_to?(:social_networks)) unless social_networks
   - social_networks&.each do |profile|
     %ul.list-group
       %li.list-group-item
@@ -14,4 +14,4 @@
             %i.fas.fa-2x.mb-1.fa-phone.indigo-text{ aria: { hidden: 'true' } }
           .col-10.mb-2.pl-3
             %h5.feature-title.font-bold.mb-1
-              = yield(:phone)
+              = yield(:phone)

data/config/initializers/tramway.rb

@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 
-::Tramway::Admin.set_available_models(::Tramway::Landing::Block, project: :landing)
+Rails.application.config.after_initialize do
+  Tramway.set_available_models(Tramway::Landing::Block, project: :landing)
+end

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require 'rails/generators'
-require 'tramway/core/generators/install_generator'
+require 'tramway/generators/install_generator'
 
 module Tramway::Landing::Generators
-  class InstallGenerator < ::Tramway::Core::Generators::InstallGenerator
+  class InstallGenerator < ::Tramway::Generators::InstallGenerator
     include Rails::Generators::Migration
     source_root File.expand_path('templates', __dir__)
 

data/lib/tramway/landing/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Landing
-    VERSION = '3.3.0.6'
+    VERSION = '3.3.0.8'
   end
 end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 3.3.0.6
+  version: 3.3.0.8
 platform: ruby
 authors:
-- moshinaan
+- kalashnikovisme
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies: []
 description: Landing Engine for your Rails projects
 email:
-- moshinaan@gmail.com
+- kalashnikovisme@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Landing Engine for your Rails projects