json-exporter 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a70e5a7d517a7206c4eb0b82c004ee44a15b3439aa4cd08e90fd54e9520513c
-  data.tar.gz: 4ffb3b63175ae577ea981d80cfb3b2307895f1483e9f11061b09263385c79b7e
+  metadata.gz: ea8fbcdeb00712d423e781894943e2a6e2b5eaad29bb227e7e014bd7eb84dbab
+  data.tar.gz: 4217c182ae80640257d5db886bfdaa75583f47ed9de842f4ffe742c7efe63634
 SHA512:
-  metadata.gz: 4fdcd23d3974377ff752b7a4b7406ff3f4b1c65b3f1f0f57dc0c0067bda08620ecab0e37aed7aef9632ab633ddeff60e290a56bb7f17bb04cef32a030ad2c4b6
-  data.tar.gz: 92c4df477e3bc5ae99938582f9a6ae187bde291c827d7d16d1469dd6b0628f650432b00e101a61eab457a40fce562a228b43a242845e9c9de7eb6836a21267d9
+  metadata.gz: 55629be4525d1bc676e6e7f29c09d1f94d10aa91a8845bdcbe00505d8e6613cbe2b10baccc358fecbfc2c4262eaf5ed56bda081e93b088829d945ba4b41194e6
+  data.tar.gz: 9aa6843b5440a0948ecb971dbc3a21dbaabebf6d0296fca20fb01b1858e1ffc21f75f992800924d31157d8b79612b4cf67c514e6802a43729bd6c3fed5f4db3c

data/.version

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/json-exporter.rb

@@ -1,114 +1,3 @@
 require 'hash_wia'
 
-class JsonExporter
-  EXPORTERS ||= {
-    __filter: proc {}
-  }
-
-  attr_accessor :response, :user, :model, :version
-
-  class << self
-    def define name, opts={}, &block
-      version = opts.delete(:version) || opts.delete(:v) || 1
-      EXPORTERS[version] ||= {}
-      EXPORTERS[version][name.to_s.classify] = block
-    end
-
-    def export name, opts={}
-      new(name, opts).render
-    end
-
-    def filter &block
-      EXPORTERS[:__filter] = block
-    end
-  end
-
-  ###
-
-  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
-    end
-
-    unless opts.is_a?(Hash)
-      raise ArgumentError, 'JsonExporter opts is not a hash'
-    end
-
-    opts[:version]       ||= opts.delete(:v) || 1
-    opts[:depth]         ||= 2 # 2 is default depth
-    opts[:current_depth] ||= 0
-    opts[:current_depth] += 1
-
-    unallowed = opts.keys - %i(user version depth current_depth exporter)
-    raise ArgumentError, 'Unallowed key JsonExporter option found: %s' % unallowed.first if unallowed.first
-
-    @model    = model
-    @version  = opts[:version]
-    @user     = opts[:user]
-    @opts     = opts
-    @block    = _find_exporter
-
-    @response = {}.to_hwia
-  end
-
-  def render
-    instance_exec &@block
-    instance_exec &EXPORTERS[:__filter]
-    @response
-  end
-
-  private
-
-  # export object
-  def export name
-    return if @opts[:current_depth] > @opts[:depth]
-
-    if name.is_a?(Symbol)
-      name, cmodel = name, @model.send(name)
-    else
-      name, cmodel = name.class.to_s.underscore.to_sym, name
-    end
-
-    @response[name] =
-      if [Array].include?(cmodel.class)
-        cmodel
-      else
-        JsonExporter.export(cmodel, @opts)
-      end
-  end
-
-  # add property to exporter
-  def property name, data=:_undefined
-    if block_given?
-      data = yield
-    elsif data == :_undefined
-      data = @model.send(name)
-    end
-
-    @response[name] = data unless data.nil?
-  end
-  alias :prop :property
-
-  # copy calls from lesser version of the same exporter
-  def copy version=nil
-    version ||= @opts[:version] - 1
-    exporter = _find_exporter version
-    instance_exec &exporter
-  end
-
-  # finds versioned exporter
-  def _find_exporter version=nil
-    version  ||= @version
-    exporter   = @opts.delete(:exporter) || model.class
-    @exporter  = exporter.to_s.classify
-
-    for num in version.downto(1).to_a
-      if block = EXPORTERS.dig(num, @exporter)
-        return block
-      end
-    end
-
-    raise('Exporter "%s" (:%s) not found' % [exporter, exporter.to_s.underscore])
-  end
-end
-
+require_relative './json-exporter/base'

data/lib/json-exporter/base.rb

@@ -0,0 +1,124 @@
+class JsonExporter
+  EXPORTERS ||= {}
+  FILTERS   ||= {}
+
+  attr_accessor :response, :user, :model, :meta
+
+  class << self
+    def define *args, &block
+      if args.first.is_a?(Hash)
+        name, opts = nil, args[0]
+      else
+        name, opts = args[0], args[1]
+      end
+
+      name   = name ? name.to_s.classify : to_s
+      opts ||= {}
+
+      EXPORTERS[name] = block
+    end
+
+    def export name, opts={}
+      new(name, opts).render
+    end
+
+    def filter &block
+      FILTERS[to_s] = block
+    end
+  end
+
+  ###
+
+  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
+    end
+
+    opts[:version] ||= opts.delete(:v) || 1
+
+    if opts.class == Hash
+      opts = opts.to_hwia :version, :user, :depth, :current_depth, :exporter, :meta, :wia, :compact
+    end
+
+    opts.meta          ||= {}
+    opts.depth         ||= 2 # 2 is default depth
+    opts.current_depth ||= 0
+    opts.current_depth += 1
+
+    @model    = model
+    @user     = opts[:user]
+    @opts     = opts
+    @meta     = opts.wia ? opts.meta.to_hwia : opts.meta
+    @block    = exporter_find_class
+    @response = opts.wia ? {}.to_hwia : {}
+  end
+
+  def render
+    instance_exec &@block
+    exporter_apply_filters
+    @opts.compact ? @response.compact : @response
+  end
+
+  def version version_num=nil, &block
+    return @opts.version unless version_num
+
+    if block && @opts.version >= version_num
+      instance_exec &block
+    end
+  end
+
+  private
+
+  # export object
+  def export name
+    return if @opts[:current_depth] > @opts[:depth]
+
+    if name.is_a?(Symbol)
+      name, cmodel = name, @model.send(name)
+    else
+      name, cmodel = name.class.to_s.underscore.to_sym, name
+    end
+
+    @response[name] =
+      if [Array].include?(cmodel.class)
+        cmodel
+      else
+        JsonExporter.export(cmodel, @opts)
+      end
+  end
+
+  # add property to exporter
+  def property name, data=:_undefined
+    if block_given?
+      data = yield
+    elsif data == :_undefined
+      data = @model.send(name)
+    end
+
+    @response[name] = data unless data.nil?
+  end
+  alias :prop :property
+
+  # finds versioned exporter
+  def exporter_find_class version=nil
+    exporter =
+    if self.class == JsonExporter
+      # JsonExporter.define User do
+      @opts.exporter ? @opts.exporter.to_s.classify : model.class
+    else
+      # class FooExporter< JsonExporter
+      self.class
+    end
+
+    EXPORTERS[exporter.to_s] || raise('Exporter "%s" (:%s) not found' % [exporter, exporter.to_s.underscore])
+  end
+
+  def exporter_apply_filters
+    for klass in self.class.ancestors.reverse.map(&:to_s)
+      if filter = FILTERS[klass]
+        instance_exec(&filter) if filter
+      end
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-exporter
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Dino Reic
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2020-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hash_wia
@@ -32,11 +32,12 @@ extra_rdoc_files: []
 files:
 - "./.version"
 - "./lib/json-exporter.rb"
+- "./lib/json-exporter/base.rb"
 homepage: https://github.com/dux/json-exporter
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -52,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Fast, simple & powerful object exporter
 test_files: []