reportinator 0.1.0 → 0.2.0

data/lib/reportinator/parsers/method.rb

@@ -1,5 +1,5 @@
 module Reportinator
-  class MethodParser < Base
+  class MethodParser < Parser
     attribute :target
     attribute :method
 
@@ -8,7 +8,10 @@ module Reportinator
     end
 
     def output
-      return send_value(target, method) if method_class == Symbol
+      if method_class == Symbol
+        value = send_value(target, method)
+        return escape_value(value)
+      end
       return parse_array_method if method_class == Array
       return parse_hash_method if method_class == Hash
       nil
@@ -24,7 +27,6 @@ module Reportinator
       output = target
       method.each do |m|
         value = parse_method(output, m)
-        next unless value.present?
         valid = true
         output = value
       end

data/lib/reportinator/parsers/report.rb

@@ -0,0 +1,47 @@
+module Reportinator
+  class ReportParser < Parser
+    attribute :element
+    attribute :data
+
+    def self.parse(element, data = nil)
+      set_data = (data.present? ? data : element)
+      new(element: element, data: set_data).output
+    end
+
+    def output
+      return parse_array if element_class == Array
+      return parse_hash if element_class == Hash
+      return parse_string if element_class == String
+      element
+    end
+
+    def parse_array
+      raise "Not an array" unless element_class == Array
+      element.map { |value| parse_value(value) }
+    end
+
+    def parse_hash
+      raise "Not a hash" unless element_class == Hash
+      element.transform_values { |value| parse_value(value) }
+    end
+
+    def parse_string
+      raise "Not a string" unless element_class == String
+      return element unless element.strip.start_with?("?")
+      return element.sub("?/", "") if element.strip.start_with?("?/")
+      # return parse_row_total if element.start_with?("?tr")
+      # return parse_column_total if element.start_with?("?tc")
+      element
+    end
+
+    def element_class
+      element.class
+    end
+
+    private
+
+    def parse_value(value)
+      self.class.parse(value, data)
+    end
+  end
+end

data/lib/reportinator/parsers/value.rb

@@ -1,7 +1,5 @@
 module Reportinator
-  class ValueParser < Base
-    VALUE_FUNCTIONS = %i[a d n rn rd r]
-
+  class ValueParser < Parser
     attribute :element
     attribute :variables, default: {}
 
@@ -13,132 +11,37 @@ module Reportinator
     def self.parse_and_execute(target, values, variables = {})
       parsed_target = target
       if target.instance_of?(String)
-        parsed_target = new(element: target, variables: variables).parse_string
+        parsed_target = parse(target, variables)
       end
       parsed_values = parse(values, variables)
       MethodParser.parse(parsed_target, parsed_values)
     end
 
     def output
+      config.configured_functions.each do |function|
+        return function.parse(element, variables) if function.accepts? element
+      end
       return parse_array if element_class == Array
       return parse_hash if element_class == Hash
-      return parse_string if element_class == String
       element
     end
 
     def parse_array
       raise "Not an array" unless element_class == Array
-      front = element[0]
-      return parse_executed_array if front.instance_of?(String) && front.start_with?("#")
       element.map { |value| parse_value(value) }
     end
 
-    def parse_executed_array
-      raise "Not an executable array" unless element[0].start_with?("#")
-      values = element
-      target = values.delete_at(0).sub("#", "")
-      parse_and_execute_value(target, values)
-    end
-
     def parse_hash
       raise "Not a hash" unless element_class == Hash
       element.transform_values { |value| parse_value(value) }
     end
 
-    def parse_string
-      raise "Not a string" unless element_class == String
-      return element.sub(":", "").to_sym if element.start_with?(":")
-      return element.sub("&", "").constantize if element.start_with?("&")
-      return parse_variable(element) if element.start_with?("$")
-      return parse_function(element) if element.start_with?("!")
-      element
-    end
-
     def element_class
       element.class
     end
 
-    private
-
-    def parse_variable(value)
-      key = value.sub("$", "").to_sym
-      variables[key]
-    end
-
-    def parse_function(value)
-      input = value.strip
-      function = function_type(input)
-      return value unless function.present?
-      input.sub!(function_prefix(function), "")
-      output = run_function(function, input)
-      output.nil? ? value : output
-    end
-
-    def run_function(function, input)
-      case function
-      when :a then addition_function(input)
-      when :d then date_function(input)
-      when :n then number_function(input)
-      when :r then range_function(input)
-      when :rn then range_function(input, :number)
-      when :rd then range_function(input, :date)
-      end
-    end
-
-    def function_type(value)
-      VALUE_FUNCTIONS.each do |function|
-        return function if value.start_with?(function_prefix(function))
-      end
-      false
-    end
-
-    def function_prefix(function)
-      "!#{function}"
-    end
-
-    def addition_function(value)
-      values = parse_function_array(value)
-      values.map! { |value| number_function(value) }
-      values.sum(0)
-    rescue
-      0
-    end
-
-    def date_function(value)
-      Time.parse(value)
-    rescue
-      Time.now
-    end
-
-    def number_function(value)
-      float = (value =~ /\d\.\d/)
-      return value.to_f if float.present?
-      value.to_i
-    rescue
-      0
-    end
-
-    def range_function(value, type = :any)
-      values = parse_function_array(value)
-      case type
-      when :number then values.map! { |subvalue| number_function(subvalue) }
-      when :date then values.map! { |subvalue| date_function(subvalue) }
-      end
-      Range.new(*values)
-    rescue
-      Range(0..1)
-    end
-
-    def parse_function_array(value)
-      value.split(",").map { |value| parse_value(value.strip) }
-    end
-
     def parse_value(value)
       self.class.parse(value, variables)
     end
-
-    def parse_and_execute_value(target, value)
-      self.class.parse_and_execute(target, value, variables)
-    end
   end
 end

data/lib/reportinator/types/model.rb

@@ -6,15 +6,13 @@ module Reportinator
     validates :target, presence: true
 
     def data
-      return get_model_data(target) unless target.methods.include? :first
+      return get_model_data(target) unless target.respond_to? :to_ary
       records_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 +21,13 @@ 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)
+      return method if method.instance_of?(String)
+      MethodParser.parse(target, method)
+    end
   end
 end

data/lib/reportinator/version.rb

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

data/lib/reportinator.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-require_relative "reportinator/version"
 require "csv"
 require "json"
 require "fileutils"
 require "active_support"
 require "active_model"
 require "require_all"
+require_relative "reportinator/version"
+require_relative "reportinator/base"
 
 module Reportinator
   class Error < StandardError; end
@@ -27,6 +28,10 @@ module Reportinator
     @logger || ActiveSupport::Logger.new($stdout)
   end
 
+  def self.parse(input, variables = {})
+    ValueParser.parse(input, variables)
+  end
+
   def self.report(template, additional_params = {})
     Loader.data_from_template(template, additional_params)
   end
@@ -43,27 +48,4 @@ module Reportinator
     end
     path
   end
-
-  class Base
-    include ActiveModel::API
-    include ActiveModel::Attributes
-
-    require_all "lib/reportinator"
-
-    def self.config
-      Reportinator.config
-    end
-
-    def config
-      self.class.config
-    end
-
-    def self.logger
-      Reportinator.logger
-    end
-
-    def logger
-      self.class.logger
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reportinator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Moxvallix
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -56,10 +56,29 @@ files:
 - Rakefile
 - app/reports/example.report.json
 - app/reports/multiplication.report.json
+- docs/0_first_report.md
 - lib/reportinator.rb
+- lib/reportinator/base.rb
 - lib/reportinator/config.rb
+- lib/reportinator/function.rb
+- lib/reportinator/functions/array.rb
+- lib/reportinator/functions/array/helper.rb
+- lib/reportinator/functions/array/join.rb
+- lib/reportinator/functions/array/method.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/loader.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/types/model.rb