openapply 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b0c0c8d58f1cd650e0ce2d45e87fb8f66a5e25cc8796214838a9b2bda42b52d
-  data.tar.gz: d7405bd5b47e826348cbfd2d39d8f16cd0f5fb2ca7b7c9186ffb4a4c7231e2d2
+  metadata.gz: 7daf1c8615f04294450317b2673835f0861e7fa090677da1ace14d15d11a6eef
+  data.tar.gz: e13d752545d7d5d4b068754ae85fb318982d1b57f06cc86f99865853ebe782b6
 SHA512:
-  metadata.gz: 344ce55394f520ed227b31d3e0e78d747b7b3a1001f605502df853951e4cec6f9d70fc9b945c76dca45aa3dc3588fb449676e3d874a93dad27ad70d7789bac14
-  data.tar.gz: a500846657c599050a2b6f72e8581e794c85822bc207a2f87c652ce6b6f4d256645dd049e3bbc23d8f90b3865ce6909314a7aa5d15c5510362984c1f4438ea9d
+  metadata.gz: 29abae7f308e955673d1a75d7c43cd8a549fefdfea4b957c461a34dfb15f4f58fc8a3b490be31357dbd1683e039ce819429cdb59c10f010903ee57e1fab3581c
+  data.tar.gz: 75f3cd2d673087d9ef22defbdd2d5066eaae3768ebe861448c0f9fc97baf0a6d507a73b106c2aeb685a8a07e5d128c4357f7efca4bead81b1a91c857a0e2e252

data/Gemfile

@@ -7,7 +7,8 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 #               ref: '776037c0fc799bb09da8c9ea47980bd3bf296874'
 
 # https://github.com/randym/axlsx/issues/501
-gem 'axlsx',  git: 'https://github.com/randym/axlsx', branch: 'master'
+# gem 'axlsx', git: 'https://github.com/randym/axlsx', branch: 'master'
+# gem 'axlsx', git: 'https://github.com/randym/axlsx.git', ref: '776037c0fc799bb09da8c9ea47980bd3bf296874'
 
 # Specify your gem's dependencies in openapply.gemspec
 gemspec

data/Gemfile.lock

@@ -1,24 +1,11 @@
-GIT
-  remote: https://github.com/randym/axlsx
-  revision: c8ac844572b25fda358cc01d2104720c4c42f450
-  branch: master
-  specs:
-    axlsx (2.1.0.pre)
-      htmlentities (~> 4.3.4)
-      mimemagic (~> 0.3)
-      nokogiri (>= 1.6.6)
-      rubyzip (>= 1.2.1)
-
 PATH
   remote: .
   specs:
-    openapply (0.2.7)
-      axlsx
+    openapply (0.2.8)
       httparty (~> 0.15)
       json (~> 2.1)
       net-scp (~> 1.2)
       net-ssh (~> 4.2)
-      rubyzip (>= 1.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -31,27 +18,19 @@ GEM
     diff-lcs (1.3)
     docile (1.1.5)
     hashdiff (0.3.7)
-    htmlentities (4.3.4)
     httparty (0.15.6)
       multi_xml (>= 0.5.2)
     json (2.1.0)
     method_source (0.9.0)
-    mimemagic (0.3.2)
-    mini_portile2 (2.3.0)
     multi_xml (0.6.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (4.2.0)
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.1)
     rake (10.5.0)
-    roo (2.7.1)
-      nokogiri (~> 1)
-      rubyzip (~> 1.1, < 2.0.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -65,7 +44,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
-    rubyzip (1.2.1)
     safe_yaml (1.0.4)
     simplecov (0.15.1)
       docile (~> 1.1.0)
@@ -81,12 +59,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  axlsx!
   bundler (~> 1.15)
   openapply!
   pry (~> 0.11)
   rake (~> 10.0)
-  roo (~> 2.7)
   rspec (~> 3.7)
   simplecov (~> 0.15)
   webmock (~> 3.1)

data/README.md

@@ -16,11 +16,14 @@ This gem allows ruby access to the OpenApply API v1 - and supports the GET featu
 
 ### CHANGE LOG
 
-* **v0.2.8** - compatible with 0.2.x - 2017-12-?? *(https://github.com/straydogstudio/axlsx_rails/issues/77)*
+* **v0.2.9** - compatible with 0.2.x - 2017-12-?? *(https://github.com/straydogstudio/axlsx_rails/issues/77)*
   - allow flattening to work with arrays
   - allow flattening and reject to work at 2 levels of depth
   - allow flattening and reject to work at any depth (with recursion?)
 
+* **v0.2.8** - compatible with 0.2.x - 2017-12-11 *(https://github.com/randym/axlsx/issues/234)*
+  - axlsx - passes tests - but won't run embedded in a rails app - pulling axlsx again!
+
 * **v0.2.7** - compatible with 0.2.x - 2017-12-10
   - safely re-enabled axlsx by using the master branch and upgradeing rubyzip
 
@@ -176,6 +179,9 @@ csv_string=@oa.students_as_csv_by_statuses(['applied','enrolled'],[:custom_field
 #
 # send CSV to a remote server as a file - using ssh-keys
 @oa.send_data_to_remote_server(csv_string, 'hostname.domain.name', 'myusername', '/home/myusername/xfer/myexport.csv', '0750')
+#
+# send CSV to a remote server as a file - using ssh-keys - don't check host_key of remote server
+@oa.send_data_to_remote_server( csv_string, 'hostname.domain.name', 'myusername', '/home/myusername/xfer/myexport.csv', '0750', {verify_host_key: false} )
 
 # Create XLSX file
 @oa.students_as_xlsx_by_status('applied',[:custom_fields], [:parent_guardian], [:id, :name], {type: :guardians, count: 1, keys: [:id, :name, :address]}, {type: :payments, count: 2, order: :newest, keys: [:date, :amount]} )

data/lib/openapply/convert.rb

@@ -1,5 +1,5 @@
 require 'csv'
-require 'axlsx'
+# require 'axlsx'
 require 'net/scp'
 require 'net/ssh'
 
@@ -99,66 +99,66 @@ module Convert
   end
 
 
-  # XLSX CODE
-  ###########
-
-
-  # Queries by status to get a list of students details of a given status
-  # and converts the result to a XLSX Object (Axlsx::Package) with headers
-  # (based on keys sent)
+  # # XLSX CODE
+  # ###########
   #
-  # ==== Attributes
-  # * +status+ - hash to convert to an array
-  # * +flatten_keys+ - an array of keys to bring to the top level
-  # (with this key prepened) -- default (blank does nothing)
-  # * +reject_keys+ - an array of keys to remove from the data -- default (blank does nothing)
-  # * +student_keys+ - [:id, :name] - include student record keys
-  # * +guardian_info+ - include guardian record info {count: 2, keys: [:id, :name]}
-  # * +payment_info+ - include payment info {count: 2, order: :newest, keys: [:date, :amount]}
-  # * guardian & payment info options:
-  #  count: 2 -- how many parent or payment records to return)
-  #  keys: [:id, :date] -- an array of keys of data to return
-  #  order: :newest -- the order to return payments :newest (most recent first - default) or :oldest
-  def students_as_xlsx_by_status( status,
-                                  flatten_keys=[], reject_keys=[],
-                                  student_keys=[],
-                                  guardian_info={}, payment_info={})
-    #
-    check = check_details_keys_validity(flatten_keys, reject_keys)
-    return check           unless check.nil? # or check[:error].nil?
-    # check = check_header_keys_validity(student_keys, guardian_info, payment_info)
-    # return check    unless check.nil?
-    #
-    students_array  = students_as_array_by_status(  status,
-                                  flatten_keys, reject_keys,
-                                  student_keys, guardian_info, payment_info )
-    #
-    return students_array      if students_array.is_a? Hash
-    #
-    students_xlsx    = students_array_to_xlsx( students_array )
-
-    # example how to save the xlsx object as a file
-    # students_xlsx.serialize("spec/data/xlsx/students_from_oa.xlsx")
-
-    return students_xlsx
-  end
-  alias_method :students_as_xlsx_by_statuses, :students_as_xlsx_by_status
-
-
-  # Given an array convert to XLSX Object (Axlsx::Package)
   #
-  # ==== Attributes
-  # +array+ - expects a hash of students_details (should be flattened to use custom fields)
-  def students_array_to_xlsx(student_array)
-    xlsx_obj = Axlsx::Package.new do |p|
-      p.workbook.add_worksheet(:name => "Students from OpenApply") do |sheet|
-        student_array.each{ |r| sheet.add_row r }
-      end
-      # to save the xlsx object as a file
-      # p.serialize("spec/data/xlsx/students_from_oa.xlsx")
-    end
-    return xlsx_obj
-  end
+  # # Queries by status to get a list of students details of a given status
+  # # and converts the result to a XLSX Object (Axlsx::Package) with headers
+  # # (based on keys sent)
+  # #
+  # # ==== Attributes
+  # # * +status+ - hash to convert to an array
+  # # * +flatten_keys+ - an array of keys to bring to the top level
+  # # (with this key prepened) -- default (blank does nothing)
+  # # * +reject_keys+ - an array of keys to remove from the data -- default (blank does nothing)
+  # # * +student_keys+ - [:id, :name] - include student record keys
+  # # * +guardian_info+ - include guardian record info {count: 2, keys: [:id, :name]}
+  # # * +payment_info+ - include payment info {count: 2, order: :newest, keys: [:date, :amount]}
+  # # * guardian & payment info options:
+  # #  count: 2 -- how many parent or payment records to return)
+  # #  keys: [:id, :date] -- an array of keys of data to return
+  # #  order: :newest -- the order to return payments :newest (most recent first - default) or :oldest
+  # def students_as_xlsx_by_status( status,
+  #                                 flatten_keys=[], reject_keys=[],
+  #                                 student_keys=[],
+  #                                 guardian_info={}, payment_info={})
+  #   #
+  #   check = check_details_keys_validity(flatten_keys, reject_keys)
+  #   return check           unless check.nil? # or check[:error].nil?
+  #   # check = check_header_keys_validity(student_keys, guardian_info, payment_info)
+  #   # return check    unless check.nil?
+  #   #
+  #   students_array  = students_as_array_by_status(  status,
+  #                                 flatten_keys, reject_keys,
+  #                                 student_keys, guardian_info, payment_info )
+  #   #
+  #   return students_array      if students_array.is_a? Hash
+  #   #
+  #   students_xlsx    = students_array_to_xlsx( students_array )
+  #
+  #   # example how to save the xlsx object as a file
+  #   # students_xlsx.serialize("spec/data/xlsx/students_from_oa.xlsx")
+  #
+  #   return students_xlsx
+  # end
+  # alias_method :students_as_xlsx_by_statuses, :students_as_xlsx_by_status
+  #
+
+  # # Given an array convert to XLSX Object (Axlsx::Package)
+  # #
+  # # ==== Attributes
+  # # +array+ - expects a hash of students_details (should be flattened to use custom fields)
+  # def students_array_to_xlsx(student_array)
+  #   xlsx_obj = Axlsx::Package.new do |p|
+  #     p.workbook.add_worksheet(:name => "Students from OpenApply") do |sheet|
+  #       student_array.each{ |r| sheet.add_row r }
+  #     end
+  #     # to save the xlsx object as a file
+  #     # p.serialize("spec/data/xlsx/students_from_oa.xlsx")
+  #   end
+  #   return xlsx_obj
+  # end
 
 
   # ARRAY CODE
@@ -307,7 +307,7 @@ module Convert
     # Prep data as necessary for scp
     # https://www.safaribooksonline.com/library/view/ruby-cookbook/0596523696/ch06s15.html
     # convert the string to a stringio object (which can act as a file)
-    xfer = data.to_stream()           if data.is_a? Axlsx::Package
+    # xfer = data.to_stream()           if data.is_a? Axlsx::Package
     xfer = data                       if data.is_a? StringIO
     xfer = StringIO.new( data )       if data.is_a? String
     xfer = data                       if data.is_a? File
@@ -332,7 +332,7 @@ module Convert
   # === Attributes
   # * +data+ - is it an Axlsx::Package, Sting, StringIO or a File class?
   def known_transfer_object?( data )
-    return true  if data.is_a? Axlsx::Package
+    # return true  if data.is_a? Axlsx::Package
     return true  if data.is_a? StringIO
     return true  if data.is_a? String
     return true  if data.is_a? File

data/lib/openapply/version.rb

@@ -1,3 +1,3 @@
 module Openapply
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/openapply.gemspec

@@ -44,10 +44,13 @@ Gem::Specification.new do |spec|
   # https://github.com/straydogstudio/axlsx_rails/issues/77
   # gem 'axlsx', git: 'https://github.com/randym/axlsx.git',
   #              ref: '776037c0fc799bb09da8c9ea47980bd3bf296874'
-  spec.add_dependency 'axlsx'
-
-  # # Rubyzip before 1.2.1 has a directory traversal vulnerability: CVE-2017-5946
-  spec.add_dependency  'rubyzip', '>= 1.2.1'
+  # spec.add_dependency 'axlsx', "2.1.0.pre"
+  # # https://github.com/randym/axlsx/issues/234
+  # # spec.add_dependency 'zip-zip'
+  #
+  # # # Rubyzip before 1.2.1 has a directory traversal vulnerability: CVE-2017-5946
+  # spec.add_dependency  'rubyzip', '1.2.1'
+  # spec.add_dependency  'rubyzip', '>= 1.2.1'
   # don't use official release - use above
   # spec.add_dependency "axlsx", "2.1.0.pre"
   # spec.add_dependency "rubyzip", "~> 1.2"
@@ -58,6 +61,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.7"
   spec.add_development_dependency "pry", "~> 0.11"
-  spec.add_development_dependency "roo", "~> 2.7"
+  # spec.add_development_dependency "roo", "~> 2.7"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapply
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Bill Tihen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-10 00:00:00.000000000 Z
+date: 2017-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -66,34 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: axlsx
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
-- !ruby/object:Gem::Dependency
-  name: roo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
 description: 
 email:
 - btihen@gmail.com