mjgiarlo

Bundler could not find compatible versions for gem "active-fedora":
  In Gemfile:
    sufia was resolved to 7.0.0.beta1, which depends on
      curation_concerns (~> 0.14.0.pre4) was resolved to 0.14.0.pre4, which depends on
        active_fedora-noid (~> 1.0) was resolved to 1.1.0, which depends on
          active-fedora (< 11, >= 9.7)

    sufia was resolved to 7.0.0.beta1, which depends on
      hydra-works (~> 0.7) was resolved to 0.8.1, which depends on
        hydra-pcdm (~> 0.5) was resolved to 0.5.0, which depends on

mjgiarlo

Bundler could not find compatible versions for gem "active-fedora":
  In Gemfile:
    active-fedora (= 9.13.0)

    sufia was resolved to 7.0.0.beta1, which depends on
      curation_concerns (~> 0.14.0.pre4) was resolved to 0.14.0.pre4, which depends on
        active_fedora-noid (~> 1.0) was resolved to 1.1.0, which depends on
          active-fedora (< 11, >= 9.7)

    sufia was resolved to 7.0.0.beta1, which depends on

mjgiarlo

Bundler could not find compatible versions for gem "active-fedora":
  In Gemfile:
    curation_concerns (= 0.14.0) was resolved to 0.14.0, which depends on
      active_fedora-noid (~> 1.0) was resolved to 1.1.0, which depends on
        active-fedora (< 11, >= 9.7)

    curation_concerns (= 0.14.0) was resolved to 0.14.0, which depends on
      active-fedora (~> 9.9)

    curation_concerns (= 0.14.0) was resolved to 0.14.0, which depends on

mjgiarlo

Keybase proof

I hereby claim:

• I am mjgiarlo on github.
• I am mjgiarlo (https://keybase.io/mjgiarlo) on keybase.
• I have a public key ASBn9_Wb6t6jYDaZm5p4GUcFtgGG-qbj7k04LHrK3fan0Qo

To claim this, I am signing this object:

mjgiarlo

diff --git a/lib/generators/sufia/templates/migrations/add_works_to_user_stats.rb b/lib/generators/sufia/templates/migrations/add_works_to_user_stats.rb
index 47de968..2f63ae0 100644
--- a/lib/generators/sufia/templates/migrations/add_works_to_user_stats.rb
+++ b/lib/generators/sufia/templates/migrations/add_works_to_user_stats.rb
@@ -1,12 +1,7 @@
 class AddWorksToUserStats < ActiveRecord::Migration
-  def self.up
-    AddGroupsToUsers
+  def change
+    add_column :user_stats, :work_views, :integer

mjgiarlo

# generator output...
       route  concern :searchable, Blacklight::Routes::Searchable.new

resource :catalog, only: [:index], as: 'catalog', path: '/catalog', controller: 'catalog' do
  concerns :searchable
end
       route  root to: "catalog#index"

mjgiarlo

diff --git a/app/services/sufia/analytics.rb b/app/services/sufia/analytics.rb
index 6ad1a46..ee6e6c3 100644
--- a/app/services/sufia/analytics.rb
+++ b/app/services/sufia/analytics.rb
@@ -1,6 +1,5 @@
 require 'google/api_client'
 require 'oauth2'
-require 'legato'
 
 module Sufia

mjgiarlo

2015-09-11 16:48:25 -0700 (21201) Solr parameters: {"facet.field"=>["resource_type_sim", "collection_sim", "creator_sim", "tag_sim", "subject_sim", "language_sim", "based_near_sim", "publisher_sim", "file_format_sim", "active_fedora_model_ssi"], "facet.query"=>[], "facet.pivot"=>[], "fq"=>["edit_access_group_ssim:public OR edit_access_group_ssim:umg\\/personal.cam156.testgroup OR edit_access_group_ssim:umg\\/personal.cdm5214.firewallgroup OR edit_access_group_ssim:umg\\/psu.itana.arb OR edit_access_group_ssim:umg\\/services.www.dept.stewardship OR edit_access_group_ssim:umg\\/up.dlt.applicationsteam OR edit_access_group_ssim:umg\\/up.dlt.archivesphere-admin-viewers OR edit_access_group_ssim:umg\\/up.dlt.archivesphere-admin.admin OR edit_access_group_ssim:umg\\/up.dlt.archivesphere-project-team OR edit_access_group_ssim:umg\\/up.dlt.gamma-ci OR edit_access_group_ssim:umg\\/up.dlt.gamma-ci.admin OR edit_access_group_ssim:umg\\/up.dlt.redmine.admin OR edit_access_group_ssim:umg\\/up.dlt.scholarsphere-admin OR ed

mjgiarlo

Failures:

  1) CollectionsController#show when signed in returns the collection and its members
     Failure/Error: expect(assigns[:presenter]).to be_kind_of Sufia::CollectionPresenter
       expected #<CurationConcerns::CollectionPresenter:0x0000000877df50 @solr_document=#<SolrDocument:0x000000087844e0 @_source={"system_create_dtsi"=>"2015-12-09T19:25:51Z", "system_modified_dtsi"=>"2015-12-09T19:25:51Z", "active_fedora_model_ssi"=>"Collection", "has_model_ssim"=>["Collection"], "id"=>"hx11xf27c", "object_profile_ssm"=>["{\"id\":\"hx11xf27c\",\"head\":[],\"tail\":[],\"depositor\":\"[email protected]\",\"part_of\":[],\"contributor\":[],\"creator\":[],\"title\":\"My collection\",\"description\":\"My incredibly detailed description of the collection\",\"publisher\":[],\"date_created\":[],\"date_uploaded\":null,\"date_modified\":null,\"subject\":[],\"language\":[],\"rights\":[],\"resource_type\":[],\"identifier\":[],\"based_near\":[],\"tag\":[],\"related_url\":[],\"representative_id\":null,\"thumbnail_id\":null

mjgiarlo

   curation_concerns_file_set_audit POST     /concern/file_sets/:file_set_id/audit(.:format) curation_concerns/audits#create
   stats_curation_concerns_file_set GET      /concern/file_sets/:id/stats(.:format)          curation_concerns/file_sets#stats
        curation_concerns_file_sets POST     /concern/file_sets(.:format)                    curation_concerns/file_sets#create
     new_curation_concerns_file_set GET      /concern/file_sets/new(.:format)                curation_concerns/file_sets#new
    curation_concerns_generic_works GET      /concern/generic_works(.:format)                curation_concerns/generic_works#index
                                    POST     /concern/generic_works(.:format)                curation_concerns/generic_works#create
 new_curation_concerns_generic_work GET      /concern/generic_works/new(.:format)            curation_concerns/generic_works#new
edit_curation_concerns_generic_work GET      /concern/generic_works/:id/edit(.:format)       curation_concerns/generic_works#ed