json_data_extractor 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac39771f7b1358e30e26bfdc81b5b4ad5ac493238e84142e31331648f96fa37e
-  data.tar.gz: 69a0d03f65e05dfb292ae01f950986822ec04991771968ede64c63c6f202d99f
+  metadata.gz: bdd75c436a18caa753cb6c35536852852b8d876b44684de7f45d66678d012c6b
+  data.tar.gz: 612d1cb976811a479e6e3f6c377186d90bd7d8fe900def4009dfeb7e2d63c81d
 SHA512:
-  metadata.gz: 403b5b95e7bfc0b7f530021980a10407f08be499092a80550a2dc55df7aeabc64197f68e6bf44f98c19be4ea8d57884db1205490970a57552ea924cf673c0f8a
-  data.tar.gz: 58260729ea70e88fdd1937cbbac0cffac998ce9dab686dedbbcb110e7618edd72a9bd71e494bfdc7441665a306e3ead800d9558b4c80b2fce525de3c70f90eee
+  metadata.gz: 3137a8b5ecbf8850bbc8f96b46cb9c24688760e1d9c634a0735611a4beadafdf24fb6f1baa66de4f486157a31fbde3b36d1c489e887c1f27c1281225b944748e
+  data.tar.gz: 1bdf6749d6c7ba7a86f7c076f0f22a113731938456b801084cbfbd9cb6bd8e15f12a3748a521d4c267a6ad59cacbf40e22ad86d78cb62cc9c09fc0f534ef3076

data/json_data_extractor.gemspec

@@ -26,7 +26,7 @@ transformations. The schema is defined as a simple Ruby hash that maps keys to p
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry'

data/lib/json_data_extractor.rb

@@ -37,20 +37,17 @@ class JsonDataExtractor
       else
         results[key] = apply_modifiers(extracted_data, modifiers)
 
-        # TODO yeah, this looks ugly. Address it later.
-        if !array_type
-          if nested
-            results[key] = self.class.new(results[key].first, @modifiers).extract(nested)
-            # todo there might be a problem if results[key] yields more than 1 item
-            # Yeah, we'll get back to it later. Or send your PRs
-          else
-            results[key] = results[key].first unless 1 < results[key].size
-          end
-        elsif nested
-          results[key] = []
-          Array(extracted_data).each do |item|
-            results[key] << self.class.new(item, @modifiers).extract(nested)
-          end
+        if array_type && nested
+          results[key] = extract_nested_data(results[key], nested)
+        elsif !array_type && nested
+          results[key] = extract_nested_data(results[key], nested).first
+        elsif !array_type && 1 < results[key].size
+          # TODO: handle case where results[key] has more than one item
+          # do nothing for now
+        elsif array_type && !nested
+          # do nothing, it is already an array
+        else
+          results[key] = results[key].first
         end
       end
     end
@@ -59,6 +56,12 @@ class JsonDataExtractor
 
   private
 
+  def extract_nested_data(data, schema)
+    Array(data).map do |item|
+      self.class.new(item, modifiers).extract(schema)
+    end
+  end
+
   def apply_modifiers(data, modifiers)
     data.map do |value|
       modified_value = value

data/lib/src/version.rb

@@ -1,3 +1,3 @@
 class JsonDataExtractor
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: json_data_extractor
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Max Buslaev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement