sufia-models 4.0.0.rc2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82546f98afb1a657c9bfba8eafcaad863373a979
-  data.tar.gz: 15a4dd50704723c213b51cf82b1de921609826a7
+  metadata.gz: ae36845b3a2212024c47f63c3f191ae3ddce2d44
+  data.tar.gz: 7156562bbb3c3a435beb3317ab420b597065b4ce
 SHA512:
-  metadata.gz: 52bf6d0263f5cfbabb55ad19eb8c847f77e2a2b313cd07a9147622348940af4d6b926b0a789a052b6f48c8f84a34ca0f3d99aee6fd9d4eadc68585171b760d8b
-  data.tar.gz: b34150a1691b2cd26c1a6b206e635105bb96b9676973ed898cc9dbc08220fad281c9f42c8b0e812cceb3fa832e719944407c199e245152b0e8bf9efc7f323a91
+  metadata.gz: 9a420c8a86700d0f47e3d9bf29b5f27a488340cb40561476d78d8cb73a267e4389f1e200a7e97ffcfc53c95026230c1b0a340b6ee1e71250198ac1a731082afa
+  data.tar.gz: ab6402e7739924eb275f012dadb3ce47af4e31d92277f6f747b3ca9d991bd2f665fdb5e246e7e4dfc775ad4dd35cb5a83b48c1a137036776fef6763618943898

data/app/actors/sufia/generic_file/actor.rb

@@ -28,7 +28,8 @@ module Sufia::GenericFile
     end
 
     def create_content(file, file_name, dsid)
-      generic_file.add_file(file, dsid, file_name)
+      fname = generic_file.label.blank? ? file_name.truncate(255) : generic_file.label
+      generic_file.add_file(file, dsid, fname)
       save_characterize_and_record_committer do
         if Sufia.config.respond_to?(:after_create_content)
           Sufia.config.after_create_content.call(generic_file, user)

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

@@ -42,11 +42,10 @@ module Sufia
 
       ## Extract the metadata from the content datastream and record it in the characterization datastream
       def characterize
-        metadata = self.content.extract_metadata
-        self.characterization.ng_xml = metadata if metadata.present?
-        self.append_metadata
+        metadata = content.extract_metadata
+        characterization.ng_xml = metadata if metadata.present?
+        append_metadata
         self.filename = [self.label]
-        extract_content
         save
       end
 

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

@@ -7,21 +7,28 @@ module Sufia
         has_file_datastream 'full_text', versionable: false
       end
 
-      def extract_content
-        url = Blacklight.solr_config[:url] ? Blacklight.solr_config[:url] : Blacklight.solr_config["url"] ? Blacklight.solr_config["url"] : Blacklight.solr_config[:fulltext] ? Blacklight.solr_config[:fulltext]["url"] : Blacklight.solr_config[:default]["url"]
-        uri = URI("#{url}/update/extract?extractOnly=true&wt=json&extractFormat=text")
-        req = Net::HTTP.new(uri.host, uri.port)
-        resp = req.post(uri.to_s, self.content.content, {
-            'Content-type' => "#{self.mime_type};charset=utf-8",
-            'Content-Length' => self.content.content.size.to_s
-          })
-        raise "URL '#{uri}' returned code #{resp.code}" unless resp.code == "200"
-        self.content.content.rewind if self.content.content.respond_to?(:rewind)
-        extracted_text = JSON.parse(resp.body)[''].rstrip
-        full_text.content = extracted_text if extracted_text.present?
-      rescue => e
-        logger.error("Error extracting content from #{self.pid}: #{e.inspect}")
+      def append_metadata
+        super
+        extract_content
       end
+
+      private
+
+        def extract_content
+          url = Blacklight.solr_config[:url] ? Blacklight.solr_config[:url] : Blacklight.solr_config["url"] ? Blacklight.solr_config["url"] : Blacklight.solr_config[:fulltext] ? Blacklight.solr_config[:fulltext]["url"] : Blacklight.solr_config[:default]["url"]
+          uri = URI("#{url}/update/extract?extractOnly=true&wt=json&extractFormat=text")
+          req = Net::HTTP.new(uri.host, uri.port)
+          resp = req.post(uri.to_s, self.content.content, {
+              'Content-type' => "#{self.mime_type};charset=utf-8",
+              'Content-Length' => self.content.content.size.to_s
+            })
+          raise "URL '#{uri}' returned code #{resp.code}" unless resp.code == "200"
+          self.content.content.rewind if self.content.content.respond_to?(:rewind)
+          extracted_text = JSON.parse(resp.body)[''].rstrip
+          full_text.content = extracted_text if extracted_text.present?
+        rescue => e
+          logger.error("Error extracting content from #{self.pid}: #{e.inspect}")
+        end
     end
   end
 end

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

@@ -23,6 +23,10 @@ module Sufia
         self.class.office_document_mime_types.include? self.mime_type
       end
 
+      def collection?
+        false
+      end
+
       def file_format
         return nil if self.mime_type.blank? and self.format_label.blank?
         return self.mime_type.split('/')[1]+ " ("+self.format_label.join(", ")+")" unless self.mime_type.blank? or self.format_label.blank?

data/app/models/file_usage.rb

@@ -28,12 +28,16 @@ class FileUsage
 
   private
 
+  # Sufia::Download is sent to Sufia::Analytics.profile as #sufia__download
+  # see Legato::ProfileMethods.method_name_from_klass
   def download_statistics
-    Sufia::Analytics.profile.download(sort: 'date').for_file(self.id)
+    Sufia::Analytics.profile.sufia__download(sort: 'date').for_file(self.id)
   end
 
+  # Sufia::Pageview is sent to Sufia::Analytics.profile as #sufia__pageview
+  # see Legato::ProfileMethods.method_name_from_klass
   def pageview_statistics
-    Sufia::Analytics.profile.pageview(sort: 'date').for_path(self.path)
+    Sufia::Analytics.profile.sufia__pageview(sort: 'date').for_path(self.path)
   end
 
   def pageviews_to_flot values = Array.new

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "4.0.0.rc2"
+    VERSION = "4.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc2
+  version: 4.0.0
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -393,9 +393,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2