worthwhile 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51148dfa82366649166775f5fa61af807bddc4e6
-  data.tar.gz: 9719ed8f1dfe0a007814ae0fafbd799dc95fda61
+  metadata.gz: 2f92a3d35183f9fecc6d40669f3947b604746570
+  data.tar.gz: 9f11fc3e4e3df7ccdea248f3bd77393590a9487b
 SHA512:
-  metadata.gz: a60c1ae8730ea3828fd0ca18acb9076e9fd128e9e6c10d426c02f1c778d3d36e0b238c17242356a99c0f60dc1aa9235aac967b6cd3ddbd24e1d3a76ec6bbecc2
-  data.tar.gz: 4f7cdd14bac47eeb3716473fd6ecccafa8d03962ba4f1643b41d7d24684a066817348b62c361a50fd73e3a07f22f19ead5f5d6965834d7d45cb8b00c365dd16e
+  metadata.gz: 553879425a72f231b43b5ffe8410fba8d65d2b11dee4a576f42ffc9bebe8693249d097eec384fe4d65d8c0b2c6537645ec89c2afdd5fb7882caa46f7105f3875
+  data.tar.gz: 33cb788b8e54d4c743588047bc9ceeab335d16c2a88d2f9c74320f0bc5303591ee5a457b203f4f3191c0be8f21fc89ce3b700d649950960396d3a54ae1df9b56

data/WORTHWHILE_VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/app/datastreams/worthwhile/generic_work_rdf_properties.rb

@@ -26,7 +26,7 @@ module Worthwhile::GenericWorkRdfProperties
       index.as :stored_searchable, :facetable
     end
     property :created, predicate: RDF::DC.created
-    
+
     property :date, predicate: RDF::DC.date do |index|
       index.type :date
       index.as :stored_sortable

data/app/helpers/curate/collections_helper.rb

@@ -7,27 +7,4 @@ module Curate::CollectionsHelper
     }
   end
 
-  def available_collections(item = nil)
-    if item.present?
-      collection_options.reject {|n| n == item}
-    else
-      collection_options
-    end
-  end
-
-  private
-
-    def collection_options
-      @collection_options ||= current_users_collections
-    end
-
-    # Defaults to returning a list of all collections.
-    # If you have implement User.collections, the results of that will be used.
-    def current_users_collections
-      if current_user.respond_to?(:collections)
-        current_user.collections.to_a
-      else
-        Collection.all
-      end
-    end
 end

data/app/helpers/worthwhile/collections_helper.rb

@@ -27,4 +27,37 @@ module Worthwhile::CollectionsHelper
     content_tag :span, '', class: "glyphicon glyphicon-#{type}"
   end
 
+  def collection_options_for_select(exclude_item = nil)
+    options_for_select(available_collections(exclude_item))
+  end
+
+  private
+    # return a list of collections for the current user with the exception of the passed in collection
+    def available_collections(exclude_item)
+      if exclude_item
+        collection_options.reject {|n| n.last == exclude_item.id}
+      else
+        collection_options
+      end
+    end
+
+
+    def collection_options
+      @collection_options ||= current_users_collections
+    end
+
+    # Defaults to returning a list of all collections.
+    # If you have implement User.collections, the results of that will be used.
+    def current_users_collections
+      if current_user.respond_to?(:collections)
+        current_user.collections.map { |c| [c.title.join(', '), c.id] }
+      else
+        query = ActiveFedora::SolrService.construct_query_for_rel(has_model: Collection.to_class_uri)
+        ActiveFedora::SolrService.query(query, fl: 'desc_metadata__title_tesim id',
+                                        rows: 1000).map do |r|
+          [r['desc_metadata__title_tesim'].join(', '), r['id']]
+        end.sort { |a, b| a.first <=> b.first }
+      end
+    end
+
 end

data/app/views/curate/collections/_form_to_add_member.html.erb

@@ -8,14 +8,8 @@
 
     <div class="form-group collection_id">
       <div class="controls">
-        <% options = "" %>
-        <% collections = available_collections(collectible) %>
-        <% if collections.any? -%>
-          <% options << '<optgroup label="Your Collections">'.html_safe %>
-          <% options << options_from_collection_for_select(collections, "pid", "title") %>
-          <% options << '</optgroup>'.html_safe %>
-        <% end %>
-        <%= select_tag :id, options, prompt: 'Make a Selection', class: 'form-control', :'aria-labelledby' => select_label_id %>
+        <%= select_tag :id, collection_options_for_select(collectible), prompt: 'Make a Selection',
+          class: 'form-control', :'aria-labelledby' => select_label_id %>
       </div>
     </div>
 

data/lib/worthwhile/version.rb

@@ -1,3 +1,3 @@
 module Worthwhile
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/helpers/worthwhile/collections_helper_spec.rb

@@ -16,4 +16,18 @@ describe Worthwhile::CollectionsHelper do
                                           batch_document_ids: [ '456' ])
     end
   end
+
+  describe "#collection_options_for_select" do
+    before do
+      allow(helper).to receive(:current_user).and_return(User.new)
+    end
+    let!(:collection1) { Collection.create!(pid: 'test:123', title: 'One') }
+    let!(:collection2) { Collection.create!(pid: 'test:456', title: 'Two') }
+    let!(:collection3) { Collection.create!(pid: 'test:789', title: 'Thre') }
+    subject { helper.collection_options_for_select(collection2) }
+
+    it "should exclude the passed in collection" do
+      expect(subject).to eq "<option value=\"#{collection1.id}\">#{collection1.title}</option>\n<option value=\"#{collection3.id}\">#{collection3.title}</option>"
+    end
+  end
 end

data/worthwhile-models/app/models/concerns/worthwhile/generic_file_base.rb

@@ -12,7 +12,7 @@ module Worthwhile
     include Sufia::GenericFile::Metadata
     include Sufia::GenericFile::Versions
     include Sufia::Permissions::Readable
-    include CurationConcern::VersionedContent
+    include ::CurationConcern::VersionedContent
 
     included do
       belongs_to :batch, property: :is_part_of, class_name: 'ActiveFedora::Base'

data/worthwhile-models/app/models/concerns/worthwhile/solr_document_behavior.rb

@@ -27,8 +27,10 @@ module Worthwhile
     # @example
     #   link_to '...', SolrDocument(:id => 'bXXXXXX5').new => <a href="/dams_object/bXXXXXX5">...</a>
     def to_model
-      m = ActiveFedora::Base.load_instance_from_solr(id, self)
-      m.class == ActiveFedora::Base ? self : m
+      @model ||= begin
+        m = ActiveFedora::Base.load_instance_from_solr(id, self)
+        m.class == ActiveFedora::Base ? self : m
+      end
     end
 
     def collection?
@@ -48,7 +50,7 @@ module Worthwhile
       Array(self[Solrizer.solr_name('human_readable_type', :stored_searchable)]).first
     end
 
-    def representative 
+    def representative
       Array(self[Solrizer.solr_name('representative', :stored_searchable)]).first
     end
 

data/worthwhile-models/lib/worthwhile/models/version.rb

@@ -1,5 +1,5 @@
 module Worthwhile
   module Models
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worthwhile
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: sufia-models
   requirement: !ruby/object:Gem::Requirement