Skip to content

Commit 7e36de1

Browse files
committed
fix: names and saved data after test on real app
1 parent 1b76805 commit 7e36de1

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

app/models/rails_url_shortener/visit.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ class Visit < ApplicationRecord
99
# Return boolean
1010

1111
def self.parse_and_save(url, request)
12-
# replace some invalid characters
13-
heads = request.headers.map { |k| k.to_s.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?') }.join
1412
# browser detection
1513
browser = Browser.new(request.headers['User-Agent'])
1614
if !RailsUrlShortener.save_bots_visits && browser.bot?
@@ -25,8 +23,7 @@ def self.parse_and_save(url, request)
2523
platform: browser.platform.name,
2624
platform_version: browser.platform.version,
2725
bot: browser.bot?,
28-
user_agent: request.headers['User-Agent'],
29-
meta: heads.to_json
26+
user_agent: request.headers['User-Agent']
3027
)
3128
end
3229
end

lib/generators/rails_url_shortener/initializer_generator.rb renamed to lib/generators/rails_url_shortener/rails_url_shortener_generator.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
require 'rails/generators'
22

3-
class InitializerGenerator < Rails::Generators::NamedBase
3+
class RailsUrlShortenerGenerator < Rails::Generators::Base
44

55
source_root File.expand_path("templates", __dir__)
6-
6+
77
def copy
88
copy_file "initializer.rb", "config/initializers/rails_url_shortener.rb"
99
end
Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
RailsUrlShortener do |r|
2-
r.default_redirect = "/"
3-
r.charset = CHARSETS[:alphanumcase]
4-
r.key_length = 6
5-
r.minimum_key_length = 3
6-
r.save_bots_visits = false
7-
end
1+
CHARSETS = {
2+
alphanum: ('a'..'z').to_a + (0..9).to_a,
3+
alphacase: ('a'..'z').to_a + ('A'..'Z').to_a,
4+
alphanumcase: ('A'..'Z').to_a + ('a'..'z').to_a + (0..9).to_a
5+
}
6+
7+
RailsUrlShortener.default_redirect = "/"
8+
RailsUrlShortener.charset = CHARSETS[:alphanumcase]
9+
RailsUrlShortener.key_length = 6
10+
RailsUrlShortener.minimum_key_length = 3
11+
RailsUrlShortener.save_bots_visits = false

lib/rails_url_shortener/engine.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
module RailsUrlShortener
22
class Engine < ::Rails::Engine
33
isolate_namespace RailsUrlShortener
4+
require 'browser'
45
end
56
end

test/lib/generators/rails_url_shortener/initializer_generator_test.rb renamed to test/lib/generators/rails_url_shortener/rails_url_shortener_generator_test.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
require "test_helper"
2-
require "generators/rails_url_shortener/initializer_generator"
2+
require "generators/rails_url_shortener/rails_url_shortener_generator"
33

44
module RailsUrlShortener
5-
class InitializerGeneratorTest < Rails::Generators::TestCase
6-
tests InitializerGenerator
5+
class RailsUrlShortenerGeneratorTest < Rails::Generators::TestCase
6+
tests RailsUrlShortenerGenerator
77
destination Rails.root.join("tmp/generators")
88
setup :prepare_destination
99

0 commit comments

Comments
 (0)