haz_enum 0.3.0 → 0.4.0

data/CHANGESET

@@ -0,0 +1,2 @@
+- 0.4.0 [2001-06-28]
+  * you can now use :yml instead of :bitfield as field_type

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/haz_enum.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{haz_enum}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["thyphoon"]
-  s.date = %q{2010-06-15}
+  s.date = %q{2010-06-28}
   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 = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "CHANGESET",
      "LICENSE",
      "README.rdoc",
      "Rakefile",

data/lib/haz_enum/set.rb

@@ -4,16 +4,10 @@ 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) ? Object.const_get(options[:class_name].to_s.camelize) : Object.const_get(set_name.to_s.camelize)
+      enum_class = options.has_key?(:class_name) ? options[:class_name].to_s.camelize.constantize : set_name.to_s.camelize.constantize
       
-      after_find "initialize_#{set_name}_from_bitfield"
-      before_save "convert_#{set_name}_to_bitfield"
-      
-      enum_class.class_eval do
-        def bitfield_index
-          index + 1
-        end
-      end unless enum_class.method_defined?(:bitfield_index)
+      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}")
@@ -31,28 +25,53 @@ module HazEnum
       end
       
       define_method("#{set_name}_changed?") do
-        send("convert_#{set_name}_to_bitfield")
+        send("convert_#{set_name}_to_#{field_type}")
         send("#{set_column}_changed?")
       end
       
-      define_method("convert_#{set_name}_to_bitfield") do
-        self[set_column] = 0
-        if send(set_name)
-          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
+      if field_type == "bitfield"
+        
+        enum_class.class_eval do
+          def bitfield_index
+            index + 1
+          end
+        end unless enum_class.method_defined?(:bitfield_index)
+        
+        define_method("convert_#{set_name}_to_bitfield") do
+          self[set_column] = 0
+          if send(set_name)
+            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
           end
         end
-      end
 
-      define_method("initialize_#{set_name}_from_bitfield") do
-        if self[set_column]
-          set_elements = enum_class.values.collect do |enum_element|
-            enum_element if ((2**enum_element.bitfield_index & self[set_column]) == 2**enum_element.bitfield_index)
-          end.compact
-          send("#{set_name}=", set_elements)
-        else
-          self[set_column] = 0
+        define_method("initialize_#{set_name}_from_bitfield") do
+          if self[set_column]
+            set_elements = enum_class.values.collect do |enum_element|
+              enum_element if ((2**enum_element.bitfield_index & self[set_column]) == 2**enum_element.bitfield_index)
+            end.compact
+            send("#{set_name}=", set_elements)
+          else
+            self[set_column] = 0
+          end
+        end
+
+      elsif field_type == "yml"
+        
+        define_method("convert_#{set_name}_to_yml") do
+          self[set_column] = YAML::dump(send(set_name))
+        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
+          send("#{set_name}=", deserialized_value)
         end
+        
       end
     end
   end

data/spec/set_spec.rb

@@ -17,6 +17,13 @@ describe "HazEnum" do
       ClassWithSet.new(:roles => [Roles::User, Roles::Admin]).roles[1].should be(Roles::Admin)
     end
     
+    it "should be able to save values as yml" do
+      YmlSet.new(:roles => [Roles::User, Roles::Admin]).roles[1].should be(Roles::Admin)
+      yml_set = YmlSet.create(:roles => [Roles::User, Roles::Admin])
+      yml_set.reload
+      yml_set.roles[1].should be(Roles::Admin)
+    end
+    
     it "should not be able to set set-values by colum-name via hash in initializer" do
       lambda { ClassWithEnum.new(:roles_bitfield => 3) }.should raise_error
     end

data/spec/spec_helper.rb

@@ -30,6 +30,7 @@ def setup_db
       create_table :class_with_sets do |t|
         t.column :title, :string
         t.column :roles_bitfield, :integer
+        t.column :roles_yml, :text
         t.column :created_at, :datetime
         t.column :updated_at, :datetime
       end
@@ -75,6 +76,11 @@ class ClassWithSet < ActiveRecord::Base
   end
 end
 
+class YmlSet < ActiveRecord::Base
+  set_table_name "class_with_sets"
+  has_set :roles, :field_type => :yml
+end
+
 class ClassWithCustomNameSet < ActiveRecord::Base
   has_set :roles, :column_name => :custom_name
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - thyphoon
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 +02:00
+date: 2010-06-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,6 +58,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- CHANGESET
 - LICENSE
 - README.rdoc
 - Rakefile