validates_lengths_from_database 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a2017e0b6fb3a3f8a69d7756dcbd581421d4520
-  data.tar.gz: cf44cca0ce1ffcf4b86afd8e188c44ede1db10ad
+  metadata.gz: ee05414f5d7aef3fb39a4e692b6616259d20db11
+  data.tar.gz: '096b57b2a49d98450f1127f27dfd135c34556d86'
 SHA512:
-  metadata.gz: 3aeba2873a46956abf4097a30eb0fb05a8934db8c13338aa69f3670d97a02d3c68689c2d5c8dc0f78ca8a34d026f0616f1d6e3914fec53b77db1fd77f8731a9c
-  data.tar.gz: 3e1ab91da9556d596daba58909c660ef1f924948c85c6eef9ff57d72c41837cb0606c153c78d9f19ed26de1376343015aa46dd9c241cea57ff230b79348e1406
+  metadata.gz: dd35abc81106fe376476a747e78a89aeedaf2828a9aeff2e1f30181a486efc7da88474e5914b82a5df3706bb6f2dd8c0995ea5c05d8a9986ebc234ea40f3cb2c
+  data.tar.gz: d637ae88ae7aa3e2a738e095981270d0228817ab660f8e98214bc0f0bfc23b09e463bb8ab62be5221a6191a9c9504e089d3ceb62d96b23f5d95f9530437a6714

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== v0.7.0 (2017-10-09)
+
+* Drop hard reliance on rails (can use with just activerecord) - thanks @grosser
+* Drop requiring of rubygems (unnecessary) - thanks @grosser
+* Update dependencies to modern, build-able versions
+
 == v0.6.0 (2017-05-02)
 
 * Drop support for integer length validations (too many issues)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    validates_lengths_from_database (0.5.0)
+    validates_lengths_from_database (0.6.0)
       activerecord (>= 3)
 
 GEM
@@ -31,7 +31,7 @@ GEM
     diff-lcs (1.1.2)
     i18n (0.7.0)
     iconv (1.0.4)
-    json (1.8.3)
+    json (1.8.6)
     minitest (4.7.5)
     multi_json (1.10.1)
     pg (0.17.1)
@@ -67,4 +67,4 @@ DEPENDENCIES
   validates_lengths_from_database!
 
 BUNDLED WITH
-   1.11.2
+   1.15.4

data/lib/validates_lengths_from_database.rb

@@ -1,75 +1,3 @@
-require "rubygems"
-require "active_record"
-
-module ValidatesLengthsFromDatabase
-  def self.included(base)
-    base.send(:extend, ClassMethods)
-    base.send(:include, InstanceMethods)
-  end
-
-  module ClassMethods
-    def validates_lengths_from_database(options = {})
-      options.symbolize_keys!
-
-      options[:only]    = Array[options[:only]]   if options[:only] && !options[:only].is_a?(Array)
-      options[:except]  = Array[options[:except]] if options[:except] && !options[:except].is_a?(Array)
-      options[:limit] ||= {}
-
-      if options[:limit] and !options[:limit].is_a?(Hash)
-        options[:limit] = {:string => options[:limit], :text => options[:limit], :decimal => options[:limit], :integer => options[:limit], :float => options[:limit]}
-      end
-      @validate_lengths_from_database_options = options
-
-      validate :validate_lengths_from_database
-
-      nil
-    end
-
-    def validate_lengths_from_database_options
-      if defined? @validate_lengths_from_database_options
-        @validate_lengths_from_database_options
-      else
-        # in case we inherited the validations, copy the options so that we can update it in child
-        # without affecting the parent
-        @validate_lengths_from_database_options = superclass.validate_lengths_from_database_options.inject({}) do |hash, (key, value)|
-          value = value.dup if value.respond_to?(:dup)
-          hash.update(key => value)
-        end
-      end
-    end
-  end
-
-  module InstanceMethods
-    def validate_lengths_from_database
-      options = self.class.validate_lengths_from_database_options
-
-      if options[:only]
-        columns_to_validate = options[:only].map(&:to_s)
-      else
-        columns_to_validate = self.class.column_names.map(&:to_s)
-        columns_to_validate -= options[:except].map(&:to_s) if options[:except]
-      end
-
-      columns_to_validate.each do |column|
-        column_schema = self.class.columns.find {|c| c.name == column }
-        next if column_schema.nil?
-        next if column_schema.respond_to?(:array) && column_schema.array
-        next unless [:string, :text, :decimal].include?(column_schema.type)
-        case column_schema.type
-        when :string, :text
-          column_limit = options[:limit][column_schema.type] || column_schema.limit
-          if column_limit
-            ActiveModel::Validations::LengthValidator.new(:maximum => column_limit, :allow_blank => true, :attributes => [column]).validate(self)
-          end
-        when :decimal
-          if column_schema.precision && column_schema.scale
-            max_val = (10 ** column_schema.precision)/(10 ** column_schema.scale)
-            ActiveModel::Validations::NumericalityValidator.new(:less_than => max_val, :allow_blank => true, :attributes => [column]).validate(self)
-          end
-        end
-      end
-    end
-  end
-end
 
+require "validates_lengths_from_database/core"
 require "validates_lengths_from_database/railtie"

data/lib/validates_lengths_from_database/core.rb

@@ -0,0 +1,70 @@
+module ValidatesLengthsFromDatabase
+  def self.included(base)
+    base.send(:extend, ClassMethods)
+    base.send(:include, InstanceMethods)
+  end
+
+  module ClassMethods
+    def validates_lengths_from_database(options = {})
+      options.symbolize_keys!
+
+      options[:only]    = Array[options[:only]]   if options[:only] && !options[:only].is_a?(Array)
+      options[:except]  = Array[options[:except]] if options[:except] && !options[:except].is_a?(Array)
+      options[:limit] ||= {}
+
+      if options[:limit] and !options[:limit].is_a?(Hash)
+        options[:limit] = {:string => options[:limit], :text => options[:limit], :decimal => options[:limit], :integer => options[:limit], :float => options[:limit]}
+      end
+      @validate_lengths_from_database_options = options
+
+      validate :validate_lengths_from_database
+
+      nil
+    end
+
+    def validate_lengths_from_database_options
+      if defined? @validate_lengths_from_database_options
+        @validate_lengths_from_database_options
+      else
+        # in case we inherited the validations, copy the options so that we can update it in child
+        # without affecting the parent
+        @validate_lengths_from_database_options = superclass.validate_lengths_from_database_options.inject({}) do |hash, (key, value)|
+          value = value.dup if value.respond_to?(:dup)
+          hash.update(key => value)
+        end
+      end
+    end
+  end
+
+  module InstanceMethods
+    def validate_lengths_from_database
+      options = self.class.validate_lengths_from_database_options
+
+      if options[:only]
+        columns_to_validate = options[:only].map(&:to_s)
+      else
+        columns_to_validate = self.class.column_names.map(&:to_s)
+        columns_to_validate -= options[:except].map(&:to_s) if options[:except]
+      end
+
+      columns_to_validate.each do |column|
+        column_schema = self.class.columns.find {|c| c.name == column }
+        next if column_schema.nil?
+        next if column_schema.respond_to?(:array) && column_schema.array
+        next unless [:string, :text, :decimal].include?(column_schema.type)
+        case column_schema.type
+        when :string, :text
+          column_limit = options[:limit][column_schema.type] || column_schema.limit
+          if column_limit
+            ActiveModel::Validations::LengthValidator.new(:maximum => column_limit, :allow_blank => true, :attributes => [column]).validate(self)
+          end
+        when :decimal
+          if column_schema.precision && column_schema.scale
+            max_val = (10 ** column_schema.precision)/(10 ** column_schema.scale)
+            ActiveModel::Validations::NumericalityValidator.new(:less_than => max_val, :allow_blank => true, :attributes => [column]).validate(self)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/validates_lengths_from_database/railtie.rb

@@ -1,7 +1,7 @@
 module ValidatesLengthsFromDatabase
   if defined?(Rails::Railtie)
     require "rails"
-    
+
     class Railtie < Rails::Railtie
       initializer "validates_lengths_from_database.extend_active_record" do
         ActiveSupport.on_load(:active_record) do
@@ -10,7 +10,7 @@ module ValidatesLengthsFromDatabase
       end
     end
   end
-  
+
   class Railtie
     def self.insert
       ActiveRecord::Base.send(:include, ValidatesLengthsFromDatabase)

data/lib/validates_lengths_from_database/version.rb

@@ -1,3 +1,3 @@
 module ValidatesLengthsFromDatabase
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validates_lengths_from_database
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ben Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -166,6 +166,7 @@ files:
 - Rakefile
 - init.rb
 - lib/validates_lengths_from_database.rb
+- lib/validates_lengths_from_database/core.rb
 - lib/validates_lengths_from_database/railtie.rb
 - lib/validates_lengths_from_database/version.rb
 - rails/init.rb