Merge branch 'maintenance'

Gemfile

@@ -3,13 +3,10 @@ source :rubygems
 gem 'rails', '~> 3.0'
 
 group :development do
-  gem 'jeweler', '1.4.0'
-end
-
-group :test do
-  gem 'rspec', '~> 2.5'
-  gem 'rspec-rails', '~> 2.5'
-  gem 'formtastic', '~> 1.2'
+  gem "jeweler", "~> 1.6.2"
+  gem "rcov", ">= 0"
+  gem "rspec-rails", "~> 2.6.1"
+  gem 'formtastic', '~> 1.2.4'
   gem 'sqlite3-ruby', :require => 'sqlite3'
   gem 'ruby-debug'
 end

Gemfile.lock

@@ -34,18 +34,16 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    formtastic (1.2.3)
+    formtastic (1.2.4)
       actionpack (>= 2.3.7)
       activesupport (>= 2.3.7)
       i18n (~> 0.4)
-    gemcutter (0.6.1)
     git (1.2.5)
     i18n (0.5.0)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
+    jeweler (1.6.2)
+      bundler (~> 1.0)
       git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.5.1)
+      rake
     linecache (0.43)
     mail (2.2.15)
       activesupport (>= 2.3.6)
@@ -73,26 +71,25 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    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)
+    rcov (0.9.9)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.5.0)
+      rspec (~> 2.6.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
     sqlite3-ruby (1.3.1)
     thor (0.14.6)
     treetop (1.4.9)
@@ -103,10 +100,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  formtastic (~> 1.2)
-  jeweler (= 1.4.0)
+  formtastic (~> 1.2.4)
+  jeweler (~> 1.6.2)
   rails (~> 3.0)
-  rspec (~> 2.5)
-  rspec-rails (~> 2.5)
+  rcov
+  rspec-rails (~> 2.6.1)
   ruby-debug
   sqlite3-ruby

README.textile

@@ -171,15 +171,15 @@ low = PriorityLow.new
 Get a list of the valid enum options
 
 <pre>
-Priority.valid_options # => low, mediume, high
+Priority.valid_options # => low, medium, high
 </pre>
 
 h2. Formtastic Support
 
 To add ClassyEnum support to Formtastic, add the following to your formtastic.rb initializer (config/initializers/formtastic.rb):
 
 <pre>
-Formtastic::SemanticFormHelper.builder = ClassyEnum::SemanticFormBuilder
+require 'classy_enum/semantic_form_builder'
 </pre>
 
 Then in your Formtastic view forms, use this syntax: @<%= f.input :priority, :as => :enum_select %>@

Rakefile

@@ -1,25 +1,29 @@
+# encoding: utf-8
+
 require 'rubygems'
+require 'bundler'
+begin
+  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'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "classy_enum"
-    gem.summary = %Q{A class based enumerator utility for Ruby on Rails}
-    gem.description = %Q{A utility that adds class based enum functionality to ActiveRecord attributes}
-    gem.email = "github@lette.us"
-    gem.homepage = "http://github.com/beerlington/classy_enum"
-    gem.authors = ["Peter Brown"]
-    gem.add_development_dependency "rspec", "~> 2.0"
-    gem.add_development_dependency 'rspec-rails', '~> 2.0'
-    gem.add_development_dependency 'formtastic', '~> 1.1'
-    gem.add_development_dependency 'sqlite3-ruby'
-    gem.add_development_dependency "activerecord", ">= 2.3"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "classy_enum"
+  gem.summary = %Q{A class based enumerator utility for Ruby on Rails}
+  gem.description = %Q{A utility that adds class based enum functionality to ActiveRecord attributes}
+  gem.email = "github@lette.us"
+  gem.homepage = "http://github.com/beerlington/classy_enum"
+  gem.authors = ["Peter Brown"]
+  gem.license = "MIT"
+  # dependencies defined in Gemfile
 end
+Jeweler::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
@@ -39,7 +43,8 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "thegem #{version}"
+  rdoc.title = "classy_enum #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+

VERSION

@@ -1 +1 @@
-0.8.1
+0.9.0

lib/classy_enum.rb

@@ -2,8 +2,3 @@
 require "classy_enum/class_methods"
 require "classy_enum/instance_methods"
 require "classy_enum/attributes"
-
-if Gem.available? 'formtastic'
-  require 'formtastic'
-  require 'classy_enum/semantic_form_builder'
-end

lib/classy_enum/semantic_form_builder.rb

@@ -20,3 +20,5 @@ def self.invalid_classy_enum_object(method)
     end
   end
 end
+
+Formtastic::SemanticFormHelper.builder = ClassyEnum::SemanticFormBuilder

spec/classy_enum_semantic_form_builder_spec.rb

@@ -1,10 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'classy_enum/semantic_form_builder'
 
 describe 'using enum_select input' do
   include FormtasticSpecHelper
 
-  Formtastic::SemanticFormHelper.builder = ClassyEnum::SemanticFormBuilder
-
   # Reset output buffer
   before { @output_buffer = "" }
 

spec/spec_helper.rb

@@ -2,6 +2,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
+require 'rspec'
 require 'active_record'
 require 'active_support'
 require 'action_pack'