object_struct 0.0.8 → 0.0.9

data/CHANGELOG

@@ -1,3 +1,7 @@
+## 0.0.9 (October 8, 2010)
+
+Update property_type class method to examine module environment too.
+
 ## 0.0.8 (October 8, 2010)
 
 Convert array elements from hash into class instances within the current class' module

data/lib/object_struct/object_struct.rb

@@ -49,7 +49,8 @@ class ObjectStruct < OpenStruct
 		plural = options.delete(:plural)
 		property, type = *options.first
 		class_name = plural ? property.to_s.classify : property.to_s.camelize
-		Object.const_set class_name, Class.new(type)
+		klass = (name.split('::')[0..-2]).join('::').constantize rescue Object
+		klass.const_set class_name, Class.new(type)
 	end
 
 	# Create a new ObjectStruct.

data/lib/object_struct/version.rb

@@ -0,0 +1,22 @@
+# ---------------------------------------------------------------------------
+# Copyright 2010, Quid, Inc.
+#
+# object_struct is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# object_struct is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with object_struct. If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------
+require 'ostruct'
+
+class ObjectStruct < OpenStruct
+	VERSION = '0.0.9'
+end

data/test/test_object_struct.rb

@@ -1,4 +1,4 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
+$:.unshift File.expand_path('../../lib', __FILE__)
 
 require 'minitest/autorun'
 require 'json'
@@ -69,12 +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
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Quid, Inc.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 -07:00
+date: 2010-10-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/object_struct/object_struct.rb
+- lib/object_struct/version.rb
 - lib/object_struct.rb
 - test/test_data.json
 - test/test_object_struct.rb