soulless 0.5.0.rc2 → 0.5.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58bfab446a9def4e9ef52b7069a1aa20ab1622e4
-  data.tar.gz: 73318d9ab3aa9c504167f6183ce4d6c0dbe6f17f
+  metadata.gz: b0e8f6cd5c894c89bc43c1a35a95ecbcaeb746dd
+  data.tar.gz: 8bb85811fcf937a02c13c202df424e9851daa8e2
 SHA512:
-  metadata.gz: 2e82e40de780dac51b0e50874a9c3ff26056a8218e0b7d8f6044b62170e05e587f030f88849a1c040db7a3a8bd1ed61e6d76d50b566e52c82d2ea80159c4b3f6
-  data.tar.gz: 9ce48b1235bdaae25647dc345713b0e3e1d8440bdceef9daf51f9259669175577cd6432ba80277caf808e65e621b140153ec185f7a6efe434c47bb0d04659ab8
+  metadata.gz: 6f99bb3322957ba131391e8f94e7b1a25a94eddf2f4ccec9cd2270b80c9dd21d46ddd7dba532215863e8efae9f5233027692e49e0bb51df363e13952d6c1d0b5
+  data.tar.gz: 4c766068bb9e1f78fc9560d6fb30fba5ac77685c5b6e214df43c4aba5de494bf3cc853b11205e8c70baa1ba2eb65ca70790b0205f34a4ff41c26b630a27a770b

data/README.md

@@ -329,6 +329,8 @@ form.errors.messages # => { name: ["can't be blank"] }
 
 ```use_database_default``` - Use the value of the ```default``` migration option as the default value for an attribute. Accepts either a boolean (for all attributes), a string or symbol for a single attribute or an array of strings and symbols for multiple attributes.
 
+```additional_attributes``` - Used to specify attributes that cannot automatically be added to the form model. These are generally attributes that have been specified using ```attr_accessor```. Accepts a string, symbolr or an array of strings and symbols for multiple attributes.
+
 ### I18n
 
 Define locales similar to how you would define them in Rails.

data/lib/soulless/inheritance.rb

@@ -25,8 +25,9 @@ module Soulless
        def get_virtus_attributes(klass, options)
          attributes = []
          attribute_set = klass.attribute_set
-         attribute_set.each do |attribute|
-           attribute_name = attribute.options[:name].to_s
+         attribute_names = get_attribute_names(attribute_set.map{ |a| a.options[:name] }, options)
+         attribute_names.each do |attribute_name|
+           attribute = attribute_set[attribute_name]
            if include_attribute?(attribute_name, options)
              attributes << {
                name: attribute_name,
@@ -42,18 +43,21 @@ module Soulless
        
        def get_active_record_attributes(klass, options)
          attributes = []
-         columns = klass.columns
-         columns.each do |column|
-           if include_attribute?(column.name, options)
+         attribute_names = get_attribute_names(klass.attribute_names.dup, options)
+         attribute_names.each do |attribute_name|
+           if include_attribute?(attribute_name, options)
+             column = klass.columns_hash[attribute_name.to_s]
              attribute = {
-               name: column.name,
-               primitive: translate_primitive(column.type),
+               name: attribute_name,
+               primitive: String,
                options: {}
              }
-             attribute[:options] = { default: column.default } if options[:use_database_default] == true ||
-                                                                  options[:use_database_default] == column.name ||
-                                                                  (options[:use_database_default].kind_of?(Array) &&
-                                                                   options[:use_database_default].collect { |v| v.to_s }.include?(column.name))
+             attribute[:primitive] = translate_primitive(column.type) 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) &&
+                                                                      options[:use_database_default].collect { |v| v.to_s }.include?(attribute_name)))
              attributes << attribute
            end
          end
@@ -84,10 +88,12 @@ module Soulless
        end
        
        def translate_primitive(primitive)
+         return nil unless primitive
          translated_primitive = primitive.to_s.capitalize
-         translated_primitive = Virtus::Attribute::Boolean.name if translated_primitive == 'Boolean'
-         translated_primitive = DateTime.name if translated_primitive == 'Datetime'
-         translated_primitive.constantize
+         translated_primitive = Virtus::Attribute::Boolean if translated_primitive == 'Boolean'
+         translated_primitive = DateTime if translated_primitive == 'Datetime'
+         translated_primitive = String if translated_primitive == 'Uuid'
+         translated_primitive
        end
        
        def include_attribute?(attribute_name, options)
@@ -105,6 +111,14 @@ module Soulless
          
          !exclude_attributes.include?(attribute_name) && (only_attributes.empty? || only_attributes.include?(attribute_name))
        end
+       
+       def get_attribute_names(attributes, options)
+         attribute_names = attributes
+         attribute_names << options[:additional_attributes] if options[:additional_attributes]
+         attribute_names.flatten!
+         attribute_names.map!{ |a| a.to_s }
+         attribute_names
+       end
      end
     end
   end

data/lib/soulless/version.rb

@@ -1,3 +1,3 @@
 module Soulless
-  VERSION = "0.5.0.rc2"
+  VERSION = "0.5.0.rc3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soulless
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc2
+  version: 0.5.0.rc3
 platform: ruby
 authors:
 - Anthony Smith