worthwhile 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7a0bdc8caa976082ae459f78c1eae0d5522c746
-  data.tar.gz: 15a19ca1cca304cc6e6f4db164668b8ac78556f8
+  metadata.gz: 5dc022225019a4ba976d79fde13890bdf57d9652
+  data.tar.gz: 0b2f53fc1cfd7b66f1d719b143a48882497741e6
 SHA512:
-  metadata.gz: 9b08b1d3e9a7ac35ed78b6cbd14d152d0f6a3326b7e911277c3c9e7d16563dc2066f79db07a66160ce7be8a8bafbec08f399e17830f7715238bbb3f3ed153e10
-  data.tar.gz: 8a446c13f86117ef8b8ddf1405c39138afa589b0d0036d56efe40c478e43567199339998b97537a8bc8a5e9a1f24967242ea02df73f0a2d65ea756f7b425f6d8
+  metadata.gz: ccc281f98244b539da01d9a88d7ae3be106ce85efe88f262ecb12860a5f1e92c62bcc4104a17283ca8ec29538fee50c52d8bec775b7a2b0777fb8d0383e8530d
+  data.tar.gz: d666f3ae3ae112fb99eff15a2721108fd6bc226a5bb2c7b02ccb41f6aad756267b878116475a1740956e05a332ce645f91c50d33e6970ae94eb1aadd3ae9b9c3

data/Gemfile

@@ -5,6 +5,8 @@ gemspec
 
 gem 'byebug' unless ENV['TRAVIS']
 gem 'sass-rails', '~> 4.0.3'
+gem 'worthwhile-models', path: './worthwhile-models'
+gem 'active-triples', '0.2.3'
 
 group :test do
   gem 'simplecov', '~> 0.9', require: false

data/RELEASING.md

@@ -0,0 +1,2 @@
+* Bump version number in WORTHWHILE_VERSION
+* Release the gem to rubygems.org: rake all:release

data/Rakefile

@@ -4,6 +4,7 @@ APP_ROOT="." # for jettywrapper
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
+Dir.glob('tasks/*.rake').each { |r| import r }
 
 require 'jettywrapper'
 require 'engine_cart/rake_task'

data/WORTHWHILE_VERSION

@@ -0,0 +1 @@
+0.1.0

data/app/actors/curation_concern/base_actor.rb

@@ -56,6 +56,7 @@ module CurationConcern
 
     def apply_save_data_to_curation_concern
       attributes[:rights] = Array(attributes[:rights]) if attributes.key? :rights
+      remove_blank_attributes!
       curation_concern.attributes = attributes
       curation_concern.date_modified = Date.today
     end
@@ -64,5 +65,22 @@ module CurationConcern
       ActiveSupport::Deprecation.warn("removing #{self.class}#attach_file, use CurationConcern.attach_file instead")
       CurationConcern.attach_file(generic_file, user, file_to_attach)
     end
+
+    # If any attributes are blank remove them
+    # e.g.:
+    #   self.attributes = { 'title' => ['first', 'second', ''] }
+    #   remove_blank_attributes!
+    #   self.attributes
+    # => { 'title' => ['first', 'second'] }
+    def remove_blank_attributes!
+      multivalued_form_attributes.each_with_object(attributes) do |(k, v), h|
+        h[k] = v.select(&:present?)
+      end
+    end
+
+    # Return the hash of attributes that are multivalued and not uploaded files
+    def multivalued_form_attributes
+      attributes.select {|_, v| v.respond_to?(:select) && !v.respond_to?(:read) }
+    end
   end
 end

data/app/views/curation_concern/permissions/confirm.html.erb

@@ -4,10 +4,10 @@
   </div>
   <div class="panel-body">
     <% if curation_concern.under_embargo? %>
-      <p>You've applied an embargo to this <%= curation_concern.human_readable_type %>, <i><%= curation_concern %></i>, changing it's visibility to <b><%= visibility_badge(curation_concern.visibility) %></b> until <%= curation_concern.embargo_release_date.to_date.to_formatted_s(:long_ordinal) %>.</p>
+      <p>You've applied an embargo to this <%= curation_concern.human_readable_type %>, <i><%= curation_concern %></i>, changing its visibility to <b><%= visibility_badge(curation_concern.visibility) %></b> until <%= curation_concern.embargo_release_date.to_date.to_formatted_s(:long_ordinal) %>.</p>
       <p>Would you like to apply the same embargo to all of the files within the  <%= curation_concern.human_readable_type %> as well?</p>
     <% elsif curation_concern.active_lease? %>
-      <p>You've applied a lease to this <%= curation_concern.human_readable_type %>, <i><%= curation_concern %></i>, changing it's visibility to <b><%= visibility_badge(curation_concern.visibility) %></b> until <%= curation_concern.lease_expiration_date.to_date.to_formatted_s(:long_ordinal) %>.</p>
+      <p>You've applied a lease to this <%= curation_concern.human_readable_type %>, <i><%= curation_concern %></i>, changing its visibility to <b><%= visibility_badge(curation_concern.visibility) %></b> until <%= curation_concern.lease_expiration_date.to_date.to_formatted_s(:long_ordinal) %>.</p>
       <p>Would you like to apply the same lease to all of the files within the  <%= curation_concern.human_readable_type %> as well?</p>
     <% else %>
       <p>You've changed the permissions on this <%= curation_concern.human_readable_type %>, <i><%= curation_concern %></i>, making it visible to <b><%= visibility_badge(curation_concern.visibility) %></b>.</p>

data/lib/worthwhile/engine.rb

@@ -1,6 +1,6 @@
 #Load blacklight which will give worthwhile views a higher preference than those in blacklight
 require 'blacklight'
-require 'sufia/models'  
+require 'worthwhile/models'
 require 'hydra-collections'
 
 module Worthwhile
@@ -12,9 +12,9 @@ module Worthwhile
      #{config.root}/lib
      #{config.root}/app/actors/concerns
     )
-    
+
     initializer 'worthwhile.initialize' do
-      require 'worthwhile/rails/routes' 
+      require 'worthwhile/rails/routes'
     end
   end
 end

data/lib/worthwhile/version.rb

@@ -1,3 +1,3 @@
 module Worthwhile
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/spec/actors/curation_concern/generic_work_actor_spec.rb

@@ -26,6 +26,7 @@ describe CurationConcern::GenericWorkActor do
 
     context 'valid attributes' do
       let(:visibility) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED }
+
       context 'with embargo' do
         let(:attributes) { { title: ["New embargo"], visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO,
                            visibility_during_embargo: "authenticated", embargo_release_date: date.to_s,
@@ -140,7 +141,6 @@ describe CurationConcern::GenericWorkActor do
       end
 
       context 'with linked resources' do
-
         let(:attributes) {
           FactoryGirl.attributes_for(:generic_work, visibility: visibility, linked_resource_urls: ['http://www.youtube.com/watch?v=oHg5SJYRHA0', "http://google.com"])
         }
@@ -160,6 +160,18 @@ describe CurationConcern::GenericWorkActor do
           expect(curation_concern).to be_authenticated_only_access
         end
       end
+
+      context "with a present and a blank title" do
+        let(:attributes) {
+          FactoryGirl.attributes_for(:generic_work, title: ['this is present', ''])
+        }
+
+        it 'should stamp each link with the access rights' do
+          expect(subject.create).to be true
+          expect(curation_concern).to be_persisted
+          expect(curation_concern.title).to eq ['this is present']
+        end
+      end
     end
   end
 
@@ -174,6 +186,7 @@ describe CurationConcern::GenericWorkActor do
         expect(subject.update).to be false
       end
     end
+
     context 'valid attributes' do
       let(:attributes) {{}}
       it "should interpret and apply embargo and lease visibility settings" do
@@ -182,6 +195,7 @@ describe CurationConcern::GenericWorkActor do
         subject.update
       end
     end
+
     context 'adding to collections' do
       let!(:collection1) { FactoryGirl.create(:collection, user: user) }
       let!(:collection2) { FactoryGirl.create(:collection, user: user) }

data/spec/spec_helper.rb

@@ -2,9 +2,9 @@ ENV["RAILS_ENV"] ||= 'test'
 
 require 'factory_girl'
 require 'database_cleaner'
-require 'devise'
 require 'engine_cart'
 EngineCart.load_application!
+require 'devise'
 
 require 'rspec/its'
 require 'rspec/rails'

data/spec/views/curation_concern/permissions/confirm.html.erb_spec.rb

@@ -11,7 +11,7 @@ describe 'curation_concern/permissions/confirm.html.erb' do
     let(:curation_concern) { build(:embargoed_work, embargo_date: '2099-09-26'.to_date) }
 
     it "should have a message about embargos" do
-      expect(rendered).to have_content "You've applied an embargo to this Generic Work, Test title, changing it's visibility to Private until September 26th, 2099. Would you like to apply the same embargo to all of the files within the Generic Work as well?"
+      expect(rendered).to have_content "You've applied an embargo to this Generic Work, Test title, changing its visibility to Private until September 26th, 2099. Would you like to apply the same embargo to all of the files within the Generic Work as well?"
     end
   end
 
@@ -19,7 +19,7 @@ describe 'curation_concern/permissions/confirm.html.erb' do
     let(:curation_concern) { build(:leased_work, embargo_date: '2099-09-26'.to_date) }
 
     it "should have a message about leases" do
-      expect(rendered).to have_content "You've applied a lease to this Generic Work, Test title, changing it's visibility to Open Access until September 26th, 2099. Would you like to apply the same lease to all of the files within the Generic Work as well?"
+      expect(rendered).to have_content "You've applied a lease to this Generic Work, Test title, changing its visibility to Open Access until September 26th, 2099. Would you like to apply the same lease to all of the files within the Generic Work as well?"
     end
   end
 

data/tasks/release.rake

@@ -0,0 +1,93 @@
+root    = File.expand_path('../../', __FILE__)
+version = File.read("#{root}/WORTHWHILE_VERSION").strip
+tag     = "v#{version}"
+
+directory 'pkg'
+
+['worthwhile-models', 'worthwhile'].each do |framework|
+  namespace framework do
+    gem     = "pkg/#{framework}-#{version}.gem"
+    gemspec = "#{framework}.gemspec"
+
+    task :clean do
+      rm_f gem
+    end
+
+    task :update_version_rb do
+      glob = root.dup
+      if framework == "worthwhile"
+        glob << "/lib/*"
+      else
+        glob << "/#{framework}/lib/**"
+      end
+      glob << "/version.rb"
+
+      file = Dir[glob].first
+      if file
+        ruby = File.read(file)
+
+        major, minor, tiny, pre = version.split('.')
+        pre = pre ? pre.inspect : "nil"
+
+        ruby.gsub!(/^(\s*)VERSION = ".*?"$/, "\\1VERSION = \"#{version}\"")
+        raise "Could not insert VERSION in #{file}" unless $1
+        File.open(file, 'w') { |f| f.write ruby }
+      end
+    end
+    task gem => %w(update_version_rb pkg) do
+      cmd = ""
+      cmd << "cd #{framework} && " unless framework == "worthwhile"
+      cmd << "gem build #{gemspec} && mv #{framework}-#{version}.gem #{root}/pkg/"
+      sh cmd
+    end
+
+    task build: [:clean, gem]
+    task install: :build do
+      sh "gem install #{gem}"
+    end
+
+    task prep_release: [:ensure_clean_state, :build]
+
+    task push: :build do
+      sh "gem push #{gem}"
+    end
+  end
+end
+
+
+namespace :all do
+  task build: ['worthwhile-models:build', 'worthwhile:build']
+  task install: ['worthwhile-models:install', 'worthwhile:install']
+  task push: ['worthwhile-models:push', 'worthwhile:push']
+
+  task :ensure_clean_state do
+    unless `git status -s | grep -v WORTHWHILE_VERSION | grep -v History.md`.strip.empty?
+      abort "[ABORTING] `git status` reports a dirty tree. Make sure all changes are committed"
+    end
+
+    unless ENV['SKIP_TAG'] || `git tag | grep "#{tag}$"`.strip.empty?
+      abort "[ABORTING] `git tag` shows that #{tag} already exists. Has this version already\n"\
+            "           been released? Git tagging can be skipped by setting SKIP_TAG=1"
+    end
+  end
+
+  task :commit do
+    File.open('pkg/commit_message.txt', 'w') do |f|
+      f.puts "# Preparing for #{version} release\n"
+      f.puts
+      f.puts "# UNCOMMENT THE LINE ABOVE TO APPROVE THIS COMMIT"
+    end
+
+    sh "git add . && git commit --verbose --template=pkg/commit_message.txt"
+    rm_f "pkg/commit_message.txt"
+  end
+
+  task :tag do
+    sh "git tag #{tag}"
+    sh "git push --tags"
+  end
+
+  desc "Release both worthwhile and worthwhile-models and update the version to #{version} in all locations"
+  task release: %w(ensure_clean_state build commit tag push)
+end
+

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

@@ -0,0 +1,7 @@
+require "worthwhile/models/version"
+require "worthwhile/models/engine"
+module Worthwhile
+  module Models
+  end
+end
+

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

@@ -0,0 +1,11 @@
+require 'sufia/models'
+module Worthwhile
+  module Models
+    class Engine < ::Rails::Engine
+      # config.autoload_paths += %W(
+      #   #{config.root}/app/models/datastreams
+      # )
+    end
+  end
+end
+

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

@@ -0,0 +1,5 @@
+module Worthwhile
+  module Models
+    VERSION = "0.1.0"
+  end
+end

data/worthwhile-models/worthwhile-models.gemspec

@@ -0,0 +1,29 @@
+# coding: utf-8
+version = File.read(File.expand_path("../../WORTHWHILE_VERSION", __FILE__)).strip
+
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |spec|
+  spec.name          = "worthwhile-models"
+  spec.version       = version
+  spec.authors       = ["Justin Coyne"]
+  spec.email         = ["justin@curationexperts.com"]
+  spec.summary       = %q{Simple institutional repository models for Hydra}
+  spec.description   = %q{An extensible repository data-model with works and and many attached files}
+  spec.homepage      = ""
+  spec.license       = "APACHE2"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'hydra-head', '~> 7.2.2'
+  spec.add_dependency "active_attr"
+  spec.add_dependency 'sufia-models', '~> 4.0.0'
+  spec.add_dependency 'hydra-collections', '~> 2.0.5'
+
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
+end

data/worthwhile.gemspec

@@ -1,11 +1,12 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'worthwhile/version'
+version = File.read(File.expand_path("../WORTHWHILE_VERSION",__FILE__)).strip
+
+# lib = File.expand_path('../lib', __FILE__)
+# $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "worthwhile"
-  spec.version       = Worthwhile::VERSION
+  spec.version       = version
   spec.authors       = ["Justin Coyne"]
   spec.email         = ["justin@curationexperts.com"]
   spec.summary       = %q{A simple institutional repository for Hydra}
@@ -22,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "breadcrumbs_on_rails", "~> 2.3.0"
   spec.add_dependency "active_attr"
   spec.add_dependency "simple_form", '~> 3.1.0.rc2'
+  spec.add_dependency 'worthwhile-models', version
   spec.add_dependency 'sufia-models', '~> 4.0.0'
   spec.add_dependency 'hydra-collections', '~> 2.0.5'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worthwhile
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0.rc2
+- !ruby/object:Gem::Dependency
+  name: worthwhile-models
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: sufia-models
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +289,9 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- RELEASING.md
 - Rakefile
+- WORTHWHILE_VERSION
 - app/actors/concerns/worthwhile/manages_embargoes_actor.rb
 - app/actors/curation_concern/base_actor.rb
 - app/actors/curation_concern/generic_file_actor.rb
@@ -361,26 +377,6 @@ files:
 - app/helpers/worthwhile/url_helper.rb
 - app/inputs/multi_value_input.rb
 - app/models/collection.rb
-- app/models/concerns/curation_concern/collection_model.rb
-- app/models/concerns/curation_concern/curatable.rb
-- app/models/concerns/curation_concern/has_representative.rb
-- app/models/concerns/curation_concern/human_readable_type.rb
-- app/models/concerns/curation_concern/with_basic_metadata.rb
-- app/models/concerns/curation_concern/with_editors.rb
-- app/models/concerns/curation_concern/with_generic_files.rb
-- app/models/concerns/curation_concern/with_linked_resources.rb
-- app/models/concerns/curation_concern/work.rb
-- app/models/concerns/worthwhile/ability.rb
-- app/models/concerns/worthwhile/generic_file/versioned_content.rb
-- app/models/concerns/worthwhile/generic_file_base.rb
-- app/models/concerns/worthwhile/solr_document_behavior.rb
-- app/models/generic_work.rb
-- app/models/worthwhile/classify_concern.rb
-- app/models/worthwhile/content_version.rb
-- app/models/worthwhile/contributor_agreement.rb
-- app/models/worthwhile/generic_file.rb
-- app/models/worthwhile/linked_resource.rb
-- app/models/worthwhile/quick_classification_query.rb
 - app/services/worthwhile/curation_concern.rb
 - app/services/worthwhile/embargo_service.rb
 - app/services/worthwhile/lease_service.rb
@@ -577,6 +573,7 @@ files:
 - spec/views/shared/_add_content.html.erb_spec.rb
 - spec/views/shared/_my_actions.html.erb_spec.rb
 - spec/workers/visibility_copy_worker_spec.rb
+- tasks/release.rake
 - vendor/assets/images/ui-bg_glass_100_fdf5ce_1x400.png
 - vendor/assets/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 - vendor/assets/javascripts/handlebars.js
@@ -592,6 +589,30 @@ files:
 - vendor/assets/stylesheets/token-input-facebook.css
 - vendor/assets/stylesheets/token-input-mac.css
 - vendor/assets/stylesheets/token-input.css
+- worthwhile-models/app/models/concerns/curation_concern/collection_model.rb
+- worthwhile-models/app/models/concerns/curation_concern/curatable.rb
+- worthwhile-models/app/models/concerns/curation_concern/has_representative.rb
+- worthwhile-models/app/models/concerns/curation_concern/human_readable_type.rb
+- worthwhile-models/app/models/concerns/curation_concern/with_basic_metadata.rb
+- worthwhile-models/app/models/concerns/curation_concern/with_editors.rb
+- worthwhile-models/app/models/concerns/curation_concern/with_generic_files.rb
+- worthwhile-models/app/models/concerns/curation_concern/with_linked_resources.rb
+- worthwhile-models/app/models/concerns/curation_concern/work.rb
+- worthwhile-models/app/models/concerns/worthwhile/ability.rb
+- worthwhile-models/app/models/concerns/worthwhile/generic_file/versioned_content.rb
+- worthwhile-models/app/models/concerns/worthwhile/generic_file_base.rb
+- worthwhile-models/app/models/concerns/worthwhile/solr_document_behavior.rb
+- worthwhile-models/app/models/generic_work.rb
+- worthwhile-models/app/models/worthwhile/classify_concern.rb
+- worthwhile-models/app/models/worthwhile/content_version.rb
+- worthwhile-models/app/models/worthwhile/contributor_agreement.rb
+- worthwhile-models/app/models/worthwhile/generic_file.rb
+- worthwhile-models/app/models/worthwhile/linked_resource.rb
+- worthwhile-models/app/models/worthwhile/quick_classification_query.rb
+- worthwhile-models/lib/worthwhile/models.rb
+- worthwhile-models/lib/worthwhile/models/engine.rb
+- worthwhile-models/lib/worthwhile/models/version.rb
+- worthwhile-models/worthwhile-models.gemspec
 - worthwhile.gemspec
 homepage: ''
 licenses: