classy_enum 3.1.1 → 3.1.2

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
 gemfile:
   - gemfiles/Gemfile.rails-3.0.x
   - gemfiles/Gemfile.rails-3.1.x

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # ClassyEnum Changelog
 
+## 3.1.2
+
+* Allow enum property to be assigned using enum class. Previously it
+  could only be assigned with an instance, string or symbol.
+
+      @alarm.priority = Priority::Medium
+      @alarm.priority.medium? # => true
+
 ## 3.1.1
 
 * Fixes a regression with Formtastic support. ClassyEnumm::Base.build now

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Peter Brown
+Copyright (c) 2010-2013 Peter Brown
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -13,7 +13,6 @@ ClassyEnum is a Ruby on Rails gem that adds class-based enumerator functionality
 * [Serializing as JSON](https://github.com/beerlington/classy_enum#serializing-as-json)
 * [Special Cases](https://github.com/beerlington/classy_enum#special-cases)
 * [Built-in Model Validation](https://github.com/beerlington/classy_enum#model-validation)
-* [Using Enums Outside of ActiveRecord](https://github.com/beerlington/classy_enum#working-with-classyenum-outside-of-activerecord)
 * [Formtastic Support](https://github.com/beerlington/classy_enum#formtastic-support)
 
 ## Rails & Ruby Versions Supported
@@ -297,19 +296,6 @@ end
 @alarm.valid? # => true
 ```
 
-## Working with ClassyEnum outside of ActiveRecord
-
-While ClassyEnum was designed to be used directly with ActiveRecord, it can also be used outside of it. Here are some examples based on the enum class defined earlier in this document.
-
-Instantiate an enum member subclass *Priority::Low*
-
-```ruby
-# These statements are all equivalent
-low = Priority.find(:low)
-low = Priority.find('low')
-low = Priority::Low.new
-```
-
 ## Formtastic Support
 
 Built-in Formtastic support has been removed as of 2.0. It is still
@@ -322,4 +308,4 @@ Note: ClassyEnum respects the `:allow_blank` and `:allow_nil` options and will i
 
 ## Copyright
 
-Copyright (c) 2012 [Peter Brown](https://github.com/beerlington). See LICENSE for details.
+Copyright (c) 2010-2013 [Peter Brown](https://github.com/beerlington). See LICENSE for details.

data/lib/classy_enum/active_record.rb

@@ -42,9 +42,14 @@ module ClassyEnum
                   )
       end
 
-      # Define setter method that accepts either string or symbol for member
+      # Define setter method that accepts string, symbol, instance or class for member
       define_method "#{attribute}=" do |value|
-        value = value.to_s unless value.nil?
+        if value.class == Class && value < ClassyEnum::Base
+          value = value.new
+        elsif value.present?
+          value = value.to_s
+        end
+
         super(value)
       end
     end

data/lib/classy_enum/version.rb

@@ -1,3 +1,3 @@
 module ClassyEnum
-  VERSION = "3.1.1"
+  VERSION = "3.1.2"
 end

data/spec/classy_enum/active_record_spec.rb

@@ -43,7 +43,7 @@ describe Dog do
   specify { Dog.new(:breed => '').should_not be_valid }
 
   context "with valid breed options" do
-    [:golden_retriever, 'golden_retriever', Breed::GoldenRetriever.new].each do |option|
+    [:golden_retriever, 'golden_retriever', Breed::GoldenRetriever.new, Breed::GoldenRetriever].each do |option|
       subject { Dog.new(:breed => option) }
       it { should be_valid }
       its(:breed) { should be_a(Breed::GoldenRetriever) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classy_enum
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2229881947389413323
+      hash: -961904907621879072
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2229881947389413323
+      hash: -961904907621879072
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24