rails_com 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91a9e381fa905dd733cdabed0016d6f6826b468e3d9a2d1af8eece1323d88d81
-  data.tar.gz: 95625b665362ccfea08fb4f9317a521e741adc0f765d0bef2996477aef0cc34c
+  metadata.gz: 2ffa9f1ff257d36fdc9bb11415039affae4ee7a1589f7c15f565e911ca6fe33a
+  data.tar.gz: 36054a13e2f3a8b7ea8c8130dcb16185612bc8b575c701eaaf0630b6c8f0ce0c
 SHA512:
-  metadata.gz: 0ce5ae23bc46a4f2d667db8d8b21ee86b4fa8670a322074857d1cee11b0a6afd7c3e8c8cce0325cc15a6b65742c25dec7b486a48bb964e971df62f9d3b21734c
-  data.tar.gz: a6f1f3e942c26a68ad460f387146fe58304895fa8c46ac76c9f9053fcbf270ca4cd7288bb0cb5a6d4839275099e18ad1282fe517cfea796e34f52e508cb257c9
+  metadata.gz: 27c0ff46020d0a06076a4c085deea1ce604434b97836232c3ccea537b05b20c7be7960cf2dad3786dfa365f1a85994e7f4b8bc68e9a759c7dd8e598a98e31f95
+  data.tar.gz: 0d745dbbe1560f2ccfb5fe2a6172ef3180903bec46aa8f40b59d864bb9b447ae8157719c7ed05822086c468a27e82282085e02709720357534af651c247ba130

data/README.md

@@ -1,5 +1,5 @@
 # RailsCom
-Short description and motivation.
+Rails Common engine, with many sugars!
 
 ## Installation
 Add this line to your application's Gemfile:
@@ -17,9 +17,11 @@ Or install it yourself as:
 ```bash
 $ gem install rails_com
 ```
-## Usage
-How to use my plugin.
-
+## Features
+* examples: puma, configs etc.
+* rails and ruby core extension;
+* methods deal rails model/controller/routes etc.
+* some helpers, for generator uuid based on time and more;
 
 ### View: add link
 ```erb

data/app/assets/javascripts/rails_com/checkbox.js

@@ -0,0 +1,59 @@
+function listenCheckedIds(name) {
+  var checked = 'input[name=' + name + ']';
+  var add_ids = [];
+  var remove_ids = [];
+  var index;
+  window.sessionStorage.setItem(name + '_add_ids', []);
+  window.sessionStorage.setItem(name + '_remove_ids', []);
+
+  $(checked).change(function(){
+    if (this.checked && this.checked !== this.defaultChecked) {
+      add_ids.push(this.value)
+    } else if (this.checked && this.checked === this.defaultChecked) {
+      index = remove_ids.indexOf(this.value);
+      remove_ids.splice(index, 1);
+    } else if (!this.checked && this.checked !== this.defaultChecked) {
+      remove_ids.push(this.value)
+    }  else if (!this.checked && this.checked === this.defaultChecked) {
+      index = add_ids.indexOf(this.value);
+      add_ids.splice(index, 1);
+    }
+    window.sessionStorage.setItem(name + '_remove_ids', remove_ids);
+    window.sessionStorage.setItem(name + '_add_ids', add_ids);
+  })
+}
+
+function getAddIds(name){
+  add_str = window.sessionStorage.getItem(name + '_add_ids');
+  return add_str;
+}
+
+function getRemoveIds(name){
+  remove_str = window.sessionStorage.getItem(name + '_remove_ids');
+  return remove_str
+}
+
+function toggleAll(source, name) {
+  var checkboxes = document.getElementsByName(name);
+  var add_ids = [];
+  var remove_ids = [];
+  var index;
+
+  for(checkbox of checkboxes) {
+    checkbox.checked = source.checked;
+    if (checkbox.checked && checkbox.checked !== checkbox.defaultChecked) {
+      add_ids.push(checkbox.value)
+    } else if (checkbox.checked && checkbox.checked === checkbox.defaultChecked) {
+      index = remove_ids.indexOf(checkbox.value);
+      remove_ids.splice(index, 1);
+    } else if (!checkbox.checked && checkbox.checked !== checkbox.defaultChecked) {
+      remove_ids.push(checkbox.value)
+    }  else if (!checkbox.checked && checkbox.checked === checkbox.defaultChecked) {
+      index = add_ids.indexOf(checkbox.value);
+      add_ids.splice(index, 1);
+    }
+  }
+
+  window.sessionStorage.setItem(name + '_remove_ids', remove_ids);
+  window.sessionStorage.setItem(name + '_add_ids', add_ids);
+}

data/app/assets/javascripts/rails_com/common.js

@@ -1,7 +1,10 @@
 function timeForLocalized(){
   $('time[data-localized!="true"]').each(function(){
-    this.textContent = moment.utc(this.textContent).local().format('YYYY-MM-DD HH:mm:ss');
-    this.dataset['localized'] = 'true'
+    if (this.textContent.length > 0) {
+      var format = this.dataset['format'] || 'YYYY-MM-DD HH:mm:ss';
+      this.textContent = moment.utc(this.textContent).local().format(format);
+      this.dataset['localized'] = 'true'
+    }
   })
 }
 

data/app/assets/javascripts/rails_com/fetch_xhr_script.js

@@ -8,46 +8,12 @@ function fetch_xhr_script(url, params){
   };
 
   fetch(url, params).then(function(response) {
-    return response.text()
+    return response.text();
   }).then(function(text) {
     var script = document.createElement('script');
     script.text = text;
     document.head.appendChild(script).parentNode.removeChild(script);
   }).catch(function(ex) {
-    console.log('parsing failed', ex)
+    console.log('parsing failed', ex);
   })
-}
-
-function listenCheckedIds(name) {
-  var checked = 'input[name="' + name + '"]:checked';
-  var unchecked = 'input[name="' + name + '"][checked!="checked"]';
-
-  window.add_ids = [];
-  window.remove_ids = [];
-  $(checked).change(function(){
-    if(this.checked){
-      var index = window.remove_ids.indexOf(this.value);
-      window.remove_ids.splice(index, 1);
-    } else {
-      window.remove_ids.push(this.value)
-    }
-  });
-  $(unchecked).change(function(){
-    if(this.checked){
-      window.add_ids.push(this.value)
-    } else {
-      var index = window.add_ids.indexOf(this.value);
-      window.add_ids.splice(index, 1);
-    }
-  });
-}
-
-function getAddIds(){
-  add_str = window.add_ids.join(',');
-  return add_str;
-}
-
-function getRemoveIds(){
-  remove_str = window.remove_ids.join(',');
-  return remove_str
-}
+}

data/app/assets/javascripts/rails_com/sidebar.js

@@ -0,0 +1,40 @@
+function sidebarSide1() {
+  $('.ui.side').addClass('invisible');
+  $('.ui.side .ui.menu').removeClass('accordion');
+  $('.ui.side .ui.menu').addClass('icon');
+  $('.ui.side .ui.menu .dropdown.icon').remove();
+  $('.ui.side .ui.menu .item:not(.header)').addClass('ui dropdown');
+  $('.ui.dropdown.item').dropdown({on: 'hover'});
+  $('.ui.side .ui.menu .item:not(.header)').removeClass('hidden');
+}
+
+function sidebarSide2() {
+  $('.ui.side').removeClass('invisible');
+  $('.ui.side .ui.menu').addClass('accordion');
+  $('.ui.side .ui.menu').removeClass('icon');
+  $('.ui.side .ui.menu .item:not(.header)').removeClass('ui dropdown');
+  $('.ui.side .ui.menu .dropdown.icon').remove();
+  $('.ui.side .ui.menu .title').append('<i class="dropdown icon"></i>');
+  $('.ui.accordion').accordion({selector: {trigger: '.title'}});
+  $('.ui.side .ui.menu .item:not(.header)').dropdown('destroy');
+}
+
+document.addEventListener('turbolinks:load', function(){
+
+  $('#close_side').click(function() {
+    if ($('.ui.side').hasClass('invisible')) {
+      window.localStorage.setItem('invisible', 'false');
+      sidebarSide2();
+    } else {
+      window.localStorage.setItem('invisible', 'true');
+      sidebarSide1();
+    }
+  });
+
+  if (localStorage.getItem('invisible') === 'true') {
+    sidebarSide1();
+  } else {
+    sidebarSide2();
+  }
+
+});

data/app/controllers/common_controller.rb

@@ -7,12 +7,4 @@ class CommonController < ApplicationController
     end
   end
 
-  def not_found
-    params.permit!
-    RailsCom.not_found_logger.info "#{params[:path]}.#{params[:format]}"
-
-    head :not_found
-  end
-
-
 end

data/app/controllers/concerns/the_common_api.rb

@@ -14,8 +14,8 @@ module TheCommonApi
   def process_errors(model)
     render json: {
       errors: model.errors.as_json(full_messages: true),
-      full_messages: model.errors.full_messages.join(',')
-    }, status: 500
+      full_messages: model.errors.full_messages.join("\n")
+    }, status: 200
   end
 
   def wrap_body

data/app/helpers/rails_com/active_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module RailsCom::ActiveHelper
 
   # active_assert('notice' == 'notice', expected: 'ui info message', unexpected: 'ui negative message')

data/app/helpers/{rails_com_helper.rb → rails_com/assets_helper.rb}

@@ -1,4 +1,5 @@
-module RailsComHelper
+# frozen_string_literal: true
+module RailsCom::AssetsHelper
 
   def js_load(filename = nil, root: nil, **options)
     filename ||= "controllers/#{controller_path}/#{action_name}"
@@ -27,13 +28,4 @@ module RailsComHelper
     end
   end
 
-  def simple_format_hash(hash_text, options = {})
-    wrapper_tag = options.fetch(:wrapper_tag, :p)
-
-    hash_text.map do |k, v|
-      text = k.to_s + ': ' + v.to_s
-      content_tag(wrapper_tag, text)
-    end.join("\n\n").html_safe
-  end
-
 end

data/app/helpers/rails_com/common_helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+module RailsCom::CommonHelper
+
+  def simple_format_hash(hash_text, options = {})
+    wrapper_tag = options.fetch(:wrapper_tag, :p)
+
+    hash_text.map do |k, v|
+      text = k.to_s + ': ' + v.to_s
+      content_tag(wrapper_tag, text)
+    end.join("\n\n").html_safe
+  end
+
+end

data/app/helpers/rails_com/time_helper.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+module RailsCom::TimeHelper
+
+  def exact_distance_time(from_time, to_time, options = {})
+    result = TimeHelper.exact_distance_time(from_time, to_time)
+
+    options = {
+      scope: :'datetime.prompts'
+    }.merge!(options)
+
+    I18n.with_options locale: options[:locale], scope: options[:scope] do |locale|
+      str = ''
+      result.each do |k, v|
+        if v > 0
+          str << v.to_s << locale.t(k)
+        end
+      end
+      str
+    end
+  end
+
+end

data/app/models/state_machine.rb

@@ -1,27 +1,75 @@
 module StateMachine
 
-  # obj = Model.new
-  # obj.process_to state: 'xxx'
-  def process_to(options = {})
-    if options.size > 1
-      raise 'Only support one column'
+  # to defined next_xxx_states in class
+
+  # obj.next_to state: 'xxx'
+  def next_to(options = {})
+    options.each do |column, value|
+      if self.class.method_defined? "next_#{column}_states"
+        _next_state = self.send("next_#{column}_states").first
+      else
+        _next_state = next_state(column)
+      end
+
+      if _next_state == value.to_s
+        assign_attributes(column => value)
+      else
+        error_msg = "Next state is wrong, should be #{_next_state}"
+        errors.add column, error_msg
+        raise ActiveRecord::Rollback, error_msg
+      end
     end
+  end
 
-    options.each do |k, v|
-      states = k.to_s.pluralize
-      states = self.class.send(states)
+  def next_to!(options = {})
+    self.next_to(options, &block)
+    self.save!
+  end
 
-      i = states[self.send(k)]
-      n = states.key(i+1)
+  def trigger_to(options = {})
+    options.each do |column, value|
+      if self.class.method_defined? "next_#{column}_states"
+        _next_states = self.send "next_#{column}_states"
+      else
+        _next_states = next_states(column)
+      end
 
-      if n == v.to_s
-        assign_attributes(k => v)
-        save!
+      if _next_states.include?(value.to_s)
+        assign_attributes(column => value)
       else
-        errors.add k, 'Next state is wrong'
-        raise ActiveRecord::Rollback, 'Next state is wrong'
+        error_msg = "Next state is wrong, should be one of #{_next_states.join(', ')}"
+        errors.add column, error_msg
+        raise ActiveRecord::Rollback, error_msg
       end
     end
   end
 
+  def trigger_to!(options = {})
+    self.trigger_to(options, &block)
+    self.save!
+  end
+
+  # obj.next_states(:state) do |result|
+  #   result.reject
+  # end
+  def next_states(state_name, &block)
+    _states = self.class.send(state_name.to_s.pluralize)
+    _states = _states.keys
+    _state = self.send(state_name)
+
+    if _state.nil?
+      next_index = 0
+    else
+      i = _states.index(_state)
+      next_index = i + 1
+    end
+    result = _states[next_index..(_states.size - 1)]
+
+    if block_given?
+      yield block.call(result)
+    else
+      result
+    end
+  end
+
 end

data/app/views/shared/_locales.html.erb

@@ -1,5 +1,5 @@
 <div class="ui simple dropdown item">
-  <i class="translate icon"></i>
+  <i class="globe icon"></i>
   <%= I18n.locale %>
   <div class="menu">
     <%= link_to 'EN', { locale: 'en' }, class: 'item' %>

data/config/locales/en.yml

@@ -22,4 +22,10 @@ en:
       update: 'Updates %{model}'
       submit: 'Saves %{model}'
       q:
-        submit: 'Search'
+        submit: 'Search'
+  number:
+    human:
+      storage_units:
+        units:
+          h: Hours
+          m: Min

data/config/locales/zh.datetime.yml

@@ -0,0 +1,44 @@
+zh:
+  datetime:
+    distance_in_words:
+      half_a_minute: 半分钟
+      less_than_x_seconds:
+        one: 不到1秒
+        other: '不到%{count}秒'
+      x_seconds:
+        one: 1秒
+        other: '%{count}秒'
+      less_than_x_minutes:
+        one: 不到1分钟
+        other: '不到%{count}分钟'
+      x_minutes:
+        one: 1分钟
+        other: '%{count}分钟'
+      about_x_hours:
+        one: 1小时
+        other: '%{count}小时'
+      x_days:
+        one: 1天
+        other: '%{count}天'
+      about_x_months:
+        one: 1个月
+        other: '%{count}个月'
+      x_months:
+        one: 1个月
+        other: '%{count} months'
+      about_x_years:
+        one: 1年
+        other: '%{count} years'
+      over_x_years:
+        one: '超过1年'
+        other: '%{count} 年'
+      almost_x_years:
+        one:  'almost 1 year'
+        other: 'almost %{count} years'
+    prompts:
+      year: 年
+      month: 月
+      day: 日
+      hour: 小时
+      minute: 分钟
+      second: 秒

data/config/locales/zh.yml

@@ -1,4 +1,13 @@
 zh:
+  errors:
+    format: "%{attribute} %{message}"
+    messages:
+      record_invalid: "验证失败: %{errors}"
+      model_invalid: "验证失败: %{errors}"
+      required: 必须存在
+      blank: 不能为空
+      too_short: 长度不够
+      taken: 已被占用
   views:
     pagination:
       first: First

data/config/routes.rb

@@ -6,7 +6,3 @@ Rails.application.routes.draw do
   end
 
 end
-
-Rails.application.routes.append do
-  match '*path' => 'common#not_found', via: :all
-end

data/lib/mina/puma.rb

@@ -1,5 +1,6 @@
-set :puma_cmd, -> { "#{fetch :bundle_prefix} puma -e #{fetch :rails_env}" }
-set :pumactl_cmd, -> { "#{fetch :bundle_prefix} pumactl" }
+set :bundle_more_prefix, -> { "BUNDLE_GEMFILE=#{fetch(:current_path) + '/Gemfile'} #{fetch :bundle_prefix}" }
+set :puma_cmd, -> { "#{fetch :bundle_more_prefix} puma -e #{fetch :rails_env}" }
+set :pumactl_cmd, -> { "#{fetch :bundle_more_prefix} pumactl" }
 set :puma_socket, -> { "#{fetch :current_path}/tmp/pids/puma.pid" }
 
 namespace :puma do

data/lib/mina/whenever.rb

@@ -0,0 +1,27 @@
+set :whenever_name, -> { "#{fetch(:domain)}_#{fetch(:rails_env)}" }
+
+namespace :whenever do
+  desc 'Clear crontab'
+  task clear: :remote_environment do
+    comment "Clear crontab for #{fetch(:whenever_name)}"
+    in_path fetch(:current_path) do
+      command "#{fetch(:bundle_bin)} exec whenever --clear-crontab #{fetch(:whenever_name)} --set 'environment=#{fetch(:rails_env)}&path=#{fetch(:current_path)}'"
+    end
+  end
+
+  desc 'Update crontab'
+  task update: :remote_environment do
+    comment "Update crontab for #{fetch(:whenever_name)}"
+    in_path fetch(:current_path) do
+      command "#{fetch(:bundle_bin)} exec whenever --update-crontab #{fetch(:whenever_name)} --set 'environment=#{fetch(:rails_env)}&path=#{fetch(:current_path)}'"
+    end
+  end
+
+  desc 'Write crontab'
+  task write: :remote_environment do
+    comment "Write crontab for #{fetch(:whenever_name)}"
+    in_path fetch(:current_path) do
+      command "#{fetch(:bundle_bin)} exec whenever --write-crontab #{fetch(:whenever_name)} --set 'environment=#{fetch(:rails_env)}&path=#{fetch(:current_path)}'"
+    end
+  end
+end

data/lib/rails_com/config.rb

@@ -0,0 +1,11 @@
+module RailsCom
+  include ActiveSupport::Configurable
+  config_accessor :access_denied_method, :default_admin_emails
+
+  configure do |config|
+    config.ignore_controllers = [
+      'rails/welcome'
+    ]
+  end
+
+end

data/lib/rails_com/core_ext/array.rb

@@ -0,0 +1,54 @@
+class Array
+
+  # arr = [1, 2, 3]
+  # arr.rjust! 5, nil
+  # => [1, 2, 3, nil, nil]
+  def rjust!(n, x)
+    return self if n < length
+    insert(0, *Array.new([0, n-length].max, x))
+  end
+
+  # arr = [1, 2, 3]
+  # arr.ljust! 5, nil
+  # => [nil, nil, 1, 2, 3]
+  def ljust!(n, x)
+    return self if n < length
+    fill(x, length...n)
+  end
+
+  # arr = [1, 2, 3]
+  # arr.mjust!(5, nil)
+  # => [1, 2, nil, nil, 3]
+  def mjust!(n, x)
+    return self if n < length
+    insert (length / 2.0).ceil, *Array.new(n - length, x)
+  end
+
+  # raw_data = [
+  #   { a: 1 },
+  #   { a: 2 },
+  #   { b: 2 }
+  # ]
+  # raw_data.to_combined_hash
+  # => { a: [1, 2], b: 2 }
+  def to_combined_hash
+    self.reduce({}) do |memo, index|
+      memo.merge(index) { |_, value, default| [value, default] }
+    end
+  end
+
+  # raw_data = [
+  #   [:a, 1],
+  #   [:a, 2],
+  #   [:b, 2]
+  # ]
+  # raw_data.to_combined_h
+  # => { 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  }
+    hash
+  end
+
+end

data/lib/rails_com/model_helper.rb

@@ -13,7 +13,6 @@ module RailsCom::ModelHelper
     generator.invoke_all
   end
 
-
   def column_attributes
     columns.map do |column|
       [
@@ -27,7 +26,6 @@ module RailsCom::ModelHelper
     end
   end
 
-
   def print_table(with_column: false)
     columns.each do |column|
       info = with_column ? '#  t.column' : '# '
@@ -48,7 +46,60 @@ module RailsCom::ModelHelper
     nil
   end
 
-end
+  def sql_table(except: [], only: [], pure: true)
+    if only.size > 0
+      _columns = columns.select { |column| only.include?(column.name) }
+    else
+      _columns = columns.reject { |column| except.include?(column.name) }
+    end
+
+    if pure
+      sql = ""
+    else
+      sql = "CREATE TABLE `#{self.table_name}` (\n"
+    end
+
+    _columns.each do |column|
+      sql << "  `#{column.name}` #{column.sql_type}"
+      sql << " COLLATE #{column.collation}" if column.collation
+      sql << " NOT NULL" unless column.null
+      if column.default
+        sql << " DEFAULT '#{column.default}',\n"
+      elsif column.default.nil? && column.null
+        sql << " DEFAULT NULL,\n"
+      else
+        sql << ",\n"
+      end
+    end
+
+    sql << "  PRIMARY KEY (`#{self.primary_key}`)"
 
+    _indexes = connection.indexes(self.table_name).reject { |index| (index.columns & _columns.map { |col| col.name }).blank? }
+    if _indexes.present?
+      sql << ",\n"
+    else
+      sql << "\n"
+    end
+    _indexes.each_with_index do |obj, index|
+      sql << "  KEY `#{obj.name}` ("
+      sql << obj.columns.map { |col| "`#{col}`" }.join(',')
+
+      if index + 1 == _indexes.size
+        sql << ")\n"
+      else
+        sql << "),\n"
+      end
+    end
+
+    if pure
+      sql
+    else
+      sql << ")"
+    end
+  end
 
-ActiveRecord::Base.extend RailsCom::ModelHelper
+end
+
+ActiveSupport.on_load :active_record do
+  extend RailsCom::ModelHelper
+end