thirtythirty 0.0.8 → 0.1.0

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 pkg/*
 spec/reports
+Gemfile.lock

data/lib/thirtythirty.rb

@@ -52,7 +52,13 @@ private
       data = Marshal.load(uncompressed)
       obj = new
       marshalled_attributes.each do |attr|
-        obj.send(:"#{attr}=", Marshal.load(data[attr]))
+        setter = :"#{attr}="
+        value = Marshal.load(data[attr])
+        if obj.respond_to?(setter)
+          obj.send(setter, value)
+        else
+          obj.instance_variable_set(:"@#{attr}", value)
+        end
       end
       obj
     end
@@ -75,7 +81,11 @@ private
 
     def build_marshalled_attributes_hash(&block)
       self.class.marshalled_attributes.inject({}) do |hash, attr|
-        value = self.send(attr)
+        value = if self.respond_to?(attr)
+          self.send(attr)
+        else
+          self.instance_variable_get(:"@#{attr}")
+        end
         hash[attr] = block.call(value)
         hash
       end

data/spec/support/classes.rb

@@ -15,3 +15,21 @@ class Compressed < ThirtythirtyBase
   marshal_with_compression
   marshalled_accessor :persistent
 end
+
+class WithoutGetterSetter < ThirtythirtyBase
+  marshal :ivar
+end
+
+class WithGetterOnly < ThirtythirtyBase
+  marshal :ivar
+  def ivar
+    @ivar.nil? ? nil : @ivar.upcase
+  end
+end
+
+class WithSetterOnly < ThirtythirtyBase
+  marshal :ivar
+  def ivar=(value)
+    @ivar = value.nil? ? nil : value.upcase
+  end
+end

data/spec/thirtythirty_spec.rb

@@ -208,6 +208,49 @@ describe Thirtythirty do
       restored.transient.should be_nil
     end
 
+    context "with marshalled instance variable without getter/setter" do
+
+      subject { WithoutGetterSetter.new }
+
+      it "should dump/restore instance variable when nil" do
+        restored = Marshal.load(Marshal.dump(subject))
+        restored.instance_variable_get(:"@ivar").should be_nil
+      end
+
+      it "should dump/restore instance variable when set" do
+        subject.instance_variable_set(:"@ivar", "value")
+        restored = Marshal.load(Marshal.dump(subject))
+        restored.instance_variable_get(:"@ivar").should == "value"
+      end
+
+    end
+
+    context "with marshalled instance variable without setter" do
+
+      subject { WithGetterOnly.new }
+
+      it "should dump accessor value/restore instance variable" do
+        subject.instance_variable_set(:"@ivar", "value")
+        subject.ivar.should == "VALUE"
+        restored = Marshal.load(Marshal.dump(subject))
+        restored.instance_variable_get(:"@ivar").should == "VALUE"
+        restored.ivar.should == "VALUE"
+      end
+
+    end
+
+    context "with marshalled instance variable without getter" do
+
+      subject { WithSetterOnly.new }
+
+      it "should dump instance variable/restore accessor value" do
+        subject.instance_variable_set(:"@ivar", "value")
+        restored = Marshal.load(Marshal.dump(subject))
+        restored.instance_variable_get(:"@ivar").should == "VALUE"
+      end
+
+    end
+
     context "with a single relation" do
 
       before do

data/thirtythirty.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "thirtythirty"
-  s.version     = "0.0.8"
+  s.version     = "0.1.0"
   s.date        = Time.now
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Benjamin Behr", "Thomas Jachmann"]
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "thirtythirty"
 
-  s.add_development_dependency "ci_reporter", "~> 1.6.3"
-  s.add_development_dependency "rspec", "~> 2.4.0"
+  s.add_development_dependency "ci_reporter", "~> 1.6.5"
+  s.add_development_dependency "rspec", "~> 2.6.0"
   s.add_development_dependency "rake", "0.8.7"
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thirtythirty
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 8
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors: 
 - Benjamin Behr
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 +02:00
+date: 2011-08-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 5
         segments: 
         - 1
         - 6
-        - 3
-        version: 1.6.3
+        - 5
+        version: 1.6.5
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 23
         segments: 
         - 2
-        - 4
+        - 6
         - 0
-        version: 2.4.0
+        version: 2.6.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -81,7 +81,6 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
-- Gemfile.lock
 - README.rdoc
 - Rakefile
 - lib/thirtythirty.rb

data/Gemfile.lock

@@ -1,31 +0,0 @@
-PATH
-  remote: .
-  specs:
-    thirtythirty (0.0.7)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    builder (3.0.0)
-    ci_reporter (1.6.4)
-      builder (>= 2.1.2)
-    diff-lcs (1.1.2)
-    rake (0.8.7)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  ci_reporter (~> 1.6.3)
-  rake (= 0.8.7)
-  rspec (~> 2.4.0)
-  thirtythirty!