enum_type 2.1.0 → 2.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 982eabb96a13860dce505242f21e0857b9463a73
+  data.tar.gz: 9f1b2ed6ad052f6a2bf2a2ec73f7908f778ab35c
+SHA512:
+  metadata.gz: b6cb18a79aba92cf79bf765e189fb665e9b274e430b07ed4bebc914339358f346ea23684b867cd41427b6cf67bc3cdb1591d745b1dab917b0468bbc06ce2bb8d
+  data.tar.gz: 1d89ae1323994051f42d43b758602cb0d37f89533e7a478469f2764399b26a4579a3ded7e115f96848eebbed5577a5553a9c7d2ab44c6b5012b6339d5d764acc

data/.ruby-gemset

@@ -0,0 +1 @@
+enum_type

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p0

data/Gemfile

@@ -1,8 +1,8 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # DEPENDENCIES
-gem 'activerecord', '>= 3.0', require: 'active_record'
-gem 'activesupport', '>= 3.0', require: 'active_support/core_ext/object/try'
+gem 'activerecord', '>= 4.0', require: 'active_record'
+gem 'activesupport', '>= 4.0', require: 'active_support/core_ext/object/try'
 
 group :development do
   # DEVELOPMENT

data/Gemfile.lock

@@ -1,53 +1,95 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
     RedCloth (4.2.9-java)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
-      builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activerecord-jdbc-adapter (1.2.2)
-    activerecord-jdbcpostgresql-adapter (1.2.2)
-      activerecord-jdbc-adapter (~> 1.2.2)
-      jdbc-postgres (>= 9.0, < 9.2)
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    factory_girl (3.3.0)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activerecord-jdbc-adapter (1.2.9.1)
+    activerecord-jdbcpostgresql-adapter (1.2.9)
+      activerecord-jdbc-adapter (~> 1.2.9)
+      jdbc-postgres (>= 9.1, < 9.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    addressable (2.3.5)
+    arel (4.0.0)
+    atomic (1.1.12)
+    atomic (1.1.12-java)
+    builder (3.1.4)
+    diff-lcs (1.2.4)
+    factory_girl (4.2.0)
       activesupport (>= 3.0.0)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
     git (1.2.5)
-    i18n (0.6.0)
-    jdbc-postgres (9.1.901)
-    jeweler (1.8.3)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.19)
+    httpauth (0.2.0)
+    i18n (0.6.4)
+    jdbc-postgres (9.2.1002.1)
+    jeweler (1.8.6)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.7.3)
-    json (1.7.3-java)
-    multi_json (1.3.5)
-    pg (0.13.2)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    json (1.8.0)
+    json (1.8.0-java)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    minitest (4.7.5)
+    multi_json (1.7.8)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    nokogiri (1.5.10-java)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    pg (0.16.0)
+    rack (1.5.2)
+    rake (10.1.0)
+    rdoc (4.0.1)
       json (~> 1.4)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.0)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    tzinfo (0.3.33)
-    yard (0.8.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.2)
+    thread_safe (0.1.2)
+      atomic
+    thread_safe (0.1.2-java)
+      atomic
+    tzinfo (0.3.37)
+    yard (0.8.7)
 
 PLATFORMS
   java
@@ -55,9 +97,9 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
-  activerecord (>= 3.0)
+  activerecord (>= 4.0)
   activerecord-jdbcpostgresql-adapter
-  activesupport (>= 3.0)
+  activesupport (>= 4.0)
   factory_girl
   jeweler
   pg

data/Rakefile

@@ -1,13 +1,15 @@
-require 'rake'
+require 'rubygems'
+require 'bundler'
 begin
-  require 'bundler'
-rescue LoadError
-  puts "Bundler is not installed; install with `gem install bundler`."
-  exit 1
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
 end
+require 'rake'
 
-Bundler.require :default, :development
-
+require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name = "enum_type"
   gem.summary = %Q{PostgreSQL enumerated types in ActiveRecord}
@@ -18,11 +20,12 @@ Jeweler::Tasks.new do |gem|
   gem.required_ruby_version = '>= 1.9'
   gem.add_dependency "activerecord", ">= 0"
 end
-Jeweler::GemcutterTasks.new
+Jeweler::RubygemsDotOrgTasks.new
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
 
+require 'yard'
 YARD::Rake::YardocTask.new('doc') do |doc|
   doc.options << "-m" << "textile"
   doc.options << "--protected"

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/enum_type.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "enum_type"
-  s.version = "2.1.0"
+  s.version = "2.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Morgan"]
-  s.date = "2012-05-14"
+  s.date = "2013-08-06"
   s.description = "Allows ActiveRecord to better use PostgreSQL's ENUM types."
   s.email = "git@timothymorgan.info"
   s.extra_rdoc_files = [
@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".ruby-gemset",
+    ".ruby-version",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
@@ -35,15 +37,15 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/riscfuture/enum_type"
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.0.6"
   s.summary = "PostgreSQL enumerated types in ActiveRecord"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     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_runtime_dependency(%q<activerecord>, [">= 4.0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 4.0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<RedCloth>, [">= 0"])
@@ -53,8 +55,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<activerecord-jdbcpostgresql-adapter>, [">= 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<activerecord>, [">= 4.0"])
+      s.add_dependency(%q<activesupport>, [">= 4.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<RedCloth>, [">= 0"])
@@ -65,8 +67,8 @@ Gem::Specification.new do |s|
       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<activerecord>, [">= 4.0"])
+    s.add_dependency(%q<activesupport>, [">= 4.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<RedCloth>, [">= 0"])

data/lib/enum_type/extensions.rb

@@ -4,11 +4,19 @@ 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)
+  def initialize(name, default, oid_type, sql_type = nil, null = true)
+    @oid_type = oid_type
+    if sql_type =~ /\[\]$/
+      @array = true
+      super(name, self.class.extract_value_from_default(default, sql_type), sql_type[0..sql_type.length - 3], null)
+    else
+      @array = false
+      super(name, self.class.extract_value_from_default(default, sql_type), sql_type, null)
+    end
   end
 
-  def self.extract_value_from_default_with_enum(default, type)
+  def self.extract_value_from_default_with_enum(default, type=nil)
+    return extract_value_from_default_without_enum(default) unless type
     case default
       when /\A'(.*)'::(?:#{Regexp.escape type})\z/
         $1

data/spec/enum_type_spec.rb

@@ -67,7 +67,7 @@ describe EnumType do
 
     context "[validations]" do
       before :each do
-        @field = Factory.next(:enum_field)
+        @field = FactoryGirl.generate(:enum_field)
         SpecSupport::EnumTypeTester.set_field(@field)
         @model = SpecSupport::EnumTypeTester.new
       end

data/spec/factories.rb

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

data/spec/spec_helper.rb

@@ -9,7 +9,8 @@ require 'enum_type'
 ActiveRecord::Base.establish_connection(
   adapter: (defined?(JRuby) ? 'jdbcpostgresql' : 'postgresql'),
   database: 'enum_type_test',
-  username: 'enum_type_tester'
+  username: 'enum_type_tester',
+  host: 'localhost'
 )
 
 class Model < ActiveRecord::Base

metadata

@@ -1,174 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: enum_type
 version: !ruby/object:Gem::Version
-  version: 2.1.0
-  prerelease: 
+  version: 2.1.1
 platform: ruby
 authors:
 - Tim Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2013-08-06 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'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   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: yard
   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: RedCloth
   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: rspec
   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: factory_girl
   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: pg
   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: activerecord-jdbcpostgresql-adapter
   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: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Allows ActiveRecord to better use PostgreSQL's ENUM types.
@@ -181,6 +160,8 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -195,26 +176,25 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/riscfuture/enum_type
 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: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: PostgreSQL enumerated types in ActiveRecord
 test_files: []