bsm-models 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa6e7aaa2e0defdb2d52f9eb853df13bf006b87c44aea8d4478018e5d237ec7f
-  data.tar.gz: 102767fc8eea2bbfde29f15fa33a332ad1e2a2a2ab65e7c9d401711cfc1670ae
+  metadata.gz: 07a5dbf9862a89755b6ea1d829651466227f856d27e203f5dd53a4466b576d27
+  data.tar.gz: 710753e8b26f19e564ceb8b16224419f3c2cfd4bd1247226f197d9c3a2ebf05b
 SHA512:
-  metadata.gz: e13bde6a1f7611d67550a8fca9f25900d0a87a07676e17ba4037a608ce458b29c2f5492e28008410bb81a4fadf4c8fd62847c813c3ebc072e2ec94de81f2b61a
-  data.tar.gz: 778270722323bf197641bce226ca4271e5584dd5616d54cba674147fd29ba4d4e961d0cae1b83ceb88daf4a9fff0e0b9c083488f50d298fb558f21977fb64a8f
+  metadata.gz: 196f8bf345b53f7c61c191ffbae886cd2c8bf8aac1996e2e3631e8ff114645e4325144ecf9184609133d9886d27911db2858a572163feaa87c67fd7774a5c75c
+  data.tar.gz: f4154249b9f00553d7b034fe2f24f48b26a98ad9f2c10881a2b98b7170384177b10621a6360f96598084cd02259c357da519da24a74d223768ddc05705aeb66d

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, 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.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.6
 description: ''
 email: dimitrij@blacksquaremedia.com
 executables: []
@@ -125,15 +139,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.0
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: BSM's very custom model extensions