has_enum 0.3.3 → 0.3.4

data/Gemfile

@@ -1,7 +1,6 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 3.0.0"
-gem "sqlite3-ruby", "~> 1.3.2"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -10,5 +9,6 @@ group :development do
   gem "rails",   "~> 3.0.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.1"
+  gem "sqlite3-ruby", "~> 1.3.2"
   gem "rcov", ">= 0"
 end

data/Rakefile

@@ -18,10 +18,6 @@ Jeweler::Tasks.new do |gem|
   gem.summary = %Q{Gem for Rails to easily handle enumeration attributes in models}
   gem.email = "kes.eclipse@gmail.com"
   gem.authors = ["Andreas Korth", "Konstantin Shabanov"]
-  gem.add_runtime_dependency     'rails',        '> 3.0.0'
-  gem.add_development_dependency 'rspec',        '> 2.2.0'
-  gem.add_development_dependency 'rails',        '> 3.0.0'
-  gem.add_development_dependency 'sqlite3-ruby', '> 1.3.2'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/has_enum.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_enum}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andreas Korth", "Konstantin Shabanov"]
-  s.date = %q{2010-12-09}
+  s.date = %q{2010-12-10}
   s.email = %q{kes.eclipse@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -51,41 +51,29 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
       s.add_development_dependency(%q<rspec>, ["~> 2.2.0"])
       s.add_development_dependency(%q<rails>, ["~> 3.0.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_development_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_runtime_dependency(%q<rails>, ["> 3.0.0"])
-      s.add_development_dependency(%q<rspec>, ["> 2.2.0"])
-      s.add_development_dependency(%q<rails>, ["> 3.0.0"])
-      s.add_development_dependency(%q<sqlite3-ruby>, ["> 1.3.2"])
     else
       s.add_dependency(%q<rails>, ["~> 3.0.0"])
-      s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
       s.add_dependency(%q<rspec>, ["~> 2.2.0"])
       s.add_dependency(%q<rails>, ["~> 3.0.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rails>, ["> 3.0.0"])
-      s.add_dependency(%q<rspec>, ["> 2.2.0"])
-      s.add_dependency(%q<rails>, ["> 3.0.0"])
-      s.add_dependency(%q<sqlite3-ruby>, ["> 1.3.2"])
     end
   else
     s.add_dependency(%q<rails>, ["~> 3.0.0"])
-    s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
     s.add_dependency(%q<rspec>, ["~> 2.2.0"])
     s.add_dependency(%q<rails>, ["~> 3.0.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+    s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rails>, ["> 3.0.0"])
-    s.add_dependency(%q<rspec>, ["> 2.2.0"])
-    s.add_dependency(%q<rails>, ["> 3.0.0"])
-    s.add_dependency(%q<sqlite3-ruby>, ["> 1.3.2"])
   end
 end
 

data/lib/has_enum/active_record.rb

@@ -11,57 +11,38 @@ module HasEnum
         attribute ? @enum[attribute.to_sym] : @enum
       end
 
-      
-      def has_enum(attributes, values, options = {})
-        [*attributes].each do |attribute|
-          attribute = attribute.to_sym
-          if values[0].is_a?(Symbol)
-            symbols = true
+      def has_enum(attribute, values, options = {})
+        enum[attribute] = values.freeze
+
+        if options[:query_methods] != false
+          values.each do |val|
+            define_method(:"#{val}?") { self.send(attribute) == val }
           end
-          if symbols
-            values = values.map{|value| value.to_s.insert(0, ':')}
+        end
+
+        define_method(:"#{attribute}=") do |value|
+          if value.nil? or values.find{ |val| val == value }
+            set_value  = lambda { |value| value.is_a?(Symbol) ? Marshal.dump(value) : value }
+            self[:"#{attribute}"] = value.nil? ? nil : set_value.call(value)
           else
-            values = values.map(&:to_s)
-          end
-          enum[attribute] = values.freeze
-          
-          if options[:query_methods] != false
-            enum[attribute].each do |val|
-              val = val[1..-1] if symbols
-              define_method(:"#{val}?") do
-                self.send(attribute).to_s == val
-              end
-            end
-          end
-          
-          define_method(:"#{attribute}=") do |value|
-            value = value.to_s.insert(0, ':') if symbols and value
-            
-            if value.nil? or values.find{ |val| val == value }
-              write_attribute(attribute, value.blank? ? nil : value.to_s)
-            else
-              errors.add(:"#{attribute}", "#{value} is not in enum")
-            end
-          end
-          
-          define_method(:"#{attribute}") do
-            if symbols and read_attribute(attribute.to_sym)
-              read_attribute(attribute.to_sym).tap{|str| str.slice!(0)}.to_sym
-            else
-              read_attribute(attribute.to_sym)
-            end
-          end
-          
-          define_method "human_#{attribute}" do
-            begin
-              return nil unless self.send(attribute)
-              key = "activerecord.attributes.#{self.class.name.underscore}.#{attribute}_enum.#{self.send(attribute)}"
-              translation = I18n.translate(key, :raise => true)
-            rescue I18n::MissingTranslationData
-              self.send(attribute).humanize
-            end
+            errors.add(:"#{attribute}", "#{value} is not in enum")
           end
+        end
 
+        define_method(:"#{attribute}") do
+          load_value = lambda { |value| value[0].getbyte(0) == 4 ? Marshal.load(value) : value }
+          value = self[:"#{attribute}"]
+          value ? load_value.call(value) : nil
+        end
+
+        define_method "human_#{attribute}" do
+          begin
+            return nil unless self.send(attribute)
+            key = "activerecord.attributes.#{self.class.name.underscore}.#{attribute}_enum.#{self.send(attribute)}"
+            translation = I18n.translate(key, :raise => true)
+          rescue I18n::MissingTranslationData
+            self.send(attribute).humanize
+          end
         end
       end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Andreas Korth
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 +06:00
+date: 2010-12-10 00:00:00 +06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,24 +33,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 2
-        version: 1.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,10 +47,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,10 +62,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -107,80 +92,35 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id007
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rails
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: sqlite3-ruby
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 3
-        - 0
-        - 0
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        segments: 
         - 2
-        - 2
-        - 0
-        version: 2.2.0
+        version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rails
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  name: rcov
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 3
-        - 0
         - 0
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 2
-        version: 1.3.2
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id007
 description: 
 email: kes.eclipse@gmail.com
 executables: []
@@ -221,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4222407025214625140
+      hash: -4461255227335299909
       segments: 
       - 0
       version: "0"