modelish 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## O.1.2 (2011-03-31)
+
+* Fixed SystemStackError when a typed property with the same name is defined multiple times.
+* Use explicit path when loading modelish classes.
+
 ## O.1.1 (2011-03-28)
 
 * Add DateTime to standard supported property types.

data/lib/modelish/property_types.rb

@@ -38,38 +38,45 @@ module Modelish
       #                              passing in the raw value as an argument
       def add_property_type(property_name, property_type=String)
         accessor = property_name.to_sym
-        property_types[accessor] = property_type
 
-        raw_accessor = define_raw_accessor(accessor)
-        bang_accessor = define_bang_accessor(accessor)
+        # TODO: Refactor. This method is getting unwieldy as more 
+        # corner cases are discovered. A few well-placed design
+        # refinements should take care of it (now we just need to figure
+        # out what those are.)
+        unless property_types[accessor] == property_type
+          property_types[accessor] = property_type
 
-        typed_accessor = "_typed_#{accessor}".to_sym
-        typed_mutator = "#{typed_accessor}=".to_sym
-        to_safe = "_to_safe_#{accessor}".to_sym
+          raw_accessor = define_raw_accessor(accessor)
+          bang_accessor = define_bang_accessor(accessor)
 
-        class_eval do
-          attr_accessor typed_accessor
-          private typed_accessor, typed_mutator
-
-          define_method(to_safe) do
-            self.send(bang_accessor) rescue self.send(raw_accessor)
-          end
-          private to_safe
+          typed_accessor = "_typed_#{accessor}".to_sym
+          typed_mutator = "#{typed_accessor}=".to_sym
+          to_safe = "_to_safe_#{accessor}".to_sym
 
-          define_method(accessor) do
-            val = self.send(typed_accessor)
+          class_eval do
+            attr_accessor typed_accessor
+            private typed_accessor, typed_mutator
 
-            unless val || self.send(raw_accessor).nil?
-              val = self.send(to_safe)
-              self.send(typed_mutator, val)
+            define_method(to_safe) do
+              self.send(bang_accessor) rescue self.send(raw_accessor)
             end
+            private to_safe
 
-            val
-          end
+            define_method(accessor) do
+              val = self.send(typed_accessor)
+
+              unless val || self.send(raw_accessor).nil?
+                val = self.send(to_safe)
+                self.send(typed_mutator, val)
+              end
 
-          define_method("#{accessor}=") do |val|
-            self.send("#{raw_accessor}=", val)
-            self.send(typed_mutator, self.send(to_safe))
+              val
+            end
+
+            define_method("#{accessor}=") do |val|
+              self.send("#{raw_accessor}=", val)
+              self.send(typed_mutator, self.send(to_safe))
+            end
           end
         end
       end
@@ -87,11 +94,13 @@ module Modelish
         raw_mutator = "raw_#{name}=".to_sym
 
         class_eval do
-          if method_defined?(accessor) && method_defined?(mutator)
-            alias_method(raw_accessor, accessor)
-            alias_method(raw_mutator, mutator)
-          else
-            attr_accessor raw_accessor
+          unless method_defined?(raw_accessor) && method_defined?(raw_mutator)
+            if method_defined?(accessor) && method_defined?(mutator)
+              alias_method(raw_accessor, accessor)
+              alias_method(raw_mutator, mutator)
+            else
+              attr_accessor raw_accessor
+            end
           end
         end
 

data/lib/modelish/version.rb

@@ -1,3 +1,3 @@
 module Modelish
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/modelish.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.expand_path('modelish',File.dirname(__FILE__)))
 
-require 'version'
-require 'base'
+require 'modelish/version'
+require 'modelish/base'
 
 module Modelish
   # Your code goes here...

data/spec/modelish/property_types_spec.rb

@@ -134,5 +134,39 @@ describe Modelish::PropertyTypes do
         let(:invalid_value) { Object.new }
       end
     end
+
+    context "when a property is defined more than once" do
+      before { model_class.add_property_type(property_name, other_property_type) }
+
+      let(:property_type) { Integer } 
+
+      context "with the same property_type" do
+        let(:other_property_type) { property_type }
+
+        it "should not raise an error when the property is accessed" do
+          expect { model.send(property_name) }.to_not raise_error
+        end
+
+        it_should_behave_like 'a typed property', :my_property, Integer do
+          let(:valid_string) { '112358' }
+          let(:valid_typed_value) { 112358 }
+          let(:invalid_value) { 'blah' }
+        end
+      end
+
+      context "with different property_types" do
+        let(:other_property_type) { Float }
+
+        it "should not raise an error when the property is accessed" do
+          expect { model.send(property_name) }.to_not raise_error
+        end
+
+        it_should_behave_like 'a typed property', :my_property, Float do
+          let(:valid_string) { '112358.13' }
+          let(:valid_typed_value) { 112358.13 }
+          let(:invalid_value) { 'blah' }
+        end
+      end
+    end
   end
 end

data/spec/support/typed_property_examples.rb

@@ -29,7 +29,11 @@ shared_examples_for "a typed property" do |prop_name, prop_type|
     it { should be }
     it { should have_key(prop_name) }
 
-    its([prop_name]) { should == property_type }
+    if prop_type
+      its([prop_name]) { should == prop_type }
+    else
+      its([prop_name]) { should be_a Proc }
+    end
   end
 
   describe "assignment" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: modelish
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Maeve Revels
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -07:00
+date: 2011-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency