activemodel_object_info 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fbb93d73230b877ddef2d140e3735c97b4bbf10f03273401f4be77f5540dbdd
-  data.tar.gz: a758c1d6b7623810b01f0379d700e4e70d7ecc8d0c013c86592be06cae68b1eb
+  metadata.gz: 06251d26eb8e76bce7322a0828b75bddf9130227aca347632ffccd1000c8de38
+  data.tar.gz: 6204ace6d5d12156f491905df5b85a21a642fc2419b7029fb27071665ff5672a
 SHA512:
-  metadata.gz: ea99c0ec6222036125acf0143a51832c70d4146f4b9b7f5e70277405d92f5819fc1d9d389ee9063d1f6b7998d06eebe873a9f465783873f7b50168dfbea6e960
-  data.tar.gz: 8fc1a83c8c641f97de5b188dbeddeb89f7be52524074d95a515546606bff1a08ab38e244296249aebd3d8bca9f4311ad5108af788c97710030ff04e9cfa1a4ea
+  metadata.gz: 1e8032eeefb546d83ec9ec07b3c1812dd59fa325d6b80c9e96cd8cd52aaaa955f2f700b01ee74895db3bfab7d514d428d429bd139ba4051d1c379824f0156a55
+  data.tar.gz: 67e9ec9cd9fa34310b8b5fd525dbf2f2e7bd7f567351f4e87d78d0dbe9f81a55a316d283658ca95d10c3e904d6743fb406c684bafebc0dfd94c47d375ce38816

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.rubocop.yml

@@ -3,6 +3,7 @@ AllCops:
     - 'bin/**/*'
     - 'examples/**/*'
   NewCops: enable
+  SuggestExtensions: false
 
 # 弱ruby版本的gem，所有目前不需要检测ruby版本
 Gemspec/RequiredRubyVersion:

data/Gemfile.lock

@@ -1,63 +1,93 @@
 PATH
   remote: .
   specs:
-    activemodel_object_info (0.1.6)
-      activerecord
+    activemodel_object_info (0.2.0)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.4.1)
-      activesupport (= 5.2.4.1)
-    activerecord (5.2.4.1)
-      activemodel (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
-      arel (>= 9.0)
-    activesupport (5.2.4.1)
+    activemodel (6.1.4.4)
+      activesupport (= 6.1.4.4)
+    activerecord (6.1.4.4)
+      activemodel (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
+    activesupport (6.1.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    ast (2.4.1)
-    concurrent-ruby (1.1.5)
-    i18n (1.8.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.0)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    method_source (1.0.0)
+    minitest (5.15.0)
+    parallel (1.21.0)
+    parser (3.0.3.2)
       ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rainbow (3.0.0)
-    rake (10.5.0)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
-    rubocop (1.7.0)
+    rake (13.0.6)
+    regexp_parser (2.2.0)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    rubocop (1.24.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.15.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.4.0)
-      parser (>= 2.7.1.5)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.1)
+      parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    yard (0.9.20)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    webrick (1.7.0)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
+    zeitwerk (2.5.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activemodel_object_info!
+  activerecord
   bundler
-  rake (~> 10.0)
+  pry
+  rake
+  rspec
   rubocop
+  simplecov
   yard
 
 BUNDLED WITH

data/Rakefile

@@ -1,4 +1,13 @@
 # frozen_string_literal: true
 
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
 task default: :spec
+
+task :console do
+  ruby 'bin/console'
+end
+task c: :console

data/activemodel_object_info.gemspec

@@ -30,11 +30,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord'
   spec.add_dependency 'activesupport'
 
+  spec.add_development_dependency 'activerecord'
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'yard'
+  spec.metadata = {
+    'rubygems_mfa_required' => 'false',
+  }
 end

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "activemodel/object/info"
+require 'bundler/setup'
+require 'activemodel_object_info'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "activemodel/object/info"
 # require "pry"
 # Pry.start
 
-require "irb"
-IRB.start(__FILE__)
+require 'pry'
+Pry.start

data/lib/activemodel_object_info/base.rb

@@ -7,6 +7,21 @@ module ActivemodelObjectInfo
   # @author shiner527 <shiner527@hotmail.com>
   #
   module Base
+    # ===== 常量定义 =====
+
+    # 满格式
+    DATETIME_FULL = '%Y-%m-%d %H:%M:%S'
+    # 截止到分
+    DATETIME_MIN = '%Y-%m-%d %H:%M'
+    # 仅日期
+    DATETIME_DATE = '%Y-%m-%d'
+    # 仅年月
+    DATETIME_MONTH = '%Y-%m'
+    # 仅年份
+    DATETIME_YEAR = '%Y'
+
+    # ===== 方法定义 =====
+
     #
     # 对象信息输出。主要返回给前端一个可用的散列（会被转化为JSON格式）格式的信息并传递给前端。
     #
@@ -83,10 +98,15 @@ module ActivemodelObjectInfo
           attribute_format = current_attr_config[:format].present? ? current_attr_config[:format] : options[:datetime_format]
           result[attribute_name] = if attribute_format.to_s == 'standard' # 会被转换为标准时间日期格式
                                      v
-                                   elsif attribute_format.present? # 按照设定的 format_date 方法的格式
-                                     v.format_date(attribute_format.to_sym)
+                                   elsif attribute_format.present? # 按照设定时间日期方法的格式
+                                     # 旧有格式匹配支持
+                                     if %i[full min date month year].include?(attribute_format.to_sym)
+                                       v.strftime("::#{self.class}::DATETIME_#{attribute_format.to_s.upcase}".constantize)
+                                     else # 否则认为直接传递的是 strftime 支持的自定义格式
+                                       v.strftime(attribute_format)
+                                     end
                                    else # 默认使用 'yyyy-MM-dd hh:mm:ss' 的格式
-                                     v.format_date(:full)
+                                     v.strftime(DATETIME_FULL)
                                    end
         else # 其他值类型默认赋值自己
           result[attribute_name] = v

data/lib/activemodel_object_info/deleted_operation.rb

@@ -12,8 +12,9 @@ module ActivemodelObjectInfo
     # 当被 include 关键字引入后的处理
     included do |_|
       # 定义好默认的删除查询语句
-      deleted_field = ::Constants::Base::TABLE_COLUMN_DELETE_COLUMN
-      deleted_value_valid = ::Constants::Base::TABLE_COLUMN_DELETE_VALID
+      deleted_field = 'deleted'
+      deleted_value_valid = 0
+      deleted_value_invalid = 1
       default_scope { where(deleted_field.to_sym => deleted_value_valid) }
 
       # 通用的删除过程
@@ -25,15 +26,15 @@ module ActivemodelObjectInfo
         raise ArgumentError, 'Must give user id!' if options[:user_id].blank?
 
         # 获取更新人字段，删除人字段
-        updated_by_field = (options[:updated_by_field] || "#{::Constants::Base::TABLE_COLUMN_UPDATED_COLUMN}_by").to_sym
-        deleted_by_field = (options[:deleted_by_field] || "#{::Constants::Base::TABLE_COLUMN_DELETE_COLUMN}_by").to_sym
-        deleted_at_field = (options[:deleted_at_field] || "#{::Constants::Base::TABLE_COLUMN_DELETE_COLUMN}_at").to_sym
+        updated_by_field = (options[:updated_by_field] || 'updated_by').to_sym
+        deleted_by_field = (options[:deleted_by_field] || 'deleted_by').to_sym
+        deleted_at_field = (options[:deleted_at_field] || 'deleted_at').to_sym
         # 设置删除状态为已失效
-        __send__("#{deleted_field}=", ::Constants::Base::TABLE_COLUMN_DELETE_INVALID)
+        __send__("#{deleted_field}=", deleted_value_invalid)
         # 设置删除人、删除时间和更新人
         __send__("#{deleted_by_field}=", options[:user_id]) if respond_to?(deleted_by_field)
         __send__("#{deleted_at_field}=", Time.now.localtime) if respond_to?(deleted_at_field)
-        __send__("#{updated_by_field}=", options[:user_id]) if respond_to?(updated_by_field)
+        __send__("#{updated_by_field}=", options[:user_id]) if respond_to?(updated_by_field) && options[:refresh_updated]
       end
 
       # 定义删除方法，但是不覆盖 ActiveRecord 的同名方法。

data/lib/activemodel_object_info/table_definition.rb

@@ -64,22 +64,15 @@ module ActivemodelObjectInfo
     #
     # @param [Symbol, String] operations 对应的操作。默认会给出 +:created+ 、 +:updated+ 和 +:deleted+ 三个操作名。
     #  如果参数中的给出操作名含有 +:deleted+ 或者 +'deleted'+ 时，还会生成默认名称为 <b>deleted</b> 整形数字段，用来标识当前记录是否被删除。
-    #  这里该字段的名称由常量 {Constants::Base::TABLE_COLUMN_DELETE_COLUMN} 设定。
     #  默认值为可用的记录标记值。由常量 {Constants::Base::TABLE_COLUMN_DELETE_DEFAULT} 设定。
     #
     def generate_operations(*operations)
       # puts "generate_operations(#{operations})"
       action_fields = operations
       # 默认只有创建、更新和删除相关的字段
-      if action_fields.empty?
-        action_fields = [
-          ::Constants::Base::TABLE_COLUMN_CREATED_COLUMN,
-          ::Constants::Base::TABLE_COLUMN_UPDATED_COLUMN,
-          ::Constants::Base::TABLE_COLUMN_DELETE_COLUMN,
-        ]
-      end
+      action_fields = %w[created updated deleted] if action_fields.empty?
       action_fields.each do |operation|
-        column(::Constants::Base::TABLE_COLUMN_DELETE_COLUMN, :integer, default: ::Constants::Base::TABLE_COLUMN_DELETE_DEFAULT, comment: '删除标记') if operation.to_sym == :deleted
+        column(operation.to_s, :integer, default: 0, comment: '删除标记') if operation.to_sym == :deleted
         operation_columns(operation)
       end
     end

data/lib/activemodel_object_info/version.rb

@@ -2,6 +2,6 @@
 
 module ActivemodelObjectInfo
   module Version
-    VERSION = '0.1.6'
+    VERSION = '0.2.0'
   end
 end

data/lib/activemodel_object_info.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'activemodel_object_info/extend'
 require 'activemodel_object_info/version'
+require 'active_support/all'
 require 'activemodel_object_info/base'
 require 'activemodel_object_info/table_definition'
 require 'activemodel_object_info/deleted_operation'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: activemodel_object_info
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - shiner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,13 +25,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -52,20 +52,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +146,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
@@ -120,17 +163,13 @@ files:
 - lib/activemodel_object_info.rb
 - lib/activemodel_object_info/base.rb
 - lib/activemodel_object_info/deleted_operation.rb
-- lib/activemodel_object_info/extend.rb
-- lib/activemodel_object_info/extends/ruby_generals.rb
 - lib/activemodel_object_info/table_definition.rb
 - lib/activemodel_object_info/version.rb
 homepage: https://github.com/shiner527/activemodel-object-info
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/shiner527/activemodel-object-info
-  source_code_uri: https://github.com/shiner527/activemodel-object-info.git
-  changelog_uri: https://github.com/shiner527/activemodel-object-info/CHANGELOG
+  rubygems_mfa_required: 'false'
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/activemodel_object_info/extend.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-# 加载扩展
-::Dir.glob('extends/**/*.rb').sort.each do |filename|
-  require_relative filename
-end

data/lib/activemodel_object_info/extends/ruby_generals.rb

@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-#
-# 时间类型相关类通用实例方法定义模块。
-#
-# @author shiner527 <shiner527@hotmail.com>
-#
-module TimeInstance
-  #
-  # 时间格式化为指定的字符串。
-  #
-  # @param [Symbol] type 指定需要转换的具体格式。默认为 +:date+ 类型的格式。
-  #
-  # @return [String] 返回转换后的字符串。
-  #
-  def format_date(type = :date)
-    case type
-    when :full
-      strftime('%Y-%m-%d %H:%M:%S')
-    when :min
-      strftime('%Y-%m-%d %H:%M')
-    when :date
-      strftime('%Y-%m-%d')
-    when :year
-      strftime('%Y')
-    end
-  end
-end
-
-#
-# 扩展 Date 类
-#
-class Date
-  include ::TimeInstance
-end
-
-#
-# 扩展 Time 类
-#
-class Time
-  include ::TimeInstance
-end
-
-#
-# 扩展 DateTime 类
-#
-class DateTime
-  include ::TimeInstance
-end
-
-#
-# 扩展 Array 类
-#
-class Array
-  #
-  # 找到数组中为空的元素，并将去掉空元素的结果返回为一个新数组。空的定义由 +blank?+ 方法确定。本方法<b>不会改变</b>数组自身。
-  #
-  # @return [Array] 返回不包含空元素的数组作为结果。
-  #
-  def compact_blank
-    result = []
-    each { |item| result << item unless item.blank? }
-    result
-  end
-
-  #
-  # 去掉空元素并将去掉后的数组作为结果返回。空的定义由 +blank?+ 方法确定。本方法<b>会改变</b>数组自身。
-  #
-  # @return [Array] 返回不包含空元素的数组作为结果。
-  #
-  def compact_blank!
-    delete_if(&:blank?)
-  end
-end
-
-#
-# 扩展 Array 类
-#
-class Hash
-  #
-  # 找到散列中键值对的值为空的元素，并将去掉这样的键值对的结果返回为一个新散列。空的定义由 +blank?+ 方法确定。本方法<b>不会改变</b>散列自身。
-  #
-  # @return [Array] 返回不包含键值对中值为空元素的散列作为结果。
-  #
-  def compact_blank
-    result = {}
-    each { |k, v| result[k] = v unless v.blank? }
-    result
-  end
-
-  #
-  # 去掉散列中键值对的值为空的键值对，并将去掉后的散列作为结果返回。空的定义由 +blank?+ 方法确定。本方法<b>会改变</b>散列自身。
-  #
-  # @return [Array] 返回不包含键值对中值为空元素的散列作为结果。
-  #
-  def compact_blank!
-    delete_if { |_k, v| v.blank? }
-  end
-end