waffle-maker 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71db571599237aa72ae48350e7d1d6436b4d695d915ec0a65c1aa1af0eefe6d9
-  data.tar.gz: 488435761c228e78e9aa713af706f7c650310c042501a769bb59abb1167cc86c
+  metadata.gz: 0ebb5a5ef50022b6f2b5d888212de4d8a21d87259d7bbb0dfa5521f1acee757e
+  data.tar.gz: fa130768309be193fc8a2c3c91653a8e97d9985b93bc12b83ed5e81d3efba0ae
 SHA512:
-  metadata.gz: ba73930d703b1725ec8fe204b4c8d77b2b8223b38afda57006c2f1290ff62f50c97b740366cf04d4f5294e4107061286b8dc4037aba6b7568d4474895e1f1e0a
-  data.tar.gz: f3174679237267adc0b8d0344bf45164250be567f5372d232955036f9e1fcf0df35fbe62ac11c1148253caa521fe7d13e28c01eb968791242ffa8b9c61400882
+  metadata.gz: 42cb1bbba00d716b11eb216ccc393c589afa318d66aec8eed3aa61aeb6e55885db3d0c3170e0fb27103606d498d20db7cea1dbae16ae0c26df2496b53b9062c9
+  data.tar.gz: 35fa40fdcc868c1a87dc5b46423c048b59d39e2681cc0ae174cc678801f6a12d866fd47ab6d22bc8b8bc075a27d65b41e3b5d2d36967e5f4c34bd55e068e9cc3

data/lib/waffle/maker.rb

@@ -24,13 +24,14 @@ module Waffle
             o.banner = "Usage: #{$0}"
             o.on("-f number", "Column number that contains the rails path") { |v| options[:f] << v.to_i }
             o.on("-w number", "Column number that contains the waf path") { |v| options[:w] << v.to_i }
+            o.on("--silent-error", "Hide parsing errors, default is false") { |v| options[:silent_error] << v }
           }.parse!(argv)
         end
       end
 
       # @override
       def default_options
-        {f: 2, w: 2}
+        { f: 2, w: 2, silent_error: false }
       end
 
       def execute
@@ -42,7 +43,7 @@ module Waffle
       private
 
       def routes
-        @routes ||= Waffle::Maker::Route.new(options[:f]).paths
+        @routes ||= Waffle::Maker::Route.new(options[:f], options[:silent_error]).paths
       end
 
       def wafs

data/lib/waffle/maker/formatter.rb

@@ -3,7 +3,8 @@
 module Waffle
   module Maker
     class Formatter
-      def initialize
+      def initialize(silent_error = false)
+        @silent_error = silent_error
         @buffer = []
       end
 
@@ -17,7 +18,11 @@ module Waffle
 
       def section(routes)
         routes.each do |r|
-          @buffer << [r[:name], r[:verb], r[:path], r[:reqs]].join(",")
+          begin
+            @buffer << [r[:name], r[:verb], r[:path], r[:reqs]].join(",").tap { |line| CSV.parse(line) }
+          rescue CSV::MalformedCSVError => e
+            puts "[ERROR] name:#{r[:name]} verb: #{r[:verb]} path:#{r[:path]} reqs:#{r[:reqs]} message:#{e}" unless @silent_error
+          end
         end
       end
 

data/lib/waffle/maker/route.rb

@@ -5,10 +5,11 @@ require 'csv'
 module Waffle
   module Maker
     class Route
-      attr_accessor :path_position
+      attr_accessor :path_position, :silent_error
 
-      def initialize(path_position)
+      def initialize(path_position, silent_error)
         self.path_position = path_position
+        self.silent_error = silent_error
       end
 
       def all
@@ -28,15 +29,30 @@ module Waffle
 
       private
 
+      class Rails
+        class << self
+          def routes
+            ::Rails.application.routes.routes
+          end
+
+          def inspector
+            ::ActionDispatch::Routing::RoutesInspector.new(Waffle::Maker::Route::Rails.routes)
+          end
+
+          # @param [Boolean] silent_error
+          def formatted_inspector(silent_error)
+            Waffle::Maker::Route::Rails.inspector.format(Waffle::Maker::Formatter.new(silent_error))
+          end
+        end
+      end
+
       # [
       # ["home", "GET", "/home(.:format)", "homes#show"],
       # ["user", "GET", "/user(.:format)", "users#show"],
       # ...
       # ]
       def rails
-        routes = ::Rails.application.routes.routes
-        inspector = ::ActionDispatch::Routing::RoutesInspector.new(routes)
-        CSV.parse(inspector.format(Waffle::Maker::Formatter.new))
+        CSV.parse(Waffle::Maker::Route::Rails.formatted_inspector(silent_error))
       end
     end
   end

data/lib/waffle/maker/version.rb

@@ -2,6 +2,6 @@
 
 module Waffle
   module Maker
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waffle-maker
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - chibicco
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-24 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,8 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Find waf logs that match rails routing.