rails_com 1.2.5 → 1.2.6

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

@@ -1,4 +1,4 @@
-module VideoResponse
+module RailsCom::VideoResponse
   extend ActiveSupport::Concern
 
   included do
@@ -26,3 +26,4 @@ module VideoResponse
 
 end
 
+ActiveStorage::DiskController.include RailsCom::VideoResponse

data/lib/rails_com/core.rb

@@ -0,0 +1,7 @@
+# Ruby core extension
+require 'rails_com/core/hash'
+require 'rails_com/core/nil'
+require 'rails_com/core/array'
+require 'rails_com/core/date'
+require 'rails_com/core/numeric'
+require 'rails_com/core/string'

data/lib/rails_com/engine.rb

@@ -11,6 +11,9 @@ class RailsCom::Engine < ::Rails::Engine #:nodoc:
 
   initializer 'rails_com.assets.precompile' do |app|
     app.config.assets.precompile += ['rails_com_manifest.js']
+    app.config.content_security_policy_nonce_generator = -> request {
+      request.headers['X-Csp-Nonce'] || SecureRandom.base64(16)
+    }
   end
 
   initializer 'rails_com.add_assets_templates' do |app|
@@ -18,10 +21,12 @@ class RailsCom::Engine < ::Rails::Engine #:nodoc:
   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
+    require 'rails_com/active_storage'
+    config_choice = Rails.configuration.active_storage.private_service
+    if config_choice
+      configs = Rails.configuration.active_storage.service_configurations
+      ActiveStorage::Blob.private_service = ActiveStorage::Service.configure config_choice, configs
+    end
   end
 
 end

data/lib/rails_com/{rails_ext → generators}/scaffold_generator.rb

@@ -2,12 +2,12 @@ require 'rails/generators'
 require 'rails/generators/erb/scaffold/scaffold_generator'
 
 class Erb::Generators::ScaffoldGenerator
-  source_root File.expand_path('../../../templates/erb/scaffold', __FILE__)
+  source_root File.expand_path('../../templates/erb/scaffold', __dir__)
 
   undef available_views
   private
   def available_views
-    ['index', 'edit', 'show', 'new', '_form', '_search_form']
+    ['index', 'edit', 'show', 'new', '_form', '_filter']
   end
 
 end

data/lib/rails_com/utils/uid_helper.rb

@@ -19,6 +19,12 @@ module UidHelper
     uuid str.to_i, prefix, suffix
   end
 
+  def usec_uuid(prefix = '', suffix = rand_string(2))
+    time = Time.now
+    str = time.to_i.to_s + time.usec.to_s
+    uuid str.to_i, prefix, suffix
+  end
+
   def sec_uuid(prefix = '', suffix = rand_string(2))
     time = Time.now
     uuid time.to_i, prefix, suffix
@@ -48,4 +54,4 @@ module UidHelper
     len.times.map { ((0..9).to_a + ('A'..'Z').to_a).sample }.join
   end
 
-end
+end

data/lib/rails_com/version.rb

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

data/lib/templates/erb/scaffold/{_search_form.html.erb.tt → _filter.html.erb.tt}

@@ -1,7 +1,10 @@
+<div class="ui attached segment">
+
 <%%= search_form_with do |f| %>
   <div class="fields">
     <%%= f.submit 'Search' %>
   </div>
 <%% end %>
 
+</div>
 

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

@@ -7,9 +7,7 @@
   </div>
 </div>
 
-<div class="ui attached segment">
-  <%%= render 'search_form' %>
-</div>
+<%%= render 'filter' %>
 
 <table class="ui bottom attached table">
   <thead>
@@ -44,4 +42,4 @@
   </tbody>
 </table>
 
-<%%= paginate @<%= plural_name %> %>
+<%%= paginate @<%= plural_name %> %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_com
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - qinmingyuan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,6 +30,26 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.16'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.16'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Common utils for Rails Application
 email:
 - mingyuan0715@foxmail.com
@@ -51,6 +71,7 @@ files:
 - app/assets/javascripts/rails_com/footer.js
 - app/assets/javascripts/rails_com/picture.js
 - app/assets/javascripts/rails_com/sidebar.js
+- app/assets/javascripts/rails_com/time_local.js
 - app/assets/stylesheets/controllers/active_storage_ext/videos/show.css
 - app/assets/stylesheets/controllers/active_storage_ext/videos/transfer.css
 - app/assets/stylesheets/rails_com/application.css
@@ -61,6 +82,7 @@ files:
 - app/controllers/active_storage_ext/audios_controller.rb
 - app/controllers/active_storage_ext/videos_controller.rb
 - app/controllers/concerns/rails_common_api.rb
+- app/controllers/concerns/rails_common_controller.rb
 - app/controllers/concerns/rails_common_xhr.rb
 - app/helpers/rails_com/active_helper.rb
 - app/helpers/rails_com/assets_helper.rb
@@ -85,7 +107,7 @@ files:
 - app/views/active_storage_ext/attachments/_image_item.html.erb
 - app/views/active_storage_ext/attachments/_list.html.erb
 - app/views/active_storage_ext/attachments/_list_edit.html.erb
-- app/views/active_storage_ext/attachments/_list_form.html.erb
+- app/views/active_storage_ext/attachments/_list_field.html.erb
 - app/views/active_storage_ext/attachments/_video_item.html.erb
 - app/views/active_storage_ext/audios/show.html.erb
 - app/views/active_storage_ext/videos/show.html.erb
@@ -105,6 +127,7 @@ files:
 - config/locales/zh.yml
 - config/routes.rb
 - db/migrate/20181012025833_rails_com_init.rb
+- lib/active_record/type/i18n.rb
 - lib/generators/doc_model_generator.rb
 - lib/generators/doc_models_generator.rb
 - lib/generators/templates/model.erb
@@ -113,29 +136,37 @@ files:
 - lib/mina/sidekiq.rb
 - lib/mina/whenever.rb
 - lib/rails_com.rb
+- lib/rails_com/action_controller.rb
+- lib/rails_com/action_controller/controller_helper.rb
+- lib/rails_com/action_controller/errors.rb
+- lib/rails_com/action_controller/parameters.rb
+- lib/rails_com/action_view.rb
+- lib/rails_com/action_view/template_renderer.rb
+- lib/rails_com/action_view/translation_helper.rb
+- lib/rails_com/active_record.rb
+- lib/rails_com/active_record/model_helper.rb
+- lib/rails_com/active_record/persistence_sneakily.rb
+- lib/rails_com/active_record/translation.rb
+- lib/rails_com/active_storage.rb
+- lib/rails_com/active_storage/activestorage_attached.rb
+- lib/rails_com/active_storage/attached_macros.rb
+- lib/rails_com/active_storage/attachment_transfer.rb
+- lib/rails_com/active_storage/blob_ext.rb
+- lib/rails_com/active_storage/video_response.rb
 - lib/rails_com/config.rb
-- lib/rails_com/core_ext/array.rb
-- lib/rails_com/core_ext/date.rb
-- lib/rails_com/core_ext/hash.rb
-- lib/rails_com/core_ext/nil.rb
-- lib/rails_com/core_ext/numeric.rb
-- lib/rails_com/core_ext/string.rb
+- lib/rails_com/core.rb
+- lib/rails_com/core/array.rb
+- lib/rails_com/core/date.rb
+- lib/rails_com/core/hash.rb
+- lib/rails_com/core/nil.rb
+- lib/rails_com/core/numeric.rb
+- lib/rails_com/core/string.rb
 - lib/rails_com/engine.rb
-- lib/rails_com/helpers/controller_helper.rb
-- lib/rails_com/helpers/model_helper.rb
+- lib/rails_com/generators/named_base.rb
+- lib/rails_com/generators/scaffold_generator.rb
 - lib/rails_com/meta/controllers.rb
 - lib/rails_com/meta/models.rb
 - lib/rails_com/meta/routes.rb
-- lib/rails_com/rails_ext/activestorage_attached.rb
-- lib/rails_com/rails_ext/attached_macros.rb
-- lib/rails_com/rails_ext/attachment_transfer.rb
-- lib/rails_com/rails_ext/errors.rb
-- lib/rails_com/rails_ext/named_base.rb
-- lib/rails_com/rails_ext/persistence_sneakily.rb
-- lib/rails_com/rails_ext/scaffold_generator.rb
-- lib/rails_com/rails_ext/template_renderer.rb
-- lib/rails_com/rails_ext/translation_helper.rb
-- lib/rails_com/rails_ext/video_response.rb
 - lib/rails_com/sprockets/non_digest_assets.rb
 - lib/rails_com/utils/babel.rb
 - lib/rails_com/utils/ip_helper.rb
@@ -146,15 +177,15 @@ files:
 - lib/rails_com/utils/uid_helper.rb
 - lib/rails_com/version.rb
 - lib/tasks/rails_com_tasks.rake
+- lib/templates/erb/scaffold/_filter.html.erb.tt
 - lib/templates/erb/scaffold/_form.html.erb.tt
-- lib/templates/erb/scaffold/_search_form.html.erb.tt
 - lib/templates/erb/scaffold/edit.html.erb.tt
 - lib/templates/erb/scaffold/index.html.erb.tt
 - lib/templates/erb/scaffold/new.html.erb.tt
 - lib/templates/erb/scaffold/show.html.erb.tt
 - lib/templates/rails/scaffold_controller/api_controller.rb.tt
 - lib/templates/rails/scaffold_controller/controller.rb.tt
-homepage: https://github.com/yougexiangfa/rails_com
+homepage: https://github.com/work-design/rails_com
 licenses:
 - LGPL-3.0
 metadata: {}

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

@@ -1,28 +0,0 @@
-<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">
-    <% if target.is_a?(ActiveStorage::Attached::One) && target.attached? %>
-      <% if target.content_type.to_s.start_with?('image') %>
-        <%= 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_ext_attachment_path(target.id), method: :delete, data: { confirm: 'Are you sure?' }, remote: true %>
-        </p>
-      <% end %>
-    <% 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_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_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/lib/rails_com/rails_ext/attached_macros.rb

@@ -1,21 +0,0 @@
-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
-
-