artk 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDE3MGM0Mjc4NzFkOTc1NTk5ZTNhZWRmODkzN2ExNWEzZTMxMGY5OQ==
+    MWFjNGMyOWUwMWE1ZmNmOTJkMDY0ZTE5ZGNjYmJjNjAwZTU2Y2U4OQ==
   data.tar.gz: !binary |-
-    NGMyZWRmMDk0OTY1YzMwY2M2YjU3ZTkzYmE1NTIwYmM3MmQ2ZGM0Mg==
+    OGU0YTQxMWQ1ZDUzYjQ3NzU4MmY4OGM3YmVlYjVkZTMzNDdlNjBiMw==
 SHA512:
   metadata.gz: !binary |-
-    MzQ4YTBiYjlmMjcxYmQ5MDZhYjFjNGNkYjY2NGI1MzE2YzJkNzJkNjY3ODUz
-    ZjgxNjkzNGE2ZDEyZTZkNGIyOGMwOTM2NTNlZjdkYzE2Y2ZjZDZjNzdlMjQy
-    N2NkMzQ2MmRkMzQzMWY3NmVlOGIwMzdjOWNjN2NiZGM0Njc1ODk=
+    MjljNDFhMmJjMjczYWViN2M1ZDQ3MDAxMDUxYTkyY2QwN2FmODUwOTllOWNi
+    ZDhjNzMyMWRiNTkxY2Q5NTVlZjk4MGYyYzRlOGEzMDM0MTkyYWI3MjliZjEz
+    MjFiZGNjMjM1NDY2N2RlYjM2NmIzZTVkY2Y5NDdiMGU3N2YxODg=
   data.tar.gz: !binary |-
-    NDA1YWMwYWZlNGE4ZWJmZmY4ZWM1NmExNjIyOTA1OTc2MmY3ODRiYTIwZTNi
-    NWExZmM1YzkzNTE3YjM4YzA5ZmExYzhjMWQzZjVjZDQ0ODMyYTY5MTIyZmQ5
-    Njg5MWU1MDc2YmUwZmRmNTk0MWI4OWU0YzliZjMwZTI2Y2IyZGI=
+    ZTgwMTNkMzE3OTBkMTU1NGM1Nzg2NDBhZjgyOGExMWRhOTBmYjkxYWE0ZjZl
+    NjlkZWM5ZGY3MThkODA2NGE5MWYxNThlMzQ5YWJiZDg4ZjkzZTFiZjhhNjIx
+    ZDY4MGFmNWQ4ZTM3YjhkODM4NDQ0ODdmNDY0NTlkYjJhOGJlYjI=

data/app/models/artk/resource.rb

@@ -20,10 +20,10 @@ class Resource < Artk::Base
     self.where("eadFaUniqueIdentifier = '#{id}'").first
   end
 
-  # Returns all Artk::Component objects that have children components attached to them
-  # and are not just the first level of <c> nodes in the finding aid
+  # Returns all Artk::Component objects or <c> nodes that are in the collection.
+  # We have to build the component levels one by one, limited to 6 levels.
   def all_series
-    first   = retrieve_initial_series
+    first   = self.components
     second  = []
     third   = []
     fourth  = []
@@ -31,11 +31,11 @@ class Resource < Artk::Base
     sixth   = []
     
     # Get additional series, second through sixth
-    second  = first.collect { |r| retrieve_additional_series(r) }.flatten unless first.empty?
-    third   = second.collect { |r| retrieve_additional_series(r) }.flatten unless second.empty?
-    fourth  = third.collect { |r| retrieve_additional_series(r) }.flatten unless third.empty?
-    fifth   = fourth.collect { |r| retrieve_additional_series(r) }.flatten unless fourth.empty?
-    sixth   = fifth.collect { |r| retrieve_additional_series(r) }.flatten unless fifth.empty?
+    second  = first.collect { |r| r.sub_components }.flatten unless first.empty?
+    third   = second.collect { |r| r.sub_components }.flatten unless second.empty?
+    fourth  = third.collect { |r| r.sub_components }.flatten unless third.empty?
+    fifth   = fourth.collect { |r| r.sub_components }.flatten unless fourth.empty?
+    sixth   = fifth.collect { |r| r.sub_components }.flatten unless fifth.empty?
 
     return (first + second + third + fourth + fifth + sixth).sort
   end
@@ -51,10 +51,12 @@ class Resource < Artk::Base
 
   private
 
+  # not used because we're returning all components and not just those that have sub-components
   def retrieve_initial_series
     self.components.keep_if{ |c| c.has_child? }
   end
 
+  # not used because we're returning all components and not just those that have sub-components
   def retrieve_additional_series component
     component.sub_components.keep_if{ |c| c.has_child? }
   end

data/lib/artk/version.rb

@@ -1,3 +1,3 @@
 module Artk
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artk
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Adam Wead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.8
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Provides a Rails interface to Archivist's Toolkit