classy_enum 0.9.1 → 1.0.0

data/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'rails', '>= 2.3.0'
+gem 'rails', '~> 3.0.0'
 
 group :development do
   gem "jeweler", "~> 1.6.2"

data/Gemfile.lock

@@ -28,7 +28,7 @@ GEM
       activemodel (= 3.0.5)
       activesupport (= 3.0.5)
     activesupport (3.0.5)
-    arel (2.0.9)
+    arel (2.0.10)
     builder (2.1.2)
     columnize (0.3.2)
     diff-lcs (1.1.2)
@@ -39,20 +39,20 @@ GEM
       activesupport (>= 2.3.7)
       i18n (~> 0.4)
     git (1.2.5)
-    i18n (0.5.0)
+    i18n (0.6.0)
     jeweler (1.6.2)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     linecache (0.43)
-    mail (2.2.15)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
     polyglot (0.3.1)
-    rack (1.2.2)
+    rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
@@ -70,7 +70,7 @@ GEM
       activesupport (= 3.0.5)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.8.7)
+    rake (0.9.2)
     rcov (0.9.9)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -94,7 +94,7 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.25)
+    tzinfo (0.3.29)
 
 PLATFORMS
   ruby
@@ -102,7 +102,7 @@ PLATFORMS
 DEPENDENCIES
   formtastic (~> 1.2.4)
   jeweler (~> 1.6.2)
-  rails (>= 2.3.0)
+  rails (~> 3.0.0)
   rcov
   rspec-rails (~> 2.6.1)
   ruby-debug

data/README.textile

@@ -4,13 +4,13 @@ ClassyEnum is a Ruby on Rails gem that adds class-based enumerator functionality
 
 h2. Requirements
 
-*Rails:* Any version of Rails 2.3.x or Rails 3.0.x. (Older versions of Rails may work, but have not been tested)
+*Rails:* 3.0.x. If you need support for Rails 2.3.x, please install "version 0.9.1":https://rubygems.org/gems/classy_enum/versions/0.9.1
 
 *Ruby:* Ruby 1.8.7 and 1.9.2.
 
 h2. Installation
 
-The gem is hosted at "rubygems.org":https://rubygems.org/gems/classy_enum and can be installed with: @gem install classy_enum@
+The gem is hosted at "rubygems.org":https://rubygems.org/gems/classy_enum
 
 You will also need to add @app/enums@ as an autoloadable path. This configuration will depend on which version of rails you are using.
 
@@ -22,14 +22,6 @@ h3. 1. Generate the Enum
 
 The fastest way to get up and running with ClassyEnum is to use the built-in Rails generator like so:
 
-Rails 2.3.x:
-
-<pre>
-script/generate classy_enum Priority low medium high
-</pre>
-
-Rails 3.x
-
 <pre>
 rails g classy_enum Priority low medium high
 </pre>

data/VERSION

@@ -1 +1 @@
-0.9.1
+1.0.0

data/classy_enum.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{classy_enum}
-  s.version = "0.9.1"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Peter Brown"]
-  s.date = %q{2011-06-07}
+  s.authors = [%q{Peter Brown}]
+  s.date = %q{2011-06-29}
   s.description = %q{A utility that adds class based enum functionality to ActiveRecord attributes}
   s.email = %q{github@lette.us}
   s.extra_rdoc_files = [
@@ -25,10 +25,9 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "classy_enum.gemspec",
-    "generators/classy_enum_generator.rb",
-    "generators/templates/enum.rb",
     "init.rb",
     "lib/classy_enum.rb",
+    "lib/classy_enum/active_record.rb",
     "lib/classy_enum/attributes.rb",
     "lib/classy_enum/base.rb",
     "lib/classy_enum/class_methods.rb",
@@ -36,22 +35,23 @@ Gem::Specification.new do |s|
     "lib/classy_enum/semantic_form_builder.rb",
     "lib/generators/classy_enum/classy_enum_generator.rb",
     "lib/generators/classy_enum/templates/enum.rb",
+    "spec/active_record_spec.rb",
     "spec/classy_enum_attributes_spec.rb",
     "spec/classy_enum_semantic_form_builder_spec.rb",
     "spec/classy_enum_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/beerlington/classy_enum}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.9.1}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{A class based enumerator utility for Ruby on Rails}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 2.3.0"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.6.1"])
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 2.3.0"])
+      s.add_dependency(%q<rails>, ["~> 3.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, ["~> 2.6.1"])
@@ -68,7 +68,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ruby-debug>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 2.3.0"])
+    s.add_dependency(%q<rails>, ["~> 3.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, ["~> 2.6.1"])

data/lib/classy_enum.rb

@@ -1,3 +1,4 @@
+require "classy_enum/active_record"
 require "classy_enum/base"
 require "classy_enum/class_methods"
 require "classy_enum/instance_methods"

data/lib/classy_enum/active_record.rb

@@ -0,0 +1,15 @@
+module ActiveRecord # :nodoc: all
+  class PredicateBuilder
+    def build_from_hash_with_classy_enum(attributes, default_table)
+
+      # Convert classy enum values to strings
+      attributes.map do |column, value|
+        attributes[column] = value.to_s if value.is_a? ClassyEnum::Base
+      end
+
+      build_from_hash_without_classy_enum(attributes, default_table)
+    end
+
+    alias_method_chain :build_from_hash, :classy_enum
+  end
+end

data/spec/active_record_spec.rb

@@ -0,0 +1,22 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+class ActiveDog < ActiveRecord::Base
+  classy_enum_attr :breed
+
+  validates :name,
+    :presence => true,
+    :uniqueness => { :scope => [:breed] }
+
+end
+
+describe ActiveDog do
+  before do
+    ActiveDog.create!(:name => 'Sebastian', :breed => :golden_retriever)
+    ActiveDog.create!(:name => 'Sirius', :breed => :husky)
+  end
+
+  it 'should allow validation with classy enum scope' do
+    dog = ActiveDog.new(:name => 'Sirius', :breed => :golden_retriever)
+    dog.should be_valid
+  end
+end

data/spec/spec_helper.rb

@@ -29,14 +29,20 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :allow_blank_breed_dogs, :force => true do |t|
     t.string :breed
   end
-  
+
   create_table :allow_nil_breed_dogs, :force => true do |t|
     t.string :breed
   end
+
+  create_table :active_dogs, :force => true do |t|
+    t.string :breed
+    t.string :name
+    t.integer :age
+  end
 end
 
 class Breed < ClassyEnum::Base
-  enum_classes :golden_retriever, :snoop
+  enum_classes :golden_retriever, :snoop, :husky
 end
 
 class Dog < ActiveRecord::Base

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: classy_enum
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 23
   prerelease: 
   segments: 
-  - 0
-  - 9
   - 1
-  version: 0.9.1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Peter Brown
@@ -15,27 +15,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 -04:00
-default_executable: 
+date: 2011-06-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 2
         - 3
         - 0
-        version: 2.3.0
-  name: rails
-  version_requirements: *id001
-  prerelease: false
+        - 0
+        version: 3.0.0
   type: :runtime
+  requirement: *id001
+  prerelease: false
+  name: rails
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +45,12 @@ dependencies:
         - 6
         - 2
         version: 1.6.2
-  name: jeweler
-  version_requirements: *id002
-  prerelease: false
   type: :development
+  requirement: *id002
+  prerelease: false
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,12 +59,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  version_requirements: *id003
-  prerelease: false
   type: :development
+  requirement: *id003
+  prerelease: false
+  name: rcov
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -76,12 +75,12 @@ dependencies:
         - 6
         - 1
         version: 2.6.1
-  name: rspec-rails
-  version_requirements: *id004
-  prerelease: false
   type: :development
+  requirement: *id004
+  prerelease: false
+  name: rspec-rails
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,12 +91,12 @@ dependencies:
         - 2
         - 4
         version: 1.2.4
-  name: formtastic
-  version_requirements: *id005
-  prerelease: false
   type: :development
+  requirement: *id005
+  prerelease: false
+  name: formtastic
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -106,12 +105,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: sqlite3-ruby
-  version_requirements: *id006
-  prerelease: false
   type: :development
+  requirement: *id006
+  prerelease: false
+  name: sqlite3-ruby
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -120,10 +119,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: ruby-debug
-  version_requirements: *id007
-  prerelease: false
   type: :development
+  requirement: *id007
+  prerelease: false
+  name: ruby-debug
 description: A utility that adds class based enum functionality to ActiveRecord attributes
 email: github@lette.us
 executables: []
@@ -142,10 +141,9 @@ files:
 - Rakefile
 - VERSION
 - classy_enum.gemspec
-- generators/classy_enum_generator.rb
-- generators/templates/enum.rb
 - init.rb
 - lib/classy_enum.rb
+- lib/classy_enum/active_record.rb
 - lib/classy_enum/attributes.rb
 - lib/classy_enum/base.rb
 - lib/classy_enum/class_methods.rb
@@ -153,11 +151,11 @@ files:
 - lib/classy_enum/semantic_form_builder.rb
 - lib/generators/classy_enum/classy_enum_generator.rb
 - lib/generators/classy_enum/templates/enum.rb
+- spec/active_record_spec.rb
 - spec/classy_enum_attributes_spec.rb
 - spec/classy_enum_semantic_form_builder_spec.rb
 - spec/classy_enum_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/beerlington/classy_enum
 licenses: 
 - MIT
@@ -187,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.1
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A class based enumerator utility for Ruby on Rails

data/generators/classy_enum_generator.rb

@@ -1,10 +0,0 @@
-class ClassyEnumGenerator < Rails::Generator::NamedBase
-
-  def manifest
-    record do |m|
-      m.directory 'app/enums'
-      m.template "enum.rb", "app/enums/#{file_name}.rb"
-    end
-  end
-
-end

data/generators/templates/enum.rb

@@ -1,7 +0,0 @@
-class <%= class_name %> < ClassyEnum::Base
-  enum_classes <%= args.map {|a| ":#{a}"}.join(", ") %>
-end
-<% args.each do |arg| %>
-class <%= class_name + arg.camelize %> < <%= class_name %>
-end
-<% end %>