ddr-models 3.0.0.rc5 → 3.0.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 882499780ce1326eec18ff01bdead5d41dcb0819
-  data.tar.gz: 6c9b5b6edbb3d442b2f5cf6d6d7d74ff31fe7707
+  metadata.gz: 6221b58e1c08d584587392c482d43567bebfca21
+  data.tar.gz: 83d4109b5fda3dc2bcb73cf0200b86c2323c1cbb
 SHA512:
-  metadata.gz: fcc433f961a831d8b14bc2825a355351feb9e9be28c68c16e1348b1d5ef7bcd1be692a152026dbad6177a4f65ad7f046f9c9fe75c13e883448a230eea327f9de
-  data.tar.gz: f9778626680a979a3d46768d6e7af65aa7f3d916c3560d0ac52394466b13f6ab377a55a4e084ddeaa61fff372699deec49a6fc798ead1aaf35e3bfe6b7f273ea
+  metadata.gz: c88cf0d218192ab7bbc26ae5552df1d087cc4d9d67c2cdd35bfd2fa674760c97db298ccfaf117b7583df5f3301b955d8cc6482df4218e462363c3fd13e56bb2e
+  data.tar.gz: 024ea216efe3f4172d02a60e8e2e4f9523cc930b3e2bf374a0fa2298d40d0bc82e8428fb416f8a69bbe9f8fcf017e411861e93dbd52a822be4c6cc1397fbdf5d

data/lib/ddr/index.rb

@@ -4,7 +4,6 @@ module Ddr
 
     autoload :AbstractQueryResult
     autoload :Connection
-    autoload :CSVOptions
     autoload :CSVQueryResult
     autoload :DocumentBuilder
     autoload :Field
@@ -18,7 +17,6 @@ module Ddr
     autoload :QueryParams
     autoload :QueryResult
     autoload :Response
-    autoload :SolrCSVOptions
     autoload :SortOrder
     autoload :UniqueKeyField
 

data/lib/ddr/index/csv_query_result.rb

@@ -3,57 +3,74 @@ require "csv"
 module Ddr::Index
   class CSVQueryResult < AbstractQueryResult
 
-    delegate :[], :to_s, :to_csv, to: :table
+    MAX_ROWS   = 10**8
+    CSV_MV_SEPARATOR = ";"
+
+    DESCMD_HEADER_CONVERTER = lambda { |header|
+      if term = Ddr::Models::DescriptiveMetadata.mapping[header.to_sym]
+        term.unqualified_name.to_s
+      else
+        header
+      end
+    }
+
+    delegate :headers, :to_s, :to_csv, to: :table
 
     def delete_empty_columns!
-      mode = table.mode
       table.by_col!.delete_if { |c, vals| vals.all?(&:nil?) }
-      table.send("by_#{mode}!")
     end
 
     def each(&block)
       table.by_row!.each(&block)
     end
 
+    def [](index_or_header)
+      table.by_col_or_row![index_or_header]
+    end
+
     def table
-      @table ||= CSV.parse(data, csv_opts.to_h)
+      @table ||= CSV.parse(data, csv_opts)
     end
 
     def csv_opts
-      @csv_opts ||= CSVOptions.new(headers: csv_headers)
+      { headers:           csv_headers,
+        return_headers:    false,
+        write_headers:     true,
+        header_converters: [ DESCMD_HEADER_CONVERTER ],
+      }
     end
 
     def solr_csv_opts
-      @solr_csv_opts ||= SolrCSVOptions.new(col_sep: csv_opts.col_sep,
-                                            quote_char: csv_opts.quote_char,
-                                            header: solr_csv_header,
-                                            rows: query.rows)
+      { "csv.mv.separator" => CSV_MV_SEPARATOR,
+        "csv.header"       => solr_csv_header?,
+        "rows"             => solr_csv_rows,
+        "wt"               => "csv",
+      }
     end
 
-    def headers
-      @headers ||= query.fields.map { |f| f.respond_to?(:heading) ? f.heading : f.to_s }
+    def query_field_headings
+      query.fields.map { |f| f.respond_to?(:heading) ? f.heading : f.to_s }
     end
 
     def csv_headers
-      if headers.empty?
-        :first_row
-      else
-        headers
-      end
+      query.fields.empty? ? :first_row : query_field_headings
     end
 
-    def solr_csv_header
+    def solr_csv_header?
       csv_headers == :first_row
     end
 
+    def solr_csv_rows
+      query.rows || MAX_ROWS
+    end
+
     def solr_csv_params
-      params.merge(solr_csv_opts.params)
+      params.merge(solr_csv_opts)
     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)
+      raw.gsub(/\\#{CSV_MV_SEPARATOR}/, CSV_MV_SEPARATOR)
     end
 
   end

data/lib/ddr/models/version.rb

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

data/spec/index/csv_query_result_spec.rb

@@ -20,21 +20,23 @@ module Ddr::Index
     }
 
     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/)
+      expect(subject["title"]).to contain_exactly("Testing 1", "Testing 2", "Testing 3")
+      expect(subject["identifier"]).to contain_exactly("test1", "test2", nil)
+      expect(subject["description"]).to contain_exactly("The process of eliminating errors.", nil, nil)
+      expect(subject["creator"]).to contain_exactly(nil, nil, nil)
+      expect(subject.headers).to include("creator")
+      expect(subject.to_s).to match(/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/)
+        expect(subject["title"]).to contain_exactly("Testing 1", "Testing 2", "Testing 3")
+        expect(subject["identifier"]).to contain_exactly("test1", "test2", nil)
+        expect(subject["description"]).to contain_exactly("The process of eliminating errors.", nil, nil)
+        expect(subject["creator"]).to contain_exactly(nil, nil, nil)
+        expect(subject.headers).to contain_exactly("pid", "title", "identifier", "description")
+        expect(subject.to_s).not_to match(/creator/)
       }
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc5
+  version: 3.0.0.rc6
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -499,7 +499,6 @@ files:
 - lib/ddr/index.rb
 - lib/ddr/index/abstract_query_result.rb
 - lib/ddr/index/connection.rb
-- lib/ddr/index/csv_options.rb
 - lib/ddr/index/csv_query_result.rb
 - lib/ddr/index/document_builder.rb
 - lib/ddr/index/field.rb
@@ -512,7 +511,6 @@ files:
 - lib/ddr/index/query_params.rb
 - lib/ddr/index/query_result.rb
 - lib/ddr/index/response.rb
-- lib/ddr/index/solr_csv_options.rb
 - lib/ddr/index/sort_order.rb
 - lib/ddr/index/unique_key_field.rb
 - lib/ddr/jobs.rb

data/lib/ddr/index/csv_options.rb

@@ -1,12 +0,0 @@
-require "csv"
-require "hashie"
-
-module Ddr::Index
-  class CSVOptions < Hashie::Dash
-    property :headers,        default: CSV::DEFAULT_OPTIONS[:headers]
-    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/solr_csv_options.rb

@@ -1,21 +0,0 @@
-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", default: CSV_MV_SEPARATOR
-    property :wt,                default: "csv"
-    property :rows,              default: MAX_ROWS
-
-    def params
-      to_h.reject { |k, v| v.nil? }
-    end
-
-  end
-end