c80_shared 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d2ecdf23242f3f9bbeb1a1a1bc2c60619c84942560f90b4a25d6516c912fbb8
-  data.tar.gz: d9cc783a187e1081e95c084a7f229a963f73c5f5e838e9310385cc7da28285aa
+  metadata.gz: fbd50ef3777c29cb4f39f60dc814e27f661b777b4e27dd57d97a95da3acce58e
+  data.tar.gz: de9300ef9898852e3a258524d2130f6b1a66566f067dc978655f1334949d3c32
 SHA512:
-  metadata.gz: 132e8442a3e50d20ffaed3676ffa6fb3468d089afad51be0b90ade62221f2d74a50a87550a94d0ffce9a267aea44bbd913c2a582c27ce77d03ce10aa9263afae
-  data.tar.gz: d4321609f4e47a00ccb6477c28abd682e7be634d8b795327252e413f854b8378e4444f85d855fe89ae786e72cce92d83cfae8491b6584492f9bd11d6d7cb2fcf
+  metadata.gz: a3bef6c9c366e52f070edcda193259acf2e13ac20116ff61e281bf94460daacdc4b9800f9568d744a7a489e918f760c2f864d65cb011d723fd07522940c5a3ec
+  data.tar.gz: 976d69f14a5c41b467011e59a04b0c408e4d3b8979624cd7e687e3837154811b18b5d63fd86170a58f53b711c6d2ab62103c61bc021dce1f33c08e55e4d1d33e

data/app/serializers/boat_serializer.rb

@@ -1,4 +1,5 @@
 class BoatSerializer < AbstractSerializer
+  extend SanitizeUrl
 
   class << self
     def available_attributes
@@ -34,6 +35,9 @@ class BoatSerializer < AbstractSerializer
         picture_medium_url
         name
         builder
+        naval_architect
+        interior_designer
+        name_builder
         short_description
         per_season
         price
@@ -48,6 +52,10 @@ class BoatSerializer < AbstractSerializer
         latitude
         longitude
         boat_type_id
+        boat_type
+        boat_hull_id
+        motor
+        hull_material
         boat_length_metrics
         boat_length_metrics_meters
         boat_length_metrics_ft
@@ -60,6 +68,7 @@ class BoatSerializer < AbstractSerializer
         state
         boat_contacts
         boat_photos
+        main_boat_photo_id
       ].freeze
     end
 
@@ -83,7 +92,7 @@ class BoatSerializer < AbstractSerializer
     # noinspection RubyResolve
     def picture_medium_url(boat)
       url = if boat.boat_photo.present?
-              boat.boat_photo.picture.url(:medium).gsub('\'', '&#39;')
+              san boat.boat_photo.picture.url(:medium)
             else
               ''
             end
@@ -91,12 +100,45 @@ 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 }
+      { 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 interior_designer(boat)
+      { interior_designer: boat.interior_designer }
+    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
 
     def short_description(boat)
@@ -177,6 +219,19 @@ 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
+        }
+      }
+    end
+
     def boat_length_metrics(boat)
       value = ::Lib::Boats::Dimensions.boatlength(boat, @opts[:uom])
       { boat_length_metrics: value }
@@ -338,9 +393,10 @@ class BoatSerializer < AbstractSerializer
     def boat_photos(boat)
       boat_photos = boat.boat_photos.map do |boat_photo|
         {
-          gallery_path: boat_photo.picture.url(:gallery),
-          medium_path:  boat_photo.picture.url(:medium),
-          thumb_path:   boat_photo.picture.url(:thumb)
+          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))
         }
       end
       { boat_photos: boat_photos }

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

@@ -0,0 +1,26 @@
+module Configs
+  module Boats
+    class BoatPrices
+      # список ценовых (продажа/аренда) атрибутов Лодки
+      def self.attributes(price_attributes = ::Dictionaries::BoatCharterAttribute::ALL)
+        attributes = []
+        ::Dicts::Currency.all.each do |currency|
+          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
+          attributes << field.to_sym
+        end
+        if block_given?
+          attributes.each do |attribute|
+            yield attribute
+          end
+        else
+          attributes
+        end
+      end
+    end
+  end
+end

data/lib/c80_shared/string/sanitize_url.rb

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

data/lib/c80_shared/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_shared
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ files:
 - app/helpers/site/time_helper.rb
 - app/serializers/boat_serializer.rb
 - app/serializers/boat_visit_day_serializer.rb
+- app/serializers/configs/boats/boat_prices.rb
 - app/serializers/configs/boats/central_agent/boat_list.rb
 - app/serializers/configs/lease/central_agent/inquiry_list.rb
 - app/serializers/lease/bid_serializer.rb
@@ -83,6 +84,7 @@ 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