bsm-models 0.10.0 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 50bef71e6d4c5f91b9d2cb14a48965f4be3da039
-  data.tar.gz: 4a00bbacc3b1ae07aa7aa2a297941671a45afc7a
+SHA256:
+  metadata.gz: 37b0f8692505a8c0eb8e1410f1421139f9247a5302ef839e092a38e1aef44a51
+  data.tar.gz: 4acbd231917862f721aa9e94cf2bed96ac87c0ab31a1a51cf6e2bbe8b42ef173
 SHA512:
-  metadata.gz: 4970fbfb69115c6d03d914a03a02d946988ec27400b1c1190aaecd67379bb6500566b223c01625882bdc4376b2ea887aaf1defc8ab4aa7cd01df8cd29b675565
-  data.tar.gz: 11b8a248c3fd9bd23b874b4e8f71f5bff21f380003147f406359c5b1b0efc3e0d6dc289380ef0a168737e21ddf831936944e0dce2df36b41bec58c06a4717d30
+  metadata.gz: 7d82f0494a4a1157b203d35a5dd7e5db0bc0987d813ead7c28eb7f399ef1c4a9f44cbf4909db7f8c2e647cb3352e231a8c309f80a8dec8434780f0c6c5af1081
+  data.tar.gz: efb282c26b87a863cc09021f266924a0a2ac7544f39af116d4b1a75cd3f4667d6f17916b0c89e7c1bd26cdd22bb1d1bbbdb49bae01c3640bbb2f12e1bc68d1b3

data/lib/bsm/model.rb

@@ -1,6 +1,7 @@
 begin
   require 'rails'
 rescue LoadError
+  nil
 end
 
 module Bsm
@@ -11,11 +12,11 @@ module Bsm
     autoload :EagerDescendants, 'bsm/model/eager_descendants'
     autoload :StiConvertable, 'bsm/model/sti_convertable'
     autoload :HasManySerialized, 'bsm/model/has_many_serialized'
-    autoload :Coders,   'bsm/model/coders'
+    autoload :Coders, 'bsm/model/coders'
   end
 
   class Railtie < ::Rails::Railtie
     require 'active_support/i18n'
-    I18n.load_path << File.expand_path('../model/locale/en.yml', __FILE__)
+    I18n.load_path << File.expand_path('model/locale/en.yml', __dir__)
   end if defined?(::Rails::Railtie)
 end

data/lib/bsm/model/abstract.rb

@@ -8,13 +8,12 @@ module Bsm::Model::Abstract
       errors.add :base, :abstract if abstract_model_instance?
     end
 
-    class_eval <<-END_EVAL
-      def abstract_model_instance?
-        self.class >= ::#{self.name}
-      end
-    END_EVAL
+    class_eval <<-METHOD, __FILE__, __LINE__ + 1
+      def abstract_model_instance? # def abstract_model_instance?
+        self.class >= ::#{name}    #   self.class >= ::ThisModel
+      end                          # end
+    METHOD
 
     protected :must_not_be_abstract, :abstract_model_instance?
   end
-
-end
+end

data/lib/bsm/model/coders/abstract_column.rb

@@ -1,5 +1,4 @@
 class Bsm::Model::Coders::AbstractColumn
-
   def self.rescue_errors
     []
   end
@@ -12,18 +11,19 @@ class Bsm::Model::Coders::AbstractColumn
     @object_class = object_class
   end
 
-  def dump(obj)
+  def dump(_obj)
     not_implemented
   end
 
   def load(string)
     return object_class.new if object_class != Object && string.nil?
+
     begin
-      obj = object_class === string ? string : _load(string)
+      obj = string.is_a?(object_class) ? string : _load(string)
 
       unless obj.is_a?(object_class) || obj.nil?
         raise ActiveRecord::SerializationTypeMismatch,
-          "Attribute was supposed to be a #{object_class}, but was a #{obj.class}"
+              "Attribute was supposed to be a #{object_class}, but was a #{obj.class}"
       end
       obj ||= object_class.new if object_class != Object
 
@@ -35,8 +35,7 @@ class Bsm::Model::Coders::AbstractColumn
 
   protected
 
-    def _load(string)
-      raise NotImplementedError
-    end
-
+  def _load(_string)
+    raise NotImplementedError
+  end
 end

data/lib/bsm/model/coders/json_column.rb

@@ -1,7 +1,6 @@
 class Bsm::Model::Coders::JsonColumn < Bsm::Model::Coders::AbstractColumn
-
   def self.rescue_errors
-    [ ::JSON::ParserError ]
+    [::JSON::ParserError]
   end
 
   def dump(obj)
@@ -10,8 +9,7 @@ class Bsm::Model::Coders::JsonColumn < Bsm::Model::Coders::AbstractColumn
 
   protected
 
-    def _load(string)
-      ActiveSupport::JSON.decode(string)
-    end
-
+  def _load(string)
+    ActiveSupport::JSON.decode(string)
+  end
 end

data/lib/bsm/model/coders/marshal_column.rb

@@ -1,9 +1,8 @@
 require 'base64'
 
 class Bsm::Model::Coders::MarshalColumn < Bsm::Model::Coders::AbstractColumn
-
   def self.rescue_errors
-    [ ArgumentError, TypeError ]
+    [ArgumentError, TypeError]
   end
 
   def dump(obj)
@@ -12,8 +11,7 @@ class Bsm::Model::Coders::MarshalColumn < Bsm::Model::Coders::AbstractColumn
 
   protected
 
-    def _load(string)
-      Marshal.load(Base64.decode64(string))
-    end
-
+  def _load(string)
+    Marshal.load(Base64.decode64(string))
+  end
 end

data/lib/bsm/model/deletable.rb

@@ -14,5 +14,4 @@ module Bsm::Model::Deletable
   def check_deletable?
     throw :abort unless deletable?
   end
-
 end

data/lib/bsm/model/eager_descendants.rb

@@ -2,25 +2,23 @@ module Bsm::Model::EagerDescendants
   extend ActiveSupport::Concern
 
   module ClassMethods
-
     def descendants
-      eager_constantize! 
+      eager_constantize!
       super
     end
 
     private
 
-      def eager_constantize!
-        return if @__eagerly_constantized__
+    def eager_constantize!
+      return if @__eagerly_constantized__
 
-        load_path = $LOAD_PATH.find do |path|
-          File.exist? File.join(path, "#{name.underscore}.rb")
-        end
-        Dir[File.join(load_path, parent_name.underscore, "**", "*.rb")].each do |file|
-          ActiveSupport::Dependencies.depend_on file
-        end
-        @__eagerly_constantized__ = true
+      load_path = $LOAD_PATH.find do |path|
+        File.exist? File.join(path, "#{name.underscore}.rb")
       end
-
+      Dir[File.join(load_path, module_parent_name.underscore, '**', '*.rb')].each do |file|
+        ActiveSupport::Dependencies.depend_on file
+      end
+      @__eagerly_constantized__ = true
+    end
   end unless Rails.application.config.respond_to?(:eager_load) && Rails.application.config.eager_load
-end
+end

data/lib/bsm/model/editable.rb

@@ -2,7 +2,7 @@ module Bsm::Model::Editable
   extend ActiveSupport::Concern
 
   included do
-    validate      :must_be_editable, :on => :update
+    validate      :must_be_editable, on: :update
     attr_accessor :force_editable
   end
 
@@ -16,8 +16,7 @@ module Bsm::Model::Editable
 
   protected
 
-    def must_be_editable
-      errors.add :base, :immutable if immutable?
-    end
-
+  def must_be_editable
+    errors.add :base, :immutable if immutable?
+  end
 end

data/lib/bsm/model/has_many_serialized.rb

@@ -4,19 +4,15 @@ module Bsm::Model::HasManySerialized
   extend ActiveSupport::Concern
 
   module ClassMethods
-
     def has_many_serialized(name, scope = nil, options = {})
       Builder.build(self, name, scope, options)
     end
-
   end
 
   class Builder < ActiveRecord::Associations::Builder::CollectionAssociation
-
     def self.build(model, name, *)
       model.serialize "#{name.to_s.singularize}_ids", ::Bsm::Model::Coders::JsonColumn.new(Array)
-      super.tap do |reflection|
-      end
+      super
     end
 
     def self.define_accessors(model, reflection)
@@ -33,6 +29,7 @@ module Bsm::Model::HasManySerialized
         records = Array.wrap(records)
         records.each do |record|
           next if record.is_a?(klass)
+
           raise ActiveRecord::AssociationTypeMismatch, "#{klass.name} expected, got #{record.class}"
         end
         write_attribute attribute_name, records.map(&:id).sort
@@ -50,6 +47,5 @@ module Bsm::Model::HasManySerialized
     def valid_dependent_options
       []
     end
-
   end
 end

data/lib/bsm/model/sti_convertable.rb

@@ -3,10 +3,11 @@ module Bsm::Model::StiConvertable
 
   included do
     include Bsm::Model::EagerDescendants
+
     class_eval <<-METHOD, __FILE__, __LINE__ + 1
-      def self.real_type?
-        self < ::#{name}
-      end
+      def self.real_type? # def real_type?
+        self < ::#{name}  #   self.class < ::ThisModel
+      end                 # end
     METHOD
   end
 
@@ -15,10 +16,9 @@ module Bsm::Model::StiConvertable
   end
 
   module ClassMethods
-
     # @Override: Allow to specify a kind
     def new(attributes = nil, *args, &block)
-      kind = attributes.delete(:kind) { attributes.delete('kind') }  if attributes.respond_to?(:delete)
+      kind = attributes.delete(:kind) { attributes.delete('kind') } if attributes.respond_to?(:delete)
       return super if real_type?
 
       klass = real_descendants.find {|k| k.kind == kind } || fallback_descendant
@@ -38,11 +38,9 @@ module Bsm::Model::StiConvertable
     def kind
       name.demodulize.underscore
     end
-
   end
 
-  delegate :kind, :to => 'self.class'
+  delegate :kind, to: 'self.class'
 
-  def kind=(_)
-  end
+  def kind=(_val); end
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: bsm-models
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.2
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rubocop-bsm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -125,15 +139,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.0
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: BSM's very custom model extensions