Ensure prefix is set correctly

* Always pass prefix argument to pairtree
* Defer to underlying creation in pairtree gem

Author: aelkiss

Gemfile

@@ -4,3 +4,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in ht-pairtree.gemspec
 gemspec
+
+group :development do
+  gem "pry"
+end

lib/ht/pairtree.rb

@@ -38,42 +38,31 @@ def path_for(htid)
 
     # Get the underlying pairtree for the given obj.
     # @param [String] htid The HathiTrust ID for an object
+    # @param [Boolean] create Whether to create the pairtree if it doesn't exist
     # @return [Pairtree] the pairtree for that object
-    def pairtree_for(htid)
-      pairtree_root(htid)
+    def pairtree_for(htid, create: false)
+      pairtree_root(htid, create: create)
     end
 
-    # Create a pairtree for the given htid. Allow namespace creation
-    # only if told to.
+    # Create the pairtree directory for the given htid. Allow namespace
+    # creation only if told to.
     # @param htid [String] The HTID
     # @param new_namespace_allowed [Boolean] Whether or not to error if the namespace DNE
     # @raise [NamespaceDoesNotExist] if namespace DNE and new namespace not allowed
     # @return [Pairtree::Obj] the underlying pairtree object
     def create(htid, new_namespace_allowed: false)
-      if !namespace_exists?(htid)
-        if new_namespace_allowed
-          create_namespace_dir(htid)
-        else
-          raise NamespaceDoesNotExist.new("Namespace #{namespace(htid)} does not exist")
-        end
+      unless namespace_exists?(htid) || new_namespace_allowed
+        raise NamespaceDoesNotExist.new("Namespace #{namespace(htid)} does not exist")
       end
-      pairtree_for(htid).mk(htid)
+      pairtree_for(htid, create: new_namespace_allowed).mk(htid)
     end
 
+    private
+
     def namespace_exists?(htid)
       namespace_dir(htid).exist?
     end
 
-    def create_namespace_dir(htid)
-      ndir = namespace_dir(htid)
-      return self if Dir.exist?(ndir)
-      Dir.mkdir(ndir)
-      File.open(ndir + "pairtree_prefix", "w:utf-8") { |f| f.print namespace(htid) }
-      File.open(ndir + "pairtree_version0_1", "w:utf-8") { |f| }
-      Dir.mkdir(ndir + "pairtree_root")
-      self
-    end
-
     def namespace_dir(htid)
       @root + namespace(htid)
     end
@@ -82,8 +71,12 @@ def namespace(htid)
       htid.split(".", 2).first
     end
 
-    def pairtree_root(htid)
-      ::Pairtree.at(namespace_dir(htid))
+    def pairtree_root(htid, create: false)
+      ::Pairtree.at(namespace_dir(htid), prefix: pairtree_prefix(htid), create: create )
+    end
+
+    def pairtree_prefix(htid)
+      namespace(htid) + "."
     end
   end
 end

spec/ht/pairtree_spec.rb

@@ -48,9 +48,12 @@ def make_paths(idmap)
   describe "#create" do
     let(:pt) { HathiTrust::Pairtree.new(root: @tmpdir + "sdr1/obj") }
 
-    it "can create new object directories" do
+    it "can create new object directories in the expected location" do
       expect { pt.create("test.something", new_namespace_allowed: false) }.to raise_error(HathiTrust::Pairtree::NamespaceDoesNotExist)
-      expect(pt.create("test.something", new_namespace_allowed: true).exist?(".")).to be true
+
+      pt_obj = pt.create("test.something", new_namespace_allowed: true) 
+      expect(pt_obj.exist?(".")).to be true
+      expect(pt_obj.to_path).to eq((@tmpdir + "sdr1/obj/test/pairtree_root/so/me/th/in/g/something").to_s)
     end
 
     it "create is idempotent" do