activerecord_enum 0.1.1 → 0.2.0

data/lib/activerecord_enum/version.rb

@@ -1,3 +1,3 @@
 module ActiverecordEnum
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/activerecord_enum.rb

@@ -1,52 +1,9 @@
 require 'active_record'
 require 'active_record/base'
-require 'active_record/connection_adapters/mysql2_adapter'
-require 'active_record/connection_adapters/sqlite3_adapter'
 require 'active_record/connection_adapters/abstract/schema_definitions.rb'
 
-module ActiveRecord
-  module ConnectionAdapters
-    existing_class = defined?( Mysql2Adapter ) ? Mysql2Adapter : AbstractMysqlAdapter
-
-    existing_class.class_eval do
-      def native_database_types_with_enum
-        native_database_types_without_enum.merge( :enum => { :name => "enum" }, :set => { :name => "set" } )
-      end
-      alias_method :native_database_types_without_enum, :native_database_types
-      alias_method :native_database_types, :native_database_types_with_enum
-
-      def type_to_sql_with_enum type, limit=nil, *args
-        if type.to_s == "enum" || type.to_s == "set"
-          "#{type}(#{quoted_comma_list limit})"
-        else
-          type_to_sql_without_enum type, limit, *args
-        end
-      end
-      alias_method :type_to_sql_without_enum, :type_to_sql
-      alias_method :type_to_sql, :type_to_sql_with_enum
-
-      private
-      def quoted_comma_list list
-        list.to_a.map{|n| "'#{n}'"}.join(",")
-      end
-    end
-  end
-end
-
-module ActiveRecord
-  module ConnectionAdapters
-    class SQLite3Adapter < SQLiteAdapter
-      def type_to_sql_with_enum type, limit=nil, *args
-        if type.to_s == "enum" || type.to_s == "set"
-          type, limit = :string, nil
-        end
-        type_to_sql_without_enum type, limit, *args
-      end
-      alias_method :type_to_sql_without_enum, :type_to_sql
-      alias_method :type_to_sql, :type_to_sql_with_enum
-    end
-  end
-end
+require 'connection_adapters/sqlite3' if defined?( SQLite3 )
+require 'connection_adapters/mysql2' if defined?( Mysql2 )
 
 module ActiveRecord
   module ConnectionAdapters

data/lib/connection_adapters/mysql2.rb

@@ -0,0 +1,30 @@
+require 'active_record/connection_adapters/mysql2_adapter'
+
+module ActiveRecord
+  module ConnectionAdapters
+    existing_class = defined?( Mysql2Adapter ) ? Mysql2Adapter : AbstractMysqlAdapter
+
+    existing_class.class_eval do
+      def native_database_types_with_enum
+        native_database_types_without_enum.merge( :enum => { :name => "enum" }, :set => { :name => "set" } )
+      end
+      alias_method :native_database_types_without_enum, :native_database_types
+      alias_method :native_database_types, :native_database_types_with_enum
+
+      def type_to_sql_with_enum type, limit=nil, *args
+        if type.to_s == "enum" || type.to_s == "set"
+          "#{type}(#{quoted_comma_list limit})"
+        else
+          type_to_sql_without_enum type, limit, *args
+        end
+      end
+      alias_method :type_to_sql_without_enum, :type_to_sql
+      alias_method :type_to_sql, :type_to_sql_with_enum
+
+      private
+      def quoted_comma_list list
+        list.to_a.map{|n| "'#{n}'"}.join(",")
+      end
+    end
+  end
+end

data/lib/connection_adapters/sqlite3.rb

@@ -0,0 +1,16 @@
+require 'active_record/connection_adapters/sqlite3_adapter'
+
+module ActiveRecord
+  module ConnectionAdapters
+    class SQLite3Adapter < SQLiteAdapter
+      def type_to_sql_with_enum type, limit=nil, *args
+        if type.to_s == "enum" || type.to_s == "set"
+          type, limit = :string, nil
+        end
+        type_to_sql_without_enum type, limit, *args
+      end
+      alias_method :type_to_sql_without_enum, :type_to_sql
+      alias_method :type_to_sql, :type_to_sql_with_enum
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'rspec'
-require 'activerecord_enum'
 
 def db
   ENV["DB"] || "mysql"
@@ -37,6 +36,10 @@ def column_props table, column
 end
 
 db_config = YAML::load(IO.read("spec/database.yml"))
+
+require db_config[db]["adapter"]
+require 'activerecord_enum'
+
 ActiveRecord::Base.configurations = db_config
 ActiveRecord::Base.establish_connection db
 RSpec.configure do |c|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord_enum
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ian Young
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-06 00:00:00 Z
+date: 2012-04-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -127,6 +127,8 @@ files:
 - activerecord_enum.gemspec
 - lib/activerecord_enum.rb
 - lib/activerecord_enum/version.rb
+- lib/connection_adapters/mysql2.rb
+- lib/connection_adapters/sqlite3.rb
 - spec/.travis.database.yml
 - spec/Gemfile.rails_3_0
 - spec/Gemfile.rails_3_1