enumlogic 1.0.1 → 1.0.2

data/Rakefile

@@ -13,6 +13,7 @@ begin
     gem.rubyforge_project = "enumlogic"
     gem.add_development_dependency "rspec"
   end
+  Jeweler::GemcutterTasks.new
   Jeweler::RubyforgeTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:patch: 1
-:major: 1
 :minor: 0
+:patch: 2
+:major: 1
+:build: 

data/enumlogic.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{enumlogic}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["binarylogic"]
-  s.date = %q{2009-09-01}
+  s.date = %q{2009-11-18}
   s.description = %q{Adds enumerations to your models}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION.yml",
      "enumlogic.gemspec",
+     "init.rb",
      "lib/enumlogic.rb",
      "spec/enumlogic_spec.rb",
      "spec/spec_helper.rb"
@@ -53,3 +54,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
+

data/init.rb

@@ -0,0 +1,3 @@
+require 'enumlogic'
+
+ActiveRecord::Base.extend(Enumlogic)

data/lib/enumlogic.rb

@@ -11,14 +11,15 @@ module Enumlogic
   #
   # You can now do the following:
   #
-  #   Computer::KINDS # passes back exactly what you specified, Array or Hash
+  #   Computer::KINDS # passes back the defined enum keys as array
   #   Computer.kind_options # gives you a friendly hash that you can easily pass into the select helper for forms
   #   Computer.new(:kind => "unknown").valid? # false, automatically validates inclusion of the enum field
   #   
   #   c = Computer.new(:kind => "apple")
   #   c.apple? # true
-  #   c.apple_key # :apple
-  #   c.apple_text # "apple" or "Apple" if you gave a hash with a user friendly text value
+  #   c.kind_key # :apple
+  #   c.kind_text # "apple" or "Apple" if you gave a hash with a user friendly text value
+  #   c.enum?(:kind) # true
   def enum(field, values, options = {})
     values_hash = if values.is_a?(Array)
       hash = {}
@@ -30,7 +31,6 @@ module Enumlogic
     
     values_array = values.is_a?(Hash) ? values.keys : values
     
-    message = options[:message] || "#{field} is not included in the list"
     constant_name = options[:constant] || field.to_s.pluralize.upcase
     const_set constant_name, values_array unless const_defined?(constant_name)
     
@@ -47,7 +47,7 @@ module Enumlogic
     define_method("#{field}_text") do
       value = send(field)
       return nil if value.nil?
-      values_hash.find { |key, text| key == value }.last
+      values_hash[value]
     end
     
     values_array.each do |value|
@@ -58,8 +58,10 @@ module Enumlogic
       end
     end
 
-    validates_inclusion_of field, :in => values_array, :message => message, :allow_nil => options[:allow_nil]
+    validates_inclusion_of field, :in => values_array, :message => options[:message], :allow_nil => options[:allow_nil], :if => options[:if]
   end
-end
 
-ActiveRecord::Base.extend Enumlogic
+  def enum?(name)
+    method_defined?("#{name}_key")
+  end
+end

data/spec/enumlogic_spec.rb

@@ -49,6 +49,12 @@ describe "Enumlogic" do
     c = Computer.new(:kind => "hp")
     c.kind_text.should == "HP"
   end
+
+  it "should create text method which results nil for wrong key" do
+    Computer.enum :kind, {"apple" => "Apple", "dell" => "Dell", "hp" => "HP"}
+    c = Computer.new :kind => 'ibm'
+    c.kind_text.should == nil
+  end
   
   it "should create boolean methods" do
     Computer.enum :kind, ["apple", "dell", "hp"]
@@ -67,7 +73,7 @@ describe "Enumlogic" do
     c = Computer.new
     c.kind = "blah"
     c.should_not be_valid
-    c.errors[:kind].should include("kind is not included in the list")
+    c.errors[:kind].should include("is not included in the list")
   end
   
   it "should allow nil during validations" do
@@ -75,4 +81,27 @@ describe "Enumlogic" do
     c = Computer.new
     c.should be_valid
   end
-end
+  
+  it "should implement the if option during validation" do
+    Computer.enum :kind, ["apple", "dell", "hp"], :if => :return_false
+    c = Computer.new
+    c.should be_valid
+  end
+  
+  it "should be included in the list" do
+    Computer.enum :kind, ["apple", "dell", "hp", "custom made"]
+    c = Computer.new(:kind => "custom made")
+    c.should be_valid
+  end
+  
+  it "should find a defined enum" do
+    Computer.enum :kind, ["apple", "dell", "hp"]
+    
+    Computer.enum?(:kind).should == true
+    Computer.enum?(:some_other_field).should == false
+  end
+  
+  it "should check for defined enums if there isn't any" do
+    Computer.enum?(:kind).should == false
+  end
+end

data/spec/spec_helper.rb

@@ -3,9 +3,10 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'spec'
 require 'spec/autorun'
 require 'rubygems'
-require 'enumlogic'
+require 'active_record'
+require "#{File.dirname(__FILE__)}/../init"
 
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 ActiveRecord::Base.configurations = true
 
 ActiveRecord::Schema.verbose = false
@@ -18,6 +19,10 @@ end
 Spec::Runner.configure do |config|
   config.before(:each) do
     class Computer < ActiveRecord::Base
+      private
+        def return_false
+          false
+        end
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: enumlogic
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - binarylogic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-01 00:00:00 -05:00
+date: 2009-11-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,6 +40,7 @@ files:
 - Rakefile
 - VERSION.yml
 - enumlogic.gemspec
+- init.rb
 - lib/enumlogic.rb
 - spec/enumlogic_spec.rb
 - spec/spec_helper.rb