rails_com 1.2.5 → 1.2.6

data/app/models/active_storage/blob_default.rb

@@ -2,4 +2,23 @@ class ActiveStorage::BlobDefault < ApplicationRecord
   self.table_name = 'active_storage_blob_defaults'
   has_one_attached :file
 
+  after_commit :delete_private_cache, :delete_default_cache, on: [:create, :destroy]
+  after_update_commit :delete_private_cache, if: -> { saved_change_to_private? }
+
+  def delete_private_cache
+    Rails.cache.delete('blob_default/private')
+  end
+
+  def delete_default_cache
+    Rails.cache.delete('blob_default/default')
+  end
+
+  def self.defaults
+    Rails.cache.fetch('blob_default/default') do
+      ActiveStorage::BlobDefault.all.map do |i|
+       ["#{i.record_class}_#{i.name}", i.file.blob_id]
+      end.to_h
+    end
+  end
+
 end

data/app/views/active_storage_ext/admin/blob_defaults/_form.html.erb

@@ -3,5 +3,6 @@
   <%= f.text_field :record_class %>
   <%= f.text_field :name %>
   <%= f.file_field :file %>
+  <%= f.check_box :private %>
   <%= f.submit %>
 <% end %>

data/app/views/active_storage_ext/admin/blob_defaults/index.html.erb

@@ -18,7 +18,7 @@
       <th><%= ActiveStorage::BlobDefault.human_attribute_name(:record_class) %></th>
       <th><%= ActiveStorage::BlobDefault.human_attribute_name(:name) %></th>
       <th><%= ActiveStorage::BlobDefault.human_attribute_name(:file) %></th>
-      <th></th>
+      <th><%= ActiveStorage::BlobDefault.human_attribute_name(:private) %></th>
       <th>Actions</th>
     </tr>
   </thead>
@@ -28,10 +28,11 @@
       <td><%= blob_default.id %></td>
       <td><%= blob_default.record_class %></td>
       <td><%= blob_default.name %></td>
-      <td><%= blob_default.file_blob.key if blob_default.file_blob %></td>
       <td>
+        <%= blob_default.file_blob.key if blob_default.file_blob %>
         <%= render 'active_storage_ext/attachments/list', target: blob_default.file %>
       </td>
+      <td><%= blob_default.private %></td>
       <td class="ui labels">
         <%= link_to edit_rails_ext_blob_default_path(blob_default), data: { tooltip: t('.edit') }, class: 'ui pink mini icon button' do %>
           <i class="pencil alternate icon"></i>

data/app/views/active_storage_ext/attachments/_default_image_item.html.erb

@@ -1,4 +1,12 @@
-<div class="ui image">
+<div class="ui image attached">
+  <div class="ui placeholder">
+    <div class="image" style="text-align: center;line-height: 100px;">
+      <i class="plus icon"></i>
+    </div>
+  </div>
+</div>
+
+<div class="ui image" id="file_template" style="display: none;">
   <a href="javascript:void(0);" onclick="this.parentNode.remove()" class="ui grey right corner mini label">
     <i class="times icon"></i>
   </a>

data/app/views/active_storage_ext/attachments/_list_edit.html.erb

@@ -1,25 +1,27 @@
 <% if target.is_a?(ActiveStorage::Attached::One) && target.attached? %>
   <% if target.content_type.to_s.start_with?('image') %>
-    <%= render partial: 'active_storage/attachments/image_item', locals: { image: target } %>
+    <%= render partial: 'active_storage_ext/attachments/image_item', locals: { image: target } %>
   <% elsif target.content_type.to_s.start_with?('video') %>
-    <%= render partial: 'active_storage/attachments/video_item', locals: { video: target } %>
+    <%= render partial: 'active_storage_ext/attachments/video_item', locals: { video: target } %>
   <% else %>
     <p id="attachment_<%= target.id %>">
-      <%= link_to target.filename, rails_blob_path(target) %>
-      <%= link_to 'x', rails_attachment_path(target.id), method: :delete, data: {confirm: 'Are you sure?'}, remote: true %>
+      <%= link_to target.filename, rails_ext_blob_path(target) %>
+      <%= link_to 'x', rails_ext_attachment_path(target.id), method: :delete, data: { confirm: 'Are you sure?' }, remote: true %>
     </p>
   <% end %>
-<% elsif target.is_a?(ActiveStorage::Attached::Many) %>
+<% elsif target.is_a?(ActiveStorage::Attached::Many) && target.attached? %>
   <% target.each do |file| %>
     <% if file.content_type.to_s.start_with?('image') %>
-      <%= render partial: 'active_storage/attachments/image_item', locals: { image: file } %>
+      <%= render partial: 'active_storage_ext/attachments/image_item', locals: { image: file } %>
     <% elsif file.content_type.to_s.start_with?('video') %>
-      <%= render partial: 'active_storage/attachments/video_item', locals: { video: file } %>
+      <%= render partial: 'active_storage_ext/attachments/video_item', locals: { video: file } %>
     <% else %>
       <p id="attachment_<%= file.id %>">
-        <%= link_to file.filename, rails_blob_path(file) %>
-        <%= link_to 'x', rails_attachment_path(file.id), method: :delete, data: {confirm: 'Are you sure?'}, remote: true %>
+        <%= link_to file.filename, rails_ext_blob_path(file) %>
+        <%= link_to 'x', rails_ext_attachment_path(file.id), method: :delete, data: { confirm: 'Are you sure?' }, remote: true %>
       </p>
     <% end %>
   <% end %>
+<% else %>
+  <%= render partial: 'active_storage_ext/attachments/default_image_item' %>
 <% end %>

data/app/views/active_storage_ext/attachments/_list_field.html.erb

@@ -0,0 +1,6 @@
+<div class="top attached inline fields" id="<%= "#{target.record.class.name.underscore}_attachments_#{target.record.id}" %>">
+  <div class="six wide field"></div>
+  <div class="field ui tiny images" id="file_preview" data-controller="picture">
+    <%= render partial: 'active_storage_ext/attachments/list_edit', locals: { target: target } %>
+  </div>
+</div>

data/db/migrate/20181012025833_rails_com_init.rb

@@ -4,6 +4,7 @@ class RailsComInit < ActiveRecord::Migration[5.2]
     create_table :active_storage_blob_defaults do |t|
       t.string :record_class
       t.string :name
+      t.boolean :private
       t.timestamps
     end
 

data/lib/active_record/type/i18n.rb

@@ -0,0 +1,19 @@
+module ActiveRecord::Type
+  class I18n < Json
+
+    def type
+      :i18n
+    end
+
+    def deserialize(value)
+      if super && super.respond_to?(:[])
+        super[::I18n.locale.to_s]
+      else
+        value
+      end
+    end
+
+  end
+end
+
+ActiveRecord::Type.register(:i18n, ActiveRecord::Type::I18n)

data/lib/rails_com.rb

@@ -2,33 +2,23 @@ require 'rails_com/version'
 require 'rails_com/engine'
 require 'rails_com/config'
 
+require 'rails_com/core'
+require 'rails_com/action_controller'
+require 'rails_com/action_view'
+require 'rails_com/active_record'
+
+require 'rails_com/active_storage/blob_ext'
+
 # Meta for Rails
 require 'rails_com/meta/routes'
 require 'rails_com/meta/models'
 require 'rails_com/meta/controllers'
 
-# Rails Helper
-require 'rails_com/helpers/model_helper'
-require 'rails_com/helpers/controller_helper'
-
-# Ruby core extension
-require 'rails_com/core_ext/hash'
-require 'rails_com/core_ext/nil'
-require 'rails_com/core_ext/array'
-require 'rails_com/core_ext/date'
-require 'rails_com/core_ext/numeric'
-require 'rails_com/core_ext/string'
-
 # Rails extension
-require 'rails_com/rails_ext/template_renderer'
-require 'rails_com/rails_ext/scaffold_generator'
-require 'rails_com/rails_ext/named_base'
-require 'rails_com/rails_ext/activestorage_attached'
-require 'rails_com/rails_ext/persistence_sneakily'
-require 'rails_com/rails_ext/translation_helper'
-require 'rails_com/rails_ext/video_response'
-require 'rails_com/rails_ext/attachment_transfer'
-require 'rails_com/rails_ext/errors'
+require 'rails_com/generators/named_base'
+require 'rails_com/generators/scaffold_generator'
+
+# controllers
 require 'rails_com/sprockets/non_digest_assets'
 
 # Utils

data/lib/rails_com/action_controller.rb

@@ -0,0 +1,3 @@
+require_relative 'action_controller/controller_helper'
+require_relative 'action_controller/errors'
+require_relative 'action_controller/parameters'

data/lib/rails_com/{helpers → action_controller}/controller_helper.rb

@@ -1,13 +1,5 @@
 module RailsCom::ControllerHelper
 
-  def set_locale
-    if params[:locale]
-      session[:locale] = params[:locale]
-    end
-
-    I18n.locale = session[:locale] || I18n.default_locale
-  end
-
   def detect_filter(filter)
     callback = self.__callbacks[:process_action].find { |i| i.filter == filter.to_sym }
     return false unless callback
@@ -25,6 +17,13 @@ module RailsCom::ControllerHelper
 
 end
 
-ActiveSupport.on_load :action_controller_base do
+module RailsCom::FilterHelper
+  def whether_filter(filter)
+    self.get_callbacks(:process_action).map(&:filter).include?(filter.to_sym)
+  end
+end
+
+ActiveSupport.on_load :action_controller do
   include RailsCom::ControllerHelper
+  extend RailsCom::FilterHelper
 end

data/lib/rails_com/action_controller/parameters.rb

@@ -0,0 +1,16 @@
+module RailsCom::Parameters
+
+  def require(key)
+    begin
+      super
+    ensure
+      @required_params ||= []
+      @required_params << key
+    end
+  end
+
+end
+
+ActiveSupport.on_load :action_controller_base do
+  ActionController::Parameters.prepend RailsCom::Parameters
+end

data/lib/rails_com/action_view.rb

@@ -0,0 +1,2 @@
+require_relative 'action_view/template_renderer'
+require_relative 'action_view/translation_helper'

data/lib/rails_com/{rails_ext → action_view}/template_renderer.rb

@@ -1,4 +1,4 @@
-module RailsExt
+module RailsCom
 
   module TemplateRenderer
 
@@ -34,21 +34,9 @@ module RailsExt
 
   end
 
-  module Parameters
-
-    def require(key)
-      begin
-        super
-      ensure
-        @required_params ||= []
-        @required_params << key
-      end
-    end
-
-  end
-
 end
 
-ActionView::TemplateRenderer.prepend RailsExt::TemplateRenderer
-ActionView::PartialRenderer.prepend RailsExt::PartialRenderer
-ActionController::Parameters.prepend RailsExt::Parameters
+ActiveSupport.on_load :action_view do
+  ActionView::TemplateRenderer.prepend RailsCom::TemplateRenderer
+  ActionView::PartialRenderer.prepend RailsCom::PartialRenderer
+end

data/lib/rails_com/{rails_ext → action_view}/translation_helper.rb

@@ -15,4 +15,6 @@ module RailsCom
   end
 end
 
-ActionView::Base.include RailsCom::TranslationHelper
+ActiveSupport.on_load :action_view do
+  include RailsCom::TranslationHelper
+end

data/lib/rails_com/active_record.rb

@@ -0,0 +1,3 @@
+require 'active_record/type/i18n'
+require_relative 'active_record/translation'
+require_relative 'active_record/model_helper'

data/lib/rails_com/active_record/translation.rb

@@ -0,0 +1,66 @@
+module RailsCom::I18n
+  extend ActiveSupport::Concern
+
+  included do
+    before_update :update_i18n_column
+  end
+
+  def update_i18n_column
+    str = []
+    self.changes.slice(*i18n_attributes).each do |key, _|
+      value = self.public_send("#{key}_before_type_cast")
+      str << "#{key} = #{key}::jsonb || '#{value.to_json}'::jsonb"
+    end
+    return if str.blank?
+    s = str.join(', ')
+    self.class.connection.execute "UPDATE #{self.class.table_name} SET #{s} WHERE id = #{self.id}"
+  end
+
+  def attributes_with_values_for_create(attribute_names)
+    r = super
+    r.slice(*i18n_attributes).each do |key, v|
+      r[key] = public_send "#{key}_before_type_cast"
+    end
+    r
+  end
+
+end
+
+module RailsCom::Translation
+
+  # name
+  # * store as jsonb in database;
+  # * read with i18n scope
+  def has_translations(*columns)
+    mattr_accessor :i18n_attributes
+    self.i18n_attributes = columns.map(&:to_s)
+    include RailsCom::I18n
+    columns.each do |column|
+      attribute column, :i18n
+
+      class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+
+        def #{column}=(value)
+          if value.is_a?(String)
+            super(::I18n.locale.to_s => value)
+          else
+            super
+          end
+        end
+
+      RUBY_EVAL
+    end
+
+  end
+
+  def _update_record(values, constraints)
+    mattr_accessor :i18n_attributes
+    values.except!(*i18n_attributes)
+    super
+  end
+
+end
+
+ActiveSupport.on_load :active_record do
+  extend RailsCom::Translation
+end

data/lib/rails_com/active_storage.rb

@@ -0,0 +1,4 @@
+require_relative 'active_storage/activestorage_attached'
+require_relative 'active_storage/attached_macros'
+require_relative 'active_storage/attachment_transfer'
+require_relative 'active_storage/video_response'

data/lib/rails_com/{rails_ext → active_storage}/activestorage_attached.rb

@@ -1,3 +1,4 @@
+require 'httparty'
 module ActiveStorage
   class Attached
 

data/lib/rails_com/active_storage/attached_macros.rb

@@ -0,0 +1,20 @@
+module RailsCom::AttachedOne
+
+  def attachment
+    if super
+      return super
+    elsif defined?(@attachment)
+      return @attachment
+    end
+
+    id = ActiveStorage::BlobDefault.defaults["#{record.class.name}_#{name}"]
+    @attachment = build_attachment(blob: ActiveStorage::Blob.find(id)) if id
+  end
+
+  def attached?
+    attachment&.id?
+  end
+
+end
+
+ActiveStorage::Attached::One.prepend RailsCom::AttachedOne

data/lib/rails_com/{rails_ext → active_storage}/attachment_transfer.rb

@@ -1,5 +1,5 @@
 require 'active_storage/downloading'
-module AttachmentTransfer
+module RailsCom::AttachmentTransfer
   include ActiveStorage::Downloading
 
   def copy
@@ -39,4 +39,6 @@ module AttachmentTransfer
     ActiveStorage.paths[:ffmpeg] || 'ffmpeg'
   end
 
-end
+end
+
+ActiveStorage::Attachment.include RailsCom::AttachmentTransfer

data/lib/rails_com/active_storage/blob_ext.rb

@@ -0,0 +1,34 @@
+module RailsCom::BlobExt
+
+  def self.prepended(klass)
+    klass.class_attribute :private_service
+  end
+
+  def duration
+    r = metadata[:duration] || 0
+    rh = TimeHelper.exact_distance_time(r.to_f)
+    "#{rh[:minute]}:#{rh[:second].to_s.rjust(2, '0')}"
+  end
+
+  def service
+    if private && private_service
+      private_service
+    else
+      super
+    end
+  end
+
+  def private
+    return @private if defined?(@private)
+    rts = self.attachments.pluck(:record_type, :name).uniq.to_combined_h
+    ps = Rails.cache.fetch('blob_default/private') do
+      ActiveStorage::BlobDefault.where(private: true).pluck(:record_class, :name).to_combined_h
+    end
+    @private = ps.slice(*rts.keys).map { |p, v| (Array(rts[p]) - Array(v)).blank? }.uniq == [true]
+  end
+
+end
+
+ActiveSupport.on_load(:active_storage_blob) do
+  prepend RailsCom::BlobExt
+end