hybag 0.0.11 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzZkYTExZGU2NGI5YjA3MzFkNWE5YjA5ZTVkOTA4ZTgxM2U4MDY4Zg==
+    MjJmNGNhNzQ1Y2U1MTYyZDFiNDJlYzk5ZWU2MGUxODI0OTFjZTNhOA==
   data.tar.gz: !binary |-
-    ZjM0NjU0NTc0ZGQzNWViNjc5OTQ2MjhhZGVkNjIzYmVkNDJjY2I1OQ==
+    MjViZjdlZDAzMzJmMDFiYmE0OTVkZjg1NTBmMDlhYmM5MDhkOTNkZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDgwZDYwZjEyMjY4ZTQ0ZmFjZWYyYWRlNjNiZGQwYTI1NDI5NzVjMWUxY2Nk
-    MDgyMmY2YWFiNDkyMzMwZDdiMmRiNzU2YjYxYTM1M2VjYzk4ZDY1NGYzNzI5
-    Y2MwYjM2ZTI0NTgzYTM4YTMyNDQ4NjYyOWJmZWU2NjY0NzIwMmM=
+    OWRmMDdiNDBkNjUyMGViZjU0YzI3NTQxNmQwMjMxYjRlNGJjMjM5OGI0ZTE2
+    ZTRjZThjNjhkMmZiMDNiYzc5NDA0MzRkMDUxNjFmMWEyMmFkY2RmMTk5OTI3
+    YjM2NDllZWVlYTk3OThhOGY2YzBlNTZmYjNjN2I5MzU0ZjA4YWE=
   data.tar.gz: !binary |-
-    ZDFkOWUxNTY0NzI3NjJlZjVjYjlmOGI0ZTUwYTdkMzdhN2ZkYzQzNjZlNTFj
-    MWFiYTY5NGRkMzNlNzIwMDE0MzEwYjdiNDFjMGM1OWZmMDhhNGU0MDQ3ZmJl
-    ZDdiNTMzOGQ5NWI3ZTI3MTZjYTliMWE2M2EzMjVhM2U1MmM2YmE=
+    ODBhOTY5OWQ0NzJhMjNkZWZkMmQ2YjBlYmRjNGIyODUyYTA3YmVkMTQyZTdl
+    NjFjZjlmZDQwMGVmMDc2OTNkM2RiNzI3OWZjN2QzY2I5ZDQyZTE5OWNlN2Y4
+    ZjkzZjhkYTdhNGU5Y2M4YjMxNWFiZTU1MWMyNjQwMWEzMTcyZGE=

data/README.md

@@ -43,11 +43,15 @@ datastream to be populated bag_root/descMetadata.* (where * is the extension) mu
 #### Determining the model name.
 
 Currently the model name is determined from the bag's fedora/rels-ext.rdf file (which Hybag::Baggable exports)
-or a config file stored in bag_root/hybag.yml. The fedora rels-ext takes precedence. An example Hybag.yml format is
-below
+or is configurable via a block as shown before
 
-```yml
-model: TestModel
+```ruby
+bag = Bagit::Bag.new("/path/to/bag")
+test_class = Hybag.ingest(bag) do |ingester|
+  ingester.bag == bag # => true
+  ingester.model_name = "ActiveFedora::Base"
+end
+test_class.class # => ActiveFedora::Base
 ```
 
 ### Examples

data/lib/hybag.rb

@@ -10,7 +10,9 @@ require 'hybag/ingester'
 
 module Hybag
   def self.ingest(bag)
-    Hybag::Ingester.new(bag).ingest
+    ingester = Hybag::Ingester.new(bag)
+    yield(ingester) if block_given?
+    ingester.ingest
   end
 
   # Error Classes

data/lib/hybag/ingester.rb

@@ -2,7 +2,7 @@ require 'rdf/rdfxml'
 
 module Hybag
   class Ingester
-    attr_accessor :bag
+    attr_accessor :bag, :model_name
     def initialize(bag)
       @bag = bag
     end
@@ -17,6 +17,12 @@ module Hybag
       return new_object
     end
 
+    def model_name
+      # TODO: Add a default model_name configuration option?
+      @model_name ||= extract_model_from_rels
+
+    end
+
     private
 
     # TODO: Add some sort of configuration to map bag filenames -> dsids.
@@ -81,12 +87,6 @@ module Hybag
       Pathname.new(bag_filename).basename.sub_ext('').to_s
     end
 
-    def model_name
-      # TODO: Add a default model_name configuration option?
-      @model_name ||= extract_model_from_rels || extract_model_from_yaml
-
-    end
-
     def extract_model_from_rels
       if File.exist?(fedora_rels)
         filler_object = ActiveFedora::Base.new
@@ -99,19 +99,6 @@ module Hybag
       return model_name
     end
 
-    def extract_model_from_yaml
-      model_name = nil
-      if(File.exist?(yaml_config))
-        conf = YAML.load(File.read(yaml_config))
-        model_name = conf['model']
-      end
-      return model_name
-    end
-
-    def yaml_config
-      File.join(bag.bag_dir,"hybag.yml")
-    end
-
     def fedora_rels
       File.join(bag.bag_dir,"fedora","RELS-EXT.rdf")
     end

data/lib/hybag/version.rb

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

data/spec/lib/hybag/ingester_spec.rb

@@ -46,32 +46,40 @@ describe Hybag::Ingester do
         end
       end
       context "when there is no rels" do
-        context "when there is a hybag.yml" do
+        context "but a model name is explicitly configured" 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}
+            subject.model_name = "TestModel"
           end
-          it "should pull the data out of hybag.yml" do
-            subject.send(:model_name).should == "TestModel"
+          it "should have a configured model name" 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
+      #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

@@ -6,5 +6,14 @@ describe Hybag do
       Hybag::Ingester.any_instance.should_receive(:ingest).and_return("bla")
       Hybag.ingest("empty")
     end
+    it "should allow the ingester to be configurable" do
+      ingesting = nil
+      Hybag::Ingester.any_instance.should_receive(:ingest).and_return("bla")
+      Hybag.ingest("empty") do |ingester|
+        ingester.model_name = "TestModel"
+        ingesting = ingester
+      end
+      expect(ingesting.model_name).to eq "TestModel"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hybag
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.1.0
 platform: ruby
 authors:
 - Trey Terrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler