c80_shared 0.1.53 → 0.1.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c34615c25251680c3ffbeec7308ebc828b2779e8b48195481a38e42a4f428470
-  data.tar.gz: 8cfb9a50eeeff2bc726e0221de7ec7a9ee6d2e631e42b2f0369f09f52ec3c4ea
+  metadata.gz: 43282acbf906a1ff70e0477cb6a7c62cedf83eb651fb91533eac15d0ac92605f
+  data.tar.gz: 70f016a3a61a94e095567c147425ddf836298ec58d4dd208209dda8de5b99516
 SHA512:
-  metadata.gz: 202523ae0c3adfc009828c10695054fa9db8b7ea9e68c7322aacb2bfd23388d0189413c3ec45fa15bb8f4667a06d4864e8c3c3b5cecdba236a41e4ac8d7f5633
-  data.tar.gz: 32c677d6a29534daae6a3f25fb5f324660c9108b1e6ddc3c9ff6e31f0dab76b5f8e52fcc4c8b74687c46e73fc142584e67ee969668425dc6da43eeaa394dc948
+  metadata.gz: 22eb8c0e71cbc24f44068e8e2b6272f6d2056ac73ae346d68832ee78101f4aa99ff537c56c0e5b3b566d4ed4164bfd650c0051878cd48c35934f153fc6b481a6
+  data.tar.gz: f4b0514f669d4632d1887ead136614423a4c7067112ba9f84d39798afc3bb0ad88c3774e42c2ca7e946f4454ed091e9ddda2251f78ffd998db871532254d0c26

data/app/dicts/fuel_type.rb

@@ -0,0 +1,9 @@
+module Dicts
+  class FuelType < ::Dict
+    DIESEL     = new 1, 'diesel'
+    PETROL     = new 2, 'petrol'
+    ELECTRIC   = new 3, 'electric'
+    HYBRYD     = new 4, 'hybryd'
+    OTHER      = new 5, 'other'
+  end
+end

data/app/serializers/boat_serializer.rb

@@ -3,20 +3,26 @@ class BoatSerializer < AbstractSerializer
   class << self
     def available_attributes
       %i[
+        amenities
         boat_beam
         boat_beam_metrics
         boat_contacts
+        boat_cruise_speed
         boat_draft
         boat_draft_metrics
+        boat_engines
         boat_hull_id
+        boat_generators
         boat_length
         boat_length_metrics
         boat_length_metrics_ft
         boat_length_metrics_meters
         boat_locations_attributes
+        boat_max_speed
         boat_model
         boat_photos
         boat_photos_attributes
+        boat_range
         boat_type
         boat_type_id
         builder
@@ -25,10 +31,12 @@ class BoatSerializer < AbstractSerializer
         crew_total
         crew_cabins
         description
+        engine_hours
         exterior_color
         equipment
         for_rent
         for_sale
+        fuel_type
         guest_cabins
         guest_heads
         guest_sleeps
@@ -52,6 +60,7 @@ class BoatSerializer < AbstractSerializer
         refit_year
         rent_prices
         rental_type
+        safety
         sale_price
         short_description
         state
@@ -80,7 +89,8 @@ class BoatSerializer < AbstractSerializer
     # определяем "простые" методы
     %i[id comments tender name description built_year boat_model boat_type_id boat_hull_id refit_year
        crew_cabins crew_total guest_heads guest_sleeps maximum_guests_during_cruise interior_designer
-       naval_architect guests_total guest_cabins state visits_today visits_total].each do |f|
+       naval_architect guests_total guest_cabins state visits_today visits_total
+       boat_cruise_speed boat_max_speed boat_range boat_engines boat_generators engine_hours].each do |f|
       define_method f do |boat|
         { f => boat.send(f) }
       end
@@ -138,7 +148,49 @@ class BoatSerializer < AbstractSerializer
         tv
         vhf
         wi_fi
-      ]
+      ].freeze
+    end
+
+    def amenities_attributes
+      %i[
+        air_conditioner
+        bow_thruster
+        electric_toilet
+        essentials
+        family_kid_friendly
+        gym
+        hardtop
+        heating
+        helipad
+        hot_cold_cockpit_shower
+        jacuzzi_on_deck
+        kitchen
+        pet_allowed
+        sauna
+        soft_top
+        stabilisers_underway
+        stabilizers_at_anchor
+        steam_room
+        toilet
+      ].freeze
+    end
+
+    def safety_attributes
+      %i[
+        carbon_detector
+        epirb
+        fire_extinguisher
+        first_aid_kit
+        flares
+        horn
+        lifebuoy
+        life_jackets
+        personal_flotation_devices
+        raft
+        smoke_detector
+        vessel_lighting
+        visual_distress_signals
+      ].freeze
     end
 
     def equipment(boat)
@@ -149,6 +201,22 @@ class BoatSerializer < AbstractSerializer
       }
     end
 
+    def amenities(boat)
+      {
+          amenities: amenities_attributes.map do |f|
+            [f, boat.send(f)]
+          end.to_h
+      }
+    end
+
+    def safety(boat)
+      {
+          safety: safety_attributes.map do |f|
+            [f, boat.send(f)]
+          end.to_h
+      }
+    end
+
     # noinspection RubyResolve
     def picture_medium_url(boat)
       url = if boat.boat_photo.present?
@@ -249,6 +317,12 @@ class BoatSerializer < AbstractSerializer
       }
     end
 
+    def fuel_type(boat)
+      {
+        fuel_type: boat.fuel_type
+      }
+    end
+
     def boat_type(boat)
       {
           boat_type: {

data/config/locales/dicts/fuel_type/en.yml

@@ -0,0 +1,8 @@
+en:
+  dicts:
+    fuel_type:
+      diesel:     Diesel
+      petrol:     Petrol
+      electric:   Electric
+      hybryd:     Hybrid
+      other:      Other

data/config/locales/dicts/fuel_type/ru.yml

@@ -0,0 +1,8 @@
+ru:
+  dicts:
+    fuel_type:
+      diesel:     Дизель
+      petrol:     Бензин
+      electric:   Электричество
+      hybryd:     Гибрид
+      other:      Другое

data/lib/c80_shared/version.rb

@@ -1,3 +1,3 @@
 module C80Shared
-  VERSION = "0.1.53"
+  VERSION = "0.1.54"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_shared
 version: !ruby/object:Gem::Version
-  version: 0.1.53
+  version: 0.1.54
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,7 @@ files:
 - app/dicts/currency.rb
 - app/dicts/email_token_subj.rb
 - app/dicts/exterior_color.rb
+- app/dicts/fuel_type.rb
 - app/dicts/hull_material.rb
 - app/dicts/length.rb
 - app/dicts/locale.rb
@@ -100,6 +101,8 @@ files:
 - config/locales/dicts/charter_category/ru.yml
 - config/locales/dicts/exterior_color/en.yml
 - config/locales/dicts/exterior_color/ru.yml
+- config/locales/dicts/fuel_type/en.yml
+- config/locales/dicts/fuel_type/ru.yml
 - config/locales/dicts/hull_material/en.yml
 - config/locales/dicts/hull_material/ru.yml
 - config/locales/dicts/length/en.yml