activerecord_enum 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f6e9e6b41679748cd07a916dfa48727efbeed9fc
+  data.tar.gz: cdfeea56ecd2d3a377e744296d5d6e630709b43c
+SHA512:
+  metadata.gz: 25bfcf50c45bc6a199b002667920c64e74dd6075b58ec01010d27c09276b3812cf805c574d931f552e5208e0b78ca88df4768afc07bf561e489960663bdbc90e
+  data.tar.gz: b91575ff89b2d1ada7a72548d72f06608d6182a66458b9a85ece4733fd19e3b254e89e23379c7764b3ad011e7b6b26db1585208d165007983bec1b7705c4b378

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile*.lock
 pkg/*
 spec/database.yml
+spec/vendor

data/.ruby-version

@@ -0,0 +1 @@
+2.1.2

data/.travis.yml

@@ -1,8 +1,11 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
+  - "2.0"
+  - "2.1"
+  - "2.2"
 before_script:
   - "mysql -e 'create database activerecord_enum_test;' >/dev/null"
   - "cp spec/{.travis.,}database.yml"
-script: ./spec/all_rails
+script: bundle exec rake spec:rails_all
+sudo: false

data/README.markdown

@@ -1,22 +1,32 @@
 # ActiveRecord Enum #
 
-Provides ActiveRecord support for the nonstandard `ENUM` and `SET` data types.
+Provides ActiveRecord (and thus Rails) support for the nonstandard `ENUM` and `SET` data types.
 
 [![Build Status](https://travis-ci.org/iangreenleaf/activerecord_enum.png?branch=master)](http://travis-ci.org/iangreenleaf/activerecord_enum)
 
-## Running the tests ##
+## How now? ##
 
-To run the tests for all supported database adapters:
+It sucks to have ActiveRecord not understand your `ENUM` columns and constantly write the wrong thing to your `schema.rb`.
+It also sucks to work with a database that uses `ENUM` in production when you'd prefer sqlite in development.
+Wait no longer...
 
-    rake spec:all
+```ruby
+create_table :balloons, :force => true do |t|
+  t.enum "color", :limit => ['red', 'gold'], :default => 'gold', :null => false
+  # or...
+  t.column "size", :enum, :limit => ['small', 'medium', 'large']
+end
+```
 
-To run the tests for all adapters and all versions of ActiveRecord:
+Your schema<->db coupling will work again, and it will fall back to a `VARCHAR` column on any adapters that don't support `ENUM`.
 
-    ./spec/all_rails
+## Installation ##
 
-To run the tests for just one adapter:
+```
+gem 'activerecord_enum'
+```
 
-    DB=mysql rake spec
+Boy, that was easy.
 
 ## Hypothetically asked questions ##
 
@@ -24,9 +34,9 @@ To run the tests for just one adapter:
 
 It currently works with:
 
- * Rails 3.0, 3.1, 3.2, 4.0.
+ * ActiveRecord 3.x and 4.0, 4.1, and 4.2.
  * The `mysql2` and `sqlite` adapters.
- * Ruby 1.9.3, 2.0.0. It probably also works with Ruby 1.8, but that is unsupported.
+ * Ruby 1.9.3, 2.0.x, 2.1.x, and 2.2.x.
 
 If you'd like to support other adapters, pull requests are welcome!
 
@@ -48,4 +58,22 @@ This isn't a plugin everyone should use. There are a number of plugins to simula
 
 However, sometimes we can't or won't avoid working with these data types. When that happens, I got you covered.
 
-## [Contributors](https://github.com/iangreenleaf/activerecord_enum/graphs/contributors) ##
+## Contributing ##
+
+Pull requests welcome! Join
+[this lovely bunch of people](https://github.com/iangreenleaf/activerecord_enum/graphs/contributors).
+
+
+### Running the tests ###
+
+To run the tests for all supported database adapters:
+
+    rake spec:all
+
+To run the tests for all adapters and all versions of ActiveRecord:
+
+    rake spec:rails_all
+
+To run the tests for just one adapter:
+
+    DB=mysql rake spec

data/Rakefile

@@ -3,6 +3,7 @@ require 'yaml'
 Bundler::GemHelper.install_tasks
 
 DB_CONFIG = "spec/database.yml"
+GEMFILES = "spec/Gemfile.rails_[0-9]_[0-9]"
 
 require 'rake'
 desc 'Default: run all unit tests.'
@@ -20,7 +21,10 @@ end
 
 require "rspec/core/rake_task"
 desc 'Run the test suite.'
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/*_spec.rb'
+  t.exclude_pattern = 'spec/**/vendor/*'
+end
 
 desc 'Run the test suite for all DBs.'
 namespace :spec do
@@ -32,4 +36,17 @@ namespace :spec do
       Rake::Task["spec"].invoke
     end
   end
+
+  desc 'Run the test suite for all supported versions of rails and all DBs'
+  task :rails_all do
+    STDOUT.sync = true
+    versions = Dir.glob(GEMFILES)
+    versions.each do |gemfile|
+      puts "Running specs for Gemfile: #{gemfile}"
+      Bundler.with_clean_env do
+        sh "bundle install --gemfile '#{gemfile}' --path 'vendor/#{File.extname(gemfile).slice(1..-1)}'"
+        sh "BUNDLE_GEMFILE='#{gemfile}' bundle exec rake spec:all"
+      end
+    end
+  end
 end

data/activerecord_enum.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler"
   s.add_development_dependency "mysql2", "~> 0.3.11"
   s.add_development_dependency "sqlite3", "~>1.3.4"
-  s.add_development_dependency "rspec", "~> 2.9.0"
+  s.add_development_dependency "rspec", "~> 3.1.0"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/activerecord_enum/activerecord_enum_post42.rb

@@ -0,0 +1,63 @@
+module ActiveRecord
+  module ConnectionAdapters
+    if defined?(AbstractMysqlAdapter)
+      class AbstractMysqlAdapter
+        protected
+        def initialize_type_map_with_enum(m)
+          initialize_without_enum(m)
+          register_enum_type(m, %r(^enum)i)
+          register_set_type(m, %r(^set)i)
+        end
+
+        alias_method :initialize_without_enum, :initialize_type_map
+        alias_method :initialize_type_map, :initialize_type_map_with_enum
+
+        def register_enum_type(mapping, key)
+          mapping.register_type(key) do |sql_type|
+            if sql_type =~ /(?:enum)\(([^)]+)\)/i
+              limit = $1.scan( /'([^']*)'/ ).flatten
+              Type::Enum.new(limit: limit)
+            end
+          end
+        end
+
+        def register_set_type(mapping, key)
+          mapping.register_type(key) do |sql_type|
+            if sql_type =~ /(?:set)\(([^)]+)\)/i
+              limit = $1.scan( /'([^']*)'/ ).flatten
+              Type::Set.new(limit: limit)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  module Type
+    class Enum < Type::Value
+      def type
+        :enum
+      end
+
+      def initialize(options = {})
+        options.assert_valid_keys(:limit)
+        @limit = options[:limit]
+      end
+    end
+
+    class Set < Type::Value
+      def type
+        :set
+      end
+
+      def initialize(options = {})
+        options.assert_valid_keys(:limit)
+        @limit = options[:limit]
+      end
+
+      def type_cast_from_database(value)
+        value.split(",")
+      end
+    end
+  end
+end

data/lib/activerecord_enum/activerecord_enum_pre42.rb

@@ -0,0 +1,46 @@
+module ActiveRecord
+  module ConnectionAdapters
+    class Column
+      def initialize_with_enum name, default, sql_type=nil, *args
+        initialize_without_enum name, default, sql_type, *args
+        @type = simplified_type_with_enum sql_type
+        @limit = extract_limit_with_enum sql_type
+        @default = extract_default_with_enum default
+      end
+      alias_method :initialize_without_enum, :initialize
+      alias_method :initialize, :initialize_with_enum
+
+      def simplified_type_with_enum field_type
+        if field_type =~ /enum|set/i
+          $&.to_sym
+        else
+          simplified_type field_type
+        end
+      end
+
+      def extract_limit_with_enum field_type
+        if field_type =~ /(?:enum|set)\(([^)]+)\)/i
+          $1.scan( /'([^']*)'/ ).flatten
+        else
+          extract_limit field_type
+        end
+      end
+
+      def extract_default_with_enum default
+        if type == :set
+          default.split "," if default.present?
+        else
+          extract_default default
+        end
+      end
+
+      def set?
+        type == :set
+      end
+
+      def enum?
+        type == :enum
+      end
+    end
+  end
+end

data/lib/activerecord_enum/version.rb

@@ -1,3 +1,3 @@
 module ActiverecordEnum
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/activerecord_enum.rb

@@ -5,52 +5,12 @@ require 'active_record/connection_adapters/abstract/schema_definitions.rb'
 require 'connection_adapters/sqlite3' if defined?( SQLite3 )
 require 'connection_adapters/mysql2' if defined?( Mysql2 )
 
-module ActiveRecord
-  module ConnectionAdapters
-    class Column
-      def initialize_with_enum name, default, sql_type=nil, *args
-        initialize_without_enum name, default, sql_type, *args
-        @type = simplified_type_with_enum sql_type
-        @limit = extract_limit_with_enum sql_type
-        @default = extract_default_with_enum default
-      end
-      alias_method :initialize_without_enum, :initialize
-      alias_method :initialize, :initialize_with_enum
-
-      def simplified_type_with_enum field_type
-        if field_type =~ /enum|set/i
-          $&.to_sym
-        else
-          simplified_type field_type
-        end
-      end
-
-      def extract_limit_with_enum field_type
-        if field_type =~ /(?:enum|set)\(([^)]+)\)/i
-          $1.scan( /'([^']*)'/ ).flatten
-        else
-          extract_limit field_type
-        end
-      end
-
-      def extract_default_with_enum default
-        if type == :set
-          default.split "," if default.present?
-        else
-          extract_default default
-        end
-      end
-
-      def set?
-        type == :set
-      end
-
-      def enum?
-        type == :enum
-      end
-    end
-  end
+if ActiveRecord::VERSION::MAJOR < 4 || (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR <= 1)
+  require 'activerecord_enum/activerecord_enum_pre42.rb'
+else
+  require 'activerecord_enum/activerecord_enum_post42.rb'
 end
+
 module ActiveRecord
   module ConnectionAdapters
     class TableDefinition

data/spec/Gemfile.rails_4_0

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 gemspec :path => ".."
 gem "mysql2", "~> 0.3.11"
-gem "activerecord", "~> 4.0.0"
+gem "activerecord", "~> 4.0.0",  "< 4.1.0"

data/spec/Gemfile.rails_4_1

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+gemspec :path => ".."
+gem "mysql2", "~> 0.3.11"
+gem "activerecord", "~> 4.1.0"

data/spec/Gemfile.rails_4_2

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+gemspec :path => ".."
+gem "mysql2", "~> 0.3.11"
+gem "activerecord", "~> 4.2.0"

data/spec/enum_spec.rb

@@ -7,15 +7,15 @@ describe "ENUM datatype" do
     subject { dumped_schema }
 
     it "dumps native format" do
-      subject.should match %r{t\.enum\s+"color",\s+(:limit =>|limit:) \["blue", "red", "yellow"\]}
+      expect(subject).to match %r{t\.enum\s+"color",\s+(:limit =>|limit:) \["blue", "red", "yellow"\]}
     end
 
     it "dumps default option" do
-      subject.should match %r{t\.enum\s+"color",.+(:default =>|default:) "red"}
+      expect(subject).to match %r{t\.enum\s+"color",.+(:default =>|default:) "red"}
     end
 
     it "dumps null option" do
-      subject.should match %r{t\.enum\s+"color",.+(:null =>|null:) false$}
+      expect(subject).to match %r{t\.enum\s+"color",.+(:null =>|null:) false$}
     end
   end
 
@@ -24,24 +24,24 @@ describe "ENUM datatype" do
     subject { column_props :balloons, :color }
 
     it "loads native format", :db_support => true do
-      subject[ :type ].should == "enum('red','gold')"
+      expect(subject[:type]).to eq("enum('red','gold')")
     end
 
     it "falls back to text when missing db support", :db_support => false do
-      subject[ :type ].should =~ /varchar/
+      expect(subject[:type]).to match(/varchar/)
     end
 
     it "loads default option" do
-      subject[ :default ].should == "gold"
+      expect(subject[:default]).to eq("gold")
     end
 
     it "loads null option" do
-      subject[ :null ].should be_false
+      expect(subject[:null]).to eq(false)
     end
 
     it "loads native column format", :db_support => true do
       subject = column_props :balloons, :size
-      subject[ :type ].should == "enum('small','medium','large')"
+      expect(subject[:type]).to eq("enum('small','medium','large')")
     end
   end
 end

data/spec/set_spec.rb

@@ -7,15 +7,15 @@ describe "SET datatype" do
     subject { dumped_schema }
 
     it "dumps native format" do
-      subject.should match %r{t\.set\s+"gadgets",\s+(:limit =>|limit:) \["propeller", "tail gun", "gps"\]}
+      expect(subject).to match %r{t\.set\s+"gadgets",\s+(:limit =>|limit:) \["propeller", "tail gun", "gps"\]}
     end
 
     it "dumps default option" do
-      subject.should match %r{t\.set\s+"gadgets",.+(:default =>|default:) \["propeller", "gps"\]}
+      expect(subject).to match %r{t\.set\s+"gadgets",.+(:default =>|default:) \["propeller", "gps"\]}
     end
 
     it "dumps null option" do
-      subject.should match %r{t\.set\s+"gadgets",.+(:null =>|null:) false$}
+      expect(subject).to match %r{t\.set\s+"gadgets",.+(:null =>|null:) false$}
     end
   end
 
@@ -24,24 +24,24 @@ describe "SET datatype" do
     subject { column_props :balloons, :ribbons }
 
     it "loads native format", :db_support => true do
-      subject[ :type ].should == "set('red','green','gold')"
+      expect(subject[:type]).to eq("set('red','green','gold')")
     end
 
     it "falls back to text when missing db support", :db_support => false do
-      subject[ :type ].should =~ /varchar/
+      expect(subject[:type]).to match(/varchar/)
     end
 
     it "loads default option" do
-      subject[ :default ].should == "green,gold"
+      expect(subject[:default]).to eq("green,gold")
     end
 
     it "loads null option" do
-      subject[ :null ].should be_false
+      expect(subject[:null]).to eq(false)
     end
 
     it "loads native column format", :db_support => true do
       subject = column_props :balloons, :gasses
-      subject[ :type ].should == "set('helium','hydrogen')"
+      expect(subject[:type]).to eq("set('helium','hydrogen')")
     end
   end
 end

data/spec/spec_helper.rb

@@ -42,7 +42,7 @@ require db_config[db]["adapter"]
 require 'activerecord_enum'
 
 ActiveRecord::Base.configurations = db_config
-ActiveRecord::Base.establish_connection db
+ActiveRecord::Base.establish_connection db.to_sym
 RSpec.configure do |c|
   c.filter_run_excluding :db_support => ! db_config[db]["supports_enums"]
 end

metadata

@@ -1,112 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_enum
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Ian Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.11
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 3.1.0
 description: Adds the ENUM data type natively to ActiveRecord.
 email:
 - ian.greenleaf+github@gmail.com
@@ -114,14 +101,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
 - activerecord_enum.gemspec
 - lib/activerecord_enum.rb
+- lib/activerecord_enum/activerecord_enum_post42.rb
+- lib/activerecord_enum/activerecord_enum_pre42.rb
 - lib/activerecord_enum/version.rb
 - lib/connection_adapters/mysql2.rb
 - lib/connection_adapters/sqlite3.rb
@@ -130,7 +120,8 @@ files:
 - spec/Gemfile.rails_3_1
 - spec/Gemfile.rails_3_2
 - spec/Gemfile.rails_4_0
-- spec/all_rails
+- spec/Gemfile.rails_4_1
+- spec/Gemfile.rails_4_2
 - spec/database.yml.tmpl
 - spec/enum_spec.rb
 - spec/schema/enum_new.rb
@@ -141,34 +132,34 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: activerecord_enum
-rubygems_version: 1.8.23
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Enum data types for ActiveRecord
 test_files:
 - spec/Gemfile.rails_3_0
 - spec/Gemfile.rails_3_1
 - spec/Gemfile.rails_3_2
 - spec/Gemfile.rails_4_0
-- spec/all_rails
+- spec/Gemfile.rails_4_1
+- spec/Gemfile.rails_4_2
 - spec/database.yml.tmpl
 - spec/enum_spec.rb
 - spec/schema/enum_new.rb
@@ -177,3 +168,4 @@ test_files:
 - spec/schema/set_old.rb
 - spec/set_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/spec/all_rails

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-#TODO: turn this into a rake task
-for f in spec/Gemfile.rails_[0-9]_[0-9]; do
-  bundle install --gemfile "$f" &&
-  bundle exec rake spec:all || exit $?
-done