hadouken-json 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8e63f5c3be2ce4a0fad68df7ea865de02aadeb62d5029387ced2bb11dfbc9d0
-  data.tar.gz: b3edbc69aa4d3119b50aea249b42f445a7e49972855d29bf69603c172d1e3cdd
+  metadata.gz: 62fef84a45118f2f47cbd64a3634580aac3a563a172badedc5cc546afd560e54
+  data.tar.gz: a9350818a683f0b13f8ec0cdc1ed7b0f3c8d4d3932968713669f9382344977e8
 SHA512:
-  metadata.gz: b3642a80fca4ad9d38563648904a4ed662773b28683f3e7db7eefc094278386b7201de8cb0223d46ccd1314cdc868d009dc19afc07505fa1bf9d4e164164dc06
-  data.tar.gz: b54e1bb78accbb5a4216c187500c43365d697c87d9688ea00b97c1cdf0122972d20e2b2608842a584f3427febd84bb3417d5c0f108e85b0cd7b4eaf78b69a49d
+  metadata.gz: 915c7205d38b350c6120eac7cb4aaec445e79d70601143ec08fdbeb2866b56e3aa23bd27520273b84bb7f5a8c57ba1b08eee46596d030f1e0bca64fc134dcce8
+  data.tar.gz: 20cd69fb5a7045761e111c630037caca265f89dba328e352895bf801079d0ce75789e61197458255f5526f9ee169d6ca484c105f28e8e9d76acf40306e2329a4

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Roman
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/lib/hadouken/json.rb

@@ -18,7 +18,7 @@ class Hadouken::Json
     options = args[0] || {}
 
     Hadouken::SqlBuilder.call(
-      main_class: relation.klass,
+      main_class: (relation_for(options[:jsonb_field_from]) || relation).klass,
       scope: options[:for],
       schema: json_schema,
       decorator: (options[:decorate_with].is_a?(Hadouken::Decorator) ? options[:decorate_with] : nil)
@@ -27,6 +27,12 @@ class Hadouken::Json
 
   private
 
+  def relation_for(scope)
+    return unless scope
+
+    scope.is_a?(ActiveRecord::Relation) ? scope : relation.klass.new(id: 1).instance_eval(scope)
+  end
+
   def execute_query(sql_query)
     ActiveRecord::Base.connection.execute(sql_query).values.first.first
   end

data/lib/hadouken/sql_builder.rb

@@ -5,6 +5,7 @@ class Hadouken::SqlBuilder
   attribute :scope
   attribute :schema, Hash, default: {}
   attribute :decorator, Hadouken::Decorator
+
   def self.call(*args)
     new(*args).call
   end
@@ -49,6 +50,7 @@ class Hadouken::SqlBuilder
 
   def build_relation
     fail 'Scope should be ActiveRecord::Relation or string' if [ActiveRecord::Relation, String].none? { |klass| scope.is_a?( klass ) }
+    return main_class.from(unwound_jsonb_table) if scope_is_jsonb_array?
 
     scope.is_a?(ActiveRecord::Relation) ? scope : main_class.new(id: sample_id).instance_eval(scope)
   end
@@ -57,7 +59,7 @@ class Hadouken::SqlBuilder
     schema.extract!(*schema.select{ |_,v| v.is_a?(String) }.keys)
           .inject({}) do |h, (field, column)|
             col = (@relation&.klass&.column_names||[]).include?(column) ? [@relation.klass.table_name, column].join('.') : column
-            h.merge(field => col)
+            scope_is_jsonb_array? ? h.merge(field => "#{unwound_jsonb_table_name}.#{column.split('::')[0]}") : h.merge(field => col)
           end
   end
 
@@ -108,4 +110,18 @@ class Hadouken::SqlBuilder
     column_name.scan(/[.]/).length <= 1 ? "\"#{column_name.split('.').join('"."')}\"" : "(#{column_name})"
   end
 
+  def scope_is_jsonb_array?
+    db_column = main_class.columns_hash[scope]
+    db_column&.type == :jsonb && JSON.parse(db_column.default.to_s).is_a?(Array)
+  end
+
+  def unwound_jsonb_table_name
+    @unwound_jsonb_table_name ||= ['array_from_', scope].join
+  end
+
+  def unwound_jsonb_table
+    table_structure = schema.values.map { |v| v.split('::').push('text')[0..1].join(' ') }.join(', ') 
+    "jsonb_to_recordset(#{main_class.table_name}.#{scope}) AS #{unwound_jsonb_table_name}(#{table_structure})"
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hadouken-json
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Roman Zaytsev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -50,6 +50,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - lib/hadouken-json.rb
 - lib/hadouken/decorator.rb
 - lib/hadouken/json.rb