ddr-models 3.0.0.rc4 → 3.0.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8155309c431868675c03fbaf02a8799964d2d47
-  data.tar.gz: b10fd2351e4e63e7fb031bce241aafa358b06002
+  metadata.gz: 882499780ce1326eec18ff01bdead5d41dcb0819
+  data.tar.gz: 6c9b5b6edbb3d442b2f5cf6d6d7d74ff31fe7707
 SHA512:
-  metadata.gz: 9cc4187d72d08043d254be38b77c6bcc40477f7959db80cfc71a6f6ef53c7ff88c86c5919c7183cfe3c0570bb00b50f414aef4d67952e561a73984de41bfd61f
-  data.tar.gz: 503759f1af8ee9bb73d9631da9dc8c0c3ac92f44625e41e8485205b65354859e8af968190844f3c2d8a955d0223854ab76ee80693682fa297fc4959d557a7845
+  metadata.gz: fcc433f961a831d8b14bc2825a355351feb9e9be28c68c16e1348b1d5ef7bcd1be692a152026dbad6177a4f65ad7f046f9c9fe75c13e883448a230eea327f9de
+  data.tar.gz: f9778626680a979a3d46768d6e7af65aa7f3d916c3560d0ac52394466b13f6ab377a55a4e084ddeaa61fff372699deec49a6fc798ead1aaf35e3bfe6b7f273ea

data/lib/ddr/index/connection.rb

@@ -1,3 +1,5 @@
+require "rsolr"
+
 module Ddr::Index
   class Connection < SimpleDelegator
 

data/lib/ddr/index/csv_options.rb

@@ -3,12 +3,10 @@ require "hashie"
 
 module Ddr::Index
   class CSVOptions < Hashie::Dash
-
     property :headers,        default: CSV::DEFAULT_OPTIONS[:headers]
-    property :return_headers, default: true
+    property :return_headers, default: false
     property :write_headers,  default: true
     property :col_sep,        default: CSV::DEFAULT_OPTIONS[:col_sep]
     property :quote_char,     default: CSV::DEFAULT_OPTIONS[:quote_char]
-
   end
 end

data/lib/ddr/index/csv_query_result.rb

@@ -3,28 +3,20 @@ require "csv"
 module Ddr::Index
   class CSVQueryResult < AbstractQueryResult
 
-    MAX_ROWS = 10**8
-    MV_SEP   = ";"
+    delegate :[], :to_s, :to_csv, to: :table
 
-    attr_reader :mv_sep
-
-    delegate :read, :each, to: :csv
-
-    def initialize(query, mv_sep: MV_SEP)
-      super(query)
-      @mv_sep = mv_sep
-    end
-
-    def csv
-      CSV.new(data, csv_opts.to_h)
+    def delete_empty_columns!
+      mode = table.mode
+      table.by_col!.delete_if { |c, vals| vals.all?(&:nil?) }
+      table.send("by_#{mode}!")
     end
 
-    def to_s
-      read.to_csv
+    def each(&block)
+      table.by_row!.each(&block)
     end
 
-    def rows
-      query.rows || MAX_ROWS
+    def table
+      @table ||= CSV.parse(data, csv_opts.to_h)
     end
 
     def csv_opts
@@ -35,12 +27,11 @@ module Ddr::Index
       @solr_csv_opts ||= SolrCSVOptions.new(col_sep: csv_opts.col_sep,
                                             quote_char: csv_opts.quote_char,
                                             header: solr_csv_header,
-                                            mv_sep: mv_sep,
-                                            rows: rows)
+                                            rows: query.rows)
     end
 
     def headers
-      @headers ||= query.fields.map(&:heading)
+      @headers ||= query.fields.map { |f| f.respond_to?(:heading) ? f.heading : f.to_s }
     end
 
     def csv_headers
@@ -56,11 +47,12 @@ module Ddr::Index
     end
 
     def solr_csv_params
-      params.merge solr_csv_opts.params
+      params.merge(solr_csv_opts.params)
     end
 
     def data
       raw = conn.get("select", params: solr_csv_params)
+      mv_sep = solr_csv_opts["csv.mv.separator"]
       raw.gsub(/\\#{mv_sep}/, mv_sep)
     end
 

data/lib/ddr/index/fields.rb

@@ -10,7 +10,7 @@ module Ddr::Index
     ADMIN_SET_FACET             = Field.new :admin_set_facet, :facetable
     ALL_TEXT                    = Field.new :all_text, solr_name: "all_text_timv"
     ASPACE_ID                   = Field.new :aspace_id, :stored_sortable
-    ATTACHED_FILES              = Field.new :attached_files, solr_name: "attached_files_ss"
+    ATTACHED_FILES              = Field.new :attached_files, :stored_sortable
     ATTACHED_FILES_HAVING_CONTENT =
       Field.new :attached_files_having_content, :symbol
     BOX_NUMBER_FACET            = Field.new :box_number_facet, :facetable

data/lib/ddr/index/query.rb

@@ -46,8 +46,8 @@ module Ddr::Index
       QueryResult.new(self)
     end
 
-    def csv(**opts)
-      CSVQueryResult.new(self, **opts)
+    def csv
+      CSVQueryResult.new(self)
     end
 
     def filter_clauses

data/lib/ddr/index/solr_csv_options.rb

@@ -3,12 +3,15 @@ require "hashie"
 module Ddr::Index
   class SolrCSVOptions < Hashie::Trash
 
+    MAX_ROWS   = 10**8
+    CSV_MV_SEPARATOR = ";"
+
     property "csv.header",       from: :header,     default: false
     property "csv.separator",    from: :col_sep,    default: ","
     property "csv.encapsulator", from: :quote_char, default: '"'
-    property "csv.mv.separator", from: :mv_sep,     default: ","
+    property "csv.mv.separator", default: CSV_MV_SEPARATOR
     property :wt,                default: "csv"
-    property :rows
+    property :rows,              default: MAX_ROWS
 
     def params
       to_h.reject { |k, v| v.nil? }

data/lib/ddr/models/attached_file_profile.rb

@@ -5,7 +5,11 @@ module Ddr::Models
     include ActiveModel::Serializers::JSON
 
     def attributes
-      { "size" => nil, "mime_type" => nil }
+      { "size"=>nil, "mime_type"=>nil, "sha1"=>nil }
+    end
+
+    def sha1
+      checksum.value
     end
 
   end

data/lib/ddr/models/attached_files_profile.rb

@@ -2,23 +2,24 @@ module Ddr::Models
   class AttachedFilesProfile
     include ActiveModel::Serializers::JSON
 
-    attr_reader :files_hash
+    attr_reader :object
 
-    # @param files_hash [ActiveFedora::FilesHash]
-    def initialize(files_hash)
-      @files_hash = files_hash
+    def initialize(object)
+      @object = object
     end
 
     def attributes
-      files_hash.keys.each_with_object({}) do |key, memo|
-        unless files_hash[key].destroyed?
-          memo[key.to_s] = nil
-        end
-      end
+      files.keys.map { |k| [k, nil] }.to_h
     end
 
     def read_attribute_for_serialization(key)
-      AttachedFileProfile.new(files_hash[key])
+      AttachedFileProfile.new(files[key])
+    end
+
+    private
+
+    def files
+      object.attached_files_having_content
     end
 
   end

data/lib/ddr/models/base.rb

@@ -128,7 +128,7 @@ module Ddr::Models
     end
 
     def attached_files_profile
-      AttachedFilesProfile.new(attached_files)
+      AttachedFilesProfile.new(self)
     end
 
     def copy_admin_policy_or_roles_from(other)

data/lib/ddr/models/solr_document.rb

@@ -89,7 +89,12 @@ module Ddr::Models
     end
 
     def has_datastream?(dsID)
-      attached_files.key?(dsID) && attached_files[dsID]["size"].present?
+      Deprecation.warn(SolrDocument, "Use `has_attached_file?` instead.")
+      has_attached_file?(dsID)
+    end
+
+    def has_attached_file?(file_id)
+      attached_files.key?(file_id)
     end
 
     def has_admin_policy?
@@ -134,15 +139,15 @@ module Ddr::Models
     end
 
     def has_thumbnail?
-      has_datastream?(Ddr::Models::File::THUMBNAIL)
+      has_attached_file?(Ddr::Models::File::THUMBNAIL)
     end
 
     def has_content?
-      has_datastream?(Ddr::Models::File::CONTENT)
+      has_attached_file?(Ddr::Models::File::CONTENT)
     end
 
     def has_extracted_text?
-      has_datastream?(Ddr::Datastreams::EXTRACTED_TEXT)
+      has_attached_file?(Ddr::Datastreams::EXTRACTED_TEXT)
     end
 
     def content_ds

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "3.0.0.rc4"
+    VERSION = "3.0.0.rc5"
   end
 end

data/spec/index/csv_query_result_spec.rb

@@ -0,0 +1,42 @@
+module Ddr::Index
+  RSpec.describe CSVQueryResult do
+
+    subject { described_class.new(query) }
+
+    before do
+      Item.create(dc_title: ["Testing 1"],
+                  dc_identifier: ["test1"],
+                  dc_description: ["The process of eliminating errors."])
+      Item.create(dc_title: ["Testing 2"],
+                  dc_identifier: ["test2"])
+      Item.create(dc_title: ["Testing 3"])
+    end
+
+    let(:query) {
+      Ddr::Index::Query.new do
+        fields Ddr::Index::Fields::ID
+        fields Ddr::Index::Fields.descmd
+      end
+    }
+
+    specify {
+      expect(subject["dc_title"]).to contain_exactly("Testing 1", "Testing 2", "Testing 3")
+      expect(subject["dc_identifier"]).to contain_exactly("test1", "test2", nil)
+      expect(subject["dc_description"]).to contain_exactly("The process of eliminating errors.", nil, nil)
+      expect(subject["dc_creator"]).to contain_exactly(nil, nil, nil)
+      expect(subject.to_s).to match(/dc_creator/)
+    }
+
+    describe "#delete_empty_columns!" do
+      specify {
+        subject.delete_empty_columns!
+        expect(subject["dc_title"]).to contain_exactly("Testing 1", "Testing 2", "Testing 3")
+        expect(subject["dc_identifier"]).to contain_exactly("test1", "test2", nil)
+        expect(subject["dc_description"]).to contain_exactly("The process of eliminating errors.", nil, nil)
+        expect(subject["dc_creator"]).to contain_exactly(nil, nil, nil)
+        expect(subject.to_s).not_to match(/dc_creator/)
+      }
+    end
+
+  end
+end

data/spec/models/attached_files_profile_spec.rb

@@ -0,0 +1,14 @@
+module Ddr::Models
+  RSpec.describe AttachedFilesProfile do
+
+    subject { described_class.new(obj) }
+
+    let(:obj) { FactoryGirl.create(:component) }
+    let!(:json) {
+      '{"content":{"size":230714,"mime_type":"image/tiff","sha1":"75e2e0cec6e807f6ae63610d46448f777591dd6b"}}'
+    }
+
+    its(:to_json) { is_expected.to eq(json) }
+
+  end
+end

data/spec/models/solr_document_spec.rb

@@ -196,18 +196,20 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
     end
   end
 
-  describe "#has_datastream?" do
+  describe "#has_attached_file?" do
     before do
-      allow(subject).to receive(:attached_files) { {"thumbnail"=>{"size"=>nil}, "content"=>{"size"=>987654} }}
+      allow(subject).to receive(:attached_files) {
+        {"content"=>{"size"=>987654, "sha1"=>"75e2e0cec6e807f6ae63610d46448f777591dd6b", "mime_type"=>"image/tiff"}}
+      }
     end
     context "when there is no content for the datastream" do
       it "should return false" do
-        expect(subject.has_datastream?("thumbnail")).to be false
+        expect(subject.has_attached_file?("thumbnail")).to be false
       end
     end
     context "when there is content for the datastream" do
       it "should return true" do
-        expect(subject.has_datastream?("content")).to be true
+        expect(subject.has_attached_file?("content")).to be true
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc4
+  version: 3.0.0.rc5
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -688,6 +688,7 @@ files:
 - spec/fixtures/sample.docx
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
+- spec/index/csv_query_result_spec.rb
 - spec/index/fields_spec.rb
 - spec/index/filter_spec.rb
 - spec/index/query_builder_spec.rb
@@ -702,6 +703,7 @@ files:
 - spec/models/active_fedora_base_spec.rb
 - spec/models/admin_set_spec.rb
 - spec/models/administrative_metadata_spec.rb
+- spec/models/attached_files_profile_spec.rb
 - spec/models/attachment_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/component_spec.rb
@@ -862,6 +864,7 @@ test_files:
 - spec/fixtures/sample.docx
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
+- spec/index/csv_query_result_spec.rb
 - spec/index/fields_spec.rb
 - spec/index/filter_spec.rb
 - spec/index/query_builder_spec.rb
@@ -876,6 +879,7 @@ test_files:
 - spec/models/active_fedora_base_spec.rb
 - spec/models/admin_set_spec.rb
 - spec/models/administrative_metadata_spec.rb
+- spec/models/attached_files_profile_spec.rb
 - spec/models/attachment_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/component_spec.rb