uwdc 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWMzZWU4NTVhZWMyZTYxNTU4NWQxNWZkNWMxZGM0MDdkZTI3MDBjMA==
+    ZjUwZjVmYjgxZTg5NzNiNTZhYThlNDA3YzgzOTQ3ZGZkMTVmYTMzMg==
   data.tar.gz: !binary |-
-    NTQzMGU2MzBiYTJkNTBkYjZmOGY3ZTY3MTQ2OThlYjAwMmYwZmI5Mw==
+    MThkNGRkOTVmMTVlMjEzOGRkOTUxMTdiOWJlZWVhYjNjMzMzZDVjOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjI3NjhmMjdjMTQxYTYwMDNhOTM4NWEzYTgyOWQxNzI1OTM4MWI3NjJiM2Nj
-    NDVjZDcxYmE1MGJkNGRjODQ3OTdkMTA3YTVjMzA2NzdmYzRmMWMwYTZjODhi
-    ZTRlYjgxNGUxNGNlMDczZjFiODI0MGIzNjFlM2JhMTdjMTkyOGE=
+    NDRhNzVmMDM4NTE3N2E3ZDIxZjA4NzRiNmVkY2VlMTg2OTYyNjU3NGMwZDEz
+    YWE5ZDcyY2ZhNjNlYTFhYjVjZDQ1OWFjZTMyNDQ1ODUzODg5OThhMWY5ZjRh
+    YjRkOWIzM2Q1YjhhM2U2NDgyZjY5NzVjYTM5YzNmMDdmMTA2Nzc=
   data.tar.gz: !binary |-
-    ZTU0OTZlZTNiY2ZhMWMyNDExMjI5YWUzZDcwOGQ2NjRiNDRkNzNiYzcyOWNh
-    NThhYjczY2U3MGNlMmE3YTI1NDIyYmExODljNDQzOWU1ZDEzZjQ0ZmRkZDE1
-    YmQ1MjY4Y2ZiNTA4N2Y3ODhjMzIwMDNkMmVkZGExOWEzMDgyZDc=
+    OTNjM2ViOTg5YjdjZTVhMDMxOGYyMzhmYzQxMDg1MmY4ZWQwMGI3MGFlYmEy
+    OWQ0NzQ0NTI3YTNiNTU5Mzg1MzQyNDRjNjg0NjFlZTlhZTI5YWQzMWJlOGRm
+    Y2VjZmRiOTU5M2Q4MmFiYzczM2JlMzVjYWE5YzEwZjg2Mzc0YWU=

data/lib/uwdc/display.rb

@@ -48,32 +48,20 @@ module UWDC
       @mets.file_sec.files
     end
     
-    def image_files(model)
-      files.select{|file| file.id.include?(model) && UWDC::Display.use[file.use][:partial] == "image"}
-    end
-    
     def images
       viewable_models.inject({}) do |result, model|
-        unless image_files(model).empty?
-          result[model] = image_files(model)
-          result
-        end
+        result[model] = select_files(model, "image") unless select_files(model, "image").empty?
+        result
       end
     end
     
     def video
     end
     
-    def audio_files(model)
-      files.select{|file| file.id.include?(model) && UWDC::Display.use[file.use][:partial] == "audio"}
-    end
-    
     def audio
       viewable_models.inject({}) do |result, model|
-        unless audio_files(model).empty?
-          result[model] = audio_files(model)
-          result
-        end
+        result[model] = select_files(model, "audio") unless select_files(model, "audio").empty?
+        result
       end
     end
     
@@ -99,6 +87,10 @@ module UWDC
     
     private
     
+    def select_files(model, partial)
+      files.select{|file| file.id.include?(model) && UWDC::Display.use[file.use][:partial] == partial}
+    end
+    
     def content_models
       @mets.rels_ext.models
     end

data/lib/uwdc/version.rb

@@ -1,3 +1,3 @@
 module UWDC
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/models/display_spec.rb

@@ -32,9 +32,8 @@ describe UWDC::Display do
       expect(@display.images.size).to eq(5)
     end
     
-    it "should note include audio" do
-      puts @display.audio.inspect
-      expect(@display.audio).to be_false
+    it "should not include audio" do
+      expect(@display.audio).to be_empty
     end
 
     it "should have metadata" do
@@ -43,14 +42,10 @@ describe UWDC::Display do
     end
     
     it "should have partials" do
-      #puts @display.partials.inspect
       expect(@display.partials).to be_true
     end
     
     it "should have models" do
-      @display.partials.each do |div|
-        puts @display.models.select{|model| model.include?(clean_id(div.id))}
-      end
       expect(@display.models).to be_true
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uwdc
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Eric Larson