remodel 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/remodel/entity.rb

@@ -77,6 +77,7 @@ module Remodel
 
     def self.set_key_prefix(prefix)
       raise(InvalidKeyPrefix, prefix) unless prefix =~ /^[a-z]+$/
+      raise(InvalidUse, "can only set key prefix for direct subclasses of entity") unless superclass == Entity
       @key_prefix = prefix
     end
 
@@ -151,11 +152,6 @@ module Remodel
       "#{self.class.key_prefix}#{id}"
     end
 
-    # Default key prefix is the first letter of the class name, in lowercase.
-    def self.key_prefix
-      @key_prefix ||= name.split('::').last[0,1].downcase
-    end
-
     def self.parse(json)
       unpack(JSON.parse(json))
     end
@@ -194,8 +190,17 @@ module Remodel
     # class instance variables:
     # lazy init + recursive lookup in superclasses
 
+    def self.key_prefix
+      superclass == Entity ? _key_prefix : superclass.key_prefix
+    end
+
+    # Default key prefix is the first letter of the class name, in lowercase.
+    def self._key_prefix
+      @key_prefix ||= name.split('::').last[0,1].downcase
+    end
+
     def self.mapper
-      self == Entity || superclass == Entity ? _mapper : superclass.mapper.merge(_mapper)
+      superclass == Entity ? _mapper : superclass.mapper.merge(_mapper)
     end
 
     def self._mapper
@@ -203,7 +208,7 @@ module Remodel
     end
 
     def self.shortname
-      self == Entity || superclass == Entity ? _shortname : superclass.shortname.merge(_shortname)
+      superclass == Entity ? _shortname : superclass.shortname.merge(_shortname)
     end
 
     def self._shortname
@@ -211,7 +216,7 @@ module Remodel
     end
 
     def self.fullname
-      self == Entity || superclass == Entity ? _fullname : superclass.fullname.merge(_fullname)
+      superclass == Entity ? _fullname : superclass.fullname.merge(_fullname)
     end
 
     def self._fullname
@@ -219,7 +224,7 @@ module Remodel
     end
 
     def self.associations
-      self == Entity || superclass == Entity ? _associations : superclass.associations + _associations
+      superclass == Entity ? _associations : superclass.associations + _associations
     end
 
     def self._associations

data/test/test_entity.rb

@@ -188,6 +188,12 @@ class TestEntity < Test::Unit::TestCase
         class InvalidPrefix < Remodel::Entity; set_key_prefix '666'; end
       end
     end
+
+    should "ensure that the class is a direct subclass of entity" do
+      assert_raise(Remodel::InvalidUse) do
+        class InvalidSetPrefix < Foo; set_key_prefix 'x'; end
+      end
+    end
   end
 
   context "#find" do

data/test/test_inheritance.rb

@@ -60,6 +60,10 @@ class TestInheritance < Test::Unit::TestCase
       assert_match /"n":/, json
       assert_match /"p":/, json
     end
+
+    should "use the same prefix as the superclass" do
+      assert_equal 'p', Admin.key_prefix
+    end
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Tim Lossen