object_struct 0.0.7 → 0.0.8

data/CHANGELOG

@@ -1,3 +1,7 @@
+## 0.0.8 (October 8, 2010)
+
+Convert array elements from hash into class instances within the current class' module
+
 ## 0.0.7 (October 4, 2010)
 
 Made to_h method public, so results can be converted to hash

data/lib/object_struct/object_struct.rb

@@ -25,7 +25,7 @@
 # @abstract You probably want to subclass ObjectStruct, to reflect your business
 #  entities. See the README for example use.
 class ObjectStruct < OpenStruct
-	VERSION = '0.0.7'
+	VERSION = '0.0.8'
 
 	# Delegated to Hash#each
 	def each &blk
@@ -126,7 +126,8 @@ class ObjectStruct < OpenStruct
 	#  requested, or an ObjectStruct; or an Array thereof; or the value if it
 	#  neither an Array nor Hash.
 	def self.convert(value, type = nil)
-		klass = ((value.is_a? Array) ? type.to_s.classify : type.to_s.camelize).constantize rescue ObjectStruct
+		klass_name = type.to_s.demodulize
+		klass = modulize((value.is_a? Array) ? klass_name.classify : klass_name.camelize).constantize rescue ObjectStruct
 
 		case value
 		when Array
@@ -139,6 +140,9 @@ class ObjectStruct < OpenStruct
 	end
 
 	private
+	def self.modulize(klassname)
+		(name.split('::')[0..-2] << klassname).join('::')
+	end
 
 	def self.value_maybe_promise(key, value)
 		case value

data/test/test_object_struct.rb

@@ -13,6 +13,11 @@ class Widget < ObjectStruct
 	property_type :slots           => Slotnozzle, :plural => true
 end
 
+module KnobModule
+	class Knobwizzle < ObjectStruct; end
+	class SubKnob < ObjectStruct; end
+end
+
 class ObjectStructTest < MiniTest::Unit::TestCase
 	def setup
 		@data   = JSON.load File.open File.dirname(__FILE__)+'/test_data.json'
@@ -64,4 +69,12 @@ class ObjectStructTest < MiniTest::Unit::TestCase
 		refute @widget.has_id?
 		assert @widget.has_text?
 	end
+	
+	def test_modulizes_array_class_names
+		obj = {'sub_knobs' => [{'a' => 'a'}, {'b' => 'b'}, {'c' => 'c'}]}
+		knobwizzle = KnobModule::Knobwizzle.convert(obj, 'KnobModule::Knobwizzle')
+		assert knobwizzle.is_a?(KnobModule::Knobwizzle), "Knobwizzle is a #{knobwizzle.class.name}, not a KnobModule::Knobwizzle"
+		assert knobwizzle.sub_knobs.all? {|sk| sk.is_a?(KnobModule::SubKnob)}, "sub_knobs are #{knobwizzle.sub_knobs.first.class.name}, not KnobModule::SubKnobs"
+	end
+	
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Quid, Inc.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -07:00
+date: 2010-10-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency