ad_space 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6552473161a7eceadac915dd6897683768efff30c2148c2c40c0d2d39fcc61c3
-  data.tar.gz: 8a2c9e2c6e90076284ec470ffbeb2a4ced4fe3b5dea072402a05b593464feea3
+  metadata.gz: f5fd64d01bfc45cc173f1e95fbaea9b6ac23291e37feb5c072f7f9477bb651ce
+  data.tar.gz: 21c7b3e8506219e0bf6f6ad2c979b1ee2de5d71cb56d4804b8948cfebc958d64
 SHA512:
-  metadata.gz: 04eb5e4c04072d15f59146b9db38f8adececbfbf542cd6759443b0f3b962384bf723e184b362c38e3a0ac9ee0e76e457e3c6e9cc611d2e4bf0e5aab11ce10e91
-  data.tar.gz: f28da1ba96cffa665b9a10220a9cb491f45555919e9f2e418312efb74c252cb46259d5213e09a2aa4f022fcb50c5fec0fb56a758cd15a3c2b4f410086eafdc06
+  metadata.gz: c8e5f37efeaf85765b65ae4c5d487fec4df002bbcc5074edaa1501fe88c80daf2c30092ec2b44265473dc1b6b8bdafb723539321e4c85afa2f304cfd52d9665b
+  data.tar.gz: 5bb47c04044cf966c4a7b6f65a98213a9e61cb61ad2bffd2ac689f67f726f8f69bec23cf3c591babcc7c2f9622bc6a60684674cf14461cf9fb0a234a07dfa93a

data/Gemfile

@@ -19,4 +19,6 @@ gem 'stimulus-rails'
 
 group :development do
   gem "pg"
+
+  gem "i18n-tasks"
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ad_space (0.1.4)
+    ad_space (0.1.6)
       active_model_serializers
       dotenv-rails
       rails (>= 7.1.1)
@@ -88,7 +88,15 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
+    ast (2.4.2)
     base64 (0.1.1)
+    better_html (2.0.2)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)
+      ast (~> 2.0)
+      erubi (~> 1.4)
+      parser (>= 2.4)
+      smart_properties
     bigdecimal (3.1.4)
     builder (3.2.4)
     case_transform (0.2)
@@ -111,8 +119,20 @@ GEM
     erubi (1.12.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
+    highline (2.1.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    i18n-tasks (1.0.13)
+      activesupport (>= 4.0.2)
+      ast (>= 2.1.0)
+      better_html (>= 1.0, < 3.0)
+      erubi
+      highline (>= 2.0.0)
+      i18n
+      parser (>= 3.2.2.1)
+      rails-i18n
+      rainbow (>= 2.2.2, < 4.0)
+      terminal-table (>= 1.5.1)
     io-console (0.6.0)
     irb (1.8.3)
       rdoc
@@ -146,6 +166,9 @@ GEM
       racc (~> 1.4)
     nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
+    parser (3.2.2.4)
+      ast (~> 2.4.1)
+      racc
     pg (1.5.4)
     psych (5.1.1.1)
       stringio
@@ -181,6 +204,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
+    rails-i18n (7.0.8)
+      i18n (>= 0.7, < 2)
+      railties (>= 6.0.0, < 8)
     railties (7.1.1)
       actionpack (= 7.1.1)
       activesupport (= 7.1.1)
@@ -189,12 +215,14 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
+    rainbow (3.1.1)
     rake (13.0.6)
     rdoc (6.5.0)
       psych (>= 4.0.0)
     reline (0.3.9)
       io-console (~> 0.5)
     ruby2_keywords (0.0.5)
+    smart_properties (1.17.0)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -207,6 +235,8 @@ GEM
     stimulus-rails (1.3.0)
       railties (>= 6.0.0)
     stringio (3.0.8)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     thor (1.3.0)
     timeout (0.4.0)
     turbo-rails (1.5.0)
@@ -215,6 +245,7 @@ GEM
       railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
@@ -229,6 +260,7 @@ DEPENDENCIES
   ad_space!
   cssbundling-rails
   debug (>= 1.0.0)
+  i18n-tasks
   jsbundling-rails
   pg
   puma

data/ad_space.gemspec

@@ -14,9 +14,7 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"] = spec.homepage
   spec.metadata["changelog_uri"] = spec.homepage
 
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    Dir["{app,config,db,lib, public}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "Gemfile", "Gemfile.lock", "ad_space.gemspec"]
-  end
+  spec.files = Dir["{bin,app,config,db,lib,public}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "ad_space.gemspec", "Gemfile", "Gemfile.lock"]
 
   spec.add_dependency "rails", ">= 7.1.1"
   spec.add_dependency "active_model_serializers"

data/app/controllers/ad_space/advertisements_controller.rb

@@ -6,22 +6,25 @@ module AdSpace
     def index
       @advertisements = Advertisement.all
 
-      add_breadcrumb("Home", root_path)
+      add_breadcrumb(t("home"), root_path)
     end
 
     # GET /advertisements/1
     def show
-      add_breadcrumb("Home", root_path)
-      add_breadcrumb("Advertisements", advertisements_path)
+      add_breadcrumb(t("home"), root_path)
+      add_breadcrumb(t("advertisements"), advertisements_path)
     end
 
     # GET /advertisements/new
     def new
       @advertisement = Advertisement.new
+
+      add_breadcrumb(t("home"), root_path)
     end
 
     # GET /advertisements/1/edit
     def edit
+      add_breadcrumb(t("home"), root_path)
     end
 
     # POST /advertisements

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

@@ -2,6 +2,27 @@ class AdSpace::Api::V1::AdvertisementsController < ActionController::API
   # before_action :prepare_params!, only: %w[index]
 
   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?
+
+    # TODO: 动态可配置，不同项目可以自定义特殊的查询条件，基于builder
+    # 0. 判断是否有配置动态用户信息，proc
+    # 1. 通过token获取用户信息 proc
+    # 2. 通过用户信息判断用户是否为会员
+    # 3. 如果是会员，则不展示广告位为“开屏广告”的广告
+    # 4. 如果不是会员，则展示所有广告
+    # 5. 如果没有配置动态用户信息，则展示所有广告
+    # has_paid 开屏逻辑、member 逻辑
+    # token = ApiKey.get_token(params[:token])
+    # if token.present?
+    #   current_user = token.user
+    #   if current_user && current_user&.paid?
+    #     # 写死 slot_id
+    #     builder = builder.where.not(position_code: '10003')
+    #   end
+    # end
+
     width = params[:screen_width].to_f
     height = params[:screen_height].to_f
     screen_ratio = width.zero? ? 0 : height / width
@@ -13,15 +34,6 @@ class AdSpace::Api::V1::AdvertisementsController < ActionController::API
             "large"
           end
 
-    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?
-
-    # TODO: 动态可配置，不同项目可以自定义特殊的查询条件，基于builder
-    # if current_user && current_user&.is_member?
-    #   builder = builder.where.not(position_code: '10003')
-    # end
-
     unless params[:version_code].blank?
       array = [0]
       array.push(params[:version_code].to_i)

data/app/controllers/ad_space/application_controller.rb

@@ -1,6 +1,7 @@
 module AdSpace
   class ApplicationController < ActionController::Base
     helper_method :_current_user
+    around_action :use_ad_space_locale
 
     before_action :init_app
 
@@ -26,5 +27,38 @@ module AdSpace
     def add_breadcrumb(name, path = nil)
       breadcrumbs << AdSpace::Breadcrumb.new(name, path)
     end
+
+    private
+
+    def default_url_options(options = {})
+      { locale: I18n.locale }.merge(options)
+    end
+
+    def use_ad_space_locale(&action)
+      @original_i18n_config = I18n.config
+      I18n.config = ::AdSpace::I18nConfig.new
+      I18n.with_locale(current_locale, &action)
+    ensure
+      I18n.config = @original_i18n_config
+      @original_i18n_config = nil
+    end
+
+    def use_original_locale
+      prev_config = I18n.config
+      I18n.config = @original_i18n_config if @original_i18n_config
+      yield
+    ensure
+      I18n.config = prev_config
+    end
+
+    def current_locale
+      if request.GET['locale']
+        request.GET['locale']
+      elsif params[:locale]
+        params[:locale]
+      else
+        I18n.default_locale
+      end
+    end
   end
 end

data/app/controllers/ad_space/slots_controller.rb

@@ -6,22 +6,25 @@ module AdSpace
     def index
       @slots = Slot.all
 
-      add_breadcrumb("Home", root_path)
+      add_breadcrumb(t("home"), root_path)
     end
 
     # GET /slots/1
     def show
-      add_breadcrumb("Home", root_path)
-      add_breadcrumb("Slots", slots_path)
+      add_breadcrumb(t("home"), root_path)
+      add_breadcrumb(t("slots"), slots_path)
     end
 
     # GET /slots/new
     def new
       @slot = Slot.new
+
+      add_breadcrumb(t("home"), root_path)
     end
 
     # GET /slots/1/edit
     def edit
+      add_breadcrumb(t("home"), root_path)
     end
 
     # POST /slots

data/app/models/ad_space/i18n_config.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module AdSpace
+  class I18nConfig < ::I18n::Config
+    BACKEND = I18n::Backend::Simple.new
+    AVAILABLE_LOCALES = AdSpace::Engine.root.join("config/locales").glob("*.yml").map { |path| File.basename(path, ".yml").to_sym }.uniq
+    AVAILABLE_LOCALES_SET = AVAILABLE_LOCALES.inject(Set.new) { |set, locale| set << locale.to_s << locale.to_sym }
+
+    def backend
+      BACKEND
+    end
+
+    def available_locales
+      AVAILABLE_LOCALES
+    end
+
+    def available_locales_set
+      AVAILABLE_LOCALES_SET
+    end
+
+    def default_locale
+      AdSpace.configuration.dashboard_default_locale
+    end
+  end
+end

data/app/views/ad_space/advertisements/_advertisement.html.erb

@@ -55,21 +55,6 @@
       <%= advertisement.remark %>
     </p>
 
-    <p>
-      <strong>Pv count:</strong>
-      <%= advertisement.pv_count %>
-    </p>
-
-    <p>
-      <strong>Uv count:</strong>
-      <%= advertisement.uv_count %>
-    </p>
-
-    <p>
-      <strong>Click count:</strong>
-      <%= advertisement.click_count %>
-    </p>
-
     <% if advertisement.cover_sm.attached? %>
       <p>
         <strong>Small Cover Image:</strong>

data/app/views/ad_space/advertisements/_form.html.erb

@@ -13,7 +13,7 @@
 
   <div>
     <%= form.label :platform, style: "display: block" %>
-    <%= form.select :platform, AdSpace::Advertisement.platforms.keys.map { |platform| [platform.capitalize, platform] } %>
+    <%= form.select :platform, AdSpace::Advertisement.platforms.keys.map { |platform| [t("activerecord.enums.ad_space/advertisement.platform.#{platform}"), platform] } %>
   </div>
 
   <div>
@@ -22,7 +22,7 @@
   </div>
 
   <div>
-    <%= form.label :slot_id, "Slot", style: "display: block" %>
+    <%= form.label :slot_id, style: "display: block" %>
     <%= form.select :slot_id, options_for_select(
       AdSpace::Slot.all.map { |s| [s.name, s.id, data: { is_splash: s.splash? }] },
       advertisement.slot_id,
@@ -31,7 +31,7 @@
 
   <div>
     <%= form.label :visibility, style: "display: block" %>
-    <%= form.select :visibility, AdSpace::Advertisement.visibilities.keys.map { |key| [key.humanize, key] } %>
+    <%= form.select :visibility, AdSpace::Advertisement.visibilities.keys.map { |key| [t("activerecord.enums.ad_space/advertisement.visibility.#{key}"), key] } %>
   </div>
 
   <div>
@@ -52,7 +52,7 @@
   <div>
     <%= form.label :ad_type, style: "display: block" %>
     <%= form.select :ad_type,
-      AdSpace::Advertisement.ad_types.keys.map { |key| [key.humanize, key] },
+      AdSpace::Advertisement.ad_types.keys.map { |key| [t("activerecord.enums.ad_space/advertisement.ad_type.#{key}"), key] },
       {},
       data: { hello_target: "adType", action: "hello#handleAdTypeChnage" }
     %>
@@ -60,7 +60,7 @@
 
   <div>
     <%= form.label :dsp_type, style: "display: block" %>
-    <%= form.select :dsp_type, AdSpace::Advertisement.dsp_types.keys.map { |key| [key.humanize, key] } %>
+    <%= form.select :dsp_type, AdSpace::Advertisement.dsp_types.keys.map { |key| [t("activerecord.enums.ad_space/advertisement.dsp_type.#{key}"), key] } %>
   </div>
 
   <div data-hello-target="schemeUrl">
@@ -88,7 +88,7 @@
 
   <div data-hello-target="splashUiType">
     <%= form.label :splash_ui_type, style: "display: block" %>
-    <%= form.select :splash_ui_type, AdSpace::Advertisement.splash_ui_types.keys.map { |key| [key.humanize, key] } %>
+    <%= form.select :splash_ui_type, AdSpace::Advertisement.splash_ui_types.keys.map { |key| [t("activerecord.enums.ad_space/advertisement.splash_ui_type.#{key}"), key] } %>
   </div>
 
   <div data-hello-target="smCover" data-controller="image-upload", data-image-upload-url-value=<%= !advertisement.persisted? ? '' : remove_cover_advertisement_path(advertisement, size: "sm")%>>

data/app/views/ad_space/advertisements/edit.html.erb

@@ -1,10 +1,10 @@
-<h1>Editing advertisement</h1>
+<h1><%= t("edit") %></h1>
 
 <%= render "form", advertisement: @advertisement %>
 
 <br>
 
 <div>
-  <%= link_to "Show this advertisement", @advertisement %> |
-  <%= link_to "Back to advertisements", advertisements_path %>
+  <%= link_to t("show"), @advertisement %> |
+  <%= link_to t("back_to"), advertisements_path %>
 </div>

data/app/views/ad_space/advertisements/index.html.erb

@@ -1,15 +1,15 @@
 <p style="color: green"><%= notice %></p>
 
-<h1>Advertisements</h1>
+<h1><%= t("advertisements") %></h1>
 
 <div id="advertisements">
   <% @advertisements.each do |advertisement| %>
     <%= render advertisement %>
     <p>
-      <%= link_to "Show this advertisement", advertisement %>
+      <%= link_to t("show"), advertisement %>
     </p>
 
   <% end %>
 </div>
 
-<%= link_to "New advertisement", new_advertisement_path %>
+<%= link_to t("new"), new_advertisement_path %>

data/app/views/ad_space/advertisements/new.html.erb

@@ -1,9 +1,9 @@
-<h1>New advertisement</h1>
+<h1><%= t("new") %></h1>
 
 <%= render "form", advertisement: @advertisement %>
 
 <br>
 
 <div>
-  <%= link_to "Back to advertisements", advertisements_path %>
+  <%= link_to t("back_to"), advertisements_path %>
 </div>

data/app/views/ad_space/advertisements/show.html.erb

@@ -3,11 +3,11 @@
 <%= render @advertisement %>
 
 <div>
-  <%= link_to "Edit this advertisement", edit_advertisement_path(@advertisement) %> |
-  <%= link_to "Back to advertisements", advertisements_path %>
-  <%= button_to "#{@advertisement.published? ? 'Unpublish' : 'Publish'} this advertisement", publish_advertisement_path(@advertisement) %>
-  <%= button_to "#{@advertisement.archived? ? 'Unarchive' : 'Archive'}  this advertisement", archive_advertisement_path(@advertisement) %>
+  <%= link_to t("edit"), edit_advertisement_path(@advertisement) %> |
+  <%= link_to t("back_to"), advertisements_path %>
+  <%= button_to "#{@advertisement.published? ? t("unpublish") : t("publish")}", publish_advertisement_path(@advertisement) %>
+  <%= button_to "#{@advertisement.archived? ? t("unarchive") : t("archive")}", archive_advertisement_path(@advertisement) %>
 
   <br/>
-  <%= button_to "Destroy this advertisement", @advertisement, method: :delete %>
+  <%= button_to t("destroy"), @advertisement, method: :delete %>
 </div>

data/app/views/ad_space/dashboard/index.html.erb

@@ -1,7 +1,7 @@
 <h1>📺 AdSpace</h1>
 <ul>
-    <li><%= link_to "广告", advertisements_path %></li>
-    <li><%= link_to "位置", slots_path %></li>
-    <li><%= link_to "Github", "https://github.com/42up/ad_space" %></li>
-    <li><%= link_to "Doc", "https://github.com/42up/ad_space/blob/main/README.md" %></li>
+    <li><%= link_to t("slots"), slots_path %></li>
+    <li><%= link_to t("advertisements"), advertisements_path %></li>
+    <li><%= link_to t("github"), "https://github.com/42up/ad_space" %></li>
+    <li><%= link_to t("doc"), "https://github.com/42up/ad_space/blob/main/README.md" %></li>
 </ul>

data/app/views/ad_space/slots/_form.html.erb

@@ -22,19 +22,19 @@
   </div>
 
   <div data-controller="image-upload", data-image-upload-url-value=<%= !slot.persisted? ? '' : remove_demo_slot_path(slot) %>>
-    <%= form.label :demo, "Demo", style: "display: block" %>
+    <%= form.label :demo, style: "display: block" %>
     <%= form.file_field :demo, data: {image_upload_target: "input"} %>
     <% if slot.demo.attached? %>
       <%= image_tag slot.demo.url, style: "max-width: 200px; height: auto;", data: {image_upload_target: "preview"} %>
-      <button type="button" data-image-upload-target="removeButton">移除图片</button>
+      <button type="button" data-image-upload-target="removeButton"><%= t("remove_image") %></button>
     <% else %>
       <img data-image-upload-target="preview" style="max-width: 200px; height: auto;">
-      <button type="button" data-image-upload-target="removeButton" style="display: none;">移除图片</button>
+      <button type="button" data-image-upload-target="removeButton" style="display: none;"><%= t("remove_image") %></button>
     <% end %>
   </div>
 
   <div>
-    <%= form.label :is_splash, "Is Splash" %>
+    <%= form.label :is_splash %>
     <%= form.check_box :is_splash, { checked: form.object.is_splash } %>
   </div>
 

data/app/views/ad_space/slots/_slot.html.erb

@@ -1,27 +1,27 @@
 <div id="<%= dom_id slot %>">
   <p>
-    <strong>Name:</strong>
+    <strong><%= AdSpace::Slot.human_attribute_name(:name) %>:</strong>
     <%= slot.name %>
   </p>
 
   <p>
-    <strong>Uuid:</strong>
+    <strong><%= AdSpace::Slot.human_attribute_name(:uuid) %>:</strong>
     <%= slot.uuid %>
   </p>
 
   <p>
-    <strong>Remark:</strong>
+    <strong><%= AdSpace::Slot.human_attribute_name(:remark) %>:</strong>
     <%= slot.remark %>
   </p>
 
   <p>
-    <strong>Is Splash:</strong>
+    <strong><%= AdSpace::Slot.human_attribute_name(:is_splash) %>:</strong>
     <%= slot.is_splash %>
   </p>
 
   <% if slot.demo.attached? %>
     <p>
-      <strong>Demo:</strong>
+      <strong><%= AdSpace::Slot.human_attribute_name(:demo) %>:</strong>
       <%= image_tag slot.demo.url, style: "max-width: 200px; height: auto;" %>
     </p>
   <% end %>

data/app/views/ad_space/slots/edit.html.erb

@@ -1,10 +1,10 @@
-<h1>Editing slot</h1>
+<h1><%= t("edit") %></h1>
 
 <%= render "form", slot: @slot %>
 
 <br>
 
 <div>
-  <%= link_to "Show this slot", @slot %> |
-  <%= link_to "Back to slots", slots_path %>
+  <%= link_to t("show"), @slot %> |
+  <%= link_to t("back_to"), slots_path %>
 </div>

data/app/views/ad_space/slots/index.html.erb

@@ -1,14 +1,14 @@
 <p style="color: green"><%= notice %></p>
 
-<h1>Slots</h1>
+<h1><%= t("slots") %></h1>
 
 <div id="slots">
   <% @slots.each do |slot| %>
     <%= render slot %>
     <p>
-      <%= link_to "Show this slot", slot %>
+      <%= link_to t("show"), slot %>
     </p>
   <% end %>
 </div>
 
-<%= link_to "New slot", new_slot_path %>
+<%= link_to t("new"), new_slot_path %>

data/app/views/ad_space/slots/new.html.erb

@@ -1,9 +1,9 @@
-<h1>New slot</h1>
+<h1><%= t("new") %></h1>
 
 <%= render "form", slot: @slot %>
 
 <br>
 
 <div>
-  <%= link_to "Back to slots", slots_path %>
+  <%= link_to t("back_to"), slots_path %>
 </div>

data/app/views/ad_space/slots/show.html.erb

@@ -3,8 +3,8 @@
 <%= render @slot %>
 
 <div>
-  <%= link_to "Edit this slot", edit_slot_path(@slot) %> |
-  <%= link_to "Back to slots", slots_path %>
+  <%= link_to t("edit"), edit_slot_path(@slot) %> |
+  <%= link_to t("back_to"), slots_path %>
 
-  <%= button_to "Destroy this slot", @slot, method: :delete %>
+  <%= button_to t("destroy"), @slot, method: :delete %>
 </div>

data/bin/rails

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path("..", __dir__)
+ENGINE_PATH = File.expand_path("../lib/ad_space/engine", __dir__)
+APP_PATH = File.expand_path("../test/dummy/config/application", __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+
+require "rails/all"
+require "rails/engine/commands"