ad_space 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5fd64d01bfc45cc173f1e95fbaea9b6ac23291e37feb5c072f7f9477bb651ce
-  data.tar.gz: 21c7b3e8506219e0bf6f6ad2c979b1ee2de5d71cb56d4804b8948cfebc958d64
+  metadata.gz: 9c294841e4e377ecf99cc3aa8f3f42ac3a9800eb88ee17ae37351ba9087b8f8b
+  data.tar.gz: 435767755057233d635c962149960a1b7f6b87dfa30bc2cc31743309b4a64686
 SHA512:
-  metadata.gz: c8e5f37efeaf85765b65ae4c5d487fec4df002bbcc5074edaa1501fe88c80daf2c30092ec2b44265473dc1b6b8bdafb723539321e4c85afa2f304cfd52d9665b
-  data.tar.gz: 5bb47c04044cf966c4a7b6f65a98213a9e61cb61ad2bffd2ac689f67f726f8f69bec23cf3c591babcc7c2f9622bc6a60684674cf14461cf9fb0a234a07dfa93a
+  metadata.gz: 1c9737924bd24df44e888663f41c7651d009a1860d77754ae943cffdb9e93e630dba0458207d44759f20a1b666a3a45298f715e53897c44d13ec2c40c04edae9
+  data.tar.gz: f79ae7773402d55979462e9dfab97481b2a8bd3a645bd22c964c79e65751d37d6a620fe19d2fc51dcf9f6091468cd4bbc0b0573e33d9ca12e423b5873e25e7fe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ad_space (0.1.6)
+    ad_space (0.1.8)
       active_model_serializers
       dotenv-rails
       rails (>= 7.1.1)

data/README.md

@@ -91,8 +91,6 @@ mount AdSpace::Engine => "/ad_space"
 ## TODO
 - 预览广告功能，支持参数可以直接在手机端拉取自定广告，展示在特定的位置
 - 效果指标统计功能，ai 方案，计算成本
-  - slot 编码 弄小一点，uuid 都弄小点
-  - uuid 改为 trace_id 追踪码？
   - 各个指标如何统计
   - 异步任务规则，打点，异步通过阿里云日志写回，sidekiq 测试
   - tacker id 跟阿里云 获取统计 异步结算
@@ -106,3 +104,9 @@ mount AdSpace::Engine => "/ad_space"
 - 操作 调整UI
 - toast 消息
 - tailwindcss
+- 平台 标题 开始时间 结束时间 位置 广告类型 可见性 目标版本
+
+```
+ip, datetime ad_id, impressions, device_id ,platform, version_code, version_name, channel, user_id
+ip, datetime ad_id, clicks, device_id, platform, version_code, version_name, channel, user_id
+```

data/app/controllers/ad_space/api/v1/advertisements_controller.rb

@@ -4,8 +4,7 @@ class AdSpace::Api::V1::AdvertisementsController < ActionController::API
   def index
     builder = AdSpace::Advertisement.includes(:slot).where(platform: params[:platform])
     builder = builder.published.unexpired
-    builder = builder.where(slot_id: params[:slot_ids].split(",")) unless params[:slot_ids].blank?
-
+    builder = builder.joins(:slot).where("ad_space_slots.uuid": params[:slot_ids].split(",")) unless params[:slot_ids].blank?
     # TODO: 动态可配置，不同项目可以自定义特殊的查询条件，基于builder
     # 0. 判断是否有配置动态用户信息，proc
     # 1. 通过token获取用户信息 proc

data/app/models/ad_space/advertisement.rb

@@ -38,8 +38,20 @@ module AdSpace
       archived_at.present?
     end
 
+    def dsp_ad?
+      ad_type == "dsp"
+    end
+
+    def custom_ad?
+      ad_type == "custom"
+    end
+
+    def trace_id
+      uuid
+    end
+
     def cover_url(size = nil)
-      if object.splash?
+      if self.splash?
         return cover_sm.attached? ? cover_sm.url : nil if size == 'little'
         return cover_md.attached? ? cover_md.url : nil if size == 'middle'
         return cover_lg.attached? ? cover_lg.url : nil if size == 'large'
@@ -59,7 +71,9 @@ module AdSpace
     def generate_uuid
       if self.uuid.blank?
         begin
-          self.uuid = SecureRandom.uuid
+          characters = ('a'..'z').to_a + ('0'..'9').to_a
+          random_string = Array.new(4) { characters.sample }.join
+          self.uuid = random_string
         end while self.class.exists?(uuid: uuid)
       end
     end

data/app/models/ad_space/slot.rb

@@ -19,9 +19,11 @@ module AdSpace
     def generate_uuid
       if self.uuid.blank?
         begin
-          self.uuid = SecureRandom.uuid
+          characters = ('a'..'z').to_a + ('0'..'9').to_a
+          random_string = Array.new(4) { characters.sample }.join
+          self.uuid = random_string
         end while self.class.exists?(uuid: uuid)
       end
     end
   end
-end
+end

data/app/serializers/v1/advertisement_serializer.rb

@@ -2,16 +2,16 @@
 
 module V1
   class AdvertisementSerializer < ActiveModel::Serializer
-    attributes :uuid, :started_at, :ended_at, :slot, :ad_type, :visibility
+    attributes :trace_id, :started_at, :ended_at, :slot_id, :ad_type, :visibility, :weight
 
-    attribute :scheme_url, if: -> { object.ad_type == :custom }
-    attribute :image_url, if: -> { object.ad_type == :custom }
-    attribute :dsp_type, if: -> { object.ad_type == :dsp }
+    attribute :scheme_url, if: -> { object.custom_ad? }
+    attribute :image_url, if: -> { object.custom_ad? }
+    attribute :dsp_type, if: -> { object.dsp_ad? }
 
     attribute :splash_ui_type, if: -> { object.splash? }
     attribute :splash_countdown, if: -> { object.splash? }
 
-    def slot
+    def slot_id
       object.slot.uuid
     end
 
@@ -20,11 +20,12 @@ module V1
     end
 
     def ended_at
-      object.started_at.to_i
+      object.ended_at.to_i
     end
 
     def image_url
       object.cover_url(instance_options[:size])
     end
   end
-end
+end
+

data/app/validators/url_or_custom_scheme_validator.rb

@@ -15,6 +15,9 @@ class UrlOrCustomSchemeValidator < ActiveModel::EachValidator
   end
 
   def valid_custom_scheme?(value)
-    value =~ /\A\w+:\/\/\w+\z/
+    uri = URI.parse(value)
+    uri.scheme.present? && uri.scheme =~ /\A\w+\z/ && uri.host.present?
+  rescue URI::InvalidURIError
+    false
   end
 end

data/lib/ad_space/version.rb

@@ -1,3 +1,3 @@
 module AdSpace
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ad_space
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - 42up
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-06 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails