safety-pin 0.1.3 → 0.1.4

data/lib/safety_pin/jcr.rb

@@ -36,7 +36,7 @@ module SafetyPin
     end
 
     def self.dev_login
-      login(:hostname => "http://localhost:4502", :username => "admin", :password => "cq4me")
+      login(:hostname => "http://localhost:4502", :username => ENV["JCR_USERNAME"], :password => ENV["JCR_PASSWORD"])
     end
   end
 end

data/lib/safety_pin/node.rb

@@ -28,7 +28,13 @@ module SafetyPin
       JCR.session
     end
     
-    def self.build(node_blueprint)
+    def self.build(node_blueprint_or_path_string)      
+      if node_blueprint_or_path_string.respond_to?(:primary_type, :properties)
+        node_blueprint = node_blueprint_or_path_string
+      else
+        node_blueprint = NodeBlueprint.new(path: node_blueprint_or_path_string)
+      end
+
       raise NodeError.new("NodeBlueprint is nil") if node_blueprint.nil?
       raise NodeError.new("NodeBlueprint has non-absolute path") unless node_blueprint.path.to_s.start_with?("/")
       raise NodeError.new("Node already exists at path: #{node_blueprint.path}") if Node.exists?(node_blueprint.path)
@@ -51,8 +57,8 @@ module SafetyPin
       node
     end
     
-    def self.create(node_blueprint)
-      node = self.build(node_blueprint)
+    def self.create(node_blueprint_or_path_string)
+      node = self.build(node_blueprint_or_path_string)
       node.save
       node
     end
@@ -116,6 +122,10 @@ module SafetyPin
       end
       child_nodes
     end
+
+    def descendants
+      children.map {|child| [child, child.descendants] }.flatten
+    end
     
     def child(relative_path)
       child_j_node = j_node.get_node(relative_path.to_s)
@@ -170,11 +180,25 @@ module SafetyPin
         Time.at(value.date.time.time / 1000)
       when "Name"
         value.string # Not sure if these should be handled differently
+      when "Binary"
+        value.binary
+      when "Decimal"
+        value.decimal
+      when "Path"
+        Pathname(value.string)
       else
         raise PropertyTypeError.new("Unknown property type: #{property_type}")
       end
     end
     
+    def property_single_valued?(name)
+      properties.has_key?(name) and !property_multi_valued?(name)
+    end
+
+    def property_multi_valued?(name)
+      properties.has_key?(name) and properties[name].is_a?(Array)
+    end
+
     def write_attribute(name, value)
       raise PropertyError.new("Illegal operation: cannot change jcr:primaryType property") if name == "jcr:primaryType"
       name = name.to_s
@@ -182,8 +206,16 @@ module SafetyPin
       if value.nil? and not j_node.has_property(name)
         return nil
       end
+
+      # when going from multi to single value
+      if property_multi_valued?(name) and !value.is_a?(Array)
+        value = [value]
+      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
         values = value
         val_fact = value_factory
         j_values = []
@@ -195,7 +227,7 @@ module SafetyPin
         calendar_value = Calendar.instance
         calendar_value.set_time(value.to_java)
         j_node.set_property(name, calendar_value)
-      elsif value.is_a? Symbol
+      elsif value.is_a?(Symbol) or value.is_a?(Pathname)
         j_node.set_property(name, value.to_s)
       else
         begin
@@ -384,6 +416,10 @@ module SafetyPin
     def has_property(name)
       properties.keys.include?(name)
     end
+
+    def inspect
+      "#<#{self.class} path=#{path}>"
+    end
   end
   
   class NodeError < Exception; end

data/lib/safety_pin/version.rb

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

data/spec/jcr_spec.rb

@@ -10,14 +10,14 @@ describe SafetyPin::JCR do
   end
   
   it "should login to a remote JCR" do
-    SafetyPin::JCR.login(:hostname => "http://localhost:4502", :username => "admin", :password => "admin")
+    SafetyPin::JCR.login(:hostname => "http://localhost:4502", :username => ENV["JCR_USERNAME"], :password => ENV["JCR_PASSWORD"])
     SafetyPin::JCR.session.should be_a(Java::JavaxJcr::Session)
     SafetyPin::JCR.should be_logged_in
     SafetyPin::JCR.logout
   end
   
   it "should logout of a remote SafetyPin::JCR" do
-    SafetyPin::JCR.login(:hostname => "http://localhost:4502", :username => "admin", :password => "admin")
+    SafetyPin::JCR.login(:hostname => "http://localhost:4502", :username => ENV["JCR_USERNAME"], :password => ENV["JCR_PASSWORD"])
     SafetyPin::JCR.logout
     SafetyPin::JCR.should be_logged_out
   end

data/spec/jcr_sql2_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper.rb'
 
 describe "JCR-SQL2 example queries" do  
   before do
+    lingering_node = SafetyPin::Node.find("/content/foo")
+    lingering_node.destroy unless lingering_node.nil?
     @node = SafetyPin::Node.create("/content/foo")
     @node.properties = {"bar" => "baz", "qux" => "qax"}
     @node.save
@@ -46,6 +48,7 @@ describe "JCR-SQL2 example queries" do
   end
   
   it "can lookup a node based on node type" do
+    pending "too slow"
     nodes = SafetyPin::Query.execute("SELECT * FROM [cq:Page]")
     nodes.first.primary_type.should eql("cq:Page")
   end

data/spec/node_spec.rb

@@ -266,6 +266,13 @@ describe SafetyPin::Node do
         end
       end
 
+      context "given a pathname value" do
+        it "coers value to string" do
+          node.write_attribute("foo", Pathname("/content/foo"))
+          node["foo"].should == "/content/foo"
+        end
+      end
+
       context "given another supported value" do
         it "sets the property" do
           node.write_attribute("foo", 1)
@@ -293,6 +300,30 @@ describe SafetyPin::Node do
           node["foo"].should eql("bar")
         end
       end
+
+      context "when changing a property from a single value to a multivalue" do
+        it "should work" do
+          node.write_attribute(:foo, "bar")
+          node.save
+          node.reload
+          node.write_attribute(:foo, ["bar"])
+          node.save
+          node.reload
+          node["foo"].should == ["bar"]
+        end
+      end
+
+      context "when changing a property from a multi value to a single value" do
+        it "wraps the value in an array (can't go from multi to single" do
+          node.write_attribute("foo", ["bar"])
+          node.save
+          node.reload
+          node.write_attribute("foo", "not bar")
+          node.save
+          node.reload
+          node["foo"].should == ["not bar"]
+        end
+      end
     end
 
     context "given an array of values" do
@@ -761,4 +792,19 @@ describe SafetyPin::Node do
       node["bar"].should_not == "BAZ"
     end
   end
+
+  describe "#descendants" do
+    before do
+      SafetyPin::Node.create(SafetyPin::NodeBlueprint.new(path: "/content/foo"))
+      SafetyPin::Node.create(SafetyPin::NodeBlueprint.new(path: "/content/foo/bar"))
+      SafetyPin::Node.create(SafetyPin::NodeBlueprint.new(path: "/content/foo/bar/baz"))
+      SafetyPin::Node.create(SafetyPin::NodeBlueprint.new(path: "/content/foo/bar/baz/qux"))
+      SafetyPin::Node.create(SafetyPin::NodeBlueprint.new(path: "/content/foo/baz"))
+      SafetyPin::Node.create(SafetyPin::NodeBlueprint.new(path: "/content/foo/baz/qux"))
+    end
+
+    it "returns all nodes beneath this one" do
+      SafetyPin::Node.find("/content/foo").descendants.should have(5).items
+    end
+  end
 end

metadata

@@ -2,14 +2,14 @@
 name: safety-pin
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jordan Raine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies: []
 description: An easy-to-use JCR connector for JRuby
 email: