thirtythirty 0.0.5 → 0.0.6

data/lib/thirtythirty.rb

@@ -7,7 +7,7 @@ module Thirtythirty
       send :include, InstanceMethods
       @marshalled_attributes = []
     end
-    @marshalled_attributes = (@marshalled_attributes.map | attributes.flatten.map(&:to_sym).uniq).freeze
+    @marshalled_attributes = (@marshalled_attributes.map | attributes.flatten.map(&:to_sym).uniq)
   end
 
   # Activates marshalling for the given attributes and generates getters - you have to implement setters yourself!
@@ -34,7 +34,13 @@ private
 
   module ClassMethods
 
-    attr_reader :marshalled_attributes, :marshalling_compression_level
+    def marshalled_attributes
+      ((superclass.respond_to?(:marshalled_attributes) ? superclass.marshalled_attributes : []) + (@marshalled_attributes || [])).uniq.freeze
+    end
+
+    def marshalling_compression_level
+      @marshalling_compression_level || (superclass.respond_to?(:marshalling_compression_level) ? superclass.marshalling_compression_level : nil)
+    end
 
   protected
 

data/spec/spec_helper.rb

@@ -2,5 +2,4 @@ require 'rubygems'
 require 'bundler'
 Bundler.require(:default, :development)
 
-require File.expand_path '../support/thirtythirty_base.rb', __FILE__
 Dir[File.expand_path '../support/*.rb', __FILE__].each {|f| require f}

data/spec/support/classes.rb

@@ -0,0 +1,17 @@
+class ThirtythirtyBase
+  extend Thirtythirty
+end
+
+class ThirtythirtyTree < ThirtythirtyBase
+  marshalled_accessor :persistent, :parent, :children
+  attr_accessor :transient
+end
+
+class Uncompressed < ThirtythirtyBase
+  marshalled_accessor :persistent
+end
+
+class Compressed < ThirtythirtyBase
+  marshal_with_compression
+  marshalled_accessor :persistent
+end

data/spec/thirtythirty_spec.rb

@@ -154,49 +154,47 @@ describe Thirtythirty do
 
   describe "marshalling (#_dump/._load)" do
 
-    before do
-      @obj = ThirtythirtyTree.new
-    end
+    subject { ThirtythirtyTree.new }
 
     it "should dump a string" do
-      Marshal.dump(@obj).should be_a(String)
+      Marshal.dump(subject).should be_a(String)
     end
 
     it "should restore a ThirtythirtyTree" do
-      Marshal.load(Marshal.dump(@obj)).should be_a(ThirtythirtyTree)
+      Marshal.load(Marshal.dump(subject)).should be_a(ThirtythirtyTree)
     end
 
     it "should dump/restore marshalled attributes" do
-      @obj.persistent = "data"
-      restored = Marshal.load(Marshal.dump(@obj))
+      subject.persistent = "data"
+      restored = Marshal.load(Marshal.dump(subject))
       restored.persistent.should == "data"
     end
 
     it "should not dump/restore unmarshalled attributes" do
-      @obj.transient = "data"
-      restored = Marshal.load(Marshal.dump(@obj))
+      subject.transient = "data"
+      restored = Marshal.load(Marshal.dump(subject))
       restored.transient.should be_nil
     end
 
     context "with a single relation" do
 
       before do
-        @obj.parent = ThirtythirtyTree.new
+        subject.parent = ThirtythirtyTree.new
       end
 
       it "should restore a ThirtythirtyTree" do
-        Marshal.load(Marshal.dump(@obj)).parent.should be_a(ThirtythirtyTree)
+        Marshal.load(Marshal.dump(subject)).parent.should be_a(ThirtythirtyTree)
       end
 
       it "should dump/restore marshalled attributes" do
-        @obj.parent.persistent = "data"
-        restored = Marshal.load(Marshal.dump(@obj))
+        subject.parent.persistent = "data"
+        restored = Marshal.load(Marshal.dump(subject))
         restored.parent.persistent.should == "data"
       end
 
       it "should not dump/restore unmarshalled attributes" do
-        @obj.parent.transient = "data"
-        restored = Marshal.load(Marshal.dump(@obj))
+        subject.parent.transient = "data"
+        restored = Marshal.load(Marshal.dump(subject))
         restored.parent.transient.should be_nil
       end
 
@@ -205,25 +203,25 @@ describe Thirtythirty do
     context "with a collection relation" do
 
       before do
-        @obj.children = [ThirtythirtyTree.new]
+        subject.children = [ThirtythirtyTree.new]
       end
 
       it "should restore an array of ThirtythirtyTrees" do
-        children = Marshal.load(Marshal.dump(@obj)).children
+        children = Marshal.load(Marshal.dump(subject)).children
         children.should be_a(Array)
         children.size.should == 1
         children.first.should be_a(ThirtythirtyTree)
       end
 
       it "should dump/restore marshalled attributes" do
-        @obj.children.first.persistent = "data"
-        restored = Marshal.load(Marshal.dump(@obj))
+        subject.children.first.persistent = "data"
+        restored = Marshal.load(Marshal.dump(subject))
         restored.children.first.persistent.should == "data"
       end
 
       it "should not dump/restore unmarshalled attributes" do
-        @obj.children.first.transient = "data"
-        restored = Marshal.load(Marshal.dump(@obj))
+        subject.children.first.transient = "data"
+        restored = Marshal.load(Marshal.dump(subject))
         restored.children.first.transient.should be_nil
       end
 
@@ -249,4 +247,28 @@ describe Thirtythirty do
 
   end
 
+  describe "inheritance" do
+
+    it "should have the same marshalled attributes as the parent" do
+      Class.new(ThirtythirtyTree).marshalled_attributes.should == ThirtythirtyTree.marshalled_attributes
+    end
+
+    it "should be able to add it's own marshalled attributes" do
+      Class.new(ThirtythirtyTree) do
+        marshalled_accessor :another_persistent
+      end.marshalled_attributes.should == ThirtythirtyTree.marshalled_attributes + [:another_persistent]
+    end
+
+    it "should have the same compression level as the parent" do
+      Class.new(Compressed).marshalling_compression_level.should == Compressed.marshalling_compression_level
+    end
+
+    it "should be able to set it's own compression level" do
+      Class.new(Uncompressed) do
+        marshal_with_compression Zlib::BEST_COMPRESSION
+      end.marshalling_compression_level.should == Zlib::BEST_COMPRESSION
+    end
+
+  end
+
 end

data/thirtythirty.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "thirtythirty"
-  s.version     = "0.0.5"
+  s.version     = "0.0.6"
   s.date        = Time.now
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Benjamin Behr", "Thomas Jachmann"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thirtythirty
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Benjamin Behr
@@ -69,10 +69,7 @@ files:
 - Rakefile
 - lib/thirtythirty.rb
 - spec/spec_helper.rb
-- spec/support/compressed.rb
-- spec/support/thirtythirty_base.rb
-- spec/support/tree.rb
-- spec/support/uncompressed.rb
+- spec/support/classes.rb
 - spec/thirtythirty_spec.rb
 - thirtythirty.gemspec
 has_rdoc: true
@@ -111,8 +108,5 @@ specification_version: 3
 summary: Marshalling customization
 test_files: 
 - spec/spec_helper.rb
-- spec/support/compressed.rb
-- spec/support/thirtythirty_base.rb
-- spec/support/tree.rb
-- spec/support/uncompressed.rb
+- spec/support/classes.rb
 - spec/thirtythirty_spec.rb

data/spec/support/compressed.rb

@@ -1,4 +0,0 @@
-class Compressed < ThirtythirtyBase
-  marshal_with_compression
-  marshalled_accessor :persistent
-end

data/spec/support/thirtythirty_base.rb

@@ -1,3 +0,0 @@
-class ThirtythirtyBase
-  extend Thirtythirty
-end

data/spec/support/tree.rb

@@ -1,4 +0,0 @@
-class ThirtythirtyTree < ThirtythirtyBase
-  marshalled_accessor :persistent, :parent, :children
-  attr_accessor :transient
-end

data/spec/support/uncompressed.rb

@@ -1,3 +0,0 @@
-class Uncompressed < ThirtythirtyBase
-  marshalled_accessor :persistent
-end