classy_enum 0.7.1 → 0.8.0

data/Gemfile

@@ -7,9 +7,9 @@ group :development do
 end
 
 group :test do
-  gem 'rspec', '~> 2.0'
-  gem 'rspec-rails', '~> 2.0'
-  gem 'formtastic', '~> 1.1'
+  gem 'rspec', '~> 2.5'
+  gem 'rspec-rails', '~> 2.5'
+  gem 'formtastic', '~> 1.2'
   gem 'sqlite3-ruby', :require => 'sqlite3'
   gem 'ruby-debug'
 end

data/Gemfile.lock

@@ -2,89 +2,90 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.1)
-      actionpack (= 3.0.1)
-      mail (~> 2.2.5)
-    actionpack (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       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.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-    activesupport (3.0.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    arel (2.0.9)
     builder (2.1.2)
     columnize (0.3.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    formtastic (1.1.0)
-      actionpack (>= 2.3.0)
-      activesupport (>= 2.3.0)
-      i18n (>= 0.4.0)
+    formtastic (1.2.3)
+      actionpack (>= 2.3.7)
+      activesupport (>= 2.3.7)
+      i18n (~> 0.4)
     gemcutter (0.6.1)
     git (1.2.5)
-    i18n (0.4.1)
+    i18n (0.5.0)
     jeweler (1.4.0)
       gemcutter (>= 0.1.0)
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
     json_pure (1.5.1)
     linecache (0.43)
-    mail (2.2.7)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
     polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.2.2)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.1)
-      actionmailer (= 3.0.1)
-      actionpack (= 3.0.1)
-      activerecord (= 3.0.1)
-      activeresource (= 3.0.1)
-      activesupport (= 3.0.1)
-      bundler (~> 1.0.0)
-      railties (= 3.0.1)
-    railties (3.0.1)
-      actionpack (= 3.0.1)
-      activesupport (= 3.0.1)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
+      bundler (~> 1.0)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-    rspec-rails (2.0.1)
-      rspec (~> 2.0.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.5.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -93,19 +94,19 @@ GEM
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     sqlite3-ruby (1.3.1)
-    thor (0.14.3)
-    treetop (1.4.8)
+    thor (0.14.6)
+    treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.25)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  formtastic (~> 1.1)
+  formtastic (~> 1.2)
   jeweler (= 1.4.0)
   rails (~> 3.0)
-  rspec (~> 2.0)
-  rspec-rails (~> 2.0)
+  rspec (~> 2.5)
+  rspec-rails (~> 2.5)
   ruby-debug
   sqlite3-ruby

data/README.textile

@@ -4,7 +4,7 @@ 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.x. (Older versions of Rails may work, but have not been tested)
+*Rails:* Any version of Rails 2.3.x or Rails 3.0.x. (Older versions of Rails may work, but have not been tested)
 
 *Ruby:* Ruby 1.8.7 and 1.9.2.
 
@@ -12,6 +12,8 @@ h2. Installation
 
 The gem is hosted at "rubygems.org":https://rubygems.org/gems/classy_enum and can be installed with: @gem install 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.
+
 h2. Example Usage
 
 The most common use for ClassyEnum is to replace database lookup tables where the content and behavior is mostly static and has multiple "types". In this example, I have an ActiveRecord model called @Alarm@ with an attribute called @priority@. Priority is stored as a string (VARCHAR) type in the database and is converted to an enum value when requested. 
@@ -121,7 +123,7 @@ What if your enum class name is not the same as your model's attribute name? No
 
 <pre>
 class Alarm < ActiveRecord::Base
-  classy_enum_attr :priority, :alarm_priority
+  classy_enum_attr :alarm_priority, :enum => :priority
 end
 
 @alarm = Alarm.create(:alarm_priority => :medium)

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.8.0

data/classy_enum.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{classy_enum}
-  s.version = "0.7.1"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Brown"]
-  s.date = %q{2011-02-06}
+  s.date = %q{2011-03-24}
   s.description = %q{A utility that adds class based enum functionality to ActiveRecord attributes}
   s.email = %q{github@lette.us}
   s.extra_rdoc_files = [
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/beerlington/classy_enum}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{A class based enumerator utility for Ruby on Rails}
   s.test_files = [
     "spec/classy_enum_attributes_spec.rb",

data/lib/classy_enum/attributes.rb

@@ -16,16 +16,22 @@ module ClassyEnum
     #
     #  # Associate an enum Priority with Alarm model's alarm_priority attribute
     #  class Alarm < ActiveRecord::Base
-    #    classy_enum_attr :priority, :alarm_priority
+    #    classy_enum_attr :alarm_priority, :enum => :priority
     #  end
-    def classy_enum_attr(enum, attribute=nil)
+    def classy_enum_attr(*args)
+      options = args.extract_options!
 
-      attribute ||= enum
+      attribute = args[0]
+      enum = options[:enum] || attribute
 
       klass = enum.to_s.camelize.constantize
 
       self.instance_eval do
 
+        # Store the enum class so it can be retrieved by Formtastic input builder
+        @classy_enums ||= {}
+        @classy_enums[attribute] = klass
+
         # Add ActiveRecord validation to ensure it won't be saved unless it's an option
         validates_inclusion_of attribute, :in => klass.all, :message => "must be one of #{klass.valid_options}"
 

data/lib/classy_enum/semantic_form_builder.rb

@@ -1,16 +1,12 @@
 module ClassyEnum
   class SemanticFormBuilder < Formtastic::SemanticFormBuilder # :nodoc: all
     def enum_select_input(method, options)
-      enum_class = object.send(method)
+      enum_class = object.class.instance_variable_get(:@classy_enums)[method]
 
-      if enum_class.nil?
-        enum_class = (options[:enum_class] || method).to_s.classify.constantize rescue Error.invalid_classy_enum_object(method)
-        options[:collection] = enum_class.select_options
-      else
-        Error.invalid_classy_enum_object(method) unless enum_class.is_a? ClassyEnum::Base
-        options[:collection] = enum_class.class.superclass.select_options
-        options[:selected] = enum_class.to_s
-      end
+      raise Error.invalid_classy_enum_object(method) if enum_class.nil?
+
+      options[:collection] = enum_class.select_options
+      options[:selected] = object.send(method).to_s
 
       options[:include_blank] = false
 

data/spec/classy_enum_semantic_form_builder_spec.rb

@@ -56,7 +56,7 @@ describe 'using enum_select input' do
     context "with an object with a different attribute name which requires the enum_class" do
       before(:each) do
         @output = semantic_form_for(OtherDog.new, :url => "/") do |builder|
-          concat(builder.input(:other_breed, :as => :enum_select, :enum_class => :breed))
+          concat(builder.input(:other_breed, :as => :enum_select))
         end
       end
 

data/spec/spec_helper.rb

@@ -32,7 +32,7 @@ class Dog < ActiveRecord::Base
 end
 
 class OtherDog < ActiveRecord::Base
-  classy_enum_attr :breed, :other_breed
+  classy_enum_attr :other_breed, :enum => :breed
 end
 
 module FormtasticSpecHelper

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: classy_enum
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
-  - 1
-  version: 0.7.1
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Peter Brown
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 -05:00
+date: 2011-03-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A class based enumerator utility for Ruby on Rails