smpl_prflr 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 667cbd9f7ea72347173b01eeb2befb0c8ef6f5e6f33087807406c88b1af6cfb3
-  data.tar.gz: f44f7825d46fd9311ce277e276094c151021b034b05ef767d353c422a37726de
+  metadata.gz: 631e5d59f68f03080bd721b15ba9bf66df3f17cc14a4856c4a3c59a5aa912a87
+  data.tar.gz: b334d58ebefc14665778ead61a91ca43794555a9510cfe0a6f7dba60c0582282
 SHA512:
-  metadata.gz: 5922c1415b82aebab63fc3ca3587164714a9c519cf04b6436cc3dd654ee567b4ea4286ef35e20f096d98b109910a78454326d6b6dd04767d1a1e1ede76d06faa
-  data.tar.gz: 2cce6ba1e2796b1beca8377837675398a7d849367fb136b209f7437186ef539fd837aee038637060fc30f9f37a3a333b5b659e70c133558db6b743bc6ff874e1
+  metadata.gz: 39ea8978dc78d2df0627d632c0e68e230893910df70cc29a339d4442f759087d6fd7ef674f683817f9cb44cd7bda6f5fa67d4f73135ec9c493e70a5739ee2721
+  data.tar.gz: fc7e47f6beb95bf206b30a1b061e3a7abdcf3c7daa941755fb5002a594eb0552da74bdfc75aa614ddd32fb121ed2381875ea3fb9d510ab00df40c4987b83800c

data/.gitignore

@@ -1,3 +1,4 @@
 .idea/
 Gemfile.lock
-*.gem
+*.gem
+/config/*

data/README.md

@@ -23,7 +23,7 @@ requre 'smpl_prflr'
 
  include SmplPrflr 
 
- orinitialize_profiler!
+ initialize_profiler!(mod: "production")
  
  p { block_of_your_own_code }
 ```

data/lib/profiler/constants.rb

@@ -0,0 +1,7 @@
+module Profiler
+  module Constants
+    DEFAULT_HOST = "127.0.0.1".freeze
+    DEFAULT_PORT = 6379
+    DEFAULT_DB = 15
+  end
+end

data/lib/smpl_prflr.rb

@@ -23,17 +23,35 @@
 # SOFTWARE.
 
 require 'logger'
-require 'profiler/profile'
-require 'env/loading'
+require "config"
+require 'ruby-prof'
+require 'redis'
+require 'profiler/constants'
+require 'active_support/all'
 
 module SmplPrflr
   # @author KILYA
   # Init logger
   # Init Profiler
-  def initialize_profiler!(mod: :development)
-    env = Env::Loading.new(app_mode: mod)
+  # Load env
+  # Init Redis
+  def initialize_profiler!(mod: "development")
+    Config.setup do |config|
+      config.const_name = "Settings"
+      config.use_env = false
+    end
+
+    env = ::ActiveSupport::StringInquirer.new(mod)
+    path = Dir.pwd << ("/config")
+    Config.load_and_set_settings(Config.setting_files(path, env))
+    Settings.env = env
+
     @logger = Logger.new($stdout)
-    @profiler = Profiler::Profile.new(env)
+    @redis = Redis.new(
+      host: Settings.HOST || Profiler::Constants::DEFAULT_HOST,
+      port: Settings.PORT || Profiler::Constants::DEFAULT_PORT,
+      db: Settings.DB || Profiler::Constants::DEFAULT_DB
+    )
   end
 
   # @author KILYA
@@ -47,10 +65,17 @@ module SmplPrflr
   # Profile block of your code
   # @return [nil]
   def p
-    @profiler.start do
+    output = String.new
+    result = RubyProf.profile do
       yield
     end
-  rescue Profiler::ProfilerError => e
-    @logger.error(e.message.to_s)
+
+    printer = RubyProf::FlatPrinter.new(result)
+    printer.print(output, min_percent: 0)
+    @redis.set(:profile, output)
+
+    nil
+  rescue StandardError => e
+    @logger.error e.message.to_s
   end
 end

data/smpl_prflr.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '2.7'
   s.required_ruby_version = '>=2.2'
   s.name = 'smpl_prflr'
-  s.version = '0.0.6'
+  s.version = '0.0.7'
   s.executables << 'smpl_prflr'
   s.license = 'MIT'
   s.summary = 'Profiler'
@@ -21,5 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'ruby-prof', '~> 1.4', '>= 1.4.3'
   s.add_dependency 'redis', '~> 4.6'
   s.add_dependency 'rack', '~> 2.2'
-  s.add_dependency 'figaro'
+  s.add_dependency 'config', '~> 4.0'
+  s.add_dependency 'activesupport', '~> 6.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smpl_prflr
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ilya Kondratev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-06 00:00:00.000000000 Z
+date: 2022-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -87,19 +87,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: figaro
+  name: config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.1
 description: SmplPrflr for profiler own code.
 email: ilyafulleveline@gmail.com
 executables:
@@ -115,9 +129,7 @@ files:
 - README.md
 - Rakefile
 - bin/smpl_prflr
-- lib/env/constants.rb
-- lib/env/loading.rb
-- lib/profiler/profile.rb
+- lib/profiler/constants.rb
 - lib/smpl_prflr.rb
 - smpl_prflr.gemspec
 - test/test_ping.rb

data/lib/env/constants.rb

@@ -1,8 +0,0 @@
-module Env
-  module Constants
-    MODES = {
-      production: "./config/production.yml",
-      development: "./config/development.yml"
-    }.freeze
-  end
-end

data/lib/env/loading.rb

@@ -1,16 +0,0 @@
-require 'figaro'
-require 'env/constants'
-
-module Env
-  class Loading
-    def initialize(app_mode: :development)
-      path = Env::Constants::MODES[app_mode]
-      Figaro.application = Figaro::Application.new(environment: app_mode, path: path)
-      Figaro.load
-    end
-
-    def store(value:)
-      Figaro.env.send(value)
-    end
-  end
-end

data/lib/profiler/profile.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-# The MIT License (MIT)
-#
-# Copyright (c) 2019-2022 Kondratev Ilya
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require 'ruby-prof'
-require 'redis'
-
-module Profiler
-  class Profile
-    class ProfilerError < StandardError; end
-
-    # @author KILYA
-    # Initialise redis
-    def initialize(env)
-      @redis = Redis.new(
-        host: env.store(value: "host") || "127.0.0.1",
-        port: env.store(value: "port") || 6379,
-        db: env.store(value: "db") || 15
-      )
-    end
-
-    # @author KILYA
-    # main point
-    def start
-      output = String.new
-      result = RubyProf.profile do
-        yield
-      end
-
-      printer = RubyProf::FlatPrinter.new(result)
-      printer.print(output, min_percent: 0)
-      @redis.set(:profile, output)
-
-      nil
-    rescue StandardError => e
-      raise ProfilerError.new e.message.to_s
-    end
-  end
-end