sufia-models 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88115b1a7a645491dcff7e47680ae4f2f4699d5f
-  data.tar.gz: c6348bf5e986f9b0666b5f8c3494fc8c864e74ae
+  metadata.gz: f5e3ced04ed7546efd8a437f75c39d33bd25ef49
+  data.tar.gz: beb42fc315b7a71f58a87f00492940f0ba57263d
 SHA512:
-  metadata.gz: 43f9323fcfa7cd7d73ce861dcb42c4fd2df22f7b09c3975d4fe18a654a66d39a49c07990399ef97106cfe4c9738420faafec1f0f7b3ef8c0281da8277204e3b9
-  data.tar.gz: bab9cc33d1e179f8b6e590429710d328c2571626a56dd4884e37ce0deb883ec2327cee36d502291f1a9c3f80d9342b1d6833eabb1a666140af81616edbbb67db
+  metadata.gz: 3b35bd03100ce61e5d87660b5f10cf7fa0591642859fea090423d170b99af71cea155b4b46f4fd6014c3b98a80e918e5f6cfb64fd86c23579f3ab3629a6fd675
+  data.tar.gz: dbe7e42f40291485bdb85fa8bb241d0115a29819da55d9155229f0a45b5359f65cc2178e9c7c83c27311657521a8ea6f974eee7a3b5e70e2b5315c853f2965c9

data/app/models/concerns/sufia/generic_file.rb

@@ -21,5 +21,6 @@ module Sufia
     include Hydra::Collections::Collectible
     include Sufia::GenericFile::Batches
     include Sufia::GenericFile::Indexing
+    include Sufia::GenericFile::Querying
   end
 end

data/app/models/concerns/sufia/generic_file/querying.rb

@@ -0,0 +1,43 @@
+module Sufia
+  module GenericFile
+    module Querying
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        # query to find generic files created during the time range
+        # @param [DateTime] start_datetime starting date time for range query
+        # @param [DateTime] end_datetime ending date time for range query
+        def find_by_date_created(start_datetime, end_datetime=nil)
+          return [] if start_datetime.blank?  # no date just return nothing
+          start_date_str =  start_datetime.utc.strftime(self.date_format)
+          end_date_str = if end_datetime.blank?
+                           "*"
+                         else
+                           end_datetime.utc.strftime(self.date_format)
+                         end
+          where "system_create_dtsi:[#{start_date_str} TO #{end_date_str}]"
+        end
+
+        def where_private
+          where_access_is 'private'
+        end
+
+        def where_public
+          where_access_is 'public'
+        end
+
+        def where_registered
+          where_access_is 'registered'
+        end
+
+        def where_access_is(access_level)
+          where Solrizer.solr_name('read_access_group', :symbol) => access_level
+        end
+
+        def date_format
+          "%Y-%m-%dT%H:%M:%SZ"
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/sufia/user.rb

@@ -167,5 +167,10 @@ module Sufia::User
     def from_url_component(component)
       User.find_by_user_key(component.gsub(/-dot-/, '.'))
     end
+
+    def recent_users(start_date, end_date = nil)
+      end_date ||= DateTime.now # doing or eq here so that if the user passes nil we still get now
+      return User.where(created_at: start_date..end_date)
+    end
   end
 end

data/lib/sufia/models/stats/user_stat_importer.rb

@@ -42,7 +42,7 @@ module Sufia
       ::User.find_each do |user|
         users.push(UserRecord.new(user.id, user.user_key, date_since_last_cache(user)))
       end
-      users.sort! {|a, b| a.last_stats_update <=> b.last_stats_update}
+      users.sort {|a, b| a.last_stats_update <=> b.last_stats_update}
     end
 
 private

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "6.1.0"
+    VERSION = "6.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -348,6 +348,7 @@ files:
 - app/models/concerns/sufia/generic_file/mime_types.rb
 - app/models/concerns/sufia/generic_file/permissions.rb
 - app/models/concerns/sufia/generic_file/proxy_deposit.rb
+- app/models/concerns/sufia/generic_file/querying.rb
 - app/models/concerns/sufia/generic_file/trophies.rb
 - app/models/concerns/sufia/generic_file/versions.rb
 - app/models/concerns/sufia/generic_file/virus_check.rb
@@ -481,7 +482,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Models and services for sufia