json-exporter 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d75515317d6672ad95a84990587e55f75a5253d3afe8e507ee858a4dd3608c78
-  data.tar.gz: 39989ef8d940c0677bf5c0478e0b1cdaa29cd863b7d002ad1dfb12f778eb046e
+  metadata.gz: 239935a36b473264e3694256237aa268bbc60bbd110692c5e0059a149b870df5
+  data.tar.gz: 3dd051ab1645e26dbe35a8db652b4aad98498057b7ad6f34bd06458850f90eae
 SHA512:
-  metadata.gz: d3db4944bc96fdde608ac516bca887760d83da88479f7080b7a65e0bf23a97565773940b19febce7186dd0725901b3d3acd7b936bf15488e838e2a1119dd700d
-  data.tar.gz: 9c8a8e4896cf16309c5ca967be8d7201514ce2ab4f6547ea10e28f98769ebaca0a3cd2d48bfc4a3774070fc8784bb10959809d4c2bec5194afc7559f05cb518b
+  metadata.gz: 49c06546834cdf633f4d56d99afb8a9f4fce9cfbd180bc3d0ac0a907704b2505547a660758e0f2d0729a4a2613a8a93d2770cbb9fd35aed110450e85ad313acd
+  data.tar.gz: 748eee943a3975b8912d2f64094fa770be7ab038455c541c8513a4b3e18bab03d617a817633a685ced4c7c8d7f181ba3773ec5b9256ba80167430fefc11b1c86

data/.version

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/json-exporter/base.rb

@@ -5,6 +5,7 @@ class JsonExporter
 
   class << self
     def define name = nil, &block
+      # if name is given, prepend name, if not, use class name as exporter name
       name = name ? "#{INFLECTOR.classify(name)}#{to_s}" : to_s
 
       EXPORTERS[name] = block
@@ -22,6 +23,8 @@ class JsonExporter
       __define_filter :after, &block
     end
 
+    private
+
     def __define_filter name, &block
       define_method name do
         super() if self.class != JsonExporter
@@ -37,8 +40,8 @@ class JsonExporter
   alias :response :json
 
   def initialize model, opts = {}
-    if model.is_a?(String) || model.is_a?(Symbol)
-      raise ArgumentError, 'model argument is not model instance (it is %s)' % model.class
+    if [String, Symbol].include?(model.class)
+      raise ArgumentError, 'model argument is not model instance (it is a %s)' % model.class
     end
 
     opts[:export_depth]  ||= 2 # 2 is default depth. if we encounter nested recursive exports, will go only to depth 2
@@ -59,6 +62,10 @@ class JsonExporter
     @json
   end
 
+  def merge data
+    data.each {|k,v| json[k] = v }
+  end
+
   def before; end
 
   def after; end
@@ -73,8 +80,8 @@ class JsonExporter
     if name.is_a?(Symbol)
       name, cmodel = name, @model.send(name)
 
-      if cmodel.respond_to?(:all) && cmodel.respond_to?(:first)
-        cmodel = cmodel.all.map { |el| JsonExporter.export(el, @opts.dup) }
+      if cmodel.class.to_s.include?('Array')
+        cmodel = cmodel.map { |el| self.class.export(el, __opts) }
       end
     else
       underscored = INFLECTOR.underscore(name.class.to_s).to_sym
@@ -86,8 +93,7 @@ class JsonExporter
     elsif cmodel.nil?
       nil
     else
-      new_opts = local_opts.merge(export_depth: @opts[:export_depth], current_depth: @opts[:current_depth])
-      self.class.new(cmodel, new_opts).render
+      self.class.new(cmodel, __opts(local_opts)).render
     end
   end
 
@@ -114,7 +120,14 @@ class JsonExporter
       return block if block
     end
 
-    raise(%[Exporter for class "#{base}" not found.])
+    raise %[Exporter for class "#{base}" not found.]
+  end
+
+  def __opts start = {}
+    start.merge(
+      export_depth: @opts[:export_depth],
+      current_depth: @opts[:current_depth]
+    )
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-exporter
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Dino Reic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-19 00:00:00.000000000 Z
+date: 2022-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hash_wia