Merge pull request #11 from ekohl/rewrite-functions

Rewrite methods to be more expressive
taro-rb · Dec 22, 2024 · 8d65a20 · 8d65a20
2 parents 288d252 + d484ce1
commit 8d65a20
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/lib/taro/rails/generators/install_generator.rb b/lib/taro/rails/generators/install_generator.rb
@@ -12,7 +12,7 @@ class Taro::Rails::Generators::InstallGenerator < ::Rails::Generators::Base
   def create_type_files
     Dir["#{self.class.source_root}/**/*.erb"].each do |tmpl|
       dest_dir = options[:dir].chomp('/')
-      template tmpl, "#{dest_dir}/#{File.basename(tmpl).sub('erb', 'rb')}"
+      template tmpl, "#{dest_dir}/#{File.basename(tmpl, '.erb')}.rb"
     end
   end
   # :nocov:

diff --git a/lib/taro/rails/route_finder.rb b/lib/taro/rails/route_finder.rb
@@ -17,13 +17,11 @@ def cache
 
     def build_cache
       # Build a Hash like
-      # { 'users#show' } => [#<NormalizedRoute>, #<NormalizedRoute>] }
-      rails_routes.each_with_object({}) do |rails_route, hash|
-        route = Taro::Rails::NormalizedRoute.new(rails_route)
-        next if route.ignored?
-
-        (hash[route.endpoint] ||= []) << route
-      end
+      # { 'users#show' => [#<NormalizedRoute>, #<NormalizedRoute>] }
+      rails_routes
+        .map { |r| Taro::Rails::NormalizedRoute.new(r) }
+        .reject(&:ignored?)
+        .group_by(&:endpoint)
     end
 
     def rails_routes