rails_com 1.2.4 → 1.2.5

data/app/views/active_storage_ext/admin/blobs/new.html.erb

@@ -0,0 +1,13 @@
+<div class="ui segment breadcrumb">
+  <%= link_to 'Back', rails_ext_blobs_path, class: 'section' %>
+  <div class="divider"> / </div>
+  <div class="active section">Add</div>
+</div>
+
+<div class="ui segment">
+  <%= form_with model: @blob, url: rails_ext_blobs_path, local: true do |f| %>
+    <%= render 'shared/error_messages', target: @blob %>
+    <%= f.file_field :io %>
+    <%= f.submit %>
+  <% end %>
+</div>

data/app/views/active_storage_ext/admin/blobs/show.html.erb

@@ -0,0 +1,10 @@
+<div class="ui segment breadcrumb">
+  <%= link_to 'Back', blobs_path, class: 'section' %>
+  <div class="divider"> / </div>
+  <div class="active section">Show</div>
+</div>
+
+<table class="ui very basic large table">
+  <tbody>
+  </tbody>
+</table>

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

@@ -0,0 +1,6 @@
+<div class="ui image">
+  <a href="javascript:void(0);" onclick="this.parentNode.remove()" class="ui grey right corner mini label">
+    <i class="times icon"></i>
+  </a>
+  <%= image_tag 'image-square.png', data: { target: 'picture.src' }, style: 'max-width: 100%' %>
+</div>

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

@@ -0,0 +1,6 @@
+<div class="ui image">
+  <%= link_to rails_ext_attachment_path(image.id), method: :delete, data: {confirm: 'Are you sure?'}, remote: true, class: 'ui grey right corner mini label' do %>
+    <i class="times icon"></i>
+  <% end %>
+  <%= image_tag image, id: "attachment_#{image.id}", data: { target: 'picture.src' }, style: 'max-width: 100%' %>
+</div>

data/app/views/{active_storage → active_storage_ext}/attachments/_list.html.erb

@@ -1,4 +1,4 @@
-<% if target.is_a?(ActiveStorage::Attached::One) && target.attached? %>
+<% if target.is_a?(ActiveStorage::Attached::One) && target.attachment.present? %>
   <% if target.content_type.to_s.start_with?('image') %>
     <%= image_tag target, style: 'max-width: 100%', class: 'ui small image' %>
   <% elsif target.content_type.to_s.start_with?('video') %>
@@ -23,6 +23,3 @@
     <% end %>
   <% end %>
 <% end %>
-
-
-

data/app/views/{active_storage → active_storage_ext}/attachments/_list_edit.html.erb

@@ -22,4 +22,4 @@
       </p>
     <% end %>
   <% end %>
-<% end %>
+<% end %>

data/app/views/{active_storage → active_storage_ext}/attachments/_list_form.html.erb

@@ -1,28 +1,28 @@
 <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" id="file_preview" data-controller="attachment">
+  <div class="field ui tiny images" id="file_preview" data-controller="picture">
     <% 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 } %>
       <% 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 '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 } %>
         <% 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 '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 %>
   </div>
 </div>
-
-

data/app/views/active_storage_ext/audios/show.html.erb

@@ -0,0 +1,5 @@
+<div class="ui basic center aligned segment">
+  <%= audio_tag @audio.service_url(disposition: params[:disposition]),
+                controls: true
+  %>
+</div>

data/config/locales/en.yml

@@ -1,4 +1,5 @@
 en:
+  site_name: Rails Application
   controller:
     show: Show
     edit: Edit
@@ -33,4 +34,4 @@ en:
       storage_units:
         units:
           h: Hours
-          m: Min
+          m: Min

data/config/locales/zh.yml

@@ -1,4 +1,5 @@
 zh:
+  site_name: Rails Application
   controller:
     show: 详情
     edit: 编辑
@@ -28,4 +29,4 @@ zh:
           one: "Displaying <b>1</b> %{entry_name}"
           other: "Displaying <b>all %{count}</b> %{entry_name}"
       more_pages:
-        display_entries: "Displaying %{entry_name} <b>%{first}&nbsp;-&nbsp;%{last}</b> of <b>%{total}</b> in total"
+        display_entries: "Displaying %{entry_name} <b>%{first}&nbsp;-&nbsp;%{last}</b> of <b>%{total}</b> in total"

data/config/routes.rb

@@ -1,13 +1,20 @@
 Rails.application.routes.draw do
 
-  scope :rails, as: 'rails', module: 'active_storage' do
-    resources :attachments, only: [:destroy]
-  end
-
-  scope :rails, as: 'rails', module: 'active_storage_ext' do
+  scope :rails, module: 'active_storage_ext', as: 'rails_ext' do
     resources :videos, only: [:show] do
       put :transfer, on: :member
     end
+    resources :audios, only: [:show] do
+      put :transfer, on: :member
+    end
+  end
+
+  scope :rails, module: 'active_storage_ext/admin', as: 'rails_ext' do
+    resources :attachments, only: [:destroy]
+    resources :blobs, only: [:index, :new, :create, :destroy] do
+      get :unattached, on: :collection
+    end
+    resources :blob_defaults
   end
 
-end
+end

data/db/migrate/20181012025833_rails_com_init.rb

@@ -0,0 +1,13 @@
+class RailsComInit < ActiveRecord::Migration[5.2]
+  def change
+
+    create_table :active_storage_blob_defaults do |t|
+      t.string :record_class
+      t.string :name
+      t.timestamps
+    end
+
+    change_column_null :active_storage_blobs, :checksum, true
+
+  end
+end

data/lib/mina/sidekiq.rb

@@ -1,3 +1,5 @@
+
+#:nodoc:
 set :sidekiq, -> { "#{fetch :bundle_prefix} sidekiq -d" }
 set :sidekiqctl, -> { "#{fetch :bundle_prefix} sidekiqctl" }
 set :sidekiq_config, -> { "#{fetch :current_path}/config/sidekiq.yml" }
@@ -62,4 +64,4 @@ namespace :sidekiq do
     invoke :'sidekiq:start'
   end
 
-end
+end

data/lib/rails_com.rb

@@ -28,10 +28,12 @@ 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/sprockets/non_digest_assets'
 
 # Utils
 require 'rails_com/utils/time_helper'
 require 'rails_com/utils/num_helper'
 require 'rails_com/utils/uid_helper'
-require 'rails_com/utils/jobber'
+require 'rails_com/utils/jobber'
+require 'rails_com/utils/babel'

data/lib/rails_com/config.rb

@@ -1,6 +1,6 @@
 require 'active_support/configurable'
 
-module RailsCom
+module RailsCom #:nodoc:
   include ActiveSupport::Configurable
 
   configure do |config|
@@ -8,6 +8,7 @@ module RailsCom
       'rails/welcome'
     ]
     config.app_class = 'ApplicationController'
+    config.admin_class = 'AdminController'
   end
 
 end

data/lib/rails_com/core_ext/array.rb

@@ -49,8 +49,8 @@ class Array
   #   [:b, 2]
   # ]
   # raw_data.to_combined_h
-  # => { a: [1, 2], b: 2 }
-  # #todo nested array bug
+  # #=> { a: [1, 2], b: 2 }
+  # todo nested array bug
   def to_combined_h
     hash = {}
     self.each { |x, y| hash[x] = hash[x] ? Array(hash[x]) << y : y  }

data/lib/rails_com/core_ext/date.rb

@@ -1,7 +1,8 @@
 class Date
 
-  # '2018-01-01'.to_date.after(2.month) => '2018-02-31'
-  # '2018-01-31'.to_date.after(1.month) => '2018-03-02'
+  # Chinese custom after date
+  #   '2018-01-01'.to_date.after(2.month) => '2018-02-31'
+  #   '2018-01-31'.to_date.after(1.month) => '2018-03-02'
   def after(other)
     if ActiveSupport::Duration === other
       if other.parts.keys == [:months]

data/lib/rails_com/engine.rb

@@ -1,4 +1,4 @@
-class RailsCom::Engine < ::Rails::Engine
+class RailsCom::Engine < ::Rails::Engine #:nodoc:
 
   config.generators do |g|
     g.stylesheets false
@@ -13,17 +13,15 @@ class RailsCom::Engine < ::Rails::Engine
     app.config.assets.precompile += ['rails_com_manifest.js']
   end
 
-  initializer 'rails_com.add_generator_templates' do |app|
-    app.config.paths['lib/templates'].unshift File.expand_path('lib/templates', root)
-  end
-
   initializer 'rails_com.add_assets_templates' do |app|
     app.config.assets.paths.push(*Dir[File.expand_path('lib/nondigest_assets/*', root)])
   end
 
   initializer 'rails_com.add_activestorage' do |app|
+    require 'rails_com/rails_ext/attached_macros'
     ActiveStorage::DiskController.include VideoResponse
     ActiveStorage::Attachment.include AttachmentTransfer
+    ActiveStorage::Attached::One.prepend RailsExt::AttachedOne
   end
 
 end

data/lib/rails_com/helpers/model_helper.rb

@@ -15,14 +15,16 @@ module RailsCom::ModelHelper
 
   def column_attributes
     columns.map do |column|
-      [
-        column.name.to_sym,
-        column.default,
-        column.type,
-        column.sql_type,
-        column.null,
-        column.default_function
-      ]
+      {
+        name: column.name.to_sym,
+        name_i18n: human_attribute_name(column.name),
+        type: column.type,
+        sql_type: column.sql_type,
+        null: column.null,
+        default: column.default,
+        default_function: column.default_function,
+        comment: column.comment
+      }
     end
   end
 

data/lib/rails_com/rails_ext/activestorage_attached.rb

@@ -29,4 +29,4 @@ module ActiveStorage
     end
   end
 
-end
+end

data/lib/rails_com/rails_ext/attached_macros.rb

@@ -0,0 +1,21 @@
+module RailsExt
+  module AttachedOne
+
+    def attachment
+
+      if super
+        super
+      elsif @blob_default ||= ActiveStorage::BlobDefault.find_by(record_class: record.class.name, name: name)
+        @attachment ||= build_attachment(blob: @blob_default.file_blob)
+      end
+
+    end
+
+    def attached?
+      attachment&.id?
+    end
+
+  end
+end
+
+

data/lib/rails_com/rails_ext/attachment_transfer.rb

@@ -28,8 +28,10 @@ module AttachmentTransfer
 
     if attach.is_a?(ActiveStorage::Attached::One)
       r
+    elsif attach.ia_a?(ActiveStorage::Attached::Many)
+      r[0]
     else
-      r.first
+      r
     end
   end
 

data/lib/rails_com/rails_ext/errors.rb

@@ -0,0 +1,4 @@
+module ActionController
+  class UnauthorizedError < StandardError; end
+  class ForbiddenError < StandardError; end
+end

data/lib/rails_com/rails_ext/template_renderer.rb

@@ -33,7 +33,22 @@ module RailsExt
     end
 
   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

data/lib/rails_com/utils/babel.rb

@@ -0,0 +1,38 @@
+require 'tempfile'
+
+module Babel
+  extend self
+
+  def script_path
+    @app_path = File.expand_path('.', Dir.pwd)
+    node_modules_bin_path = ENV['WEBPACKER_NODE_MODULES_BIN_PATH'] || `yarn bin`.chomp
+    babel_config = File.join(@app_path, '.babelrc')
+
+    "#{node_modules_bin_path}/babel --config-file #{babel_config}"
+  end
+
+  def context(file)
+    `#{script_path} #{file}`
+  end
+
+  def transform(code, options = {})
+    tmpfile = write_to_tempfile(code)
+
+    begin
+      r = context(tmpfile)
+    ensure
+      File.unlink(tmpfile)
+    end
+
+    r
+  end
+
+  def write_to_tempfile(contents)
+    tmpfile = Tempfile.open(['babel', 'js'])
+    tmpfile.write(contents)
+    r = tmpfile.path
+    tmpfile.close
+    r
+  end
+
+end

data/lib/rails_com/utils/time_helper.rb

@@ -1,9 +1,14 @@
 module TimeHelper
   extend self
 
-  def exact_distance_time(from_time, to_time)
-    from_time = from_time.to_datetime
-    to_time = to_time.to_datetime
+  def exact_distance_time(from_time = 0, to_time)
+    if to_time.is_a?(Numeric)
+      from_time = Time.at(from_time)
+      to_time = Time.at(to_time)
+    else
+      from_time = from_time.to_datetime
+      to_time = to_time.to_datetime
+    end
 
     return {} if from_time > to_time
 
@@ -55,4 +60,4 @@ module TimeHelper
     seconds
   end
 
-end
+end

data/lib/rails_com/version.rb

@@ -1,3 +1,3 @@
-module RailsCom
-  VERSION = '1.2.4'
+module RailsCom #:nodoc:
+  VERSION = '1.2.5'
 end

data/lib/templates/erb/scaffold/edit.html.erb.tt

@@ -1,9 +1,9 @@
 <div class="ui segment breadcrumb">
   <%%= link_to 'Back', <%= index_helper %>_path, class: 'section' %>
-  <div class="divider"> / </div>
+  <div class="divider">/</div>
   <div class="active section">Edit</div>
 </div>
 
 <div class="ui segment">
   <%%= render 'form' %>
-</div>
+</div>