tramway-event 1.11.0.1 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f27625a250dc36c6140e260f507e2423da7a883be89f9a88e59fac19de869069
-  data.tar.gz: 3216e6d36b13502007cca14cf03a101e5a2784c20b4a8e5fe83c6b9d795bbe5b
+  metadata.gz: ea77a5e9957af8c76d807a94d3f1203b1085922f2c8a0c55fb44d5de40527977
+  data.tar.gz: e489de38c330b4863c18c01eaf8fda08fa717d60163a340a76e5c9f3362af4e1
 SHA512:
-  metadata.gz: 30b7f594133dfcb4f45c88555728aaccf0fff41764614480e000606e7efa6547fb8e852bbfa7d09fdeb86cb9ffa71dee46685d26d7b289b32ca6f21d8632c1a9
-  data.tar.gz: 803a55bf9dc48aa317e56450b33819f0cc2898b0c7a77151e59c20010634c2c7b5ac02388f20dd91c6728ced493e3d798f47b3064a88786b10e16da4d4052948
+  metadata.gz: df6b5e3111bf46c7e8312a716255ace9e2320f365e6ebb9a027b08896d3d228d6f7d95a2ae2a37d3f65f6e90d5bd41556c9dbfe68f9fe59156eaa8059ac9248a
+  data.tar.gz: f2475bafa4f3004d842a80c81ae465ceeae776eafb6a447c37b43d6a5408a61c949680abfc38c4828661473ec462e32179b6e08a8ec8795f1216948f5101b199

data/app/decorators/tramway/event/action_decorator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Event::ActionDecorator < Tramway::Core::ApplicationDecorator
   class << self
     delegate :human_action_state_event_name, to: :model_class
@@ -7,7 +9,7 @@ class Tramway::Event::ActionDecorator < Tramway::Core::ApplicationDecorator
   def name
     "#{object.title} - #{date_view(object.deadline)} - #{state_machine_view(object, :action_state)}"
   end
-  
+
   def action_state_button_color(event)
     case event
     when :do

data/app/decorators/tramway/event/event_decorator.rb

@@ -36,7 +36,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   decorate_association :partakings
   decorate_association :partnerships
   decorate_association :organizations
-  decorate_association :actions, as: :event, state_machines: [ :action_state ]
+  decorate_association :actions, as: :event, state_machines: [:action_state]
 
   def background
     object.photo

data/app/forms/admin/tramway/event/action_form.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Admin::Tramway::Event::ActionForm < Tramway::Core::ApplicationForm
   properties :title, :action_state_event, :deadline
 
@@ -6,8 +8,8 @@ class Admin::Tramway::Event::ActionForm < Tramway::Core::ApplicationForm
   def initialize(object)
     super(object).tap do
       form_properties event: :association,
-        title: :string,
-        deadline: :date_picker
+                      title: :string,
+                      deadline: :date_picker
     end
   end
 end

data/app/forms/admin/tramway/event/participant_form.rb

@@ -12,7 +12,7 @@ class Admin::Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm
         SecureRandom.hex,
         object.event,
         participation_state_event: :default,
-        comment: :string,
+        comment: :string
       ).new object
     else
       super(object).tap do |obj|

data/app/models/tramway/event/action.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Event::Action < Tramway::Core::ApplicationRecord
   belongs_to :event, class_name: 'Tramway::Event::Event'
 
@@ -15,7 +17,7 @@ class Tramway::Event::Action < Tramway::Core::ApplicationRecord
     end
 
     event :return do
-      transition [ :declined, :done ] => :must_be_done
+      transition %i[declined done] => :must_be_done
     end
   end
 end

data/app/models/tramway/event/event.rb

@@ -3,6 +3,15 @@
 class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
   mount_uploader :photo, PhotoUploader
 
+  validate :check_dimensions
+
+  def check_dimensions
+    if photo.present?
+      errors.add :photo, :too_small_image if photo.width < 1920 || photo.height < 1080
+      errors.add :photo, :image_aspect_ratio if photo.height / photo.width == 16 / 9
+    end
+  end
+
   has_many :participants, class_name: 'Tramway::Event::Participant'
   has_many :participant_form_fields, class_name: 'Tramway::Event::ParticipantFormField'
   has_many :sections, class_name: 'Tramway::Event::Section'

data/config/locales/models.yml

@@ -81,6 +81,11 @@ ru:
         deadline: Дедлайн
     errors:
       models:
+        tramway/event/event:
+          attributes:
+            photo:
+              too_small_image: слишком маленькое (минимальный размер изображения 1920*1080)
+              image_aspect_ratio: не соответствует формату (соотношение сторон должно быть 16 на 9)
         tramway/event/participant:
           attributes:
             default:

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.11.0.1'
+    VERSION = '1.11.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.11.0.1
+  version: 1.11.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configus
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rails engine for events