reportinator 0.1.1 → 0.3.2

data/lib/reportinator/{report.rb → report_type.rb}

@@ -1,5 +1,8 @@
 module Reportinator
-  class Report < Base
+  class ReportType < Base
+    PARSE_PARAMS = true
+
+    attr_accessor :metadata
     attribute :title
 
     def self.generate(params)

data/lib/reportinator/types/model.rb

@@ -1,20 +1,21 @@
 module Reportinator
-  class ModelReport < Report
+  class ModelReport < ReportType
+    include Helpers
+    PARSE_PARAMS = false
     attribute :target
     attribute :method_list, default: []
 
     validates :target, presence: true
 
     def data
-      return get_model_data(target) unless target.methods.include? :first
-      records_data
+      self.target = ValueParser.parse(target, metadata)
+      return Row.create(get_model_data(target)) unless target.respond_to? :each
+      records_data.map { |data| Row.create(data) }
     end
 
     def records_data
-      records = target
-      records = target.all if target.methods.include? :all
       output = []
-      records.each do |model|
+      target.each do |model|
         value = get_model_data(model)
         output << value
       end
@@ -23,8 +24,15 @@ module Reportinator
 
     def get_model_data(target)
       method_list.map do |method|
-        ValueParser.parse_and_execute(target, method)
+        parse_method(target, method)
       end
     end
+
+    def parse_method(target, method)
+      parser_metadata = merge_hash(metadata, {variables: {target: target}})
+      parsed_method = ValueParser.parse(method, parser_metadata)
+      return parsed_method if parsed_method.instance_of? String
+      MethodParser.parse(target, parsed_method)
+    end
   end
 end

data/lib/reportinator/types/preset.rb

@@ -1,5 +1,26 @@
 module Reportinator
-  class PresetReport < Report
-    attribute :data, default: []
+  class PresetReport < ReportType
+    attribute :values
+
+    def data
+      split_values.map { |row| Row.create(row) }
+    end
+
+    def split_values
+      data = values.instance_of?(Array) ? values : [values]
+      rows = []
+      temp = []
+      data.each do |col|
+        if col.instance_of?(Array)
+          rows << temp unless temp.empty?
+          temp = []
+          rows << col
+        else
+          temp << col
+        end
+      end
+      rows << temp unless temp.empty?
+      rows
+    end
   end
 end

data/lib/reportinator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Reportinator
-  VERSION = "0.1.1"
+  VERSION = "0.3.2"
 end

data/lib/reportinator.rb

@@ -6,14 +6,17 @@ require "fileutils"
 require "active_support"
 require "active_model"
 require "require_all"
+require "json_schemer"
 require_relative "reportinator/version"
 require_relative "reportinator/base"
 
 module Reportinator
+  SCHEMA = "#{__dir__}/../data/schema/report_schema.json"
   class Error < StandardError; end
   class << self
     attr_writer :config
     attr_writer :logger
+    attr_writer :schema
   end
 
   def self.config
@@ -24,24 +27,35 @@ module Reportinator
     yield(config)
   end
 
+  def self.schema
+    return @schema if @schema.instance_of? JSONSchemer
+    schema = JSON.parse(File.read(SCHEMA))
+    @schema = JSONSchemer.schema(schema)
+  end
+
   def self.logger
     @logger || ActiveSupport::Logger.new($stdout)
   end
 
-  def self.report(template, additional_params = {})
-    Loader.data_from_template(template, additional_params)
+  def self.parse(input, metadata = {})
+    ValueParser.parse(input, metadata)
+  end
+
+  def self.report(template, metadata = {})
+    report = ReportLoader.load(template, metadata).report
+    report.output
   end
 
-  def self.output(template, additional_params = {}, filename = "")
+  def self.output(template, metadata = {}, filename = "")
     filename = (filename.present? ? filename : "#{template}.csv")
     path = "#{config.output_directory}/#{filename}"
     FileUtils.mkdir_p(File.dirname(path))
-    data = Loader.data_from_template(template, additional_params)
-    CSV.open(path, "wb") do |csv|
-      data.each do |row|
-        csv << row
-      end
+    report = ReportLoader.load(template, metadata).report
+    data = report.to_csv
+    if File.write(path, data)
+      path
+    else
+      raise "Error writing to: #{path}"
     end
-    path
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reportinator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Moxvallix
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: json_schemer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: Behold! My Reportinator! Reportinator makes reports from JSON files.
 email:
 - dev@moxvallix.com
@@ -56,13 +70,42 @@ files:
 - Rakefile
 - app/reports/example.report.json
 - app/reports/multiplication.report.json
+- app/reports/multiplication_v2.report.json
+- data/schema/report_schema.json
+- docs/0_first_report.md
 - lib/reportinator.rb
 - lib/reportinator/base.rb
 - lib/reportinator/config.rb
-- lib/reportinator/loader.rb
+- lib/reportinator/function.rb
+- lib/reportinator/functions/array.rb
+- lib/reportinator/functions/array/flatten.rb
+- lib/reportinator/functions/array/helper.rb
+- lib/reportinator/functions/array/join.rb
+- lib/reportinator/functions/array/method.rb
+- lib/reportinator/functions/array/range.rb
+- lib/reportinator/functions/array/snippet.rb
+- lib/reportinator/functions/array/string.rb
+- lib/reportinator/functions/string.rb
+- lib/reportinator/functions/string/addition.rb
+- lib/reportinator/functions/string/constant.rb
+- lib/reportinator/functions/string/date.rb
+- lib/reportinator/functions/string/join.rb
+- lib/reportinator/functions/string/logical.rb
+- lib/reportinator/functions/string/number.rb
+- lib/reportinator/functions/string/range.rb
+- lib/reportinator/functions/string/symbol.rb
+- lib/reportinator/functions/string/variable.rb
+- lib/reportinator/helpers.rb
+- lib/reportinator/parser.rb
 - lib/reportinator/parsers/method.rb
+- lib/reportinator/parsers/report.rb
 - lib/reportinator/parsers/value.rb
-- lib/reportinator/report.rb
+- lib/reportinator/report/column.rb
+- lib/reportinator/report/loader.rb
+- lib/reportinator/report/report.rb
+- lib/reportinator/report/row.rb
+- lib/reportinator/report/template.rb
+- lib/reportinator/report_type.rb
 - lib/reportinator/types/model.rb
 - lib/reportinator/types/preset.rb
 - lib/reportinator/version.rb
@@ -74,7 +117,7 @@ metadata:
   rubygems_mfa_required: 'true'
   homepage_uri: https://github.com/moxvallix/reportinator
   source_code_uri: https://github.com/moxvallix/reportinator
-  changelog_uri: https://github.com/moxvallix/reportinator
+  changelog_uri: https://github.com/moxvallix/reportinator/blob/main/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/reportinator/loader.rb

@@ -1,112 +0,0 @@
-module Reportinator
-  class Loader < Base
-    attribute :type
-    attribute :template
-    attribute :variables
-    attribute :params
-
-    def self.data_from_template(template, additional_params = {})
-      template_data = load_template(template, additional_params)
-      return split_rows(template_data.data) unless template_data.instance_of?(Array)
-      output = []
-      template_data.each { |report| output += report.data }
-      split_rows(output)
-    end
-
-    def self.load_template(template, additional_params = {})
-      data = parse_template(template)
-      return load_multiple(data, additional_params) if data.instance_of?(Array)
-      load_singular(data, additional_params)
-    end
-
-    def self.load_multiple(data, additional_params)
-      data.map { |report| load_singular(report, additional_params) }
-    end
-
-    def self.load_singular(data, additional_params)
-      data.merge!(additional_params) { |key, old_value, new_value| merge_values(new_value, old_value) }
-      filtered_data = filter_params(data, attribute_names)
-      variables = filtered_data[:variables]
-      parsed_data = ValueParser.parse(filtered_data, variables)
-      new(parsed_data).report
-    end
-
-    def self.find_template(template)
-      suffixes = config.configured_suffixes
-      directories = config.configured_directories
-      template_files = suffixes.map { |suffix| (suffix.present? ? "#{template}.#{suffix}" : template) }
-      template_paths = directories.map { |dir| template_files.map { |file| "#{dir}/#{file}" } }
-      template_paths.flatten!
-      template_paths.each do |path|
-        return path if File.exist? path
-      end
-      raise "Missing template: #{template}. Searched: #{template_paths}"
-    end
-
-    def self.parse_template(template)
-      file = find_template(template)
-      begin
-        json = File.read(file)
-        JSON.parse(json, symbolize_names: true)
-      rescue
-        raise "Error parsing template file: #{file}"
-      end
-    end
-
-    def self.split_rows(data)
-      data = data.instance_of?(Array) ? data : [data]
-      rows = []
-      temp = []
-      data.each do |col|
-        if col.instance_of?(Array)
-          rows << temp unless temp.empty?
-          temp = []
-          rows << col
-        else
-          temp << col
-        end
-      end
-      rows << temp unless temp.empty?
-      rows
-    end
-
-    def self.filter_params(params, allowed_params)
-      filtered_params = params.select { |param| allowed_params.include? param.to_s }
-      if params.size > filtered_params.size
-        invalid_params = (params.keys - filtered_params.keys).map { |key| key.to_s }
-        logger.warn "Invalid attributes found: #{invalid_params} Valid attributes are: #{allowed_params}"
-      end
-      filtered_params
-    end
-
-    def self.merge_values(new_value, old_value)
-      return old_value.merge(new_value) if old_value.is_a?(Hash) && new_value.is_a?(Hash)
-      new_value
-    end
-
-    def report
-      if template.present?
-        additional_params = {type: type, variables: variables, params: params}
-        self.class.load_template(template, additional_params.compact)
-      else
-        attribute_list = report_class.attribute_names
-        filtered_params = self.class.filter_params(params, attribute_list)
-        report_class.new(filtered_params)
-      end
-    end
-
-    def report_class
-      types = config.configured_types
-      raise "Invalid type: #{type}" unless types.include? type
-      types[type].constantize
-    end
-
-    def template_file
-      self.class.find_template(template)
-    end
-
-    def template_data
-      self.class.parse_template(template)
-    end
-  end
-end