rails_com 1.2.0 → 1.2.1

data/lib/rails_com/rails_ext/activestorage_attached.rb

@@ -0,0 +1,32 @@
+module ActiveStorage
+  class Attached
+
+    def url_sync(url, filename = 'tmp_file_' + self.record.id.to_s)
+      tmp_path = File.expand_path 'tmp/storage_migrate'
+      file_path = File.join tmp_path, filename.to_s
+
+      File.open(file_path, 'w+') do |file|
+        file.binmode
+        HTTParty.get(url, stream_body: true) do |fragment|
+          file.write fragment
+        end
+
+        file.rewind
+        self.attach io: file, filename: filename
+      end
+    end
+
+
+    class One
+
+      def variant(transformations)
+        if attachment.variable?
+          attachment.variant(transformations)
+        else
+          self
+        end
+      end
+
+    end
+  end
+end

data/lib/rails_com/rails_ext/persistence_sneakily.rb

@@ -0,0 +1,11 @@
+module PersistenceSneakily
+
+  def save_sneakily!(*args, &block)
+    self.method(:create_or_update).super_method.call(*args, &block)
+  end
+
+end
+
+ActiveSupport.on_load :active_record do
+  include PersistenceSneakily
+end

data/lib/rails_com/rails_ext/scaffold_generator.rb

@@ -1,3 +1,4 @@
+require 'rails/generators'
 require 'rails/generators/erb/scaffold/scaffold_generator'
 
 class Erb::Generators::ScaffoldGenerator

data/lib/rails_com/rails_ext/template_renderer.rb

@@ -1,6 +1,6 @@
 module RailsExt
   module TemplateRenderer
-    
+
     # record where the view rendered from, main project or which engine
     # used by view helper methods: js_load, css_load, js_ready
     def render_template(template, layout_name = nil, locals = nil)
@@ -11,7 +11,7 @@ module RailsExt
 
       engine = result.classify.safe_constantize
 
-      @view.instance_variable_set(:@_rendered_from,  engine.root) if engine
+      @view.instance_variable_set(:@_rendered_from, engine.root) if engine
 
       super
     end
@@ -19,4 +19,4 @@ module RailsExt
   end
 end
 
-ActionView::TemplateRenderer.prepend RailsExt::TemplateRenderer
+ActionView::TemplateRenderer.prepend RailsExt::TemplateRenderer

data/lib/rails_com/rails_ext/translation_helper.rb

@@ -0,0 +1,18 @@
+module RailsCom
+  module TranslationHelper
+
+    def t(key, options = {})
+      options[:default] ||= default_keys(key)
+      super
+    end
+
+    def default_keys(key)
+      [
+        ['controller' + key].join('.').to_sym
+      ]
+    end
+
+  end
+end
+
+ActionView::Base.include RailsCom::TranslationHelper

data/lib/rails_com/routes.rb

@@ -9,6 +9,11 @@ module RailsCom::Routes
     routes_wrapper.select { |i| i[:controller] == controller.to_s }.map { |i| i[:action] }.uniq
   end
 
+  def controllers
+    _controllers = routes_wrapper.map { |i| i[:controller] }.compact.uniq
+    _controllers - RailsCom.config.ignore_controllers
+  end
+
   def routes_wrapper
     return @routes_wrapper if @routes_wrapper.present?
 

data/lib/rails_com/setting.rb

@@ -0,0 +1,34 @@
+class Setting < OpenStruct
+
+  def initialize(hash = {})
+    @table = {}
+    @hash_table = {}
+
+    hash.each do |k, v|
+      if v.is_a?(Hash)
+        @table[k.to_sym] = self.class.new(v)
+      elsif v.is_a?(Array)
+        @table[k.to_sym] = v.map { |h| h.is_a?(Hash) ? self.class.new(h) : h }
+      else
+        @table[k.to_sym] = v
+      end
+      @hash_table[k.to_sym] = v
+      new_ostruct_member(k)
+    end
+  end
+
+  def to_hash
+    @hash_table.with_indifferent_access
+  end
+
+end
+
+class Settings < Array
+
+  def initialize(data = [])
+    data.map do |h|
+      self << Setting.new(h)
+    end
+  end
+
+end

data/lib/rails_com/version.rb

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

data/lib/rails_com.rb

@@ -1,4 +1,5 @@
 require 'rails_com/version'
+require 'rails_com/config'
 
 require 'rails_com/routes'
 require 'rails_com/models'
@@ -12,14 +13,15 @@ require 'rails_com/helpers/jobber'
 
 require 'rails_com/core_ext/hash'
 require 'rails_com/core_ext/nil'
+require 'rails_com/core_ext/array'
 
 require 'rails_com/rails_ext/template_renderer'
 require 'rails_com/rails_ext/scaffold_generator'
+require 'rails_com/rails_ext/activestorage_attached'
+require 'rails_com/rails_ext/persistence_sneakily'
+require 'rails_com/rails_ext/translation_helper'
 
-require 'rails_com/engine'
+require 'utils/time_helper'
 
-module RailsCom
-  mattr_accessor :not_found_logger
+require 'rails_com/engine'
 
-  self.not_found_logger = ActiveSupport::Logger.new('log/not_found.log')
-end

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

@@ -1,4 +1,4 @@
-<%%= search_form_with css: { wrapper_all: 'inline field', wrapper_input: 'field', wrapper_submit: 'field', submit: 'ui green button'} do |f| %>
+<%%= search_form_with do |f| %>
   <div class="fields">
     <%%= f.submit 'Search' %>
   </div>

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

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

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

@@ -1,43 +1,39 @@
-<div>
-
-  <div class="ui top attached menu borderless">
-    <div class="header item"><%= plural_table_name.titleize %></div>
-  </div>
-
-  <div class="ui segment bottom attached">
-    <%%= render 'search_form' %>
+<div class="ui top attached borderless menu">
+  <div class="header item"><%= plural_table_name.titleize %></div>
+  <div class="right menu">
+    <div class="item">
+      <%%= link_to 'New <%= singular_table_name.titleize %>', new_<%= singular_table_name %>_path, class: 'ui teal button' %>
+    </div>
   </div>
+</div>
 
-  <div class="ui segment top attached">
-    <%%= link_to 'New <%= singular_table_name.titleize %>', new_<%= singular_table_name %>_path, class: 'ui teal button' %>
-  </div>
+<div class="ui attached segment">
+  <%%= render 'search_form' %>
+</div>
 
-  <table class="ui bottom attached table">
-    <thead>
+<table class="ui bottom attached table">
+  <thead>
+  <tr>
+  <% attributes.reject(&:password_digest?).each do |attribute| -%>
+    <th><%= attribute.human_name %></th>
+  <% end -%>
+  </tr>
+  </thead>
+
+  <tbody>
+  <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
     <tr>
-    <% attributes.reject(&:password_digest?).each do |attribute| -%>
-      <th><%= attribute.human_name %></th>
-    <% end -%>
-    </tr>
-    </thead>
-
-    <tbody>
-    <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
-      <tr>
 <% attributes.reject(&:password_digest?).each do |attribute| -%>
-        <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
+      <td><%%= <%= singular_table_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>
-      </tr>
-    <%% end %>
-    </tbody>
-  </table>
-
-  <%%= paginate @<%= plural_table_name %> %>
-</div>
-
+      <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>
+    </tr>
+  <%% end %>
+  </tbody>
+</table>
 
+<%%= paginate @<%= plural_table_name %> %>

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

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

data/lib/utils/ip_helper.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# 亚洲最新ip地址
+# http://ftp.apnic.net/apnic/stats/apnic/delegated-apnic-latest
+module IpHelper
+  extend self
+
+  def read(name)
+    IO.foreach(name) do |x|
+      if x.match? /apnic\|CN\|ipv4/
+        r = x.split('|').values_at(3, 4)
+        int_min = IPAddr.new(r[0]).to_i
+        int_max = min + r[1].to_i - 1
+        ip_max = IPAddr.new(max, Socket::AF_INET).to_s
+
+        [r[0], ip_max, int_min, int_max]
+      end
+    end
+  end
+
+end

data/lib/utils/time_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_com
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - qinmingyuan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,15 +51,19 @@ files:
 - app/assets/config/rails_com_manifest.js
 - app/assets/images/verification.jpg
 - 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/rails_com/application.css
 - app/controllers/common_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_helper.rb
+- app/helpers/rails_com/assets_helper.rb
+- app/helpers/rails_com/common_helper.rb
+- app/helpers/rails_com/time_helper.rb
 - app/models/state_machine.rb
 - app/views/kaminari/_first_page.html.erb
 - app/views/kaminari/_gap.html.erb
@@ -73,27 +77,22 @@ files:
 - app/views/shared/_error_messages.html.erb
 - app/views/shared/_locales.html.erb
 - app/views/the_guards/index.html.erb
-- config/initializers/time_format.rb
 - config/locales/en.yml
+- config/locales/zh.datetime.yml
 - config/locales/zh.yml
 - config/routes.rb
 - lib/assets/javascripts/input-attachment.js
-- lib/assets/javascripts/semantic.js
 - lib/generators/doc_model_generator.rb
 - lib/generators/doc_models_generator.rb
 - lib/generators/templates/model.erb
 - lib/mina/puma.rb
 - lib/mina/sidekiq.rb
-- lib/nondigest_assets/fonts/themes/default/assets/fonts/icons.eot
-- lib/nondigest_assets/fonts/themes/default/assets/fonts/icons.otf
-- lib/nondigest_assets/fonts/themes/default/assets/fonts/icons.svg
-- lib/nondigest_assets/fonts/themes/default/assets/fonts/icons.ttf
-- lib/nondigest_assets/fonts/themes/default/assets/fonts/icons.woff
-- lib/nondigest_assets/fonts/themes/default/assets/fonts/icons.woff2
-- lib/nondigest_assets/fonts/themes/default/assets/images/flags.png
+- 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/hash.rb
 - lib/rails_com/core_ext/nil.rb
 - lib/rails_com/engine.rb
@@ -101,9 +100,13 @@ files:
 - lib/rails_com/helpers/uid_helper.rb
 - lib/rails_com/model_helper.rb
 - lib/rails_com/models.rb
+- lib/rails_com/rails_ext/activestorage_attached.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/sprockets/non_digest_assets.rb
 - lib/rails_com/version.rb
 - lib/tasks/rails_com_tasks.rake
@@ -114,6 +117,8 @@ files:
 - lib/templates/erb/scaffold/new.html.erb.tt
 - lib/templates/erb/scaffold/show.html.erb.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

data/config/initializers/time_format.rb

@@ -1 +0,0 @@
-Time::DATE_FORMATS[:admin] = '%Y-%m-%d %H:%M:%S'