rubypitaya 3.14.0 → 3.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bffdcf22b6825ba0654f97375e06f4910294b5f9690c00b7109fdaba3bf687fe
-  data.tar.gz: 5a67d67b4094a7af3d879d0fddb7e23208d2d7bca233178112cfcff75405368a
+  metadata.gz: 9d6a7ca3ed892f759919d42c36bb87f8c4771b71e1bd8c4ad99e0bee773f1bda
+  data.tar.gz: 7ada9f158e21765e05c09f10e5c49a78e37187592d9c37d6caac924f44bcbb19
 SHA512:
-  metadata.gz: dddf9158f329df422d45dde7066dd3111b5da677d536f3ba25c9238571fddaced05df832728fa21495f40236f896e503307277a3f891032f03b99a6a78645d1f
-  data.tar.gz: 88a4266ec4db9532093fac4cddbffccb84475ee37d3c245adfa44db599e10dffbe0bad5222ef76994ae26bc0228773166d5cfe8e289a7993d7cc60ed0d898156
+  metadata.gz: bd90eb98da9be2b93975df43b27c48986a5c0b4b5d96855381db4f4896b3e3c7a771162d56726df4b76f2fc245ba61e939580da3760fec3414d3a394aabecb5c
+  data.tar.gz: ff971b93d82fbd29a06a7882bc282e058bfcc7fbf9bea6f6200cf0bcfd9ee709d5f52a9fa3a7bd6852486815dfadc00905056be35082acce0082c9c03f68a419

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '3.14.0'
+gem 'rubypitaya', '3.15.1'
 
 group :development do
   gem 'pry', '0.14.2'

data/lib/rubypitaya/app-template/Gemfile.lock

@@ -94,7 +94,7 @@ GEM
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
     ruby2_keywords (0.0.5)
-    rubypitaya (3.14.0)
+    rubypitaya (3.15.1)
       activerecord (= 7.0.4)
       etcdv3 (= 0.11.5)
       google-protobuf (= 3.21.12)
@@ -132,7 +132,7 @@ DEPENDENCIES
   listen (= 3.8.0)
   pry (= 0.14.2)
   rspec (= 3.12.0)
-  rubypitaya (= 3.14.0)
+  rubypitaya (= 3.15.1)
   sinatra-contrib (= 3.0.5)
 
 BUNDLED WITH

data/lib/rubypitaya/app-template/bin/console

@@ -13,25 +13,18 @@ ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT)
 ActiveSupport::LogSubscriber.colorize_logging = true
 
 # Loading core files
-Gem.find_files('rubypitaya/**/*.rb').each do |path|
-  require path unless path.end_with?('spec.rb') ||
-                      path.include?('app/migrations') ||
-                      path.include?('core/templates') ||
-                      path.include?('core/spec-helpers') ||
-                      path.include?('app-template')
-end
+gem_files = Dir.glob('/app/rubypitaya/lib/rubypitaya/core/**/*.rb')
+gem_files.select! {|file| !file[/.+spec.rb/] && !file[/.*(?:app\/migrations|core\/templates|core\/spec-helpers|app-template).*/]}
+gem_files.each {|file| require file}
 
 # Loading application files
+gem_files = []
 app_folder_paths = RubyPitaya::Path::Plugins::APP_FOLDER_PATHS + [RubyPitaya::Path::APP_FOLDER_PATH]
 app_folder_paths.each do |app_folder_path|
-  app_files_path = File.join(app_folder_path, '**/*.rb')
-
-  Dir[app_files_path].each do |path|
-    require path unless path.end_with?('spec.rb') ||
-                        path.include?('app/migrations') ||
-                        path.include?('spec_helper.rb')
-  end
+  gem_files += Dir.glob("#{app_folder_path}**/*.rb")
 end
+gem_files.select! {|file| !file[/.+(?:spec.rb|spec_helper.rb)/] && !file[/.*app\/migrations.*/]}
+gem_files.each {|file| require file}
 
 # Starting irb
 require 'irb'

data/lib/rubypitaya/app-template/features/step_definitions/rubypitaya_steps.rb

@@ -1,11 +1,6 @@
-Given(/^the following User[s]?$/) do |table|
-  table.hashes.each do |table_hash|
-    User.create(id: table_hash[:user_id])
-  end
-end
-
 Given(/^the User ["'](.+)["'] is authenticated$/) do |user_id|
-  @app_helper.authenticate(user_id)
+  user = User.find(user_id)
+  @app_helper.authenticate(user.id)
 end
 
 Given(/^the setup key ["'](.+)["'] is ["'](.+)["']$/) do |key, value|
@@ -16,7 +11,7 @@ Given(/^the config key ["'](.+)["'] is ["'](.+)["']$/) do |key, value|
   @app_helper.add_config(key, value)
 end
 
-Given(/^the config is the following json*$/) do |config_json|
+Given(/^the config is the following json$/) do |config_json|
   config = JSON.parse(config_json)
   @app_helper.set_config(config)
 end
@@ -44,28 +39,92 @@ end
 Then(/^the server response ["'](.+)["'] should be ["'](.+)["']$/) do |response_key, expected_value|
   response_value = @app_helper.response.dig(*response_key.split('.').map(&:to_sym))
 
+  response_value = to_string(response_value)
+  expected_value = to_string(expected_value)
+
   expect(response_value.to_s).to eq(expected_value)
 end
 
+Then(/^the server response ["'](.+)["'] should not be ["'](.+)["']$/) do |response_key, expected_value|
+  response_value = @app_helper.response.dig(*response_key.split('.').map(&:to_sym))
+
+  response_value = to_string(response_value)
+  expected_value = to_string(expected_value)
+
+  expect(response_value.to_s).not_to eq(expected_value)
+end
+
 Then(/^the server response(?: ["'](.+)["'])? should be the following json$/) do |response_key, expected_json_text|
-  response_json = @app_helper.response
-  response_json = @app_helper.response.dig(*response_key.split('.').map(&:to_sym)) unless response_key.blank?
+  response_hash = @app_helper.response
+  response_hash = @app_helper.response.dig(*response_key.split('.').map(&:to_sym)) unless response_key.blank?
+  expected_hash = JSON.parse(expected_json_text.strip)
 
-  expected_json = JSON.parse(expected_json_text.strip, symbolize_names: true)
+  expected_json = JSON.generate(expected_hash)
+  response_json = JSON.generate(response_hash)
 
   expect(response_json).to eq(expected_json)
 end
 
 Then(/^the server response(?: ["'](.+)["'])? should contains the following json[:]?$/) do |response_key, expected_json_text|
-  response_json = @app_helper.response
-  response_json = @app_helper.response.dig(*response_key.split('.').map(&:to_sym)) unless response_key.blank?
+  response_hash = @app_helper.response
+  response_hash = @app_helper.response.dig(*response_key.split('.').map(&:to_sym)) unless response_key.blank?
+  expected_hash = JSON.parse(expected_json_text.strip, symbolize_names: true)
+
+  expected_hash = response_hash.deep_merge(expected_hash) do |key, response_value, expected_value|
+    next expected_value if response_value.class != Array
+
+    expect(response_value.size).to eq(expected_value.size), "Array '#{key}' doesn't have same size.\nexpected: #{expected_value.size}\n     got: #{response_value.size}\n"
+
+    response_value.map.with_index do |_, i|
+      response_value[i].deep_merge(expected_value[i])
+    end
+  end
 
-  expected_json = JSON.parse(expected_json_text.strip, symbolize_names: true)
-  expected_json = response_json.deep_merge(expected_json)
+  expected_json = JSON.generate(expected_hash)
+  response_json = JSON.generate(response_hash)
 
   expect(response_json).to eq(expected_json)
 end
 
+###
+# It validates a model field. Example:
+#
+# Given the following "Player"
+#   | id                                   | name |
+#   | 00000000-0000-0000-0000-000000000001 | Jose |
+# Then the "name" of the "Player" with "id" "00000000-0000-0000-0000-000000000001" should be "Jose"
+Then(/^the ["'](.+)["'] of the ["'](.+)["'] with ["'](.+)["'] ["'](.+)["'] should be ["'](.+)["']$/) do |model_attribute, model_name, search_attribute_name, search_attribute_value, expected_value|
+  current_value = model_name.constantize.where(search_attribute_name => search_attribute_value).select(search_attribute_name).limit(1).pluck(model_attribute).first
+
+  current_value = to_string(current_value)
+  expected_value = to_string(expected_value)
+
+  expect(current_value).to eq(expected_value)
+end
+
+Then(/^the ["'](.+)["'] of the ["'](.+)["'] with ["'](.+)["'] ["'](.+)["'] should not be ["'](.+)["']$/) do |model_attribute, model_name, search_attribute_name, search_attribute_value, expected_value|
+  current_value = model_name.constantize.where(search_attribute_name => search_attribute_value).select(search_attribute_name).limit(1).pluck(model_attribute).first
+
+  current_value = to_string(current_value)
+  expected_value = to_string(expected_value)
+
+  expect(current_value).not_to eq(expected_value)
+end
+
+
+###
+# It count the number of models. Example
+#
+# Then the number of 'Users' should be 10
+Then(/^the number of ["'](.+)["'] should be (\d+)$/) do |model_name, model_amount|
+  model_name = model_name.singularize
+
+  expected_value = model_amount
+  current_value = model_name.constantize.count
+
+  expect(current_value).to eq(expected_value)
+end
+
 Given(/^print server response$/) do
   puts JSON.pretty_generate(@app_helper.response)
 end

data/lib/rubypitaya/app-template/features/support/env.rb

@@ -10,4 +10,11 @@ RubyPitaya::AppSpecHelper.initialize_before_suite
 
 at_exit do
   RubyPitaya::AppSpecHelper.finalize_after_suite
-end
+end
+
+def to_string(value)
+  return value if value.class == String
+  return value.to_s if value.class == Integer
+  return 'nil' if value.nil?
+  value
+end

data/lib/rubypitaya/core/config.rb

@@ -11,6 +11,9 @@ module RubyPitaya
 
       @empty_hash = {}
       @result_cache = {}
+
+      @empty_hash.extend(ConfigHashExtension)
+      @result_cache.extend(ConfigHashExtension)
     end
 
     def [](key)

data/lib/rubypitaya/core/config_core.rb

@@ -4,6 +4,8 @@ module RubyPitaya
 
     def initialize()
       @config = {}
+      @config.extend(ConfigHashExtension)
+
       configs_folder_paths = Path::Plugins::APP_CONFIG_FOLDER_PATHS + [Path::APP_CONFIG_FOLDER_PATH]
 
       configs_folder_paths.each do |configs_folder_path|
@@ -42,10 +44,11 @@ module RubyPitaya
     def load_config_file(configs_folder_path, file_path)
       config_text = File.open(file_path, &:read)
       config_hash = JSON.parse(config_text, symbolize_names: true)
+      config_hash.extend(ConfigHashExtension)
 
       file_name = file_path.sub(/^#{configs_folder_path}/, '')[0..-6]
 
-      @config[file_name] = config_hash
+      @config[file_name.to_sym] = config_hash
 
       rescue Exception => error
         puts "ERROR: #{error}"

data/lib/rubypitaya/core/config_hash_extension.rb

@@ -0,0 +1,25 @@
+module RubyPitaya
+
+  module ConfigHashExtension
+    def [](key)
+      super(key.to_sym)
+    end
+
+    def fetch(*args)
+      args[0] = args[0].to_sym
+      super(*args)
+    end
+
+    def dig(*args)
+      super(*args.map(&:to_sym))
+    end
+
+    def key?(key)
+      super(key.to_sym)
+    end
+
+    def has_key?(key)
+      super(key.to_sym)
+    end
+  end
+end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '3.14.0'
+  VERSION = '3.15.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 3.14.0
+  version: 3.15.1
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-17 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -330,6 +330,7 @@ files:
 - "./lib/rubypitaya/core/application_files_importer.rb"
 - "./lib/rubypitaya/core/config.rb"
 - "./lib/rubypitaya/core/config_core.rb"
+- "./lib/rubypitaya/core/config_hash_extension.rb"
 - "./lib/rubypitaya/core/database_config.rb"
 - "./lib/rubypitaya/core/database_connector.rb"
 - "./lib/rubypitaya/core/etcd_connector.rb"