safety-pin 0.1.4 → 0.1.5

data/lib/safety_pin/node.rb

@@ -199,23 +199,30 @@ module SafetyPin
       properties.has_key?(name) and properties[name].is_a?(Array)
     end
 
+    def has_property?(name)
+      j_node.has_property(name)
+    end
+
+    def remove_property(name)
+      j_node.get_property(name).remove if has_property?(name)
+    end
+
     def write_attribute(name, value)
       raise PropertyError.new("Illegal operation: cannot change jcr:primaryType property") if name == "jcr:primaryType"
       name = name.to_s
       
-      if value.nil? and not j_node.has_property(name)
+      if value.nil?
+        remove_property(name)
         return nil
       end
 
       # when going from multi to single value
       if property_multi_valued?(name) and !value.is_a?(Array)
-        value = [value]
+        remove_property(name)
       end
       
       if value.is_a? Array
-        if properties.has_key?(name) and property_single_valued?(name) # when going from single to multi value
-          j_node.set_property(name, nil)
-        end
+        remove_property(name)
         values = value
         val_fact = value_factory
         j_values = []

data/lib/safety_pin/version.rb

@@ -1,3 +1,3 @@
 module SafetyPin
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/node_spec.rb

@@ -302,7 +302,7 @@ describe SafetyPin::Node do
       end
 
       context "when changing a property from a single value to a multivalue" do
-        it "should work" do
+        it "doesn't throw exceptions" do
           node.write_attribute(:foo, "bar")
           node.save
           node.reload
@@ -321,7 +321,17 @@ describe SafetyPin::Node do
           node.write_attribute("foo", "not bar")
           node.save
           node.reload
-          node["foo"].should == ["not bar"]
+          node["foo"].should == "not bar"
+        end
+
+        it "doesn't wrap nil" do
+          node.write_attribute("foo", ["bar"])
+          node.save
+          node.reload
+          node.write_attribute("foo", nil)
+          node.save
+          node.reload
+          node["foo"].should be_nil
         end
       end
     end

metadata

@@ -2,7 +2,7 @@
 name: safety-pin
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jordan Raine