enum_column3 0.1.3 → 0.1.4

data/lib/enum/active_record_helper.rb

@@ -25,16 +25,16 @@ if defined?(ActionView::Base)
 			end
 
 			class InstanceTag
-				def to_enum_select_tag(options, html_options={})					
+				def to_enum_select_tag(options, html_options={})
 					if self.object.respond_to?(method_name.to_sym)
-						choices = self.object.send("column_for_attribute", method_name).limit
+            column = self.object.column_for_attribute(method_name)
 						if (value = self.object.__send__(method_name.to_sym))
 							options[:selected] ||= value.to_s
 						else
-              options[:include_blank] = enums.allows_nil? if options[:include_blank].nil?
+              options[:include_blank] = column.null if options[:include_blank].nil?
 						end
 					end
-					to_select_tag(choices, options, html_options)
+					to_select_tag(column.limit, options, html_options)
 				end
 
 				#initialize record_name, method, self

data/lib/enum/enum_adapter.rb

@@ -1,11 +1,18 @@
-
 # This module provides all the column helper methods to deal with the
 # values and adds the common type management code for the adapters.
 
+
+# try rails 3.1, then rails 3.2+, mysql column adapters
 column_class = if defined? ActiveRecord::ConnectionAdapters::Mysql2Column
   ActiveRecord::ConnectionAdapters::Mysql2Column
-else
+elsif defined? ActiveRecord::ConnectionAdapters::MysqlColumn
   ActiveRecord::ConnectionAdapters::MysqlColumn
+elsif defined? ActiveRecord::ConnectionAdapters::Mysql2Adapter::Column
+  ActiveRecord::ConnectionAdapters::Mysql2Adapter::Column
+elsif defined? ActiveRecord::ConnectionAdapters::MysqlAdapter::Column
+  ActiveRecord::ConnectionAdapters::MysqlAdapter::Column
+else
+  ObviousHint::NoMysqlAdapterFound
 end
 
 column_class.module_eval do
@@ -68,7 +75,7 @@ private
   alias __extract_limit_enum extract_limit
   def extract_limit(sql_type)
     if sql_type =~ /^enum/i
-      sql_type.sub(/^enum\('([^)]+)'\)/i, '\1').split("','").map { |v| v.intern }
+      sql_type.sub(/^enum\('(.+)'\)/i, '\1').split("','").map { |v| v.intern }
     else
       __extract_limit_enum(sql_type)
     end

metadata

@@ -1,32 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: enum_column3
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.1.4
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Nick Pohodnya
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-16 00:00:00 Z
+date: 2012-03-15 00:00:00.000000000Z
 dependencies: []
-
 description: 
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.txt
 - LICENSE
 - init.rb
@@ -47,38 +37,29 @@ files:
 - test/enum_mysql_test.rb
 homepage: http://github.com/electronick/enum_column
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Enable enum type for MySQL db.
-test_files: 
+test_files:
 - test/test_helper.rb
 - test/db/schema.rb
 - test/fixtures/enumeration.rb