unidom-common 2.1.2 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c086fb6689c4136771a0168f4532b7e8532de09716682d9a8747379056ef30ef
-  data.tar.gz: deb216901a9121e91189982b5f4db8d2a2a9e275df2bf8dd88f8effa4b5279ad
+  metadata.gz: 9c71146870a9030fc64208ac28ed4bc6f7a92530432a95ffcbb5166d13ad7527
+  data.tar.gz: b045e9c5680d646c078d9b6b16e1ecac57f6b4b5db15c48b37e0158919ef5141
 SHA512:
-  metadata.gz: 8ee211251ac52e8116f708710a3514cdba6cc65b8e12dbc987b0465cc1e620a3bc7c24d1803a50176fb9adeff4765d661237b500bb8ba029d64f20394ca1e787
-  data.tar.gz: ddda1c685bf861c47ed23c20bd1815e8c1059191abf35bf505c6e544fa9ec5fdb7b6c7da72bea4ac54df2e371975de80cdde3a4169197d56874d8ee363899f3e
+  metadata.gz: 5dd9f8e8d2a8f5f0daf8185c3f3162a1ad6b0290c2433914a34f4198e02f7b7a522a47cb857bc9c34c3c06c5c4899bea85120fb6ca2d190bb2425d2e00f4945c
+  data.tar.gz: 7f4259427bbb8377258e12c630b19eec5aff6310df53201d2d56ae6b927759c200d3082b771fa1161b1b8aa684fb482b95de92c7366c45406e102780062844f6

data/README.md

@@ -7,7 +7,7 @@
 [![Dependency Status](https://gemnasium.com/badges/github.com/topbitdu/unidom-common.svg)](https://gemnasium.com/github.com/topbitdu/unidom-common)
 
 Unidom (UNIfied Domain Object Model) is a series of domain model engines. The Common domain model engine includes the common models.
-Unidom (统一领域对象模型)是一系列的领域模型引擎。常用领域模型引擎包括一些常用的模型。
+Unidom （统一领域对象模型）是一系列的领域模型引擎。常用领域模型引擎包括一些常用的模型。
 
 
 
@@ -134,7 +134,7 @@ Project.notation_boolean_column_where(:enabled, true) # All enabled projects
 
 ```ruby
 # db/migrate/YYYYMMDDHHMMSS_create_people.rb
-class CreatePeople < ActiveRecord::Migration[5.0]
+class CreatePeople < ActiveRecord::Migration[6.0]
 
   def change
 
@@ -189,7 +189,7 @@ Person.passport_number_is('E00000000').first==person                # true
 
 ```ruby
 # db/migrate/YYYYMMDDHHMMSS_create_orderings.rb
-class CreateOrderings < ActiveRecord::Migration[5.0]
+class CreateOrderings < ActiveRecord::Migration[6.0]
 
   def change
 

data/app/models/unidom/common/concerns/aes256_cryptor.rb

@@ -79,7 +79,10 @@ module Unidom::Common::Concerns::Aes256Cryptor
       cipher = OpenSSL::Cipher::AES.new(256, 'CBC')
       cipher.decrypt
       cipher.padding = aes_256_padding
-      cipher.key     = key
+      #cipher.key     = key
+
+      times = key.length/cipher.key_len>=1 ? 1 : cipher.key_len/key.length+1
+      cipher.key = (key*times)[0..cipher.key_len-1]
 
       cipher.update(encoded)+cipher.final
 

data/app/models/unidom/common/concerns/model_extension.rb

@@ -140,6 +140,19 @@ module Unidom::Common::Concerns::ModelExtension
       end
     end
 
+    ##
+    # 抽取验证错误。
+    def extract_errors
+      refined_errors = {}
+      self.errors.messages.each do | name, messages |
+        details = errors.details[name]
+        refined_errors[name] = []
+        messages.count.times { |i| refined_errors[name] << details[i].merge(message: messages[i]) }
+      end
+      refined_errors
+    end
+
+
   end
 
   module ClassMethods

data/lib/unidom/common/engine_extension.rb

@@ -1,38 +1,44 @@
-##
-# Engine Extension 是为 Rails 引擎提供的扩展关注点。
-# .enable_initializer 方法简化了知识层枚举和数据库迁移脚本的加载。
-
-module Unidom::Common::EngineExtension
-
-  extend ActiveSupport::Concern
-
-  #included do |includer|
-  #end
-
-  module ClassMethods
+module Unidom
+  module Common
 
     ##
-    # 设置初始化器的开关。如:
-    # Unidom::Common::EngineExtension.enable_initializer enum_enabled: true, migration_enabled: false
-    # enum_enabled 表明是否加载枚举型。
-    # migration_enabled 表明是否运行领域模型数据库迁移脚本，同时也表明加载对应的领域模型。
-    def enable_initializer(enum_enabled: false, migration_enabled: false)
-
-      if enum_enabled
-        require 'unidom/common/yaml_helper'
-        initializer :load_config_initializers do |app|
-          Unidom::Common::YamlHelper.load_enum config: app.config, root: config.root
-        end
-      end
+    # Engine Extension 是为 Rails 引擎提供的扩展关注点。
+    # .enable_initializer 方法简化了知识层枚举和数据库迁移脚本的加载。
+    module EngineExtension
+
+      extend ActiveSupport::Concern
+
+      #included do |includer|
+      #end
+
+      #module ClassMethods
+      class_methods do
+
+        ##
+        # 设置初始化器的开关。如:
+        # Unidom::Common::EngineExtension.enable_initializer enum_enabled: true, migration_enabled: false
+        # enum_enabled 表明是否加载枚举型。
+        # migration_enabled 表明是否运行领域模型数据库迁移脚本，同时也表明加载对应的领域模型。
+        def enable_initializer(enum_enabled: false, migration_enabled: false)
+
+          if enum_enabled
+            require 'unidom/common/yaml_helper'
+            initializer :load_config_initializers do |app|
+              Unidom::Common::YamlHelper.load_enum config: app.config, root: config.root
+            end
+          end
+
+          if migration_enabled
+            initializer :append_migrations do |app|
+              config.paths['db/migrate'].expanded.each { |expanded_path| app.config.paths['db/migrate'] << expanded_path } unless Unidom::Common::Neglection.namespace_neglected?(self.class.name)||app.root.to_s.match(root.to_s)
+            end
+          end
 
-      if migration_enabled
-        initializer :append_migrations do |app|
-          config.paths['db/migrate'].expanded.each { |expanded_path| app.config.paths['db/migrate'] << expanded_path } unless Unidom::Common::Neglection.namespace_neglected?(self.class.name)||app.root.to_s.match(root.to_s)
         end
+
       end
 
     end
 
   end
-
 end

data/lib/unidom/common/neglection.rb

@@ -1,20 +1,25 @@
-##
-# Neglection 根据配置信息忽略指定的类或者命名空间。
+module Unidom
+  module Common
 
-class Unidom::Common::Neglection
+    ##
+    # Neglection 根据配置信息忽略指定的类或者命名空间。
+    class Neglection
 
-  ##
-  # 判断指定的类名是否被忽略。如:
-  # Unidom::Common::Neglection.namespace_neglected? 'Namespace::ClassName'
-  # 在应用的 config/initializers/unidom.rb 文件中配置如下代码，即可忽略 Namespace::ClassName 这个类。
-  # Unidom::Common.configure do |options|
-  # # The migrations inside the following namespaces will be ignored. The models inside the following namespaces won't be defined.
-  # options[:neglected_namespaces] = %w{
-  #   Namespace::ClassName
-  # }
-  def self.namespace_neglected?(class_name)
-    neglected_namespaces = Unidom::Common.try(:options).try(:[], :neglected_namespaces)
-    neglected_namespaces.present? ? neglected_namespaces.include?(class_name.to_s.deconstantize) : false
-  end
+      ##
+      # 判断指定的类名是否被忽略。如:
+      # Unidom::Common::Neglection.namespace_neglected? 'Namespace::ClassName'
+      # 在应用的 config/initializers/unidom.rb 文件中配置如下代码，即可忽略 Namespace::ClassName 这个类。
+      # Unidom::Common.configure do |options|
+      # # The migrations inside the following namespaces will be ignored. The models inside the following namespaces won't be defined.
+      # options[:neglected_namespaces] = %w{
+      #   Namespace::ClassName
+      # }
+      def self.namespace_neglected?(class_name)
+        neglected_namespaces = Unidom::Common.try(:options).try(:[], :neglected_namespaces)
+        neglected_namespaces.present? ? neglected_namespaces.include?(class_name.to_s.deconstantize) : false
+      end
+
+    end
 
+  end
 end

data/lib/unidom/common/numeration.rb

@@ -1,20 +1,25 @@
-##
-# Numeration 是数字格式转换的辅助类。
+module Unidom
+  module Common
 
-class Unidom::Common::Numeration
+    ##
+    # Numeration 是数字格式转换的辅助类。
+    class Numeration
 
-  ##
-  # 将二进制数据转换成 16 进制的表达。如：
-  # Unidom::Common::Numeration.hex [ 'A', '}' ]
-  def self.hex(data)
-    data.present? ? data.unpack('H*')[0] : nil
-  end
+      ##
+      # 将二进制数据转换成 16 进制的表达。如：
+      # Unidom::Common::Numeration.hex [ 'A', '}' ]
+      def self.hex(data)
+        data.present? ? data.unpack('H*')[0] : nil
+      end
 
-  ##
-  # 将十六进制数的表达字符串，转换成二进制数据。如：
-  # Unidom::Common::Numeration.rev_hex '6CA0'
-  def self.rev_hex(hex)
-    hex.present? ? hex.scan(/../).map(&:hex).pack('c*') : nil
-  end
+      ##
+      # 将十六进制数的表达字符串，转换成二进制数据。如：
+      # Unidom::Common::Numeration.rev_hex '6CA0'
+      def self.rev_hex(hex)
+        hex.present? ? hex.scan(/../).map(&:hex).pack('c*') : nil
+      end
 
+    end
+
+  end
 end

data/lib/unidom/common/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Common
-    VERSION = '2.1.2'.freeze
+    VERSION = '3.0'.freeze
   end
 end

data/lib/unidom/common/yaml_helper.rb

@@ -1,25 +1,30 @@
-##
-# YAML Helper 是用于加载知识层枚举的配置文件的辅助模块。
+module Unidom
+  module Common
 
-module Unidom::Common::YamlHelper
+    ##
+    # YAML Helper 是用于加载知识层枚举的配置文件的辅助模块。
+    module YamlHelper
 
-  ##
-  # 从应用或者引擎的跟路径 root 加载 config/enum.yml 中的内容到 config 中。
-  def self.load_enum(config: nil, root: nil)
+      ##
+      # 从应用或者引擎的跟路径 root 加载 config/enum.yml 中的内容到 config 中。
+      def self.load_enum(config: nil, root: nil)
 
-    enum_yaml_path = root.join 'config', 'enum.yml'
-    raise ArgumentError.new "The file #{enum_yaml_path} does not exist." unless enum_yaml_path.exist?
+        enum_yaml_path = root.join 'config', 'enum.yml'
+        raise ArgumentError.new "The file #{enum_yaml_path} does not exist." unless enum_yaml_path.exist?
+
+        unless config.respond_to? :enum
+          config.class_eval do
+            attr_accessor :enum
+          end
+        end
+        config.enum = {} if config.enum.nil?
+
+        enum_definitions = YAML.load File.read(enum_yaml_path)
+        config.enum.merge! enum_definitions['enum'] if enum_definitions.present?&&enum_definitions['enum'].present?
 
-    unless config.respond_to? :enum
-      config.class_eval do
-        attr_accessor :enum
       end
-    end
-    config.enum = {} if config.enum.nil?
 
-    enum_definitions = YAML.load File.read(enum_yaml_path)
-    config.enum.merge! enum_definitions['enum'] if enum_definitions.present?&&enum_definitions['enum'].present?
+    end
 
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-common
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: '3.0'
 platform: ruby
 authors:
 - Topbit Du
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2024-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -124,11 +124,11 @@ files:
 - lib/unidom/common/numeration.rb
 - lib/unidom/common/version.rb
 - lib/unidom/common/yaml_helper.rb
-homepage: http://github.com/topbitdu/unidom-common
+homepage: https://gitee.com/Unidom/unidom-common
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,8 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.5.6
+signing_key:
 specification_version: 4
 summary: Unidom Common Domain Model Engine 常用领域模型引擎
 test_files: []