bsm-models 0.9.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 68a107120c0c5f44c411f7447348323a7c0ca6ee
-  data.tar.gz: ae4e2a600e05ce1eb233affd003e21ebcea2ceca
+SHA256:
+  metadata.gz: 4f4aa0f0eb8e4f1d0177ff328886762f34f2ca6b7be2f29be6e6d81b7082f932
+  data.tar.gz: 4ba6ae82c5276b0a594203faeb37d3bc66db87815b8c79ec042fae424f9ac3aa
 SHA512:
-  metadata.gz: d82015d125b38b3185e0ac731884b1082b8d1780210c30f2eef49a621f694c8f0cad045e858225c6f74f2d80a582c35875b9cd568d0a58aabdb2ac19bf848980
-  data.tar.gz: 33e2006f7fe15c1eed43d92fd4897ed571b542ada330461c4390f3676769f42f94900ad3edc80293175857f9b288fc6a98efa7b1dfb357dd9748d337a3026fd3
+  metadata.gz: 248ff7b584f16b6c29e8238dcd32fe610317ecd3f58d5ad659ff7753f8d6bc7cd1caeb67c94385c5270592f73f36de32da82d5399b7f6690c215390455944537
+  data.tar.gz: b20a1ba4f587ad84b407c447ba3cd978910b068141fa4337e0e81919b76780b73a79e7bdb290cc83d80a66b2183c3a58325da8758703c7e34d18d8819f3cb58c

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
+    class_eval <<-METHOD, __FILE__, __LINE__ + 1
       def abstract_model_instance?
-        self.class >= ::#{self.name}
+        self.class >= ::#{name}
       end
-    END_EVAL
+    METHOD
 
     protected :must_not_be_abstract, :abstract_model_instance?
   end
-
-end
+end

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

@@ -8,18 +8,19 @@ class Bsm::Model::Coders::AbstractColumn
   attr_reader :object_class
 
   # @param [Class] obejct_class
-  def initialize(object_class = Object)
+  def initialize(object_class=Object)
     @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,
@@ -35,8 +36,8 @@ 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,7 @@
 class Bsm::Model::Coders::JsonColumn < Bsm::Model::Coders::AbstractColumn
 
   def self.rescue_errors
-    [ ::JSON::ParserError ]
+    [::JSON::ParserError]
   end
 
   def dump(obj)
@@ -10,8 +10,8 @@ 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

@@ -3,7 +3,7 @@ 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 +12,8 @@ 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,11 +4,9 @@ module Bsm::Model::HasManySerialized
   extend ActiveSupport::Concern
 
   module ClassMethods
-
-    def has_many_serialized(name, scope = nil, options = {})
+    def has_many_serialized(name, scope=nil, options={})
       Builder.build(self, name, scope, options)
     end
-
   end
 
   class Builder < ActiveRecord::Associations::Builder::CollectionAssociation
@@ -33,6 +31,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

data/lib/bsm/model/sti_convertable.rb

@@ -15,10 +15,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)
+    def new(attributes=nil, *args, &block)
+      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 +37,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bsm-models
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2019-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !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.0'
-    - - "<"
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        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
@@ -59,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -131,15 +139,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.0
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: BSM's very custom model extensions