anoubis 1.0.8 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5464dccc282a05f485f875d7961916178f580dfb96957bde888ab61ec73f7276
-  data.tar.gz: 8cc6edd51976891558a02532f13b2d8613763f0f50075b2dcaa642f18707f268
+  metadata.gz: ca54a9f12fd045c1744271d6cf951da94061e002af8d32a1eb50e2616daeac75
+  data.tar.gz: e5dbe2556e68d9e2a6509dfca422237f94626b060006e40e319e649619b8be90
 SHA512:
-  metadata.gz: 7ff86708955579d2f88fa8f6492b7c9dc59f6d33e15e290578f046547bd921eb92dea83f0a16f3e97a6144e6c5f0775dc27bc478f1deb33441c140da4f5903a7
-  data.tar.gz: 32e3ce400a9838b7785a0fea0ba6f60e884c25dc4ece6d8e15a5ae940c05c4e6cb79931a0fc6f68dc47597655da1aa6d431eeff067218ff4db1488800a7afb77
+  metadata.gz: 91436b864c0a61a4d66d510b5e1845c73e07857c40f3f93b06fc1c406fc7b5d3dc3e9c247cb26285f6746ac04da526bb9adb1a7bddfdf337492220756dbe1caa
+  data.tar.gz: 209eeb301e6bd66bf17617c7fb395ec4cb3d31cf48d838ee06adfdf67c23205e1e73d72a3d2c131bf775bcc2955fe7128de0f5a9e3c726eb7d427f5ce466ea85

data/app/controllers/anoubis/application_controller.rb

@@ -14,6 +14,10 @@ class Anoubis::ApplicationController < ActionController::API
   #    @return [Anoubis::Output] standard output.
   attr_accessor :output
 
+  # @!attribute [rw] exports
+  #   @return [Anubis::Export] Export data class
+  attr_accessor :exports
+
   ##
   # Returns default locale initialized in application configuration file. Variable is taken from {https://guides.rubyonrails.org/i18n.html Rails.configuration.i18n.default_locale} parameter
   # @return [String] default locale
@@ -54,6 +58,7 @@ class Anoubis::ApplicationController < ActionController::API
     self.locale = params[:locale] if params.has_key? :locale
     self.locale = default_locale unless self.locale
     self.locale = default_locale if self.locale == ''
+    self.exports = nil
     begin
       I18n.locale = locale
     rescue

data/app/controllers/anoubis/data/actions.rb

@@ -104,7 +104,7 @@ module Anoubis
         self.after_get_table_data
         self.before_output
 
-        render json: around_output(self.output.to_h)
+        render json: around_output(output.to_h)
       end
 
       ##
@@ -193,7 +193,7 @@ module Anoubis
         setup_frame
         before_output
 
-        render json: self.output.to_h
+        render json: around_output(output.to_h)
       end
 
       ##
@@ -301,12 +301,11 @@ module Anoubis
         end
         if self.output.result == 0
           self.output.title = I18n.t(format('%s.show.form.title', params[:controller].sub('/', '.')), title: self.output.values[:sys_title],
-                                default: I18n.t('anubis.form.titles.show', title: self.output.values[:sys_title]))
+                                default: I18n.t('anoubis.form.titles.show', title: self.output.values[:sys_title]))
         end
         self.before_output
-        respond_to do |format|
-          format.json { render json: self.output.to_h }
-        end
+
+        render json: around_output(output.to_h)
       end
 
       ##
@@ -405,14 +404,11 @@ module Anoubis
           self.output.result = -1
         end
         if self.output.result == 0
-          self.output.title = I18n.t(format('%s.%s.form.title', params[:controller].sub('/', '.'), action), default: I18n.t('anubis.form.titles.new'))
+          self.output.title = I18n.t(format('%s.%s.form.title', params[:controller].sub('/', '.'), action), default: I18n.t('anoubis.form.titles.new'))
         end
         self.before_output
 
-
-        respond_to do |format|
-          format.json { render json: self.output.to_h }
-        end
+        render json: around_output(output.to_h)
       end
 
       ##
@@ -533,9 +529,8 @@ module Anoubis
           self.output.result = -2
         end
         self.before_output
-        respond_to do |format|
-          format.json { render json: self.output.to_h }
-        end
+
+        render json: around_output(output.to_h)
       end
 
       ##
@@ -647,12 +642,11 @@ module Anoubis
         end
         if self.output.result == 0
           self.output.title = I18n.t(format('%s.edit.form.title', params[:controller].sub('/', '.')), title: self.output.values[:sys_title],
-                                default: I18n.t('anubis.form.titles.edit', title: self.output.values[:sys_title]))
+                                default: I18n.t('anoubis.form.titles.edit', title: self.output.values[:sys_title]))
         end
         self.before_output
-        respond_to do |format|
-          format.json { render json: self.output.to_h }
-        end
+
+        render json: around_output(output.to_h)
       end
 
       ##
@@ -766,9 +760,8 @@ module Anoubis
           self.output.result = -1
         end
         self.before_output
-        respond_to do |format|
-          format.json { render json: self.output.to_h }
-        end
+
+        render json: around_output(output.to_h)
       end
 
       ##
@@ -849,9 +842,8 @@ module Anoubis
           self.output.result = -1
         end
         self.before_output
-        respond_to do |format|
-          format.json { render json: self.output.to_h }
-        end
+
+        render json: around_output(output.to_h)
       end
 
       ##
@@ -877,9 +869,8 @@ module Anoubis
           end
         end
         self.before_output
-        respond_to do |format|
-          format.json { render json: self.output.to_h }
-        end
+
+        render json: around_output(output.to_h)
       end
 
       ##

data/app/controllers/anoubis/data/convert.rb

@@ -143,12 +143,8 @@ module Anoubis
         #puts value.class
         if (value.class == Date) || (value.class == ActiveSupport::TimeWithZone)
           begin
-            new_value = case field.format
-                        when 'month' then I18n.t('anubis.months.main')[value.month-1]+' '+value.year.to_s
-                        when 'date' then value.day.to_s+' '+ I18n.t('anubis.months.second')[value.month-1]+' '+value.year.to_s
-                        when 'datetime' then value.day.to_s+' '+ I18n.t('anubis.months.second')[value.month-1]+' '+value.year.to_s+', '+value.hour.to_s+':'+('%02d' % value.min)
-                        else value.day.to_s+' '+ I18n.t('anubis.months.second')[value.month-1]+' '+value.year.to_s+', '+value.hour.to_s+':'+('%02d' % value.min)+':'+('%02d' % value.sec)
-                        end
+            new_value = convert_datetime_to_string value, field.format
+
             if %w[month date].include? field.format
               raw_value = value.year.to_s + '-' + ('%02d' % value.month) + '-' + ('%02d' % value.day)
             else
@@ -170,7 +166,28 @@ module Anoubis
         return { key => new_value, format('%s_raw', key).to_sym => value }
       end
 
+      ##
+      # Convert value from database to view format for 'hash' type
+      # @param key [Symbol] field's identifier in {Anoubis::Etc::Data#fields self.etc.data.fields} structure
+      # @param value [String] value from database
+      # @return [Hash] returns text representation of database value
+      def convert_db_to_view_value_hash(key, value)
+        return { key => '' } if !value
+        return { key => value }
+      end
 
+      ##
+      # Converts DateTime representation to string value
+      # @param value [DateTime] date and time
+      # @param format [String] convert representation ('month' - return only month and year, 'date' - returns only date, 'datetime' - returns date and time)
+      # @return Returns date and time representation string
+      def convert_datetime_to_string(value, format)
+        return I18n.t('anoubis.months.main')[value.month-1]+' '+value.year.to_s if format == 'month'
+        return value.day.to_s+' '+ I18n.t('anoubis.months.second')[value.month-1]+' '+value.year.to_s if format == 'date'
+        return value.day.to_s+' '+ I18n.t('anoubis.months.second')[value.month-1]+' '+value.year.to_s+', '+value.hour.to_s+':'+('%02d' % value.min) if format == 'datetime'
+
+        value.day.to_s+' '+ I18n.t('anoubis.months.second')[value.month-1]+' '+value.year.to_s+', '+value.hour.to_s+':'+('%02d' % value.min)+':'+('%02d' % value.sec)
+      end
 
 
 
@@ -219,10 +236,10 @@ module Anoubis
       def convert_db_to_table_value_datetime1(key, field, value)
         begin
           value = case field[:format]
-                  when 'month' then I18n.t('months.main')[value.month-1]+' '+value.year.to_s
-                  when 'date' then value.day.to_s+' '+ I18n.t('months.second')[value.month-1]+' '+value.year.to_s
-                  when 'datetime' then value.day.to_s+' '+ I18n.t('months.second')[value.month-1]+' '+value.year.to_s+', '+value.hour.to_s+':'+('%02d' % value.min)
-                  else value.day.to_s+' '+ I18n.t('months.second')[value.month-1]+' '+value.year.to_s+', '+value.hour.to_s+':'+('%02d' % value.min)+':'+('%02d' % value.sec)
+                  when 'month' then I18n.t('anoubis.months.main')[value.month-1]+' '+value.year.to_s
+                  when 'date' then value.day.to_s+' '+ I18n.t('anoubis.months.second')[value.month-1]+' '+value.year.to_s
+                  when 'datetime' then value.day.to_s+' '+ I18n.t('anoubis.months.second')[value.month-1]+' '+value.year.to_s+', '+value.hour.to_s+':'+('%02d' % value.min)
+                  else value.day.to_s+' '+ I18n.t('anoubis.months.second')[value.month-1]+' '+value.year.to_s+', '+value.hour.to_s+':'+('%02d' % value.min)+':'+('%02d' % value.sec)
                   end
         rescue
           value = I18n.t('incorrect_field_format')
@@ -249,10 +266,10 @@ module Anoubis
       def convert_db_to_table_value_datetime(key, field, value)
         begin
           value = case field[:format]
-                  when 'month' then I18n.t('months.main')[value.month-1]+' '+value.year.to_s
-                  when 'date' then value.day.to_s+' '+ I18n.t('months.second')[value.month-1]+' '+value.year.to_s
-                  when 'datetime' then value.day.to_s+' '+ I18n.t('months.second')[value.month-1]+' '+value.year.to_s+', '+value.hour.to_s+':'+('%02d' % value.min)
-                  else value.day.to_s+' '+ I18n.t('months.second')[value.month-1]+' '+value.year.to_s+', '+value.hour.to_s+':'+('%02d' % value.min)+':'+('%02d' % value.sec)
+                  when 'month' then I18n.t('anoubis.months.main')[value.month-1]+' '+value.year.to_s
+                  when 'date' then value.day.to_s+' '+ I18n.t('anoubis.months.second')[value.month-1]+' '+value.year.to_s
+                  when 'datetime' then value.day.to_s+' '+ I18n.t('anoubis.months.second')[value.month-1]+' '+value.year.to_s+', '+value.hour.to_s+':'+('%02d' % value.min)
+                  else value.day.to_s+' '+ I18n.t('anoubis.months.second')[value.month-1]+' '+value.year.to_s+', '+value.hour.to_s+':'+('%02d' % value.min)+':'+('%02d' % value.sec)
                   end
         rescue
           value = I18n.t('incorrect_field_format')

data/app/controllers/anoubis/data_controller.rb

@@ -10,6 +10,7 @@ require_dependency "anoubis/data/callbacks"
 ##
 # Main data controller class
 class Anoubis::DataController < Anoubis::ApplicationController
+  include ActionController::MimeResponds
   include Anoubis::Data::Actions
   include Anoubis::Data::Load
   include Anoubis::Data::Get

data/app/controllers/anoubis/etc/field.rb

@@ -152,6 +152,13 @@ module Anoubis
 
       end
 
+      ##
+      # Initialize additional parameters for {Anoubis::Etc::Field#type 'hash' field type} for controller actions.
+      # @param options [Hash] field's initial options
+      def initialize_hash (options)
+
+      end
+
       ##
       # Initialize additional parameters for {Anoubis::Etc::Field#type 'number' field type} for controller actions.
       # @param options [Hash] field's initial options

data/app/models/anoubis/application_record.rb

@@ -2,9 +2,29 @@
 class Anoubis::ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 
+  after_initialize :initialize_anubis_application_record
+
   ## Redis database variable
   attr_accessor :redis
 
+  # @!attribute [rw] need_refresh
+  #   @return [Boolean] defines when table representation data should be updated even after simple update
+  attr_accessor :need_refresh
+
+  ##
+  # Fires after ApplicationRecord initialized for define default values
+  def initialize_anubis_application_record
+    self.need_refresh = false
+
+    after_initialize_anubis_application_record
+  end
+
+  ##
+  # Fires after initialize default variables
+  def after_initialize_anubis_application_record
+
+  end
+
   ##
   # Returns {https://github.com/redis/redis-rb Redis database} class
   # @return [Class] {https://github.com/redis/redis-rb Redis} class reference
@@ -130,4 +150,37 @@ class Anoubis::ApplicationRecord < ActiveRecord::Base
   def sys_title
     id.to_s
   end
+
+  ##
+  # Returns the ability to create new data. By default all items may be deleted. For another result
+  # procedure should be overridden.
+  # @param args [Hash] transferred parameters
+  # @option args [String] :controller Called controller identifier
+  # @option args [String] :tab Called controller tab element
+  # @return [Boolean] true if new data may be created.
+  def can_new(args = {})
+    true
+  end
+
+  ##
+  # Returns the ability to edit the data. By default all items may be edited. For another result
+  # procedure should be overridden.
+  # @param args [Hash] transferred parameters
+  # @option args [String] :controller Called controller identifier
+  # @option args [String] :tab Called controller tab element
+  # @return [Boolean] true if data may be edited
+  def can_edit(args = {})
+    true
+  end
+
+  ##
+  # Returns the ability to delete a data. By default all items may be deleted. For another result
+  # procedure should be overridden.
+  # @param args [Hash] transferred parameters
+  # @option args [String] :controller Called controller identifier
+  # @option args [String] :tab Called controller tab element
+  # @return [Boolean] true if data may be deleted
+  def can_delete(args = {})
+    true
+  end
 end

data/config/locales/ru.yml

@@ -52,6 +52,51 @@ ru:
           title: "Дашборд"
           page_title: "Дашборд"
           short_title: "Дашборд"
+    form:
+      titles:
+        edit: "Редактирование элемента: %{title}"
+        show: "Просмотр элемента: %{title}"
+        new: "Добавление нового элемента"
+    months:
+      main:
+        - "Январь"
+        - "Февраль"
+        - "Март"
+        - "Апрель"
+        - "Май"
+        - "Июнь"
+        - "Июль"
+        - "Август"
+        - "Сентябрь"
+        - "Октябрь"
+        - "Ноябрь"
+        - "Декабрь"
+      second:
+        - "Января"
+        - "Февраля"
+        - "Марта"
+        - "Апреля"
+        - "Мая"
+        - "Июня"
+        - "Июля"
+        - "Августа"
+        - "Сентября"
+        - "Октября"
+        - "Ноября"
+        - "Декабря"
+      short:
+        - "янв"
+        - "фев"
+        - "мар"
+        - "апр"
+        - "май"
+        - "июн"
+        - "июл"
+        - "авг"
+        - "сен"
+        - "окт"
+        - "ноя"
+        - "дек"
 
 
 
@@ -69,46 +114,6 @@ ru:
         error_changing_data: Ошибка изменения данных
 
 
-    months:
-      main:
-        - Январь
-        - Февраль
-        - Март
-        - Апрель
-        - Май
-        - Июнь
-        - Июль
-        - Август
-        - Сентябрь
-        - Октябрь
-        - Ноябрь
-        - Декабрь
-      second:
-        - Января
-        - Февраля
-        - Марта
-        - Апреля
-        - Мая
-        - Июня
-        - Июля
-        - Августа
-        - Сентября
-        - Октября
-        - Ноября
-        - Декабря
-      short:
-        - янв
-        - фев
-        - мар
-        - апр
-        - май
-        - июн
-        - июл
-        - авг
-        - сен
-        - окт
-        - ноя
-        - дек
     install2:
       groups:
         admin: Администраторы
@@ -123,11 +128,6 @@ ru:
       buttons:
         edit: "Редактировать: %{title}"
         delete: "Удалить: %{title}"
-    form:
-      titles:
-        edit: "Редактирование элемента: %{title}"
-        show: "Просмотр элемента: %{title}"
-        new: "Добавление нового элемента"
 
     tenants:
       errors:

data/lib/anoubis/version.rb

@@ -1,5 +1,5 @@
 module Anoubis
   ##
   # Anoubis current version
-  VERSION = '1.0.8'
+  VERSION = '1.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anoubis
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.12
 platform: ruby
 authors:
 - Andrey Ryabov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-23 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -321,7 +321,7 @@ metadata:
   homepage_uri: https://github.com/RA-Company/
   source_code_uri: https://github.com/RA-Company/anoubis
   changelog_uri: https://github.com/RA-Company/anoubis/blob/main/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/anoubis/1.0.8
+  documentation_uri: https://www.rubydoc.info/gems/anoubis/1.0.12
 post_install_message: 
 rdoc_options: []
 require_paths: