rubyxls 1.0.3 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 74916c956a8fc971279c119395acfffae0111737
-  data.tar.gz: 9476493c61794596c2b1f96ca7d89c0a7aa8c4c3
+SHA256:
+  metadata.gz: 24f45bca515a1f44519ded9015bbb9cf72cc2cc50663127f0f234c3e4618e3f5
+  data.tar.gz: a8303c3a9f281daf3786bef89298f9de0ff73967ef082f8a80a0d1fd1c3b5d66
 SHA512:
-  metadata.gz: cf9cf1b1f9cc904bcb19b38710d87414407071f2d61a45bf1ce17e43fd58b4ab5cec5f7a1ac88448daf7c4618b00d4f540ac2fdaaaa0d0a44c658ddf45bd9f85
-  data.tar.gz: 2d37e34a2ee09cd255fc244faf8c3b71790f0350cfc79d272db901aa0ce52846cbbdd8806c868b437c0d6d63ea63c9a069e2d6adaa8eff2d4c61f922f9cc0128
+  metadata.gz: '019b2a1819b9c13db528ea10aa0de440ab72d00c237d909530499e9d503a3a900aa40d01ae35ae0d3a8641a8a7c5e4aa5fb842cd5618f6081a2bd09f5e10d3e0'
+  data.tar.gz: 28c44a14cd5cf867f9295df2b3592c8cab7b3cc30ddba05e42587ddc01912d53d78a716f08a8856afee7dab899c70714e4419bd29833c53594cbfa5eeb834f00

data/.circleci/config.yml

@@ -0,0 +1,42 @@
+version: 2
+jobs:
+  build:
+    parallelism: 1
+    docker:
+      - image: circleci/ruby:2.6.5
+        environment:
+          RAILS_ENV: test
+          RACK_ENV: test
+    steps:
+      - restore_cache:
+          keys:
+            - source-v1-{{ .Branch }}-{{ .Revision }}
+            - source-v1-{{ .Branch }}-
+            - source-v1-
+
+      - checkout
+
+      - save_cache:
+          key: source-v1-{{ .Branch }}-{{ .Revision }}
+          paths:
+            - ".git"
+
+      - restore_cache:
+          keys:
+          - dependencies-{{ checksum "rubyxls.gemspec" }}-{{ checksum ".circleci/config.yml" }}
+          - dependencies-
+
+      - run:
+          name: install gem dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: dependencies-{{ checksum "rubyxls.gemspec" }}-{{ checksum ".circleci/config.yml" }}
+
+      - run:
+          name: run rspec
+          command: |
+            bundle exec rspec --format documentation --color spec

data/.ruby-version

@@ -1 +1 @@
-2.2.4
+2.6.5

data/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
+ruby '2.6.5'
 
 gemspec

data/lib/rubyxls/sheet.rb

@@ -73,8 +73,10 @@ module Rubyxls
     end
 
     def unique_sheet_name(sheet_name, taken_names, index=1)
-      return sheet_name[0, 31] unless taken_names.include?(sheet_name[0, 31])
-      sheet_name = "#{sheet_name[0, 29 - index.to_s.length]}(#{index})"
+      sliced_name = sheet_name.byteslice(0, 31)
+      return sliced_name unless taken_names.include?(sliced_name)
+
+      sheet_name = "#{sheet_name.byteslice(0, 28)}(#{index})"
       unique_sheet_name(sheet_name, taken_names, index + 1)
     end
 

data/lib/rubyxls/version.rb

@@ -1,3 +1,3 @@
 module Rubyxls
-  VERSION = "1.0.3"
+  VERSION = "1.2.1"
 end

data/lib/rubyxls/view_model.rb

@@ -37,7 +37,9 @@ module Rubyxls
     end
 
     def build_additional_rows!
-      until @data_rows.size == @data_rows_count do
+      number_of_additional_rows = @data_rows_count - @data_rows.size
+
+      number_of_additional_rows.times do
         build_additional_row!
       end
     end

data/rubyxls.gemspec

@@ -24,9 +24,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.2.4'
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 
-  spec.add_runtime_dependency "axlsx", "~> 2.0"
-
+  spec.add_runtime_dependency "caxlsx", ">= 2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyxls
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.2.1
 platform: ruby
 authors:
 - Alexander Frankel
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2020-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -53,17 +53,17 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: axlsx
+  name: caxlsx
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 description: |-
@@ -76,6 +76,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
@@ -87,7 +88,6 @@ files:
 - bin/console
 - bin/generate_default
 - bin/setup
-- circle.yml
 - lib/rubyxls.rb
 - lib/rubyxls/builders/cell_builder.rb
 - lib/rubyxls/builders/chart_builder.rb
@@ -104,7 +104,7 @@ homepage: https://github.com/alexanderfrankel/rubyxls
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,9 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A simple DSL for generating XLS files in plain-old ruby.
 test_files: []

data/circle.yml

@@ -1,8 +0,0 @@
-machine:
-
-  timezone:
-    America/New_York
-
-  ruby:
-    version:
-      2.3.0