sushi_counter 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d6e5e173e88c45200a3f4966060ce1153f93d6a
-  data.tar.gz: 30817939966490cbcd1667cdeed0778b722cb555
+  metadata.gz: 95f7c943d58b5485c950efb26143cab845f4db07
+  data.tar.gz: df21c32e8eef3fee4e76dfeb3b74124ac48b18ae
 SHA512:
-  metadata.gz: 5c7fa75cf5156ffb4b97f6cf065cea398874007eecd57ca20519dc584707ceaf7a128a48f01af5626465acdc4a495c7573c12ed27994a3428eadb9875eca4996
-  data.tar.gz: 6f0366b9ea9c058a58a5e5ddccf54ac1528b8778ef0b5914fc39ceb04dd0ce7a8ab98e844103d2aa33ee41e498c01d7b8cced2b7c4c35311380de7f6767f6886
+  metadata.gz: 2e9fe70c44aa5e5f0d92cee13bf487784b24353f1327f01dda3870d9661a4d137e3589bd36250de4942fa2265101571706776f0951439c718c3cd003572d0c1b
+  data.tar.gz: 6273352d2ed6a3c4303ff5c3e8749dbd419d58e8389c7e5c43eaa4f934a455798c2117fe6a718e5bedfa365a265ab60d3ce8b9f5a325dd0d4b771976fa571bab

data/sushi_counter.rb

@@ -161,7 +161,7 @@ define_method :sushi_call do
       },
     } )
     puts "Fetching report..."
-    begin
+    #begin
 
     xml = response.doc
     #Need to replace below xml file with a dynamically generated name based on vendor/year.
@@ -212,6 +212,8 @@ define_method :sushi_call do
     html_holder = []
     month_holder = []
     count_holder = []
+    total_holder = []
+    all_stats = []
     count_hash = Hash[month_array.map{|x| [x.to_sym] }]
     month_iterator = nil
     total_iterator = nil
@@ -225,8 +227,7 @@ define_method :sushi_call do
     total_all = nil
     i = 0
     platform = nil
-    total_integer = nil
-    #total_months = []
+
 
 
     noko_doc.xpath('//ReportItems').each do |item|
@@ -255,7 +256,6 @@ define_method :sushi_call do
 
 
       n = 0
-      m = 0
 
 
       #Match months supplied by user to months in month_holder array
@@ -264,7 +264,6 @@ define_method :sushi_call do
         if month_holder.include? month_array[n]
           month_key = month_array[n]
           count = count_hash[month_key.to_sym]
-          m += 1
           total_stats << count
           if n < count_var
             n += 1
@@ -291,18 +290,17 @@ define_method :sushi_call do
       #Refine code below? Currently working, but could probably be DRYer
       total_stats.each_slice(months_var).each do |slice|
         iterator = slice.join(",")
-        total_integer = slice.map(&:to_i).inject(0, :+)
       end
       #Could probably just add up html_stats array and output in CSV row below.
       html_stats.each_slice(months_var).each do |slice|
         html_holder = slice
         html_integer = html_holder.map(&:to_i)
-        html_iterator = html_integer.inject(0, :+)
+        html_iterator = html_integer.reduce(0, :+)
       end
       pdf_stats.each_slice(months_var).each do |slice|
         pdf_holder = slice
         pdf_integer = pdf_holder.map(&:to_i)
-        pdf_iterator = pdf_integer.inject(0, :+)
+        pdf_iterator = pdf_integer.reduce(0, :+)
       end
       total_iterator = pdf_iterator + html_iterator
 
@@ -316,6 +314,13 @@ define_method :sushi_call do
     total_html = html_stats.map(&:to_i).reduce(:+)
     total_all = total_html + total_pdf
 
+    #Need to use with_index to divide index, not value
+    #z = 1
+    #months_var.times do
+    #  all_stats << total_stats.select {|x| x % z == 0}
+    #  z += 1
+    #end
+
     ##Output Nokogiri Doc into csv
     CSV.open(output_file, 'wb') do |row|
       row << ["#{doc_version}", "Release: #{doc_release}"]
@@ -328,22 +333,22 @@ define_method :sushi_call do
       #Prints all headers
       row << ["Journal", "Publisher", "Platform", "Journal DOI", "Proprietary Identifier", "Print ISSN", "Online ISSN", "Reporting Period Total", "Reporting Period HTML", "Reporting Period PDF", month_array]
       #Prints totals of all data - need to add more totals.
-      row << ["Total for all Journals", "", platform, "","","","", total_all, total_html, total_pdf, total_integer]
+      row << ["Total for all Journals", "", platform, "","","","", total_all, total_html, total_pdf, all_stats]
 
       #Code below iterates through array, printing each item to a row
       report_data.each do |data|
         row << data
       end
     end
-    rescue
-      puts Rainbow("There was an error running the script. Double check the values you are passing to the script and try adding '--log' to your command
-      to see what went wrong.").bright.red
-    else
+    #rescue
+      #puts Rainbow("There was an error running the script. Double check the values you are passing to the script and try adding '--log' to your command
+      #to see what went wrong.").bright.red
+    #else
     #Rewrite XML filename to something more useful (e.g. vendor name)?
     #Add statements to check if files actually created.
-    puts "The XML file is in the" + Rainbow(" 'raw_xml/'").green.bright + " folder and the filename is" + Rainbow(" '#{options[:customer]}-#{Time.now.strftime("%Y%m%d")}.xml'").green.bright
-    puts "Your COUNTER report is in the file" + Rainbow(" '#{ARGV[0]}'").green.bright
-    end
+    #puts "The XML file is in the" + Rainbow(" 'raw_xml/'").green.bright + " folder and the filename is" + Rainbow(" '#{options[:customer]}-#{Time.now.strftime("%Y%m%d")}.xml'").green.bright
+    #puts "Your COUNTER report is in the file" + Rainbow(" '#{ARGV[0]}'").green.bright
+    #end
 end
 
 sushi_call()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sushi_counter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Max King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="