worsemodel 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d074330251305ee69cd05e357c209ebb80dcec8a
-  data.tar.gz: 4832c830ee8e8c0ad0ee0c763f57564aa0b12bc5
+  metadata.gz: 1ce7f3751966028db5b242d65a3c15f81fc3e21d
+  data.tar.gz: 747684787f00a309f9ffbd7de06afc2ff038c147
 SHA512:
-  metadata.gz: 00b3db91c19d3a154b032fd9199bee29608a7a5eafd28ba994c6e75d3c28703d8c965338d83d8886c2c221958632894e0067de583428404f540837a440014b5c
-  data.tar.gz: b11eee3986ed87268bb286d56b212d0e7b6117a9e885f042a3f127cf0dccde0252850fa543f35eecabb3b8350e5282eb01fb4614dbdb8c08f526880fcf3f81c4
+  metadata.gz: 5fb68b5801d1a246f064deb4f4dc3c522fb9b2890c41637de62b394c3a5e5d1e40870b3a849e71620279314bd4e396c752c1a59e2f48f71758d9766616a85796
+  data.tar.gz: 630967abac0d6b6a5d6a890e2693e2c43f28a89ce4614bf3a525b522d5aa94a0f1018ccebd509a0cc04f69962f5977c1e83e5afd2346dee7547a64d498ad855d

data/lib/supermodel/random_id.rb

@@ -1,8 +1,10 @@
+require 'securerandom'
+
 module SuperModel
   module RandomID
     protected
       def generate_id
-        ActiveSupport::SecureRandom.hex(13)
+        SecureRandom.hex(13)
       end
   end
-end
+end

data/lib/supermodel/validations/uniqueness.rb

@@ -1,16 +1,11 @@
 module SuperModel
   module Validations
     class UniquenessValidator < ActiveModel::EachValidator
-      attr_reader :klass
-      
+
       def validate_each(record, attribute, value)
-        alternate = klass.find_by_attribute(attribute, value)
+        alternate = record.class.find_by_attribute(attribute, value)
         return unless alternate
-        record.errors.add(attribute, "must be unique", :default => options[:message])
-      end
-      
-      def setup(klass)
-        @klass = klass
+        record.errors.add(attribute, 'must be unique', default: options[:message])
       end
     end
 
@@ -37,4 +32,4 @@ module SuperModel
       end
     end
   end
-end
+end

data/lib/supermodel/validations.rb

@@ -1,3 +1,5 @@
+require 'supermodel/validations/uniqueness'
+
 module SuperModel
   module Validations
     extend  ActiveSupport::Concern
@@ -6,7 +8,7 @@ module SuperModel
     included do
       alias_method_chain :save, :validation
     end
-  
+
     def save_with_validation(options = nil)
       perform_validation = case options
       when Hash
@@ -16,7 +18,7 @@ module SuperModel
       else
         options
       end
-    
+
       if perform_validation && valid? || !perform_validation
         save_without_validation
         true
@@ -28,5 +30,3 @@ module SuperModel
     end
   end
 end
-
-require "supermodel/validations/uniqueness"

data/supermodel.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'worsemodel'
-  s.version = "0.1.8"
+  s.version = '0.1.9'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worsemodel
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Alex MacCaw