json-streamer 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f04ab89c1174d12704fb5bf27ed2c7663ab6c95
-  data.tar.gz: 95e508c4081e086a58a579d1147ac63d88f86d81
+  metadata.gz: 78f558defb01fa6c47525de0c47a96900638168d
+  data.tar.gz: ea21aadfedf4d8c9dddb1e8f06a0c2d9aff44be4
 SHA512:
-  metadata.gz: 612d180722eb1b7c07b4855dc24a5a9971bb6bb8dd20b66743aa06bcf98eee39845c8e313b3f7952c582cd6915571d11a0534ce71a2cf70a1e4ab1d8c54ff1f8
-  data.tar.gz: 48feddeccbadaa95784fe23ebee4bcbbe87dbf27b440ad7f9b10cbac230665be29e005671f304e4d7727e2e06fef6620bb47c5e5601e0af220f3f944de928f34
+  metadata.gz: a595fd7837371e1555180e17beaf42e2bcac4dd06aa12973393431dd234d4eb71f2ba6ffa6df6b965a00e40837295b33409b9d3840cb23d32039e658fd6f94b1
+  data.tar.gz: 144ef35ae0f18f2fb51099e735f87dc39a17a1da734f35575ef27fd3dff0f01e7054f765a5b852aca9f1176dc65e9ca3a6210f89eb8a1c47270cc9df4838d645

data/.gitmodules

@@ -1,3 +1,3 @@
-[submodule "ruby-devenv"]
-	path = ruby-devenv
-	url = https://github.com/thisismydesign/ruby-devenv
+[submodule "ruby-devenv"]
+	path = ruby-devenv
+	url = https://github.com/thisismydesign/ruby-devenv

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.travis.yml

@@ -0,0 +1,5 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.3.3
+before_install: gem install bundler -v 1.14.6

data/README.md

@@ -1,5 +1,10 @@
 # Json::Streamer
 
+| Build status |   |
+| ------------ | - |
+| Release | [![Build Status](https://travis-ci.org/thisismydesign/json-streamer.svg?branch=release)](https://travis-ci.org/thisismydesign/json-streamer)   [![Coverage Status](https://coveralls.io/repos/github/thisismydesign/json-streamer/badge.svg?branch=release)](https://coveralls.io/github/thisismydesign/json-streamer?branch=release)   [![Gem Version](https://badge.fury.io/rb/json-streamer.svg)](https://badge.fury.io/rb/json-streamer) |
+| Development | [![Build Status](https://travis-ci.org/thisismydesign/json-streamer.svg?branch=master)](https://travis-ci.org/thisismydesign/json-streamer)   [![Coverage Status](https://coveralls.io/repos/github/thisismydesign/json-streamer/badge.svg?branch=master)](https://coveralls.io/github/thisismydesign/json-streamer?branch=master) |
+
 Ruby utility that supports JSON streaming allowing you to get data based on various criteria (key, nesting level, etc).
 
 *If you've tried JSON streaming with other Ruby libraries before (e.g. [JSON::Stream](https://github.com/dgraham/json-stream), [Yajl::FFI](https://github.com/dgraham/yajl-ffi)):*

data/Rakefile

@@ -1,2 +1,11 @@
 require "bundler/gem_tasks"
-task :default => :spec
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+desc "Check if source can be required locally"
+task :require do
+  sh "ruby -e \"require '#{File.dirname __FILE__}/lib/json/streamer'\""
+end
+
+task :default => [:require, :spec]

data/json-streamer.gemspec

@@ -24,7 +24,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "ndhash"
+  spec.add_development_dependency "sys-proctable"
+  spec.add_development_dependency "get_process_mem"
 
   spec.add_dependency "json-stream"
 end

data/lib/json/streamer/json_streamer.rb

@@ -20,7 +20,6 @@ module Json
         @parser.start_object {start_object}
         @parser.start_array {start_array}
         @parser.key {|k| key(k)}
-
       end
 
       # Callbacks containing `yield` have to be defined in the method called via block otherwise yield won't work
@@ -30,7 +29,11 @@ module Json
 
         @parser.value do |v|
           if @aggregator[@current_nesting_level].kind_of? Array
-            @aggregator[@current_nesting_level] << v
+            if yield_values and yield_value?(yield_nesting_level)
+              yield v
+            else
+              @aggregator[@current_nesting_level] << v
+            end
           else
             @aggregator[@current_nesting_level][@current_key] = v
             if yield_values and yield_value?(yield_nesting_level, wanted_key)
@@ -70,8 +73,8 @@ module Json
         @current_nesting_level.eql? yield_nesting_level or (not wanted_key.nil? and wanted_key == @temp_aggregator_keys[@current_nesting_level-1])
       end
 
-      def yield_value?(yield_nesting_level, wanted_key)
-        (@current_nesting_level + 1).eql? yield_nesting_level or wanted_key == @current_key
+      def yield_value?(yield_nesting_level, wanted_key = nil)
+        (@current_nesting_level + 1).eql? yield_nesting_level or (not wanted_key.nil? and wanted_key == @current_key)
       end
 
       def start_object

data/lib/json/streamer/version.rb

@@ -1,5 +1,5 @@
 module Json
   module Streamer
-    VERSION = "0.6.0"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-streamer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - thisismydesign
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ndhash
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sys-proctable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: get_process_mem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json-stream
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +131,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".gitmodules"
+- ".rspec"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt