ruby_px 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfa0ddb5f455e289afe1507164ab005e0896e7e091531a052472f36cfdfe11d3
-  data.tar.gz: 3acf6d18b2ae29ddceab2c0859d4fe79be33a61a54be7f93632a014ebaf5dee7
+  metadata.gz: 6f5d35908531ee6fa8cf93f8ee71fb406c13d15ab65cd2f0e62a0333a3525320
+  data.tar.gz: 787d66c1ebb61aad54d2bb3809716bda8f89b4abab6a2e26fe0de6a19cdd507a
 SHA512:
-  metadata.gz: c2439c7a3698ae78f288866cb91933325dbd48ec88a2bbc6b54353e6fe4567e768b7a2c6febb326c2e6566f1f4633eca4b6bb4d7e5ea471dacae21dbe6818f66
-  data.tar.gz: 5482d50e2be5fc9fc4ab6c1b2d40bdf7e2b4b1ea8f2f528ef13d2c575cd9630208ff6e188ba3e3e8c3f17eb4e005787c7c64095c4619d77b0ed23125a5865d80
+  metadata.gz: 79c159ae77206a80e507f5450568df35fb7343b791350e583e15dada526aed82c6c39da78cbefd3210096121176f6a9dcbf856b1a706c228b96b9b2e7ba5f052
+  data.tar.gz: 2f97231b09776a596f5863e1c1d66a87ee6bf6fb032e6ec91c91113f8c8a500df52c64ce728d96796f9fa23c95ecc9285665db8091704a2cea47ec8121272e29

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 0.8.0 (2021-03-04)
+
+- Fix wrong DATA key error [#10](https://github.com/PopulateTools/ruby_px/pull/10)
+
+## 0.7.0 (2021-03-04)
+
+- Performance in large datasets [#9](https://github.com/PopulateTools/ruby_px/pull/9)
+
 ## 0.6.0 (2020-04-28)
 
 - Nice badge with the current version

data/lib/ruby_px/dataset/data.rb

@@ -0,0 +1,48 @@
+module RubyPx
+  class Dataset
+    class Data
+
+      CHUNK_SIZE = 5_000
+      attr_accessor :current_chunk_index
+
+      def initialize
+        @current_chunk_index = 0
+      end
+
+      def at index
+        chunk_index = index/CHUNK_SIZE
+        index_inside_chunk = index%CHUNK_SIZE
+
+        get_chunk(chunk_index)[index_inside_chunk]
+      end
+
+      def concat array
+        current_chunk.concat(array)
+        if current_chunk.size > CHUNK_SIZE
+          excess = current_chunk.pop(current_chunk.size-CHUNK_SIZE)
+          self.current_chunk_index += 1
+          concat(excess)
+        end
+      end
+
+      def indexes_count
+        self.current_chunk_index+1
+      end
+
+      private
+
+
+      def current_chunk
+        current = instance_variable_get("@chunk_#{self.current_chunk_index}")
+        return current if current
+
+        instance_variable_set("@chunk_#{self.current_chunk_index}", [])
+      end
+
+      def get_chunk chunk_index
+        instance_variable_get("@chunk_#{chunk_index}")
+      end
+
+    end
+  end
+end

data/lib/ruby_px/dataset.rb

@@ -4,6 +4,8 @@ require 'open-uri'
 
 module RubyPx
   class Dataset
+    require 'ruby_px/dataset/data'
+
     attr_reader :headings, :stubs
 
     METADATA_RECORDS = %w[TITLE UNITS SOURCE CONTACT LAST-UPDATED CREATION-DATE].freeze
@@ -15,7 +17,7 @@ module RubyPx
       @headings = []
       @stubs = []
       @values = {}
-      @data = []
+      @data = Data.new
 
       parse_resource(resource_uri)
     end
@@ -82,7 +84,7 @@ module RubyPx
           offset += (d ? p * d : p)
         end
 
-        @data[offset]
+        @data.at(offset)
 
       # Return an array of options
       elsif options.length == dimensions.length - 1
@@ -160,7 +162,7 @@ module RubyPx
                         elsif key =~ /\AVALUES/ && key !~ /\[\w\w\]/
                           @type = :values
                           key.match(/\"([^"]+)\"/)[1]
-                        elsif key =~ /\ADATA/
+                        elsif key =~ /\ADATA\z/
                           @type = :data
                           key
                         end

data/ruby_px.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'ruby_px'
-  spec.version       = '0.6.0'
+  spec.version       = '0.8.0'
   spec.authors       = ['Fernando Blat']
   spec.email         = ['fernando@blat.es']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_px
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Fernando Blat
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2023-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,13 +86,14 @@ files:
 - bin/setup
 - lib/ruby_px.rb
 - lib/ruby_px/dataset.rb
+- lib/ruby_px/dataset/data.rb
 - ruby_px.gemspec
 homepage: https://github.com/PopulateTools/ruby_px
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,8 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Read PC-Axis files using Ruby
 test_files: []