jsonize 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3227e59ca0f4826ae7a108ba9ab99419e2441fa7ca4182cd288000fe5caaa5b
-  data.tar.gz: 5d79a0a28100a90b628b96820d250a10fa9b70806203b078d68c7828a035d88a
+  metadata.gz: 5f9ca1fdab05a8d207c70e1600579a486d4532431fae68683398cb1ee1d8e7ec
+  data.tar.gz: bd1db6eda7a52b81fbfdeda0b83c9ede523da3c06df6fecefe961e9006784def
 SHA512:
-  metadata.gz: e427382e3c42a97b5991c2d382a078a198562c1686c835e7039546de9ce360890c8cd6ada52bb3339c1835fd9422d686875631ecdad6bf30f312a5bac38480ab
-  data.tar.gz: e35614f1087c93893ee1dc739b4c2a85756f632afcb99a419b70afb605714b459f5b8bf3bc2b1e0435527d4ce24999993df61e6c39366eb5c53d01cbda81a7c8
+  metadata.gz: 427fbc6d4eb02797ffcf4a93915b044d14cfb205ec7b8cd2784258f989b98739cef5b69a294e37cbd6a5e02a6895a9eecf45a92911906f64229296ae3398ce14
+  data.tar.gz: 47329b942f4f8f89243c5cb8c775186d80febecb0233944978cfdd3d1b8a3cae2bc90bb9e79ce893487dbea49b86c5b3505a0c8259b23657a548819febc6dcca

data/README.md

@@ -32,7 +32,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/jsonize. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/jsonize/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://codeberg.org/majioa/jsonize. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://codeberg.org/majioa/jsonize/blob/master/CODE_OF_CONDUCT.md).
 
 
 ## License
@@ -41,4 +41,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Jsonize project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/jsonize/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Jsonize project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://codeberg.org/majioa/jsonize/blob/master/CODE_OF_CONDUCT.md).

data/jsonize.gemspec

@@ -8,15 +8,15 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Act as as_json for active record model or as a jsonize}
   spec.description   = %q{Act as as_json for active record model or as a jsonize using the cacheable redisize}
-  spec.homepage      = "https://github.com/majioa/jsonize"
+  spec.homepage      = "https://codeberg.org/majioa/jsonize"
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/majioa/jsonize"
-  spec.metadata["changelog_uri"] = "https://github.com/majioa/jsonize/CHANGELOG.md"
+  spec.metadata["source_code_uri"] = "https://codeberg.org/majioa/jsonize"
+  spec.metadata["changelog_uri"] = "https://codeberg.org/majioa/jsonize/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/lib/jsonize/orm/active_record.rb

@@ -3,4 +3,5 @@ require 'active_support/lazy_load_hooks'
 ActiveSupport.on_load :active_record do
    ::ActiveRecord::Base.send :include, Jsonize
    ::ActiveRecord::Relation.send :include, Jsonize::Relation
+   ::Enumerable.send :include, Jsonize::Collection
 end

data/lib/jsonize/version.rb

@@ -1,3 +1,3 @@
 module Jsonize
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/jsonize.rb

@@ -34,18 +34,18 @@ module Jsonize
    end
 
    def generate_relation rela, source_in, options
-      source = source_in.is_a?(Hash) ? source_in : source_in.polymorphic? ?
-         {} : required_attibutes(source_in.klass, {})
+      attr_props = source_in.is_a?(Hash) ? source_in : source_in.polymorphic? ?
+         {} : jsonize_scheme_for(source_in.klass, attibute_tree(source_in.klass, options))
 
       case rela
       when Enumerable
          rela.map do |rec|
-            generate_json(rec, source, options)
+            generate_json(rec, attr_props, options)
          end
       when NilClass
          nil
       when Object
-         generate_json(rela, source, options)
+         generate_json(rela, attr_props, options)
       end
    end
 
@@ -57,11 +57,24 @@ module Jsonize
             [props].flatten.reduce(nil) do |r, source|
                case source
                when UnboundMethod
-                  r || source.bind(flow)[]
+                  r ||
+                     begin
+                        source.bind(flow)[]
+                     rescue ActiveModel::MissingAttributeError, TypeError, NoMethodError
+                     rescue Exception => e
+                        $stderr.puts("#{e.class}: #{e.message}")
+                        # binding.pry
+                     end
                when Proc
                   r || source[flow]
                when Hash, ActiveRecord::Reflection::AbstractReflection
-                  generate_relation(r || flow.send(name), source, options)
+                  o = !options[:only] ? options :
+                     options[:only].is_a?(Hash) ? options.merge(only: options[:only][name]) :
+                     options.merge(only: nil)
+
+                  generate_relation(r || flow.respond_to?(name) && flow.send(name) || nil, source, o)
+               when NilClass
+                  r
                else
                   raise
                end
@@ -80,24 +93,35 @@ module Jsonize
          if x.is_a?(Hash)
             x.reduce(h) do |hh, (sub, subattrs)|
                if submodel = model._reflections[sub]&.klass
-                  hh.merge(sub.to_sym => prepare_attributes(submodel, subattrs))
+                  collect_attributes(hh, model, sub, sub.to_sym, prepare_attributes(submodel, subattrs))
                else
                   hh
                end
             end
          else
-            props = [
-               model._reflections[x.to_s],
-               model.instance_methods.include?(x.to_sym) ? model.instance_method(x.to_sym) : nil,
-               (self.class == model ? self.attribute_names : model.attribute_names).
-                  include?(x.to_s) ? ->(this) { this.read_attribute(x) } : nil
-            ].compact
-
-            h.merge(x.to_s.sub(/^_/, '').to_sym => props)
+            collect_attributes(h, model, x, x.to_s.sub(/^_/, '').to_sym, nil)
          end
       end
    end
 
+   def collect_attributes h, model, name, key, value
+      base = [ ->(this) { this.respond_to?(:read_attribute) ? this.read_attribute("_#{name}") : nil } ]
+
+      props =
+      unless value
+         [model._reflections[name.to_s],
+         model.instance_methods.include?(name.to_sym) ? model.instance_method(name.to_sym) : nil,
+         ->(this) { this.is_a?(Hash) ? this[name] : nil },
+         (self.class == model ? self.attribute_names : model.attribute_names).include?(name.to_s) ?
+         ->(this) { this.respond_to?(:read_attribute) ? this.read_attribute(name) : nil } : nil,
+         ].compact
+      else
+         [value]
+      end
+
+      h.merge(key => base.concat(props))
+   end
+
    def attibute_tree klass, options = {}
       options[:only] ||
       jsonize_attributes_except(self.class == klass ? self.attribute_names : klass.attribute_names,
@@ -149,6 +173,50 @@ module Jsonize
       generate_json(self, attr_props, options)
    end
 
+   module Collection
+      def jsonize context = {}
+         method =
+            case self
+            when Hash
+               :redisize_hash
+            when Array
+               :redisize_array
+            end
+
+         send(method) do
+            as_pure_json(context)
+         end
+      end
+
+      def recontext context, key
+         context_only = [context[:only]].flatten(1).reduce(nil) { |r, x| r || (x.is_a?(Hash) ? x[key] : r) }
+         context_except = [context[:except]].flatten(1).reduce(nil) { |r, x| r || (x.is_a?(Hash) ? x[key] : r) }
+
+         context.merge(only: context_only, except: context_except)
+      end
+
+      def as_pure_json context = {}
+         case self
+         when Hash
+            self.map do |key, value_in|
+               new_context = recontext(context, key)
+
+               value = value_in.respond_to?(:as_pure_json) ? value_in.as_pure_json(new_context) : value_in.as_json(new_context)
+
+               [key.to_s, value]
+            end.to_h
+         when Array
+            self.map.with_index do |value_in, index|
+               new_context = recontext(context, index.to_i)
+
+               value_in.respond_to?(:as_pure_json) ? value_in.as_pure_json(new_context) : value_in.as_json(new_context)
+            end
+         else
+            as_json(context)
+         end
+      end
+   end
+
    module Relation
       def jsonize context = {}
          redisize_sql do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonize
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Pavel «Malo» Skrylev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-31 00:00:00.000000000 Z
+date: 2024-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redisize
@@ -72,14 +72,14 @@ files:
 - lib/jsonize.rb
 - lib/jsonize/orm/active_record.rb
 - lib/jsonize/version.rb
-homepage: https://github.com/majioa/jsonize
+homepage: https://codeberg.org/majioa/jsonize
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: https://github.com/majioa/jsonize
-  source_code_uri: https://github.com/majioa/jsonize
-  changelog_uri: https://github.com/majioa/jsonize/CHANGELOG.md
+  homepage_uri: https://codeberg.org/majioa/jsonize
+  source_code_uri: https://codeberg.org/majioa/jsonize
+  changelog_uri: https://codeberg.org/majioa/jsonize/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Act as as_json for active record model or as a jsonize