enum_type 1.0.0 → 2.0.0

data/Gemfile

@@ -1,16 +1,17 @@
 source 'http://rubygems.org'
 
 # DEPENDENCIES
-gem 'activerecord', require: 'active_record'
-gem 'activesupport', require: 'active_support/core_ext/object/try'
+gem 'activerecord', '>= 3.0', require: 'active_record'
+gem 'activesupport', '>= 3.0', require: 'active_support/core_ext/object/try'
 
-# DEVELOPMENT
-gem 'jeweler'
-gem 'yard'
-gem 'RedCloth', require: 'redcloth'
+group :development do
+  # DEVELOPMENT
+  gem 'jeweler'
+  gem 'yard'
+  gem 'RedCloth', require: 'redcloth'
 
-# TEST
-gem 'rspec'
-group :test do
+  # TEST
+  gem 'rspec'
   gem 'factory_girl'
-end
+  gem 'pg'
+end

data/Gemfile.lock

@@ -1,53 +1,49 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    RedCloth (4.2.3)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    RedCloth (4.2.7)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
+      i18n (~> 0.5.0)
+    activerecord (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    activesupport (3.0.9)
+    arel (2.0.10)
     builder (2.1.2)
     diff-lcs (1.1.2)
-    factory_girl (1.3.2)
-    gemcutter (0.6.1)
+    factory_girl (1.3.3)
     git (1.2.5)
-    i18n (0.4.2)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
+    i18n (0.5.0)
+    jeweler (1.6.2)
+      bundler (~> 1.0)
       git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    tzinfo (0.3.23)
-    yard (0.6.1)
+      rake
+    pg (0.11.0)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    tzinfo (0.3.28)
+    yard (0.7.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   RedCloth
-  activerecord
-  activesupport
+  activerecord (>= 3.0)
+  activesupport (>= 3.0)
   factory_girl
   jeweler
+  pg
   rspec
   yard

data/README.textile

@@ -42,4 +42,4 @@ class MyModel < ActiveRecord::Base
 end
 </code></pre>
 
-See the @enum_type@ method documentation for more information.
+See the {EnumType#enum_type} method documentation for more information.

data/Rakefile

@@ -6,7 +6,7 @@ rescue LoadError
   exit 1
 end
 
-Bundler.require :default
+Bundler.require :default, :development
 
 Jeweler::Tasks.new do |gem|
   gem.name = "enum_type"
@@ -20,27 +20,17 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::GemcutterTasks.new
 
-desc "Build API documentation"
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
+
 YARD::Rake::YardocTask.new('doc') do |doc|
   doc.options << "-m" << "textile"
   doc.options << "--protected"
   doc.options << "-r" << "README.textile"
   doc.options << "-o" << "doc"
-  doc.options << "--title" << "enum_type Documentation".inspect
+  doc.options << "--title" << "enum_type Documentation"
   
   doc.files = [ 'lib/**/*', 'README.textile' ]
 end
 
-require 'rspec/core/rake_task'
-
-desc 'Run all RSpecs'
 task(default: :spec)
-
-desc 'Run all RSpecs'
-RSpec::Core::RakeTask.new
-
-desc "Generate code coverage"
-RSpec::Core::RakeTask.new(:coverage) do |t|
-  t.rcov = true
-  t.rcov_opts = %w( --exclude spec )
-end

data/VERSION

@@ -1 +1 @@
-1.0.0
+2.0.0

data/enum_type.gemspec

@@ -1,57 +1,76 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{enum_type}
-  s.version = "1.0.0"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tim Morgan"]
-  s.date = %q{2010-10-29}
+  s.authors = [%q{Tim Morgan}]
+  s.date = %q{2011-06-20}
   s.description = %q{Allows ActiveRecord to better use PostgreSQL's ENUM types.}
   s.email = %q{git@timothymorgan.info}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.textile"
+    "README.textile"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     ".rspec",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.textile",
-     "Rakefile",
-     "VERSION",
-     "enum_type.gemspec",
-     "lib/enum_type.rb",
-     "spec/enum_type_spec.rb",
-     "spec/factories.rb"
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.textile",
+    "Rakefile",
+    "VERSION",
+    "enum_type.gemspec",
+    "lib/enum_type.rb",
+    "lib/enum_type/extensions.rb",
+    "spec/enum_type_spec.rb",
+    "spec/factories.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/riscfuture/enum_type}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
+  s.require_paths = [%q{lib}]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{PostgreSQL enumerated types in ActiveRecord}
-  s.test_files = [
-    "spec/enum_type_spec.rb",
-     "spec/factories.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<RedCloth>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<factory_girl>, [">= 0"])
+      s.add_development_dependency(%q<pg>, [">= 0"])
       s.add_runtime_dependency(%q<activerecord>, [">= 0"])
     else
+      s.add_dependency(%q<activerecord>, [">= 3.0"])
+      s.add_dependency(%q<activesupport>, [">= 3.0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<RedCloth>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<factory_girl>, [">= 0"])
+      s.add_dependency(%q<pg>, [">= 0"])
       s.add_dependency(%q<activerecord>, [">= 0"])
     end
   else
+    s.add_dependency(%q<activerecord>, [">= 3.0"])
+    s.add_dependency(%q<activesupport>, [">= 3.0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<RedCloth>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<factory_girl>, [">= 0"])
+    s.add_dependency(%q<pg>, [">= 0"])
     s.add_dependency(%q<activerecord>, [">= 0"])
   end
 end

data/lib/enum_type/extensions.rb

@@ -0,0 +1,23 @@
+require 'active_support/core_ext/module/aliasing'
+require 'active_record/connection_adapters/postgresql_adapter'
+
+# Patch the PostgreSQL adapter to recognize defaults on ENUM columns.
+
+class ActiveRecord::ConnectionAdapters::PostgreSQLColumn
+  def initialize(name, default, sql_type = nil, null = true)
+    super(name, self.class.extract_value_from_default(default, sql_type), sql_type, null)
+  end
+  
+  def self.extract_value_from_default_with_enum(default, type)
+    case default
+      when /\A'(.*)'::(?:#{Regexp.escape type})\z/
+        $1
+      else
+        extract_value_from_default_without_enum default
+    end
+  end
+  
+  class << self
+    alias_method_chain :extract_value_from_default, :enum
+  end
+end

data/lib/enum_type.rb

@@ -1,9 +1,11 @@
+require 'enum_type/extensions'
+
 # Adds the @enum_type@ method to a model.
 #
 # @example Basic usage
 #   class MyModel < ActiveRecord::Base
 #     extend EnumType
-#     enum_type :status, %w( open closed flagged deleted )
+#     enum_type :status, values: %w( open closed flagged deleted )
 #   end
 
 module EnumType
@@ -36,7 +38,7 @@ module EnumType
       end
 
       validates_presence_of(field) unless options[:allow_nil]
-      validates_inclusion_of(field, in: options[:values]) if options[:values]
+      validates_inclusion_of(field, in: options[:values].map(&:to_sym), allow_nil: options[:allow_nil]) if options[:values]
     end
   end
 end

data/spec/enum_type_spec.rb

@@ -1,6 +1,4 @@
-Bundler.require :default, :test
-require "#{File.dirname __FILE__}/../lib/enum_type"
-require 'factories'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 module SpecSupport
   class EnumTypeTester
@@ -35,63 +33,76 @@ module SpecSupport
 end
 
 describe EnumType do
-  before :each do
-    @field = Factory.next(:enum_field)
-    SpecSupport::EnumTypeTester.set_field(@field)
-    @model = SpecSupport::EnumTypeTester.new
-  end
-
   describe "#enum_type" do
-    context "getter" do
+    context "[getter]" do
       it "should return a symbol" do
-        @model.set 'string'
-        @model.send(@field).should eql(:string)
+        Model.connection.execute "INSERT INTO models (state) VALUES ('completed')"
+        Model.last.state.should eql(:completed)
       end
-
+      
       it "should return nil if the value is nil" do
-        @model.set nil
-        @model.send(@field).should be_nil
+        Model.connection.execute "INSERT INTO models (state) VALUES (NULL)"
+        Model.last.state.should be_nil
       end
     end
 
-    context "setter" do
+    context "[setter]" do
       it "should typecast the value to a string" do
-        @model.send :"#{@field}=", :string
-        @model.get.should eql('string')
+        m = Model.new
+        m.state = :failed
+        m.state.should eql(:failed)
+        m.save!
+        m.reload.state.should eql(:failed)
+        m.state_before_type_cast.should eql('failed')
       end
-
+      
       it "should leave nil as nil" do
-        @model.send :"#{@field}=", nil
-        @model.get.should be_nil
+        m = Model.new
+        m.state = nil
+        m.state.should eql(nil)
+        m.save!
+        m.reload.state.should be_nil
       end
     end
 
-    it "should validate inclusion if :values option is given" do
-      SpecSupport::EnumTypeTester.enum_type @field, values: [ :a, :b ]
-      @model.send :"#{@field}=", :a
-      @model.get.should eql('a')
-      @model.should be_valid
-      @model.send :"#{@field}=", :c
-      @model.should_not be_valid
-    end
-
-    it "should not validate presence if :allow_nil is true" do
-      pending "Doesn't work"
-      SpecSupport::EnumTypeTester.enum_type @field, allow_nil: true
-      @model.send :"#{@field}=", nil
-      @model.should be_valid
-    end
+    context "[validations]" do
+      before :each do
+        @field = Factory.next(:enum_field)
+        SpecSupport::EnumTypeTester.set_field(@field)
+        @model = SpecSupport::EnumTypeTester.new
+      end
+      
+      it "should validate inclusion if :values option is given" do
+        SpecSupport::EnumTypeTester.enum_type @field, values: [ :a, :b ]
+        @model.send :"#{@field}=", :a
+        @model.get.should eql('a')
+        @model.should be_valid
+        @model.send :"#{@field}=", :c
+        @model.should_not be_valid
+      end
 
-    it "should validate presence if :allow_nil is not given" do
-      SpecSupport::EnumTypeTester.enum_type @field
-      @model.send :"#{@field}=", nil
-      @model.should_not be_valid
+      it "should not validate presence if :allow_nil is true" do
+        pending "Doesn't work"
+        SpecSupport::EnumTypeTester.enum_type @field, allow_nil: true
+        @model.send :"#{@field}=", nil
+        @model.should be_valid
+      end
+      
+      it "should validate presence if :allow_nil is not given" do
+        SpecSupport::EnumTypeTester.enum_type @field
+        @model.send :"#{@field}=", nil
+        @model.should_not be_valid
+      end
+      
+      it "should validate presence if :allow_nil is false" do
+        SpecSupport::EnumTypeTester.enum_type @field, allow_nil: false
+        @model.send :"#{@field}=", nil
+        @model.should_not be_valid
+      end
     end
-
-    it "should validate presence if :allow_nil is false" do
-      SpecSupport::EnumTypeTester.enum_type @field, allow_nil: false
-      @model.send :"#{@field}=", nil
-      @model.should_not be_valid
+    
+    it "should determine the correct column default" do
+      Model.columns.detect { |c| c.name == 'state' }.default.should eql('pending')
     end
   end
 end

data/spec/factories.rb

@@ -1 +1,2 @@
+require 'factory_girl'
 Factory.sequence(:enum_field) { |i| :"field#{i}" }

data/spec/spec_helper.rb

@@ -0,0 +1,27 @@
+Bundler.require :default, :test
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'factories'
+require 'enum_type'
+
+ActiveRecord::Base.establish_connection(
+  adapter: 'postgresql',
+  database: 'enum_type_test',
+  username: 'enum_type_tester'
+)
+
+class Model < ActiveRecord::Base
+  extend EnumType
+  enum_type :state, allow_nil: true, values: %w( pending processing completed failed )
+end
+
+RSpec.configure do |config|
+  config.before(:each) do
+    Model.connection.execute "DROP TABLE IF EXISTS models"
+    Model.connection.execute "DROP TYPE IF EXISTS state_type"
+    Model.connection.execute "CREATE TYPE state_type AS ENUM ('pending', 'processing', 'completed', 'failed')"
+    Model.connection.execute "CREATE TABLE models (id SERIAL PRIMARY KEY, state state_type DEFAULT 'pending')"
+  end
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: enum_type
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors: 
 - Tim Morgan
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 -07:00
-default_executable: 
+date: 2011-06-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -24,12 +19,98 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: "3.0"
   type: :runtime
   prerelease: false
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "3.0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yard
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: factory_girl
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: pg
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id009
 description: Allows ActiveRecord to better use PostgreSQL's ENUM types.
 email: git@timothymorgan.info
 executables: []
@@ -41,7 +122,6 @@ extra_rdoc_files:
 - README.textile
 files: 
 - .document
-- .gitignore
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -51,15 +131,16 @@ files:
 - VERSION
 - enum_type.gemspec
 - lib/enum_type.rb
+- lib/enum_type/extensions.rb
 - spec/enum_type_spec.rb
 - spec/factories.rb
-has_rdoc: true
+- spec/spec_helper.rb
 homepage: http://github.com/riscfuture/enum_type
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -67,25 +148,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
       version: "1.9"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: PostgreSQL enumerated types in ActiveRecord
-test_files: 
-- spec/enum_type_spec.rb
-- spec/factories.rb
+test_files: []
+

data/.gitignore

@@ -1,25 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-.rvmrc
-.bundle
-
-## PROJECT: DOCS
-.yardoc
-doc