rubypitaya 2.14.0 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef2357fb173bf33d95bf3d254c4eb6ff8943c420372dd4abccf1a0c40a5d43d8
-  data.tar.gz: c0c66d8b81f67c8081d0ac0fa3dff7f9036e8e54cc3ff4e3ea370427cf067adb
+  metadata.gz: 38d15208a32190c01690735d3d8433bb0f8cc9b6f71a64f7897ba668c21e4e97
+  data.tar.gz: 7396c21b202d611ea5945fd9838b68323b4751777d3e154b20b31557ee470b7a
 SHA512:
-  metadata.gz: 3568a02b718ec1b9f60063c01e1ef69256fdd45c3d4907a017ae668326e9486aff1f638e11abb068bd5e446efb93cdd4eaa737843a366609da3e7bf807950ef3
-  data.tar.gz: 9de2d78d09e2a4aaf15df8e6d5f269a16aedd798ee72083e83bd537bf941d2d954cc0f1910e7234b12367827e544ac97f2c62926bc4d5e6aac27ab4628d60321
+  metadata.gz: 6b70755f160f42aa9a145bf55c0709bb82ec92f1f2105874127439bdc286ea124e7f2093cdae34a377d595bb54e21e75af244d34cbd9c30f8feac08849db7d9a
+  data.tar.gz: 50df16ee2575fd5840b0af30cfa3aedb9a7e4b35d27291a3a484ac2233b09b41700618ef9a1d8b2223cc1dba3e0cc0d8c7fc42a168971e548bd0301e34b77e7d

data/lib/rubypitaya/app-template/Gemfile

@@ -1,11 +1,11 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '2.14.0'
+gem 'rubypitaya', '2.18.0'
 
 group :development do
-  gem 'pry', '0.12.2'
-  gem 'bundler', '1.17.2'
-  gem 'rspec', '3.8.0'
-  gem 'listen', '3.2.1'
-  gem 'cucumber', '2.4.0'
+  gem 'pry', '0.14.0'
+  gem 'bundler', '2.1.4'
+  gem 'rspec', '3.10.0'
+  gem 'listen', '3.4.1'
+  gem 'cucumber', '5.3.0'
 end

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

@@ -1,99 +1,123 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.2)
-      activesupport (= 6.0.2)
-    activerecord (6.0.2)
-      activemodel (= 6.0.2)
-      activesupport (= 6.0.2)
-    activesupport (6.0.2)
+    activemodel (6.1.3)
+      activesupport (= 6.1.3)
+    activerecord (6.1.3)
+      activemodel (= 6.1.3)
+      activesupport (= 6.1.3)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
-    cucumber (2.4.0)
-      builder (>= 2.1.2)
-      cucumber-core (~> 1.5.0)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 4.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (1.5.0)
-      gherkin (~> 4.0)
-    cucumber-wire (0.0.1)
+    concurrent-ruby (1.1.8)
+    cucumber (5.3.0)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-core (~> 8.0, >= 8.0.1)
+      cucumber-create-meta (~> 2.0, >= 2.0.2)
+      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
+      cucumber-gherkin (~> 15.0, >= 15.0.2)
+      cucumber-html-formatter (~> 9.0, >= 9.0.0)
+      cucumber-messages (~> 13.1, >= 13.1.0)
+      cucumber-wire (~> 4.0, >= 4.0.1)
+      diff-lcs (~> 1.4, >= 1.4.4)
+      multi_test (~> 0.1, >= 0.1.2)
+      sys-uname (~> 1.2, >= 1.2.1)
+    cucumber-core (8.0.1)
+      cucumber-gherkin (~> 15.0, >= 15.0.2)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
+    cucumber-create-meta (2.0.4)
+      cucumber-messages (~> 13.1, >= 13.1.0)
+      sys-uname (~> 1.2, >= 1.2.1)
+    cucumber-cucumber-expressions (10.3.0)
+    cucumber-gherkin (15.0.2)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    cucumber-html-formatter (9.0.0)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    cucumber-messages (13.2.1)
+      protobuf-cucumber (~> 3.10, >= 3.10.8)
+    cucumber-tag-expressions (2.0.4)
+    cucumber-wire (4.0.1)
+      cucumber-core (~> 8.0, >= 8.0.1)
+      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
+      cucumber-messages (~> 13.0, >= 13.0.1)
     diff-lcs (1.4.4)
     etcdv3 (0.10.2)
       grpc (~> 1.17)
     eventmachine (1.2.7)
     ffi (1.14.2)
-    gherkin (4.1.3)
-    google-protobuf (3.14.0)
-    googleapis-common-protos-types (1.0.5)
-      google-protobuf (~> 3.11)
-    grpc (1.34.0)
-      google-protobuf (~> 3.13)
+    google-protobuf (3.15.3-x86_64-linux)
+    googleapis-common-protos-types (1.0.6)
+      google-protobuf (~> 3.14)
+    grpc (1.36.0-x86_64-linux)
+      google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.0)
-    i18n (1.8.6)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    listen (3.2.1)
+    listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    method_source (0.9.2)
+    method_source (1.0.0)
     middleware (0.1.0)
-    minitest (5.14.2)
+    minitest (5.14.4)
     multi_json (1.15.0)
     multi_test (0.1.2)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     nats (0.11.0)
       eventmachine (~> 1.2, >= 1.2)
-    ostruct (0.1.0)
-    pg (0.21.0)
+    ostruct (0.3.3)
+    pg (1.2.3)
     protobuf (3.10.0)
       activesupport (>= 3.2)
       middleware
       thor
       thread_safe
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    protobuf-cucumber (3.10.8)
+      activesupport (>= 3.2)
+      middleware
+      thor
+      thread_safe
+    pry (0.14.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rack (2.2.3)
     rack-protection (2.1.0)
       rack
-    rake (10.0.0)
+    rake (13.0.3)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redis (4.1.3)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.6)
+    redis (4.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.2)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.3)
-    ruby2_keywords (0.0.2)
-    rubypitaya (2.14.0)
-      activerecord (= 6.0.2)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    ruby2_keywords (0.0.4)
+    rubypitaya (2.18.0)
+      activerecord (= 6.1.3)
       etcdv3 (= 0.10.2)
       eventmachine (= 1.2.7)
       nats (= 0.11.0)
-      ostruct (= 0.1.0)
-      pg (= 0.21.0)
+      ostruct (= 0.3.3)
+      pg (= 1.2.3)
       protobuf (= 3.10.0)
-      rake (= 10.0)
-      redis (= 4.1.3)
+      rake (= 13.0.3)
+      redis (= 4.2.5)
       sinatra (= 2.1.0)
       sinatra-contrib (= 2.1.0)
     sinatra (2.1.0)
@@ -107,23 +131,25 @@ GEM
       rack-protection (= 2.1.0)
       sinatra (= 2.1.0)
       tilt (~> 2.0)
-    thor (1.0.1)
+    sys-uname (1.2.2)
+      ffi (~> 1.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (= 1.17.2)
-  cucumber (= 2.4.0)
-  listen (= 3.2.1)
-  pry (= 0.12.2)
-  rspec (= 3.8.0)
-  rubypitaya (= 2.14.0)
+  bundler (= 2.1.4)
+  cucumber (= 5.3.0)
+  listen (= 3.4.1)
+  pry (= 0.14.0)
+  rspec (= 3.10.0)
+  rubypitaya (= 2.18.0)
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

data/lib/rubypitaya/app-template/Makefile

@@ -41,7 +41,7 @@ test-cucumber:
 ## Update gems dependencies on Gemfile.lock
 update-dependencies:
 	@rm -f Gemfile.lock
-	@docker run --rm -v "$(PWD)":/usr/src/app -w /usr/src/app ruby:2.6.6 bundle install
+	@docker run --rm -v "$(PWD)":/usr/src/app -w /usr/src/app ruby:2.7.2 bundle install
 
 ## + Improve metagame
 

data/lib/rubypitaya/app-template/app/bll/player_bll.rb

@@ -1,11 +1,11 @@
 class PlayerBLL
 
   def create_new_player(setup, config)
-    name = config['initial_player']['name']
+    name = config['initial_player'][:name]
     gold = setup['initial_player.wallet.gold']
 
     player = Player.new(name: name, gold: gold, user: User.new)
-    player.save
+    player.save!
     player
   end
 end

data/lib/rubypitaya/app-template/app/handlers/player_handler.rb

@@ -17,7 +17,7 @@ class PlayerHandler < RubyPitaya::HandlerBase
   #               Given you have the following file "app/config/initial_player.json"
   #               And this json content is {'name': 'Guest'}
   #               And you can get the initial player name
-  #               Then you can run the following code: @config['initial_player']['name']
+  #               Then you can run the following code: @config['initial_player'][:name]
   #
   #  - @params
   #    - info: Special hash with the request parameters

data/lib/rubypitaya/app-template/docker/dev/Dockerfile

@@ -1,18 +1,21 @@
-FROM ruby:2.6.6
+FROM ruby:2.7.2
 
-RUN apt update
-RUN apt install -y git vim postgresql-client docker.io --no-install-recommends
+ENV LANG=C.UTF-8
+ENV LC_ALL=C.UTF-8
 
-WORKDIR /app/rubypitaya/
+RUN apt update && \
+    apt install -y --no-install-recommends \
+    docker.io \
+    postgresql-client \
+    && rm -rf /var/lib/apt/lists/*
 
 COPY Gemfile Gemfile.lock ./
 
 RUN bundle install
 
-COPY . .
+WORKDIR /app/rubypitaya/
 
-ENV LANG=C.UTF-8
-ENV LC_ALL=C.UTF-8
+COPY . .
 
 ENTRYPOINT ["./docker/entrypoint.sh"]
 

data/lib/rubypitaya/app-template/docker/prod/Dockerfile

@@ -1,35 +1,35 @@
-FROM ruby:2.6.6 as builder
+FROM ruby:2.7.2 as builder
 
-WORKDIR /app/rubypitaya/
+RUN apt update && \ 
+    apt install -y --no-install-recommends \ 
+    curl \
+    && rm -rf /var/lib/apt/lists/*
 
 COPY Gemfile Gemfile.lock ./
 
-RUN bundle install --without development
+RUN bundle config --local without "development test" && \
+    bundle install
 
-COPY . .
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
 
-FROM ruby:2.6.6-slim
+FROM ruby:2.7.2-slim
 
-RUN apt update && apt install -y postgresql-client curl python3 bash vim --no-install-recommends
-RUN rm -rf /var/lib/apt/lists/*
+ENV LANG=C.UTF-8
+ENV LC_ALL=C.UTF-8
 
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
-RUN chmod +x ./kubectl
-RUN mv ./kubectl /usr/local/bin
+RUN apt update && \ 
+    apt install -y --no-install-recommends \ 
+    postgresql-client \
+    && rm -rf /var/lib/apt/lists/*
 
-COPY --from=builder /usr/local/etc /usr/local/etc
 COPY --from=builder /usr/local/bundle /usr/local/bundle
-COPY --from=builder /usr/local/bin/ruby /usr/local/bin/ruby
-COPY --from=builder /usr/local/lib/ruby/gems/2.6.0 /usr/local/lib/ruby/gems/2.6.0
-
-COPY --from=builder /app/rubypitaya /app/rubypitaya
+COPY --from=builder /kubectl /usr/local/bin/kubectl
+ 
+RUN chmod +x /usr/local/bin/kubectl
 
 WORKDIR /app/rubypitaya/
 
-RUN rm -rf vendor/
-
-ENV LANG=C.UTF-8
-ENV LC_ALL=C.UTF-8
+COPY . .
 
 ENTRYPOINT ["./docker/entrypoint.sh"]
 

data/lib/rubypitaya/core/config.rb

@@ -4,16 +4,26 @@ module RubyPitaya
 
   class Config
 
-    attr_writer :config_core_override
-
     def initialize
       @config_core = ConfigCore.new
       @config_core_override = nil
+      @has_config_core_override = false
+
+      @result_cache = {}
     end
 
     def [](key)
-      result = @config_core_override[key] unless @config_core_override.nil?
-      result = @config_core[key] if result.nil?
+      result = @result_cache[key]
+      return result unless result.nil?
+
+      if @has_config_core_override
+        result = @config_core_override[key]
+      else
+        result = @config_core[key]
+      end
+
+      @result_cache[key] = result.deep_symbolize_keys
+
       result
     end
 
@@ -21,5 +31,14 @@ module RubyPitaya
       @config_core.auto_reload
       @config_core_override.auto_reload unless @config_core_override.nil?
     end
+
+    def clear_cache
+      @result_cache.clear
+    end
+
+    def config_core_override=(value)
+      @config_core_override = value
+      @has_config_core_override = !value.nil?
+    end
   end
 end

data/lib/rubypitaya/core/config_core.rb

@@ -17,8 +17,7 @@ module RubyPitaya
     end
 
     def [](key)
-      split_key = key.split('/')
-      @config.dig(*split_key)
+      @config[key]
     end
 
     def auto_reload
@@ -42,12 +41,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)
+      config_hash = JSON.parse(config_text, symbolize_names: true)
 
-      path_array = file_path.sub(/^#{configs_folder_path}/, '')[0..-6]
-                              .split('/')
+      file_name = file_path.sub(/^#{configs_folder_path}/, '')[0..-6]
 
-      set_config_value(path_array, config_hash)
+      @config[file_name] = config_hash
 
       rescue Exception => error
         puts "ERROR: #{error}"
@@ -69,20 +67,5 @@ module RubyPitaya
         puts "MODIFIED @config: #{path}"
       end
     end
-
-    def set_config_value(keys, value)
-      config = @config
-
-      keys.each_with_index do |key, index|
-        is_last_index = index == keys.size - 1
-
-        if is_last_index
-          config[key] = value
-        else
-          config[key] = {} unless config.key?(key)
-          config = config[key]
-        end
-      end
-    end
   end
 end