haz_enum 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/haz_enum.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{haz_enum}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["thyphoon"]
-  s.date = %q{2010-06-28}
+  s.date = %q{2010-06-29}
   s.description = %q{use has_set and has_enum in your ActiveRecord models if you want to have one (has_enum) value from a defined enumeration or more (has_set))}
   s.email = %q{andi@galaxycats.com}
   s.extra_rdoc_files = [

data/lib/haz_enum/set.rb

@@ -5,16 +5,22 @@ module HazEnum
       field_type = options.has_key?(:field_type) ? options[:field_type].to_s : "bitfield"
       set_column = options.has_key?(:column_name) ? options[:column_name].to_s : "#{set_name}_#{field_type}"
       enum_class = options.has_key?(:class_name) ? options[:class_name].to_s.camelize.constantize : set_name.to_s.camelize.constantize
+      separator = options.has_key?(:separator) ? options[:separator].to_s : ", "
       
       after_find "initialize_#{set_name}_from_#{field_type}"
       before_save "convert_#{set_name}_to_#{field_type}"
       
       define_method("#{set_name}") do
-        instance_variable_get("@#{set_name}")
+        instance_variable_get("@#{set_name}") || "initialize_#{set_name}_from_#{field_type}"
       end
       
       define_method("#{set_name}=") do |value|
+        value.collect! { |val| val.is_a?(String) ? val.constantize : val }.compact! if value.is_a?(Array)
+        value.instance_variable_set("@separator", separator)
         class <<value
+          define_method :to_s do
+            self.join(@separator)
+          end
           yield if block_given?
         end
         instance_variable_set("@#{set_name}", value)
@@ -39,7 +45,7 @@ module HazEnum
         
         define_method("convert_#{set_name}_to_bitfield") do
           self[set_column] = 0
-          if send(set_name)
+          unless send(set_name).blank?
             send(set_name).each do |element|
               2**element.bitfield_index & self[set_column] == 2**element.bitfield_index ? next : self[set_column] += 2**element.bitfield_index
             end
@@ -54,6 +60,7 @@ module HazEnum
             send("#{set_name}=", set_elements)
           else
             self[set_column] = 0
+            send("#{set_name}=", [])
           end
         end
 
@@ -64,11 +71,7 @@ module HazEnum
         end
 
         define_method("initialize_#{set_name}_from_yml") do
-          deserialized_value =  unless self[set_column].is_a?(String) && self[set_column] =~ /^---/
-            self[set_column]
-          else
-            (YAML::load(self[set_column]) || []) rescue self[set_column]
-          end
+          deserialized_value = (YAML::load(self[set_column]) || [])
           send("#{set_name}=", deserialized_value)
         end
         

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - thyphoon
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 +02:00
+date: 2010-06-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency