resterl 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/resterl/base_object.rb

@@ -3,8 +3,7 @@ require 'hashie'
 class Resterl::BaseObject #< Hashie::Mash
 
   include ClassLevelInheritableAttributes
-  inheritable_attributes :resterl_client, :parser, :complete_mime_type,
-                         :mapper
+  cattr_inheritable :resterl_client, :parser, :complete_mime_type, :mapper
 
   #self.resterl_client = nil
   #self.complete_mime_type = 'text/plain'
@@ -34,6 +33,7 @@ class Resterl::BaseObject #< Hashie::Mash
     when :json
       [proc {|str| JSON.parse(str)}, 'application/json']
     when :xml
+      # TODO: Only works when Rails is loaded?
       [proc {|str| Hash.from_xml(str)}, 'application/xml']
     end
   end

data/lib/resterl/caches/rails_memcached_cache.rb

@@ -6,8 +6,14 @@ class Resterl::Caches::RailsMemcachedCache < Resterl::Caches::CacheInterface
     @client = client
   end
 
-  def_delegators :@client, :read, :delete
+  def_delegators :@client, :delete
 
+  def read key
+    obj = @client.read key
+    # Rails freezes the object when putting it put the cache.
+    # So unfreeze it:
+    obj ? obj.dup : obj
+  end
   def write key, value, expires_in
     @client.write key, value, :expires_in => expires_in
   end

data/lib/resterl/class_level_inheritable_attributes.rb

@@ -1,24 +1,25 @@
 # From:
 # http://railstips.org/blog/archives/2006/11/18/class-and-instance-variables-in-ruby/
+# http://railstips.org/blog/archives/2008/06/12/a-class-instance-variable-update/
 module ClassLevelInheritableAttributes
   def self.included(base)
     base.extend(ClassMethods)
   end
 
   module ClassMethods
-    def inheritable_attributes(*args)
-      @resterl_inheritable_attributes ||= [:inheritable_attributes]
-      @resterl_inheritable_attributes += args
+    def cattr_inheritable(*args)
+      @cattr_inheritable_attrs ||= [:cattr_inheritable_attrs]
+      @cattr_inheritable_attrs += args
       args.each do |arg|
         class_eval %(
           class << self; attr_accessor :#{arg} end
         )
       end
-      @resterl_inheritable_attributes
+      @cattr_inheritable_attrs
     end
 
     def inherited(subclass)
-      @resterl_inheritable_attributes.each do |inheritable_attribute|
+      @cattr_inheritable_attrs.each do |inheritable_attribute|
         instance_var = "@#{inheritable_attribute}"
         subclass.instance_variable_set(instance_var,
                                        instance_variable_get(instance_var))

data/resterl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resterl}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Dütsch"]

data/test/test_resterl.rb

@@ -30,6 +30,27 @@ class TestResterl < Test::Unit::TestCase
       end
 
     end
+
+    should 'work with deeper nestings (cattr_inheritable)' do
+
+      assert_nothing_raised do
+
+        class Test::BaseObject < Resterl::BaseObject
+          self.mime_type = :json
+          self.resterl_client = 1
+        end
+
+        class Test::T1 < Test::BaseObject
+
+        end
+
+        
+        Test::T1.complete_mime_type
+        Test::T1.resterl_client
+
+      end
+
+    end
     
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - "Florian D\xC3\xBCtsch"