jruby_excelcom 0.0.2-java → 0.0.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2baab089c175a34cdf1bf5d929a2d522bd3f801c
-  data.tar.gz: 8ab1043b1bef46183effa114c09bf3aeb699c56e
+  metadata.gz: e86a5a545a59b53142a958df3ce881ca84654203
+  data.tar.gz: 6609ca73a5186d9d5121a97888932503f1cda522
 SHA512:
-  metadata.gz: d09a250b2d2db31288f7a8339e1f6d6ed907144bc78326c4bfde2d30ad69ef9a1a3b6f170ae752d4e6fb4fb8ddbcec3baebcab39b9d52cd7f466c14d016d3f3a
-  data.tar.gz: 49ad80bcb7e2805a10b30ac4e50282df690d00f3dd796fedec57e78a680a897678b8d6496166070a3f8d05c160c905eedba1e0d418a617f8085819054d7aad5a
+  metadata.gz: 180415ce38b272e409cf41c012120d91b771556b5ed6d5ce226349470a77d2be6f55d5728e199e5b1e710a9ffa1c58dcba2cd56b53199079113b383e6467c4af
+  data.tar.gz: 21f7fdd9b74d7e2c5629a398fcb578d352c7c7e8b5c6f2ddcf676544d903af49dade61e6f7290195966589ca885203471cff7f1d37d8c46ff30eb948cc8f4141

data/{jruby_excelcom.gemspec → .//jruby_excelcom.gemspec}

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'jruby_excelcom'
-  s.version       = '0.0.2'
+  s.version       = '0.0.4'
   s.date          = Time.now.strftime('%Y-%m-%d')
   s.platform      = 'java'
   s.summary       = "Excel spreadsheet modification using COM"
@@ -8,6 +8,8 @@ Gem::Specification.new do |s|
   s.authors       = ["lprc"]
   s.files         = Dir.glob("{doc,lib,test}/**/*") + ['LICENSE', __FILE__]
   s.require_paths = ['lib']
-  s.homepage      = 'http://rubygems.org/gems/jruby_excelcom'
+  s.homepage      = 'https://github.com/lprc/jruby_excelcom'
   s.license       = 'Apache-2.0'
+  s.add_development_dependency 'minitest', '~> 4.7'
+  s.add_development_dependency 'minitest-reporters', '~> 0.14'
 end

data/lib/jruby_excelcom/excel_connection.rb

@@ -78,4 +78,20 @@ class ExcelConnection
   alias :openWorkbook :workbook
   alias :open_workbook :workbook
 
+  # creates a new workbook. If block is given, workbook will be saved and closed at end
+  def new_workbook(file)
+    if file.is_a? String
+      wb = Workbook.new(@con.newWorkbook(java.io.File.new(file)))
+    else
+      wb = Workbook.new(@con.newWorkbook(java.io.File.new(file.path)))
+    end
+    if block_given?
+      yield(wb)
+      wb.close true
+    else
+      wb
+    end
+  end
+  alias :add_workbook :new_workbook
+
 end

data/lib/jruby_excelcom/worksheet.rb

@@ -26,7 +26,7 @@ class Worksheet
   # returns the content in range as a matrix, a vector or a single value, depending on +range+'s dimensions
   # +range+:: range with content to get, default value is _UsedRange_
   def content(range = 'UsedRange')
-    c = @ws.getContent(range).to_a.each{ |row| row.to_a }
+    c = @ws.getContent(range).to_a.map!{ |row| row.to_a }
     columns = c.size
     rows = columns > 0 ? c[0].size : 0
     if columns == 1 and rows == 1 # range is one cell
@@ -131,6 +131,26 @@ class Worksheet
   end
   alias :getBorderColor :border_color
 
+  # sets comment of cells in range
+  # +range+:: range
+  # +comment+:: comment text
+  def set_comment(range, comment)
+    @ws.setComment(range, comment)
+  end
+  alias :setComment :set_comment
 
+  # sets comment of cells in range
+  # +hash+:: must contain +:range+ and +:comment+
+  def comment=(hash)
+    raise ArgumentError, 'cannot set border color, argument is not a hash' unless hash.is_a? Hash
+    raise ArgumentError, 'cannot set border color, hash does not contain :range or :comment key' if hash[:range].nil? or hash[:comment].nil?
+    set_comment hash[:range], hash[:comment]
+  end
+
+  # gets the comment of cells in range. Throws a +NullpointerException+ if range contains multiple comments
+  def comment(range)
+    @ws.getComment(range)
+  end
+  alias :getComment :comment
 
 end

data/lib/jruby_excelcom.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 
 require 'java'
-require_relative 'jars/jna-4.4.0.jar'
-require_relative 'jars/jna-platform-4.4.0.jar'
-require_relative 'jars/excelcom-0.0.6.jar'
-require_relative 'jruby_excelcom/excel_connection'
-require_relative 'jruby_excelcom/workbook'
-require_relative 'jruby_excelcom/worksheet'
+require 'jars/jna-4.4.0.jar'
+require 'jars/jna-platform-4.4.0.jar'
+require 'jars/excelcom-0.0.6.jar'
+require 'jruby_excelcom/excel_connection'
+require 'jruby_excelcom/workbook'
+require 'jruby_excelcom/worksheet'
 
 java_import 'excelcom.api.ExcelException'
 

data/test/test_helper.rb

@@ -1,4 +1,12 @@
 # encoding: utf-8
 
+$:.unshift "#{File.expand_path(__FILE__)}/../lib"
+
+# define public_send for Object for minitest-reporters (actually first defined in Ruby 1.9)
+class Object
+  alias :public_send :send unless method_defined?(:public_send)
+end
+
+require 'rubygems'
 require 'minitest/reporters'
 MiniTest::Reporters.use!

data/test/unit/excel_connection_spec.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 
 require 'minitest/autorun'
-require_relative '../../lib/jruby_excelcom'
+require 'tmpdir'
+require 'jruby_excelcom'
 
 describe 'ExcelConnection' do
 
@@ -10,9 +11,9 @@ describe 'ExcelConnection' do
     e.display_alerts = false
     e
   end
-  $wb ||= $con.workbook("#{File.dirname(File.absolute_path(__FILE__))}/../resources/test.xlsx")
+  $wb ||= $con.workbook("#{File.dirname(File.expand_path(__FILE__))}/../resources/test.xlsx")
 
-  Minitest.after_run {
+  Minitest::Unit.after_tests {
     $wb.close unless $wb.nil?; $wb = nil
     $con.quit unless $con.nil?; $con = nil
   }
@@ -30,9 +31,18 @@ describe 'ExcelConnection' do
 
   it '#workbook' do
     $wb.wont_be_nil
-    $con.workbook("#{File.dirname(File.absolute_path(__FILE__))}/../resources/test2.xlsx") { |wb|
+    $con.workbook("#{File.dirname(File.expand_path(__FILE__))}/../resources/test2.xlsx") { |wb|
       wb.name.is_a? String
     }
   end
 
+  it '#new_workbook' do
+    path = "#{Dir.tmpdir}/newwb.xlsx"
+    $con.new_workbook(path) { |wb|
+      wb.name.must_equal "newwb.xlsx"
+    }
+    File.exists?(path).must_equal true
+    File.delete path
+  end
+
 end

data/test/unit/workbook_spec.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
 require 'minitest/autorun'
-require_relative '../../lib/jruby_excelcom'
+require 'jruby_excelcom'
 
 describe 'Workbook' do
 
-  Minitest.after_run {
+  Minitest::Unit.after_tests {
     $wb.close unless $wb.nil?; $wb = nil
     $con.quit unless $con.nil?; $con = nil
     File.delete($temp_file_path) if not $temp_file_path.nil? and File.exists?($temp_file_path)
@@ -16,7 +16,7 @@ describe 'Workbook' do
     e.display_alerts = false
     e
   end
-  $wb ||= $con.workbook("#{File.dirname(File.absolute_path(__FILE__))}/../resources/test.xlsx")
+  $wb ||= $con.workbook("#{File.dirname(File.expand_path(__FILE__))}/../resources/test.xlsx")
   $temp_file_path ||= "#{Dir::tmpdir}/test.xlsx"
 
   it '#name' do

data/test/unit/worksheet_spec.rb

@@ -2,7 +2,7 @@
 
 require 'minitest/autorun'
 require 'time'
-require_relative '../../lib/jruby_excelcom'
+require 'jruby_excelcom'
 
 describe 'Worksheet' do
 
@@ -11,9 +11,9 @@ describe 'Worksheet' do
     e.display_alerts = false
     e
   end
-  $wb ||= $con.workbook("#{File.dirname(File.absolute_path(__FILE__))}/../resources/test.xlsx")
+  $wb ||= $con.workbook("#{File.dirname(File.expand_path(__FILE__))}/../resources/test.xlsx")
 
-  Minitest.after_run {
+  Minitest::Unit.after_tests {
     $wb.close unless $wb.nil?; $wb = nil
     $con.quit unless $con.nil?; $con = nil
   }
@@ -107,4 +107,12 @@ describe 'Worksheet' do
     actual.must_equal color
   end
 
+  it '#comment' do
+    range = 'A1'
+    comment = "test"
+    $ws.comment = {:range => range, :comment => comment}
+    actual = $ws.comment range
+    actual.must_equal comment
+  end
+
 end

metadata

@@ -1,22 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: jruby_excelcom
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: java
 authors:
 - lprc
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-25 00:00:00.000000000 Z
-dependencies: []
+date: 2017-06-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 description: Uses the java library excelcom and JNA for modifying excel spreadsheets.
   Works on windows only.
-email:
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".\\jruby_excelcom.gemspec"
 - LICENSE
 - doc/ExcelColor.html
 - doc/ExcelConnection.html
@@ -73,7 +102,6 @@ files:
 - doc/js/searcher.js
 - doc/js/searcher.js.gz
 - doc/table_of_contents.html
-- jruby_excelcom.gemspec
 - lib/jars/excelcom-0.0.6.jar
 - lib/jars/jna-4.4.0.jar
 - lib/jars/jna-platform-4.4.0.jar
@@ -87,11 +115,11 @@ files:
 - test/unit/excel_connection_spec.rb
 - test/unit/workbook_spec.rb
 - test/unit/worksheet_spec.rb
-homepage: http://rubygems.org/gems/jruby_excelcom
+homepage: https://github.com/lprc/jruby_excelcom
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -106,9 +134,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.2
+signing_key: 
 specification_version: 4
 summary: Excel spreadsheet modification using COM
 test_files: []