hybag 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjJmNGNhNzQ1Y2U1MTYyZDFiNDJlYzk5ZWU2MGUxODI0OTFjZTNhOA==
+    MDA1ZjhjNWEzYWE5NTEwNGQ4ODM4NGVkMDY1N2E2MmI4YjVhYWFlOQ==
   data.tar.gz: !binary |-
-    MjViZjdlZDAzMzJmMDFiYmE0OTVkZjg1NTBmMDlhYmM5MDhkOTNkZg==
+    MjdiYWIzZGIwNDRmOWJjYjFhODFiMDY2NzBiNDM2NmI0OTRiNjIwMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWRmMDdiNDBkNjUyMGViZjU0YzI3NTQxNmQwMjMxYjRlNGJjMjM5OGI0ZTE2
-    ZTRjZThjNjhkMmZiMDNiYzc5NDA0MzRkMDUxNjFmMWEyMmFkY2RmMTk5OTI3
-    YjM2NDllZWVlYTk3OThhOGY2YzBlNTZmYjNjN2I5MzU0ZjA4YWE=
+    ZmVjOGUxZTVkODQyOGJlOTMxZjM1YWU1MzgzNmQ3ODhhOGM2Yjc5NmJkMzUy
+    NDUyYTI1OTM2MDQyZDY0OWVmNjQxMjI2MDdkYTM5MTBlNjFmN2JjNTNhMmVl
+    MTMxZTVhYWM5MTYxZWFmZTBlMTg0NTVmOTc2MGNlNzIzZWU4MjA=
   data.tar.gz: !binary |-
-    ODBhOTY5OWQ0NzJhMjNkZWZkMmQ2YjBlYmRjNGIyODUyYTA3YmVkMTQyZTdl
-    NjFjZjlmZDQwMGVmMDc2OTNkM2RiNzI3OWZjN2QzY2I5ZDQyZTE5OWNlN2Y4
-    ZjkzZjhkYTdhNGU5Y2M4YjMxNWFiZTU1MWMyNjQwMWEzMTcyZGE=
+    Y2IyMmIyODI0NjA3YWI3MWE5YTgxODNjYTY2YmNjZmRjZmQ0NTMzN2UzMDVk
+    ZTk5MjQ0MmZhNmI3MzAxY2IyMjA3MTcwYjY5ZTIwOGQ3MzlkODI4M2Q4Njdl
+    YjJlOTAyYWUzYjQ2NzI5ZTAwNGE1N2U2MTk5MDkyNGRjNmMxMTY=

data/lib/hybag.rb

@@ -7,14 +7,30 @@ require 'hybag/baggable'
 require 'hybag/validator'
 require 'hybag/bag_writer'
 require 'hybag/ingester'
+require 'hybag/bulk_ingester'
 
 module Hybag
   def self.ingest(bag)
+    return self.bulk_ingest(bag) if self.bulk_directory?(bag)
+    bag = BagIt::Bag.new(bag.to_s) unless bag.kind_of?(BagIt::Bag)
     ingester = Hybag::Ingester.new(bag)
     yield(ingester) if block_given?
     ingester.ingest
   end
 
+  def self.bulk_ingest(directory)
+    objects = []
+    Hybag::BulkIngester.new(directory).each do |ingester|
+      yield(ingester) if block_given?
+      objects << ingester.ingest
+    end
+    return objects
+  end
+
+  def self.bulk_directory?(directory)
+    Dir.glob(File.join(directory,"*")).select{|x| File.directory?(x) && File.exist?(File.join(x, "bagit.txt"))}.length > 0
+  end
+
   # Error Classes
   class UndiscoverableModelName < StandardError
     def initialize(bag)

data/lib/hybag/bulk_ingester.rb

@@ -0,0 +1,13 @@
+class Hybag::BulkIngester
+  include Enumerable
+  def initialize(directory)
+    @bags = Dir.glob(File.join(directory,"*")).select{|f| File.directory? f}.map{|x| BagIt::Bag.new(x) unless !File.exists?(File.join(x, "bagit.txt"))}.compact
+  end
+
+  def each
+    return enum_for(:each) unless block_given?
+    @bags.each do |bag|
+      yield Hybag::Ingester.new(bag) if bag.complete?
+    end
+  end
+end

data/lib/hybag/version.rb

@@ -1,3 +1,3 @@
 module Hybag
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/lib/hybag/bulk_ingester_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+require 'open-uri'
+require 'pry'
+require File.join(DUMMY_PATH, "baggable_dummy")
+# Override Kernel.open
+module ::Kernel
+  private
+
+  alias :original_open :open
+  def open(name, *rest, &block)
+    if name =~ /\|.*/ then
+      original_open(name, *rest, &block)
+    else
+      FakeFS::File.open(name, *rest, &block)
+    end
+  end
+  module_function :open
+end
+describe Hybag::BulkIngester do
+  before(:each) do
+    @items = []
+    5.times do |n|
+      item = BaggableDummy.new(:pid => "filler#{n}")
+      item.descMetadata.content = File.open(File.join(FIXTURE_PATH,"example_datastream.nt")).read.strip
+      content_file = File.open(File.join(FIXTURE_PATH,"hydra.png"))
+      item.add_file_datastream(content_file, :dsid => "content", :mimeType => "image/png")
+      item.rels_ext.content = File.open(File.join(FIXTURE_PATH,"rels.rdf")).read
+      item.load_relationships
+      item.stub(:persisted?).and_return(true)
+      @items << item
+    end
+    # Stub Rails root
+    rails = double("Rails")
+    Rails = rails unless defined?(Rails)
+    Rails.stub(:root).and_return(Pathname.new('/test'))
+    # Stub ActiveFedora assign_pid
+    ActiveFedora::Base.stub(:assign_pid).and_return(*(5.times.map{|x| "new_filler_#{x}"}))
+  end
+  5.times do |n|
+    let("item_#{n}".to_sym) {@items[n]}
+    let("bag_#{n}".to_sym) {@items[n].write_bag}
+  end
+  subject {Hybag::BulkIngester.new("/test/tmp/bags")}
+  describe "functionality" do
+    include FakeFS::SpecHelpers
+    context "when given a directory of bags" do
+      before(:each) do
+        bag_0
+        bag_1
+        bag_2
+        bag_3
+        bag_4
+      end
+      describe ".each" do
+        it "should return an enumerator" do
+          expect(subject.each).to be_kind_of(Enumerator)
+        end
+        it "should return an ingest object" do
+          expect(subject.each.first).to be_kind_of(Hybag::Ingester)
+        end
+      end
+      it "should only ingest bagit bags" do
+        FileUtils.mkdir('/test/tmp/bags/6')
+        expect(subject.each.to_a.length).to eq 5
+      end
+      it "should be able to ingest a bunch of bags" do
+        result = subject.map{|ingester| ingester.ingest}
+        expect(result.length).to eq 5
+        expect(result.first.pid).to eq "new_filler_0"
+        expect(result.first.title).to eq ["Mexican workers"]
+      end
+    end
+  end
+end

data/spec/lib/hybag/ingester_spec.rb

@@ -54,32 +54,7 @@ describe Hybag::Ingester do
             expect(subject.send(:model_name)).to eq "TestModel"
           end
         end
-        #context "when there is a hybag.yml" do
-        #  before(:each) do
-        #    FileUtils.rm(subject.send(:fedora_rels), :force => true)
-        #    # Add the hybag.yml from fixture
-        #    FakeFS.deactivate!
-        #    hybag_content = File.read(File.join(FIXTURE_PATH,"hybag.yml"))
-        #    FakeFS.activate!
-        #    File.open(File.join(bag.bag_dir,"hybag.yml"),'w') {|f| f.puts hybag_content}
-        #  end
-        #  it "should pull the data out of hybag.yml" do
-        #    subject.send(:model_name).should == "TestModel"
-        #  end
-        #end
       end
-      #context "when there is a rels and a hybag.yml" do
-      #  before(:each) do
-      #    # Add the hybag.yml from fixture
-      #    FakeFS.deactivate!
-      #    hybag_content = File.read(File.join(FIXTURE_PATH,"hybag.yml"))
-      #    FakeFS.activate!
-      #    File.open(File.join(bag.bag_dir,"hybag.yml"),'w') {|f| f.puts hybag_content}
-      #  end
-      #  it "should prioritize the rels" do
-      #    subject.send(:model_name).should == "BaggableDummy"
-      #  end
-      #end
     end
     describe ".ingest" do
       context "when there is no discoverable model" do

data/spec/lib/hybag_spec.rb

@@ -1,11 +1,60 @@
 require 'spec_helper'
+require 'open-uri'
+require 'pry'
+require File.join(DUMMY_PATH, "baggable_dummy")
 
 describe Hybag do
   describe ".ingest" do
+    include FakeFS::SpecHelpers
     it "should call Hybag::Ingester.ingest" do
       Hybag::Ingester.any_instance.should_receive(:ingest).and_return("bla")
       Hybag.ingest("empty")
     end
+    it "should make a bag out of a directory" do
+      BagIt::Bag.should_receive(:new).with("/bag/directory")
+      Hybag::Ingester.any_instance.should_receive(:ingest).and_return("bla")
+      Hybag.ingest("/bag/directory")
+    end
+    context "full test" do
+      before(:each) do
+        FileUtils.mkdir_p("/bag/directory")
+        FakeFS.deactivate!
+        @item = BaggableDummy.new(:pid => '1')
+        @item.descMetadata.content = File.open(File.join(FIXTURE_PATH,"example_datastream.nt")).read.strip
+        content_file = File.open(File.join(FIXTURE_PATH,"hydra.png"))
+        @item.add_file_datastream(content_file, :dsid => "content", :mimeType => "image/png")
+        @item.rels_ext.content = File.open(File.join(FIXTURE_PATH,"rels.rdf")).read
+        @item.load_relationships
+        @item.stub(:persisted?).and_return(true)
+        # Stub Rails root
+        rails = double("Rails")
+        Rails = rails unless defined?(Rails)
+        Rails.stub(:root).and_return(Pathname.new('/'))
+        # Stub ActiveFedora assign_pid
+        ActiveFedora::Base.stub(:assign_pid).and_return("new_pid")
+        @item.stub(:bag_path_namespace).and_return(File.join("bag","directory"))
+        FakeFS.activate!
+        @bag = @item.write_bag
+      end
+      it "should return objects" do
+        objects = Hybag.ingest("/bag/directory")
+        expect(objects.length).to eq 1
+        expect(objects.first).to be_kind_of(ActiveFedora::Base)
+      end
+    end
+    context "when given a directory of bags" do
+      before(:each) do
+        Hybag.should_receive(:bulk_directory?).and_return(true)
+      end
+      it "should not call Ingester" do
+        Hybag::Ingester.any_instance.should_not_receive(:ingest)
+        Hybag.ingest("/bag/directory")
+      end
+      it "should call Bulk Ingester" do
+        Hybag::BulkIngester.should_receive(:new).with("/bag/directory").and_return([])
+        Hybag.ingest("/bag/directory")
+      end
+    end
     it "should allow the ingester to be configurable" do
       ingesting = nil
       Hybag::Ingester.any_instance.should_receive(:ingest).and_return("bla")
@@ -16,4 +65,4 @@ describe Hybag do
       expect(ingesting.model_name).to eq "TestModel"
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hybag
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Trey Terrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,6 +173,7 @@ files:
 - lib/hybag.rb
 - lib/hybag/bag_writer.rb
 - lib/hybag/baggable.rb
+- lib/hybag/bulk_ingester.rb
 - lib/hybag/ingester.rb
 - lib/hybag/validator.rb
 - lib/hybag/version.rb
@@ -182,6 +183,7 @@ files:
 - spec/fixtures/hydra.png
 - spec/fixtures/rels.rdf
 - spec/lib/hybag/baggable_spec.rb
+- spec/lib/hybag/bulk_ingester_spec.rb
 - spec/lib/hybag/ingester_spec.rb
 - spec/lib/hybag/validator_spec.rb
 - spec/lib/hybag_spec.rb
@@ -218,6 +220,7 @@ test_files:
 - spec/fixtures/hydra.png
 - spec/fixtures/rels.rdf
 - spec/lib/hybag/baggable_spec.rb
+- spec/lib/hybag/bulk_ingester_spec.rb
 - spec/lib/hybag/ingester_spec.rb
 - spec/lib/hybag/validator_spec.rb
 - spec/lib/hybag_spec.rb