founders_toolkit 0.2.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6dd057ec97f97ab59a9bcba36d014f994f6042ec8877ebe5ca696317b4b0706
-  data.tar.gz: 4be1969f1f142fdd563ce0b3de48888ffc65491c32d28bc6ced7d0a41142d14f
+  metadata.gz: b5f9177014a99ce6c0ac2751cbc8dd34589a510e6412533c4c33a783a83cb5f5
+  data.tar.gz: 7143a519fdc2f6cd00f441331c24c601c1d2c70eaaa58f95cf1d9a6f2b1fdbe1
 SHA512:
-  metadata.gz: cb12a632363369958f210b86504c074bae31fbe072843ece75471a1a26a5ef0a722c5ef8295196387e49558260406be031abaffce90f891cc381ab8f5623e4e5
-  data.tar.gz: a39639f8bd9adb2164fa9f1db86f21714e4ed7fd5a858584f7e1254b1ff5b0f22cb88b45051882407408969576741fbc10a4a9b60ff7c22c21e937152d9f0094
+  metadata.gz: 3173aede632715cf33a530fc8d161baa667be9a887a8f0632c8bd7fa929ad972857b95d830720999d753e909202d7dc688deb7eca806a80e135d6ef22c1fe253
+  data.tar.gz: fc1bcda91214a46918cb7ca7f64e376a82517d01c15f10590df1d48074e26e7524fa83a8e3cb2933557f6810d4fe31043993535536d079f83e7d6794be481207

data/CHANGELOG.md

@@ -6,6 +6,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.6.0] - 2021-03-29
+- Fix for rate limiter
+
+## [0.5.0] - 2021-03-29
+
+- Added install rake task.
+- Remove email as a protected attribute by default.
+
+## [0.4.0] - 2021-03-29
+- Add tracking to limitable
+
+## [0.3.0] - 2021-03-29
+- Added TrackedJob for simple statsd active job monitoring
+
+## [0.2.1] - 2021-03-25
+### Fixed
+- Fixed the protected attributes validator when updating the password.
+
 ## [0.1.0] - 2021-03-25
 - No real change, just CI
 

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    founders_toolkit (0.2.0)
+    founders_toolkit (0.6.0)
       activemodel (~> 6.1)
       activesupport (~> 6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activesupport (6.1.3)
+    activemodel (6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)

data/lib/founders_toolkit/auth/securable/model.rb

@@ -7,7 +7,6 @@ module FoundersToolkit::Auth::Securable::Model
     include FoundersToolkit::Auth::Emailable::Model
     extend FoundersToolkit::Auth::Securable::Validations::ProtectedValidator::HelperMethods
 
-    validates_protected_attributes :email
     validates_protected_attributes :password, secure: true
 
     has_secure_password

data/lib/founders_toolkit/auth/securable/validations/protected_validator.rb

@@ -31,7 +31,10 @@ module FoundersToolkit::Auth::Securable::Validations
     end
 
     def authenticate?(record)
-      record.try(:reset_password_token?) || record.authenticate(record.current_password)
+      return true if record.try(:reset_password_token?)
+
+      fresh_record = record.class.find(record.id)
+      fresh_record.authenticate(record.current_password)
     end
 
     module HelperMethods

data/lib/founders_toolkit/jobs/tracked_job.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module FoundersToolkit::Jobs
+  module TrackedJob
+    extend ActiveSupport::Concern
+
+    included do
+      include FoundersToolkit::Monitoring::Statsdable
+
+      around_perform :update_stats
+    end
+
+    private
+
+    def update_stats(&block)
+      statsd.increment("active_job.#{self.class.queue_name}.#{self.class.name}.started")
+      statsd.time("active_job.#{self.class.queue_name}.#{self.class.name}", &block)
+      statsd.increment("active_job.#{self.class.queue_name}.#{self.class.name}.finished")
+      update_queue_size_stats
+    end
+
+    def update_queue_size_stats
+      Resque.queues.each do |name|
+        statsd.gauge("active_job.queue_size.#{name}", Resque.size(name))
+      end
+    end
+  end
+end

data/lib/founders_toolkit/util/rate_limitable.rb

@@ -14,8 +14,6 @@ rescue LoadError
   raise
 end
 
-require_relative '../monitoring/statsdable'
-
 module FoundersToolkit::Util
   module RateLimitable
     extend ActiveSupport::Concern
@@ -31,13 +29,16 @@ module FoundersToolkit::Util
           limiter = instance_variable_get("@#{limiter_name}".to_sym)
           limiter ||= instance_variable_set("@#{limiter_name}".to_sym, Ratelimit.new(name))
 
-          limiter.exec_within_threshold(__send__(key), threshold: threshold, interval: interval) do
-            result = statsd.time(['retryable', limiter_name].join('.')) do
-              Retryable.retryable(tries: 3, on: retry_from) { block.call }
-            end
-            limiter.add __send__(key)
-            result
+          while limiter.exceeded?(__send__(key), threshold: threshold, interval: interval)
+            statsd.increment ['thottled', limiter_name].join('.')
+            sleep 5
+          end
+
+          result = statsd.time(['retryable', limiter_name].join('.')) do
+            Retryable.retryable(tries: 3, on: retry_from) { block.call }
           end
+          limiter.add __send__(key)
+          result
         end
       end
     end

data/lib/founders_toolkit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FoundersToolkit
-  VERSION = '0.2.0'
+  VERSION = '0.6.0'
 end

data/lib/install/current.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source_paths << File.expand_path('templates', __dir__)
+
+say 'Creating Current'
+copy_file 'current.rb', 'app/models/current.rb'

data/lib/install/gems.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+say 'Add gems'
+gem 'hotwire-rails'
+gem 'tailwindcss-rails'
+run 'bin/bundle install'
+
+say 'Install Tailwind CSS'
+rails_command 'tailwindcss:install'
+
+say 'Install Hotwire'
+rails_command 'hotwire:install'

data/lib/install/linters.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source_paths << File.expand_path('templates', __dir__)
+
+say 'Add rubocop'
+gem_group :development do
+  gem 'rubocop'
+end
+run 'bin/bundle install'
+copy_file '.rubocop.yml', '.rubocop.yml'

data/lib/install/templates/.rubocop.yml

@@ -0,0 +1,2 @@
+inherit_from:
+  - https://raw.githubusercontent.com/trobrock/style-guides/master/ruby-style.yml

data/lib/install/templates/current.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Current < ActiveSupport::CurrentAttributes
+  include FoundersToolkit::Auth::Securable::CurrentAttributes
+end

data/lib/tasks/install.rake

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+def run_install_template(path)
+  system "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{File.expand_path(
+    "../install/#{path}.rb", __dir__
+  )}"
+end
+
+namespace :founders_toolkit do
+  desc 'Install Founders Toolkit'
+  task :install do
+    run_install_template 'gems'
+    run_install_template 'current'
+    run_install_template 'linters'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: founders_toolkit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Trae Robrock
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -76,12 +76,19 @@ files:
 - lib/founders_toolkit/auth/securable/validations/protected_validator.rb
 - lib/founders_toolkit/engine.rb
 - lib/founders_toolkit/jobs/locked_job.rb
+- lib/founders_toolkit/jobs/tracked_job.rb
 - lib/founders_toolkit/monitoring/statsdable.rb
 - lib/founders_toolkit/util.rb
 - lib/founders_toolkit/util/cacheable.rb
 - lib/founders_toolkit/util/lockable.rb
 - lib/founders_toolkit/util/rate_limitable.rb
 - lib/founders_toolkit/version.rb
+- lib/install/current.rb
+- lib/install/gems.rb
+- lib/install/linters.rb
+- lib/install/templates/.rubocop.yml
+- lib/install/templates/current.rb
+- lib/tasks/install.rake
 homepage: https://github.com/trobrock/founders-toolkit
 licenses:
 - MIT