rails_com 1.2.1 → 1.2.2

data/lib/rails_com/rails_ext/named_base.rb

@@ -0,0 +1,9 @@
+class Rails::Generators::NamedBase
+
+  undef class_name
+  private
+  def class_name
+    file_name.classify
+  end
+
+end

data/lib/rails_com/rails_ext/template_renderer.rb

@@ -1,4 +1,5 @@
 module RailsExt
+
   module TemplateRenderer
 
     # record where the view rendered from, main project or which engine
@@ -6,7 +7,7 @@ module RailsExt
     def render_template(template, layout_name = nil, locals = nil)
       path = template.identifier
 
-      result = path.match /(?<=\/)[a-zA-Z0-9_-]+(?=\/app\/views)/
+      result = path.match(/(?<=\/)[a-zA-Z0-9_-]+(?=\/app\/views)/)
       result = result.to_s.split('-').first.to_s + '/engine'
 
       engine = result.classify.safe_constantize
@@ -17,6 +18,22 @@ module RailsExt
     end
 
   end
+
+  module PartialRenderer
+
+    def find_template(path, locals)
+      if path.start_with?('_')
+        prefixes = @lookup_context.prefixes
+      elsif path.include?(?/)
+        prefixes = []
+      else
+        prefixes = @lookup_context.prefixes
+      end
+      @lookup_context.find_template(path, prefixes, true, locals, @details)
+    end
+
+  end
 end
 
 ActionView::TemplateRenderer.prepend RailsExt::TemplateRenderer
+ActionView::PartialRenderer.prepend RailsExt::PartialRenderer

data/lib/rails_com/rails_ext/video_response.rb

@@ -0,0 +1,28 @@
+module VideoResponse
+  extend ActiveSupport::Concern
+
+  included do
+    after_action :wrap_video
+  end
+
+  def wrap_video
+    if ['video/mp4'].include? self.response.media_type
+      add_range_headers
+    end
+  end
+
+  def add_range_headers
+    file_size = self.response.body.size
+    match = request.headers['range'].to_s.match(/bytes=(\d+)-(\d*)/)
+    match = Array(match)
+    file_begin = match[1].presence
+    file_end = match[2].presence
+    if file_begin && file_end
+      response.header['Content-Range'] = 'bytes ' + file_begin.to_s + '-' + file_end.to_s + '/' + file_size.to_s
+      response.header['Content-Length'] = (file_end.to_i - file_begin.to_i + 1).to_s
+      response.status = 206
+    end
+  end
+
+end
+

data/lib/rails_com/utils/num_helper.rb

@@ -0,0 +1,45 @@
+module NumHelper
+  NUM = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']
+  DEL = ['', '拾', '佰', '仟']
+  SUB_DEL = ['分', '角']
+  UNIT = ['元', '万', '亿', '兆', '京']
+  DELIMITER_REGEX = /(\d)(?=(\d\d\d\d)+(?!\d))/
+  extend self
+
+  def to_rmb(num)
+    left, right = num.to_s(:rounded, precision: 2, strip_insignificant_zeros: true, separator: '.', delimiter: ',', delimiter_pattern: DELIMITER_REGEX).split('.')
+
+    left_str = to_parts(left, unit: UNIT, del: DEL)
+
+    if right
+      right_str = to_parts(right, del: SUB_DEL)
+      left_str + right_str
+    else
+      left_str + '整'
+    end
+  end
+
+  def to_parts(num_str, unit: [], del: [])
+    han_arr = num_str.split(',').reverse.map.with_index do |str, index|
+      str = str.each_char.map { |i| NUM[i.to_i] }
+      xx = ''
+      str.zip(del[0..str.size - 1].reverse) do |st, de|
+        if st != '零' && de
+          xx << st + de
+        else
+          xx << st unless xx.end_with?('零')
+        end
+      end
+      if xx.chomp!('零')
+        xx << (unit[index].to_s) << '零'
+      else
+        xx << (unit[index].to_s)
+      end
+      xx
+    end
+
+    han_arr.reverse.join
+  end
+
+end
+

data/lib/rails_com/utils/time_helper.rb

@@ -0,0 +1,58 @@
+module TimeHelper
+  extend self
+
+  def exact_distance_time(from_time, to_time)
+    from_time = from_time.to_datetime
+    to_time = to_time.to_datetime
+
+    return {} if from_time > to_time
+
+    years = to_time.year - from_time.year
+    months = to_time.month - from_time.month
+    days = to_time.mday - from_time.mday
+    day_seconds = to_time.seconds_since_midnight.to_i - from_time.seconds_since_midnight.to_i
+
+    if day_seconds < 0
+      days -= 1
+      day_seconds = 86400 + day_seconds
+    end
+
+    if days < 0
+      months -= 1
+      days = to_time.prev_month.end_of_month.mday + days
+    end
+
+    if months < 0
+      years -= 1
+      months = 12 + months
+    end
+
+    hours, minute_seconds = day_seconds.to_i.divmod(3600)
+    minutes, seconds = minute_seconds.divmod(60)
+
+    { year: years, month: months, day: days, hour: hours, minute: minutes, second: seconds }
+  end
+
+  def interval(start_at, finish_at, interval_start: '12:30', since: 1.hour)
+    return 0 if start_at.blank? || finish_at.blank? || start_at >= finish_at
+    raise 'Must be same day!' if start_at.to_date != finish_at.to_date
+
+    hour, min = interval_start.split(':')
+    interval_start_at = start_at.change hour: hour, min: min
+    interval_finish_at = interval_start_at.since(since)
+
+    if start_at < interval_start_at && finish_at > interval_finish_at
+      seconds = ((finish_at - start_at) - since).to_i
+    elsif start_at < interval_start_at && finish_at >= interval_start_at && finish_at <= interval_finish_at
+      seconds = interval_start_at - start_at
+    elsif start_at >= interval_start_at && start_at <= interval_finish_at && finish_at > interval_finish_at
+      seconds = finish_at - interval_finish_at
+    elsif start_at >= interval_start_at && start_at <= interval_finish_at && finish_at <= interval_finish_at
+      seconds = 0
+    else
+      seconds = finish_at - start_at
+    end
+    seconds
+  end
+
+end

data/lib/rails_com/version.rb

@@ -1,3 +1,3 @@
 module RailsCom
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

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

@@ -1,5 +1,5 @@
-<%%= form_with model: @<%= model_resource_name %>, local: true do |f| %>
-  <%%= render 'shared/error_messages', target: @<%= singular_table_name %> %>
+<%%= form_with model: @<%= singular_name %>, local: true do |f| %>
+  <%%= render 'shared/error_messages', target: @<%= singular_name %> %>
 <% attributes.each do |attribute| -%>
 <% if attribute.password_digest? -%>
   <%%= f.password_field :password %>

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

@@ -13,27 +13,35 @@
 
 <table class="ui bottom attached table">
   <thead>
-  <tr>
-  <% attributes.reject(&:password_digest?).each do |attribute| -%>
-    <th><%= attribute.human_name %></th>
-  <% end -%>
-  </tr>
+    <tr>
+      <th><%%= <%= class_name %>.human_attribute_name(:id) %></th>
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+      <th><%%= <%= class_name %>.human_attribute_name(:<%= attribute.name %>) %></th>
+<% end -%>
+      <th>Actions</th>
+    </tr>
   </thead>
-
   <tbody>
-  <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
+  <%% @<%= plural_name %>.each do |<%= singular_name %>| %>
     <tr>
+      <td><%%= <%= singular_name %>.id %></td>
 <% attributes.reject(&:password_digest?).each do |attribute| -%>
-      <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
+      <td><%%= <%= singular_name %>.<%= attribute.name %> %></td>
 <% end -%>
-      <td>
-        <%%= link_to 'Show', <%= singular_table_name %>_path(<%= singular_table_name %>), class: 'ui blue label' %>
-        <%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>), class: 'ui pink label' %>
-        <%%= link_to 'Destroy', <%= singular_table_name %>_path(<%= singular_table_name %>), method: :delete, data: { confirm: 'Are you sure?' }, class: 'ui red label' %>
+      <td class="ui labels">
+        <%%= link_to <%= singular_table_name %>_path(<%= singular_name %>), data: { tooltip: t('.show') }, class: 'ui blue mini icon button' do %>
+          <i class="location arrow icon"></i>
+        <%% end %>
+        <%%= link_to edit_<%= singular_table_name %>_path(<%= singular_name %>), data: { tooltip: t('.edit') }, class: 'ui pink mini icon button' do %>
+          <i class="pencil alternate icon"></i>
+        <%% end %>
+        <%%= link_to <%= singular_table_name %>_path(<%= singular_name %>), method: :delete, data: { tooltip: t('.destroy'), confirm: 'Are you sure?' }, class: 'ui red mini icon button' do %>
+          <i class="times icon"></i>
+        <%% end %>
       </td>
     </tr>
   <%% end %>
   </tbody>
 </table>
 
-<%%= paginate @<%= plural_table_name %> %>
+<%%= paginate @<%= plural_name %> %>

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

@@ -1,7 +1,16 @@
-<% attributes.reject(&:password_digest?).each do |attribute| -%>
-<p>
-  <strong><%= attribute.human_name %>:</strong>
-  <%%= @<%= singular_table_name %>.<%= attribute.name %> %>
-</p>
+<div class="ui segment breadcrumb">
+  <%%= link_to 'Back', <%= index_helper %>_path, class: 'section' %>
+  <div class="divider"> / </div>
+  <div class="active section">Show</div>
+</div>
 
+<table class="ui very basic large table">
+  <tbody>
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+    <tr>
+      <td class="right aligned"><%%= <%= class_name %>.human_attribute_name(:<%= attribute.name %>) %></td>
+      <td><%%= @<%= singular_name %>.<%= attribute.name %> %></td>
+    </tr>
 <% end -%>
+  </tbody>
+</table>

data/lib/templates/rails/scaffold_controller/api_controller.rb.tt

@@ -0,0 +1,48 @@
+class <%= controller_class_name %>Controller < ApplicationController
+  before_action :set_<%= singular_table_name %>, only: [:show, :update, :destroy]
+
+  def index
+    @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
+
+    render json: <%= "@#{plural_table_name}" %>
+  end
+
+  def show
+    render json: <%= "@#{singular_table_name}" %>
+  end
+
+  def create
+    @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
+
+    if @<%= orm_instance.save %>
+      render json: <%= "@#{singular_table_name}" %>, status: :created, location: <%= "@#{singular_table_name}" %>
+    else
+      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
+    end
+  end
+
+  def update
+    if @<%= orm_instance.update("#{singular_table_name}_params") %>
+      render json: <%= "@#{singular_table_name}" %>
+    else
+      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
+    end
+  end
+
+  def destroy
+    @<%= orm_instance.destroy %>
+  end
+
+  private
+  def set_<%= singular_table_name %>
+    @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
+  end
+
+  def <%= "#{singular_table_name}_params" %>
+    <%- if attributes_names.empty? -%>
+    params.fetch(:<%= singular_table_name %>, {})
+    <%- else -%>
+    params.require(:<%= singular_table_name %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
+    <%- end -%>
+  end
+end

data/lib/templates/rails/scaffold_controller/controller.rb.tt

@@ -1,21 +1,18 @@
-<% if namespaced? -%>
-require_dependency '<%= namespaced_path %>/application_controller'
-<% end -%>
 class <%= controller_class_name %>Controller < <%= controller_class_path.map(&:camelize).join('::') %>::BaseController
-  before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
+  before_action :set_<%= singular_name %>, only: [:show, :edit, :update, :destroy]
 
   def index
-    @<%= plural_table_name %> = <%= orm_class %>.page(params[:page])
+    @<%= plural_name %> = <%= class_name %>.page(params[:page])
   end
 
   def new
-    @<%= singular_table_name %> = <%= orm_class.build(class_name) %>
+    @<%= singular_name %> = <%= orm_class.build(class_name) %>
   end
 
   def create
-    @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
+    @<%= singular_name %> = <%= orm_class.build(class_name, "#{singular_name}_params") %>
 
-    if @<%= orm_instance.save %>
+    if @<%= orm_instance(singular_name).save %>
       redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully created.'" %>
     else
       render :new
@@ -29,7 +26,7 @@ class <%= controller_class_name %>Controller < <%= controller_class_path.map(&:c
   end
 
   def update
-    if @<%= orm_instance.update("#{singular_table_name}_params") %>
+    if @<%= orm_instance(singular_name).update("#{singular_name}_params") %>
       redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully updated.'" %>
     else
       render :edit
@@ -37,17 +34,21 @@ class <%= controller_class_name %>Controller < <%= controller_class_path.map(&:c
   end
 
   def destroy
-    @<%= orm_instance.destroy %>
+    @<%= orm_instance(singular_name).destroy %>
     redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully destroyed.'" %>
   end
 
   private
-  def set_<%= singular_table_name %>
-    @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
+  def set_<%= singular_name %>
+    @<%= singular_name %> = <%= orm_class.find(class_name, "params[:id]") %>
   end
 
-  def <%= "#{singular_table_name}_params" %>
-    params.fetch(:<%= singular_table_name %>, {}).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
+  def <%= "#{singular_name}_params" %>
+    params.fetch(:<%= singular_name %>, {}).permit(
+<% attributes_names.map do |name| -%>
+      <%= ":#{name}," %>
+<% end -%>
+    )
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_com
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - qinmingyuan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: '5.2'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rucaptcha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '6.0'
 description: Rails Engine with many common utils
 email:
 - mingyuan0715@foxmail.com
@@ -45,26 +37,36 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
+- LICENSE
 - README.md
 - Rakefile
 - app/assets/config/rails_com_manifest.js
 - app/assets/images/verification.jpg
+- app/assets/javascripts/controllers/active_storage_ext/videos/show.ready.js
 - app/assets/javascripts/rails_com/application.js
 - app/assets/javascripts/rails_com/checkbox.js
 - app/assets/javascripts/rails_com/common.js
 - app/assets/javascripts/rails_com/fetch_xhr_script.js
 - app/assets/javascripts/rails_com/footer.js
 - app/assets/javascripts/rails_com/sidebar.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
-- app/controllers/common_controller.rb
+- app/controllers/active_storage/attachments_controller.rb
+- app/controllers/active_storage_ext/videos_controller.rb
 - app/controllers/concerns/the_common_api.rb
-- app/controllers/the_guards_controller.rb
 - app/helpers/rails_com/active_helper.rb
 - app/helpers/rails_com/assets_helper.rb
-- app/helpers/rails_com/common_helper.rb
+- app/helpers/rails_com/format_helper.rb
 - app/helpers/rails_com/time_helper.rb
 - app/models/state_machine.rb
+- app/views/active_storage/attachments/_image_item.html.erb
+- app/views/active_storage/attachments/_list.html.erb
+- app/views/active_storage/attachments/_list_edit.html.erb
+- app/views/active_storage/attachments/_list_form.html.erb
+- app/views/active_storage/attachments/_video_item.html.erb
+- app/views/active_storage/attachments/destroy.js.erb
+- app/views/active_storage_ext/videos/show.html.erb
 - app/views/kaminari/_first_page.html.erb
 - app/views/kaminari/_gap.html.erb
 - app/views/kaminari/_last_page.html.erb
@@ -76,7 +78,6 @@ files:
 - app/views/shared/_alert.html.erb
 - app/views/shared/_error_messages.html.erb
 - app/views/shared/_locales.html.erb
-- app/views/the_guards/index.html.erb
 - config/locales/en.yml
 - config/locales/zh.datetime.yml
 - config/locales/zh.yml
@@ -85,29 +86,39 @@ files:
 - lib/generators/doc_model_generator.rb
 - lib/generators/doc_models_generator.rb
 - lib/generators/templates/model.erb
+- lib/mina/git2.rb
 - lib/mina/puma.rb
 - lib/mina/sidekiq.rb
 - lib/mina/whenever.rb
 - lib/rails_com.rb
 - lib/rails_com/config.rb
-- lib/rails_com/controller_helper.rb
-- lib/rails_com/controllers.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/engine.rb
-- lib/rails_com/helpers/jobber.rb
-- lib/rails_com/helpers/uid_helper.rb
-- lib/rails_com/model_helper.rb
-- lib/rails_com/models.rb
+- lib/rails_com/helpers/controller_helper.rb
+- lib/rails_com/helpers/model_helper.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/attachment_transfer.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/routes.rb
-- lib/rails_com/setting.rb
+- lib/rails_com/rails_ext/video_response.rb
 - lib/rails_com/sprockets/non_digest_assets.rb
+- lib/rails_com/utils/ip_helper.rb
+- lib/rails_com/utils/jobber.rb
+- lib/rails_com/utils/num_helper.rb
+- lib/rails_com/utils/setting.rb
+- lib/rails_com/utils/time_helper.rb
+- lib/rails_com/utils/uid_helper.rb
 - lib/rails_com/version.rb
 - lib/tasks/rails_com_tasks.rake
 - lib/templates/erb/scaffold/_form.html.erb.tt
@@ -116,12 +127,11 @@ files:
 - 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
-- lib/utils/ip_helper.rb
-- lib/utils/time_helper.rb
 homepage: https://github.com/qinmingyuan/rails_com
 licenses:
-- MIT
+- LGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -139,8 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: Rails Engine with many common utils
+summary: Rails Engine with common utils
 test_files: []