c80_shared 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbd50ef3777c29cb4f39f60dc814e27f661b777b4e27dd57d97a95da3acce58e
-  data.tar.gz: de9300ef9898852e3a258524d2130f6b1a66566f067dc978655f1334949d3c32
+  metadata.gz: f84795cb065e618a232fb00682c7c86e72b75a711e95a0775a38efeef30760c0
+  data.tar.gz: 97291d1a16b348ac5282c0c4076c3fc1272eef290b421ed162eaf48ea4a6b66e
 SHA512:
-  metadata.gz: a3bef6c9c366e52f070edcda193259acf2e13ac20116ff61e281bf94460daacdc4b9800f9568d744a7a489e918f760c2f864d65cb011d723fd07522940c5a3ec
-  data.tar.gz: 976d69f14a5c41b467011e59a04b0c408e4d3b8979624cd7e687e3837154811b18b5d63fd86170a58f53b711c6d2ab62103c61bc021dce1f33c08e55e4d1d33e
+  metadata.gz: '0854fbb3a527864d20de902e31271f89caeedfa4aa7abe76399b8f1b049a8a1a45587afbf3535fb2581eb050e6ce2cef26f0051e088d2092465f94a1fa5c7dcf'
+  data.tar.gz: 2c940900cb0c71603daa845b47ff8188be748c009ae6f3d41b064bae9690fb3cbaa4b5b2c3888b3f77079a66d32884c8237ec98b94ed65de133d7848b49b3252

data/.rubocop.yml

@@ -12,15 +12,9 @@ Metrics/LineLength:
   Max: 120
   Enabled: false
 Metrics/MethodLength:
-  CountComments: false  # count full line comments?
-  Max: 20
   Enabled: false
 Metrics/ModuleLength:
-  CountComments: false  # count full line comments?
-  Max: 150
-Metrics/ClassLength:
-  CountComments: false  # count full line comments?
-  Max: 150
+  Enabled: false
 Metrics/ParameterLists:
   Max: 3
   CountKeywordArgs: true
@@ -32,8 +26,6 @@ Layout/ExtraSpacing:
   Enabled: false
 Layout/CaseIndentation:
   Enabled: false
-Layout/TrailingWhitespase:
-  Enabled: false
 Layout/SpaceAroundOperators:
   Enabled: false
 Style/FormatString:
@@ -50,3 +42,9 @@ Metrics/AbcSize:
   Enabled: false
 Style/Documentation:
   Enabled: false
+Layout/AlignHash:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Lint/Syntax:
+  Enabled: false

data/app/serializers/boat_serializer.rb

@@ -1,74 +1,73 @@
 class BoatSerializer < AbstractSerializer
-  extend SanitizeUrl
 
   class << self
     def available_attributes
       %i[
-        charter_1_hour_low_usd
-        charter_1_hour_low_rub
-        charter_1_hour_low_eur
-        charter_1_day_low_usd
-        charter_1_day_low_rub
+        boat_beam_metrics
+        boat_beam_metrics_ft
+        boat_beam_metrics_meters
+        boat_contacts
+        boat_draft_metrics
+        boat_draft_metrics_ft
+        boat_draft_metrics_meters
+        boat_hull_id
+        boat_length_metrics
+        boat_length_metrics_ft
+        boat_length_metrics_meters
+        boat_model
+        boat_photos
+        boat_type
+        boat_type_id
+        builder
+        built_year
+        charter_1_day_high_eur
+        charter_1_day_high_rub
+        charter_1_day_high_usd
         charter_1_day_low_eur
-        charter_1_week_low_usd
-        charter_1_week_low_rub
-        charter_1_week_low_eur
-        charter_1_month_low_usd
-        charter_1_month_low_rub
-        charter_1_month_low_eur
-        charter_1_hour_high_usd
-        charter_1_hour_high_rub
+        charter_1_day_low_rub
+        charter_1_day_low_usd
         charter_1_hour_high_eur
-        charter_1_day_high_usd
-        charter_1_day_high_rub
-        charter_1_day_high_eur
-        charter_1_week_high_usd
-        charter_1_week_high_rub
-        charter_1_week_high_eur
-        charter_1_month_high_usd
-        charter_1_month_high_rub
+        charter_1_hour_high_rub
+        charter_1_hour_high_usd
+        charter_1_hour_low_eur
+        charter_1_hour_low_rub
+        charter_1_hour_low_usd
         charter_1_month_high_eur
-        sale_price_usd
-        sale_price_rub
-        sale_price_eur
+        charter_1_month_high_rub
+        charter_1_month_high_usd
+        charter_1_month_low_eur
+        charter_1_month_low_rub
+        charter_1_month_low_usd
+        charter_1_week_high_eur
+        charter_1_week_high_rub
+        charter_1_week_high_usd
+        charter_1_week_low_eur
+        charter_1_week_low_rub
+        charter_1_week_low_usd
+        crew_total
+        guest_cabins
+        guests_total
+        hull_material
         id
-        picture_medium_url
-        name
-        builder
-        naval_architect
         interior_designer
+        latitude
+        location_address
+        longitude
+        main_boat_photo_id
+        motor
+        name
         name_builder
-        short_description
+        naval_architect
         per_season
+        picture_medium_url
         price
         price_discount
-        guests_total
-        guest_cabins
-        crew_total
-        built_year
         refit_year
-        boat_model
-        location_address
-        latitude
-        longitude
-        boat_type_id
-        boat_type
-        boat_hull_id
-        motor
-        hull_material
-        boat_length_metrics
-        boat_length_metrics_meters
-        boat_length_metrics_ft
-        boat_beam_metrics
-        boat_beam_metrics_ft
-        boat_beam_metrics_meters
-        boat_draft_metrics
-        boat_draft_metrics_ft
-        boat_draft_metrics_meters
+        sale_price_eur
+        sale_price_rub
+        sale_price_usd
+        short_description
         state
-        boat_contacts
-        boat_photos
-        main_boat_photo_id
       ].freeze
     end
 
@@ -89,10 +88,34 @@ class BoatSerializer < AbstractSerializer
       { id: boat.id }
     end
 
+    def interior_designer(boat)
+      { interior_designer: boat.interior_designer }
+    end
+
+    def naval_architect(boat)
+      { naval_architect: boat.naval_architect }
+    end
+
+    # Для страницы просмотра лодки
+    #
+    # example: Carpe Diem by Lazzara
+    # example: Ismail
+    def name_builder(boat)
+      arr = []
+      arr << boat.name&.strip
+      if boat.builder.present?
+        arr << I18n.t('boat.builder.prefix')
+        arr << boat.builder.strip
+      end
+
+      { name_builder: arr * ' ' }
+    end
+
+
     # noinspection RubyResolve
     def picture_medium_url(boat)
       url = if boat.boat_photo.present?
-              san boat.boat_photo.picture.url(:medium)
+              boat.boat_photo.picture.url(:medium)
             else
               ''
             end
@@ -100,45 +123,24 @@ class BoatSerializer < AbstractSerializer
       { picture_medium_url: url }
     end
 
-    def main_boat_photo_id(boat)
-      { main_boat_photo_id: boat.boat_photo.id }
-    end
-
     def name(boat)
       { name: boat.name }
     end
 
-    def builder(boat)
-      { builder: boat.builder&.strip }
-    end
-
     def motor(boat)
       { motor: boat.motor }
     end
 
-    def hull_material(boat)
-      { hull_material: boat.hull_material }
-    end
-
-    def naval_architect(boat)
-      { naval_architect: boat.naval_architect }
-    end
+    def main_boat_photo_id(boat)
+      boat_photo_id = if boat.boat_photo.present?
+                        boat.boat_photo.id
+                      end
 
-    def interior_designer(boat)
-      { interior_designer: boat.interior_designer }
+      { main_boat_photo_id: boat_photo_id }
     end
 
-    # example: Carpe Diem by Lazzara
-    # example: Ismail
-    def name_builder(boat)
-      arr = []
-      arr << boat.name&.strip
-      if boat.builder.present?
-        arr << I18n.t('boat.builder.prefix')
-        arr << boat.builder.strip
-      end
-
-      { name_builder: arr * ' ' }
+    def builder(boat)
+      { builder: boat.builder&.strip }
     end
 
     def short_description(boat)
@@ -186,6 +188,10 @@ class BoatSerializer < AbstractSerializer
       { guest_cabins: boat.guest_cabins || '' }
     end
 
+    def hull_material(boat)
+      { hull_material: boat.hull_material }
+    end
+
     def crew_total(boat)
       { crew_total: boat.crew_total || '' }
     end
@@ -219,16 +225,12 @@ class BoatSerializer < AbstractSerializer
       { boat_type_id: boat.boat_type_id }
     end
 
-    def boat_hull_id(boat)
-      { boat_hull_id: boat.boat_hull_id }
-    end
-    
     def boat_type(boat)
-      { 
-        boat_type: {
-          id:     boat.boat_type_id,
-          title:  boat.boat_type&.name&.strip
-        }
+      {
+          boat_type: {
+              id:     boat.boat_type_id,
+              title:  boat.boat_type&.name&.strip
+          }
       }
     end
 
@@ -271,6 +273,10 @@ class BoatSerializer < AbstractSerializer
       { boat_draft_metrics_meters: boat.boat_draft_metrics_meters }
     end
 
+    def boat_hull_id(boat)
+      { boat_hull_id: boat.boat_hull_id }
+    end
+
 
     # --[low]-----------------------------------------------------------------------------------------------------------
 
@@ -391,23 +397,22 @@ class BoatSerializer < AbstractSerializer
     end
 
     def boat_photos(boat)
+      # FIXME:: выяснить, нужно ли всётаки использовать .gsub('\'', '&#39;') для строк с путями к фоткам?
       boat_photos = boat.boat_photos.map do |boat_photo|
         {
-          id:           boat_photo.id,
-          gallery_path: san(boat_photo.picture.url(:gallery)),
-          medium_path:  san(boat_photo.picture.url(:medium)),
-          thumb_path:   san(boat_photo.picture.url(:thumb))
+          gallery_path: boat_photo.picture.url(:gallery),
+          medium_path:  boat_photo.picture.url(:medium),
+          thumb_path:   boat_photo.picture.url(:thumb)
         }
       end
       { boat_photos: boat_photos }
     end
 
+    # Контакты владельцев: то, что приходит в `boat_users_attributes` из админской формы
     def boat_contacts(boat)
-      boat_contacts = boat.users.map do |user|
+      boat_contacts = boat.boat_users.map do |user|
         {
-          id:    user.id,
-          name:  user.name,
-          email: user.email
+          user_id: user.user_id
         }
       end
       { boat_contacts: boat_contacts }

data/app/serializers/configs/boats/boat_prices.rb

@@ -8,6 +8,7 @@ module Configs
           price_attributes.map do |attr|
             field = Currency.attribute_name currency.index, attr
             next unless field
+
             attributes << field.to_sym
           end
           field = Currency.attribute_name currency.index, :sale_price
@@ -23,4 +24,4 @@ module Configs
       end
     end
   end
-end
+end

data/config/locales/boat/en.yml

@@ -0,0 +1,4 @@
+en:
+  boat:
+    builder:
+      prefix: by

data/config/locales/boat/ru.yml

@@ -0,0 +1,4 @@
+ru:
+  boat:
+    builder:
+      prefix: от

data/lib/c80_shared/version.rb

@@ -1,3 +1,3 @@
 module C80Shared
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_shared
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2019-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,8 @@ files:
 - bin/rails
 - bin/setup
 - c80_shared.gemspec
+- config/locales/boat/en.yml
+- config/locales/boat/ru.yml
 - config/locales/rent_skip_type/en.yml
 - config/locales/rent_skip_type/ru.yml
 - lib/c80_shared.rb
@@ -84,7 +86,6 @@ files:
 - lib/c80_shared/engine.rb
 - lib/c80_shared/geo/distance.rb
 - lib/c80_shared/middleware/images_proxy.rb
-- lib/c80_shared/string/sanitize_url.rb
 - lib/c80_shared/token_generator.rb
 - lib/c80_shared/version.rb
 homepage: http://google.com
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Write a short summary, because RubyGems requires one.

data/lib/c80_shared/string/sanitize_url.rb

@@ -1,5 +0,0 @@
-module SanitizeUrl
-  def san(str)
-    str.gsub('\'', ''')
-  end
-end