soulless 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 615a453828093d6ce2cbcab5b32fc65440e0a42a
-  data.tar.gz: f1c6bf566a4ddb0e76a10eb37ff494970feba49c
+  metadata.gz: b5f1fdf92746ec9e608ea04972dc9bccca8e7dbb
+  data.tar.gz: 4f85870777d309a49b95e1183537cfde8fb5abca
 SHA512:
-  metadata.gz: c7e467d9ad1ab576025944da5cefc86ef864b42e12801bb492429026a957907d41af6239cdf461d17c22dc816e2a2df736efba6da568bff2d87a66e07aebaff7
-  data.tar.gz: 4533c9bea37d3786bf700922315d749e12228de08bd3ad4ffbd9c8ab91a93616aee63d72bec4c1068418ea2ca25af48faeff110d5dc4655584cedf4e2c7d6cec
+  metadata.gz: 76939041a34437f9cda7a52bde28c203f11964f29404ae1c6e5714e340594331f31449eadba64fc17320fe0bfd10258496d96f8277c02f8412045145e9279d6a
+  data.tar.gz: 3c03f011a6027fd83c33a26044f62fde6dbb81401cb2f0dbb9ce5b11edfaf93aa06d02b8ca1b2a2abd3d60fc34ecf3bfe6b90d6d1f3db599b56ee22836896f92

data/lib/soulless/inheritance.rb

@@ -4,7 +4,7 @@ module Soulless
      base.instance_eval do
        def inherit_from(klass, options = {})
          attributes = get_attributes(klass, options)
-         
+
          attributes.each do |attribute|
            self.attribute(attribute[:name], attribute[:primitive], attribute[:options])
            if Object.const_defined?('ActiveModel'.to_sym) && klass.ancestors.include?(ActiveModel::Validations)
@@ -12,7 +12,7 @@ module Soulless
            end
          end
        end
-       
+
        private
        def get_attributes(klass, options)
          if klass.ancestors.include?(Virtus::Model::Core)
@@ -21,7 +21,7 @@ module Soulless
            get_active_record_attributes(klass, options)
          end
        end
-       
+
        def get_virtus_attributes(klass, options)
          attributes = []
          attribute_set = klass.attribute_set
@@ -40,7 +40,7 @@ module Soulless
          end
          attributes
        end
-       
+
        def get_active_record_attributes(klass, options)
          attributes = []
          attribute_names = get_attribute_names(klass.attribute_names.dup, options)
@@ -53,7 +53,7 @@ module Soulless
                options: {}
              }
              attribute[:primitive] = translate_primitive(column.type) if column
-             attribute[:options] = { default: column.default } if column && 
+             attribute[:options] = { default: column.default } if column &&
                                                                   (options[:use_database_default] == true ||
                                                                     options[:use_database_default] == attribute_name ||
                                                                     (options[:use_database_default].kind_of?(Array) &&
@@ -63,7 +63,7 @@ module Soulless
          end
          attributes
        end
-       
+
        def setup_validators(attribute_name, klass, options)
          return if skip_validators?(attribute_name, options) || !include_attribute?(attribute_name, options)
          klass.validators.each do |validator|
@@ -82,13 +82,15 @@ module Soulless
                # environment without a database. It's
                # necessary to convert to an ActiveModel
                # validation.
-               validator_class = "ActiveModel::Validations::#{validator_class.name.split('::').last}".constantize
+               if validator_class.name =~ /\AActiveRecord/
+                 validator_class = "ActiveModel::Validations::#{validator_class.name.split('::').last}".constantize
+               end
              end
              validates_with(validator_class, { attributes: attribute_name }.merge(validator_options))
            end
          end
        end
-       
+
        def get_attribute_names(attributes, options)
          attribute_names = attributes
          attribute_names << options[:additional_attributes] if options[:additional_attributes]
@@ -96,7 +98,7 @@ module Soulless
          attribute_names.map!{ |a| a.to_s }
          attribute_names
        end
-       
+
        def translate_primitive(primitive)
          return nil unless primitive
          translated_primitive = primitive.to_s.capitalize
@@ -105,7 +107,7 @@ module Soulless
          translated_primitive = String if translated_primitive == 'Uuid'
          translated_primitive
        end
-       
+
        def include_attribute?(attribute_name, options)
          # Attributes we don't want to inherit
          exclude_attributes = ['id']
@@ -118,10 +120,10 @@ module Soulless
          only_attributes << options[:only] if options[:only]
          only_attributes.flatten!
          only_attributes.collect!{ |v| v.to_s }
-         
+
          !exclude_attributes.include?(attribute_name) && (only_attributes.empty? || only_attributes.include?(attribute_name))
        end
-       
+
        def skip_validators?(attribute_name, options)
          return true if options[:skip_validators] == true
          skip_validators = []
@@ -133,4 +135,4 @@ module Soulless
      end
     end
   end
-end
+end

data/lib/soulless/version.rb

@@ -1,3 +1,3 @@
 module Soulless
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soulless
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Anthony Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport