classy_enum 2.1.0 → 2.2.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # ClassyEnum Changelog
 
+## 2.2.0
+
+* Deprecating class names like ParentChild in favor of namespaced names
+  like Parent::Child
+
 ## 2.1.0
 
 * Deprecating ClassyEnum::Base.enum_classes() (this is no longer needed)

data/lib/classy_enum/class_methods.rb

@@ -40,7 +40,13 @@ module ClassyEnum
         define_method "visit_#{klass.name}", lambda {|value| quote(value.to_s) }
       end
 
-      enum = klass.name.gsub(klass.base_class.name, '').underscore.to_sym
+      if klass.name.start_with? "#{base_class.name}::"
+        enum = klass.name.split('::').last.underscore.to_sym
+      else
+        ActiveSupport::Deprecation.warn("The enum class name #{klass} is deprecated. ClassyEnum 3.0 will require subclasses to use the parent class as a namespace. Change it to #{base_class}::#{klass.name.gsub(base_class.name, '')}", caller)
+        enum = klass.name.gsub(klass.base_class.name, '').underscore.to_sym
+      end
+
       index = self.enum_options.index(enum) + 1
 
       klass.class_eval do
@@ -64,7 +70,14 @@ module ClassyEnum
       return value if value.blank?
       return TypeError.new("Valid #{self} options are #{self.valid_options}") unless self.enum_options.include? value.to_sym
 
-      object = ("#{self}#{value.to_s.camelize}").constantize.new
+      # Temp hack until 3.0 to allow both namespaced and non-namespaced classes
+      begin
+        klass = "#{self}::#{value.to_s.camelize}".constantize
+      rescue NameError
+        klass = "#{self}#{value.to_s.camelize}".constantize
+      end
+
+      object = klass.new
       object.owner = options[:owner]
       object.serialize_as_json = options[:serialize_as_json]
       object

data/lib/classy_enum/version.rb

@@ -1,3 +1,3 @@
 module ClassyEnum
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/lib/generators/classy_enum/templates/enum.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classy_enum
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4601389622693505403
+      hash: -1067969167030479994
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4601389622693505403
+      hash: -1067969167030479994
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24