activerecord_enum 0.0.2 → 0.0.3

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (C) 2011 by Ian Young
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.markdown

@@ -1,18 +1,29 @@
-# ActiveRecord Enum
+# ActiveRecord Enum #
 
 Provides ActiveRecord support for the nonstandard `ENUM` and `SET` data types.
 
 [![Build Status](http://travis-ci.org/iangreenleaf/activerecord_enum.png)](http://travis-ci.org/iangreenleaf/activerecord_enum)
 
-## Hypothetically asked questions
+## Hypothetically asked questions ##
 
-### Y U NO WORK?!
-Sorry, it currently only works with Rails 3.0.x and the mysql2 adapter. I plan to support 3.1.x and other adapters at some point.
+### Y U NO WORK?! ###
 
-### Why doesn't it validate anything?
-Right now it really only supports schema operations - attribute access is left untouched. I'll be working on that too at some point.
+Sorry, it currently only works with Rails 3.0.x and the mysql2 and sqlite adapters. I plan to support 3.1.x and other standard adapters at some point.
+
+### Why doesn't it validate anything? ###
+
+Following ActiveRecord's lead, this plugin doesn't do any validation work itself.
+
+For ENUM columns, you may be satisfied with something simple:
+
+    validates_inclusion_of :attr, :in => [ :possible, :values ]
+
+Or if you prefer more bells and whistles, try [nofxx/symbolize](https://github.com/nofxx/symbolize).
+
+For SET columns, you may be interested in [iangreenleaf/active_set](https://github.com/iangreenleaf/active_set).
+
+### Nonstandard SQL?! What's your problem, jerkweed? ###
 
-### Nonstandard SQL?! What's your problem, jerkweed?
 This isn't a plugin everyone should use. There are a number of plugins to simulate enum behavior backed by standard data types. Personally, I like [nofxx/symbolize](https://github.com/nofxx/symbolize).
 
 However, sometimes we can't or won't avoid working with these data types. When that happens, I got you covered.

data/Rakefile

@@ -27,6 +27,7 @@ namespace :spec do
     db_config = YAML::load(IO.read(DB_CONFIG))
     db_config.each do |db,config|
       ENV["DB"] = db
+      Rake::Task["spec"].reenable
       Rake::Task["spec"].invoke
     end
   end

data/activerecord_enum.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "bundler"
   s.add_development_dependency "mysql2", "~> 0.2.0"
+  s.add_development_dependency "sqlite3", "~>1.3.4"
   s.add_development_dependency "rspec", "~> 2.6.0"
 
   s.files         = `git ls-files`.split("\n")

data/lib/activerecord_enum.rb

@@ -1,23 +1,8 @@
 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'
-require 'active_record/attribute_methods/write'
-
-module ActiveRecord
-  module AttributeMethods
-    module Write
-      def write_attribute_with_enum(attr_name, value)
-        if (column = column_for_attribute(attr_name)) && column.set? && value.respond_to?(:join)
-          value = value.join ","
-        end
-        write_attribute_without_enum attr_name, value
-      end
-      alias_method :write_attribute_without_enum, :write_attribute
-      alias_method :write_attribute, :write_attribute_with_enum
-    end
-  end
-end
 
 module ActiveRecord
   module ConnectionAdapters
@@ -46,6 +31,21 @@ module ActiveRecord
   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
+
 module ActiveRecord
   module ConnectionAdapters
     class Column

data/lib/activerecord_enum/version.rb

@@ -1,3 +1,3 @@
 module ActiverecordEnum
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/.travis.database.yml

@@ -2,3 +2,8 @@ mysql:
   adapter: mysql2
   database: activerecord_enum_test
   username:
+  supports_enums: true
+sqlite:
+  adapter: sqlite3
+  database: ":memory:"
+  supports_enums: false

data/spec/database.yml.tmpl

@@ -4,3 +4,8 @@ mysql:
   database: enum_test
   username: enum_test
   password: enum_test
+  supports_enums: true
+sqlite:
+  adapter: sqlite3
+  database: ":memory:"
+  supports_enums: false

data/spec/enum_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "ENUM datatype" do
 
-  describe "schema dump" do
+  describe "schema dump", :db_support => true do
     before { load_schema "enum_old" }
     subject { dumped_schema }
 
@@ -21,23 +21,27 @@ describe "ENUM datatype" do
 
   describe "schema loading" do
     before { load_schema "enum_new" }
-    subject { ActiveRecord::Base.connection.select_one "SHOW FIELDS FROM balloons WHERE Field='color'" }
+    subject { column_props :balloons, :color }
 
-    it "loads native format" do
-      subject[ "Type" ].should == "enum('red','gold')"
+    it "loads native format", :db_support => true do
+      subject[ :type ].should == "enum('red','gold')"
+    end
+
+    it "falls back to text when missing db support", :db_support => false do
+      subject[ :type ].should =~ /varchar/
     end
 
     it "loads default option" do
-      subject[ "Default" ].should == "gold"
+      subject[ :default ].should == "gold"
     end
 
     it "loads null option" do
-      subject[ "Null" ].should == "NO"
+      subject[ :null ].should be_false
     end
 
-    it "loads native column format" do
-      subject = ActiveRecord::Base.connection.select_one "SHOW FIELDS FROM balloons WHERE Field='size'"
-      subject[ "Type" ].should == "enum('small','medium','large')"
+    it "loads native column format", :db_support => true do
+      subject = column_props :balloons, :size
+      subject[ :type ].should == "enum('small','medium','large')"
     end
   end
 end

data/spec/schema/set_new.rb

@@ -1,7 +1,7 @@
 ActiveRecord::Schema.define do
   create_table :balloons, :force => true do |t|
     t.integer "id"
-    t.set "ribbons", :limit => ['red', 'green', 'gold'], :default => ['gold', 'green'], :null => false
+    t.set "ribbons", :limit => ['red', 'green', 'gold'], :default => ['green','gold'], :null => false
     t.column "gasses", :set, :limit => ['helium', 'hydrogen']
   end
 end

data/spec/set_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "SET datatype" do
 
-  describe "schema dump" do
+  describe "schema dump", :db_support => true do
     before { load_schema "set_old" }
     subject { dumped_schema }
 
@@ -21,60 +21,28 @@ describe "SET datatype" do
 
   describe "schema loading" do
     before { load_schema "set_new" }
-    subject { ActiveRecord::Base.connection.select_one "SHOW FIELDS FROM balloons WHERE Field='ribbons'" }
+    subject { column_props :balloons, :ribbons }
 
-    it "loads native format" do
-      subject[ "Type" ].should == "set('red','green','gold')"
+    it "loads native format", :db_support => true do
+      subject[ :type ].should == "set('red','green','gold')"
     end
 
-    it "loads default option" do
-      subject[ "Default" ].should == "green,gold"
-    end
-
-    it "loads null option" do
-      subject[ "Null" ].should == "NO"
+    it "falls back to text when missing db support", :db_support => false do
+      subject[ :type ].should =~ /varchar/
     end
 
-    it "loads native column format" do
-      subject = ActiveRecord::Base.connection.select_one "SHOW FIELDS FROM balloons WHERE Field='gasses'"
-      subject[ "Type" ].should == "set('helium','hydrogen')"
+    it "loads default option" do
+      subject[ :default ].should == "green,gold"
     end
-  end
 
-  describe "assignment" do
-    before { load_schema "set_new" }
-    it "accepts single value" do
-      b = Balloon.create :gasses => "helium"
-      b.should be_valid
-      b.reload.gasses.should == "helium"
-    end
-    it "accepts array of values" do
-      b = Balloon.create :gasses => [ "helium", "hydrogen" ]
-      b.should be_valid
-      b.reload.gasses.should == "helium,hydrogen"
-    end
-    it "accepts comma-separated values" do
-      b = Balloon.create :gasses => "helium,hydrogen"
-      b.should be_valid
-      b.reload.gasses.should == "helium,hydrogen"
-    end
-    it "accepts empty list" do
-      b = Balloon.create :gasses => [ ]
-      b.should be_valid
-      b.reload.gasses.should == ""
+    it "loads null option" do
+      subject[ :null ].should be_false
     end
-  end
 
-  describe "getter" do
-    before do
-      load_schema "set_new"
-      ActiveRecord::Base.connection.execute "INSERT INTO balloons (gasses) VALUES ('helium,hydrogen')"
-      @b = Balloon.first
-    end
-    it "returns comma-separated values by default" do
-      @b.gasses.should == "helium,hydrogen"
+    it "loads native column format", :db_support => true do
+      subject = column_props :balloons, :gasses
+      subject[ :type ].should == "set('helium','hydrogen')"
     end
-    it "returns array of values when config option is set"
   end
 end
 

data/spec/spec_helper.rb

@@ -20,6 +20,22 @@ def dumped_schema
   stream.string.lines.select {|l| /^\s*#/.match(l).nil? }.join
 end
 
-ActiveRecord::Base.configurations = YAML::load(IO.read("spec/database.yml"))
+def column_props table, column
+  case ENV["DB"]
+  when "mysql"
+    result = ActiveRecord::Base.connection.select_one "SHOW FIELDS FROM #{table} WHERE Field='#{column}'"
+    { :type => result["Type"], :default => result["Default"], :null => ( result["Null"] == "YES" ) }
+  when "sqlite"
+    result = ActiveRecord::Base.connection.select_value "SELECT sql FROM sqlite_master WHERE type='table' AND name='#{table}'"
+    matches = /"#{column}" ([^[:space:]]+) (?:DEFAULT '([^[:space:]]+)')?( NOT NULL)?,/.match result
+    { :type => matches[1], :default => matches[2], :null => matches[3].nil? }
+  end
+end
+
+db_config = YAML::load(IO.read("spec/database.yml"))
+ActiveRecord::Base.configurations = db_config
 db = ENV["DB"] || "mysql"
 ActiveRecord::Base.establish_connection db
+RSpec.configure do |c|
+  c.filter_run_excluding :db_support => ! db_config[db]["supports_enums"]
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord_enum
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ian Young
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-02 00:00:00 -07:00
-default_executable: 
+date: 2011-11-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -79,9 +78,25 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: sqlite3
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 3
+        - 4
+        version: 1.3.4
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,7 +108,7 @@ dependencies:
         - 0
         version: 2.6.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: Adds the ENUM data type natively to ActiveRecord.
 email: 
 - ian.greenleaf+github@gmail.com
@@ -107,6 +122,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- LICENSE
 - README.markdown
 - Rakefile
 - activerecord_enum.gemspec
@@ -121,7 +137,6 @@ files:
 - spec/schema/set_old.rb
 - spec/set_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -151,16 +166,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: activerecord_enum
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Enum data types for ActiveRecord
-test_files: 
-- spec/database.yml.tmpl
-- spec/enum_spec.rb
-- spec/schema/enum_new.rb
-- spec/schema/enum_old.rb
-- spec/schema/set_new.rb
-- spec/schema/set_old.rb
-- spec/set_spec.rb
-- spec/spec_helper.rb
+test_files: []
+