spektr 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67409372de77e0e8bf4117c53e8589c393250ce270720735e6f306aabe97dd3f
-  data.tar.gz: db4149f62a076ae7ce005b72a3daf1e9cbbf26d860f092ff8e0259923c4736bb
+  metadata.gz: 3856f34c87bf7f347c90149e5cc0a824e68d80df6c6a4704a204e4862ea3e54b
+  data.tar.gz: f0c98f054f09841c3de0e7f756c80537b5d0a409a2fe0a70d555b63715958691
 SHA512:
-  metadata.gz: 05c35aff0fb9d5453585f302febdcdfe1e5a778925cc59caa958a1a41ad8b4de657bb1f9ff47aa895f0cc382c09accc731cd0095fbf51b5a7c33dad4c1bbc137
-  data.tar.gz: 1a9ccf43fc043a6d66574d195a45ee6351c0fe98937928a17f3452e4ad184dd70565fc878f63f5008475cc3ae07740665fa8e624b327b2734e6855af45de04a1
+  metadata.gz: fb99134225086acbaab6417f03594c7cb1b44893bdd413faf5056d3990afdd8e6bea3812c6a5a61344fc518e7d47b78bdbe49dfdb49e75722f6c5303df43101a
+  data.tar.gz: 7c20a2d6f2ec1a7c1a5e006b2ce4bb41e527a55fae099fd66d4e120f7fdffd9c6849496269abd998226f303b4602b5ac23b703a8be448abcd851a4f25bdb974a

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 0.5.4
+
+* more parser fixes
+
+
 ## 0.5.3
 
 * parser fixes

data/lib/spektr/checks/base.rb

@@ -54,11 +54,11 @@ module Spektr
             return true if user_input?(argument)
           end
         end
-      when :embedded_statements_node, :if_node, :else_node
+      when :embedded_statements_node, :if_node, :else_node, :case_node, :embedded_variable_node
         node.statements.body.each do |item|
           return true if user_input? item
         end
-      when :interpolated_string_node, :interpolated_x_string_node, :interpolated_symbol_node
+      when :interpolated_string_node, :interpolated_x_string_node, :interpolated_symbol_node, :interpolated_regular_expression_node
         node.parts.each do |part|
           return true if user_input?(part)
         end
@@ -93,32 +93,79 @@ module Spektr
         end
         return if variable && variable.location.start_line == node.location.start_line
         return user_input?(variable)
-      when :local_variable_or_write_node
+      when :instance_variable_or_write_node, :local_variable_or_write_node
         return user_input?(node.value)
+      when :instance_variable_write_node, :local_variable_write_node
+        return user_input? node.value
       when :and_node, :or_node
         return user_input?(node.left)
         return user_input?(node.right)
-      when :instance_variable_write_node, :local_variable_write_node
-        return user_input? node.value
       when :splat_node
         return user_input? node.expression
       when :parentheses_node
         node.body.body.each do |item|
           return user_input? item
         end
-      when :string_node, :symbol_node, :constant_read_node, :integer_node, :true_node, :constant_path_node, :nil_node, :true_node, :false_node, :self_node, :global_variable_read_node
+      when :string_node, :symbol_node, :constant_read_node, :integer_node, :true_node, :constant_path_node, :nil_node, :true_node, :false_node, :self_node, :global_variable_read_node, :and_node
         # do nothing
       else
-        raise "Unknown argument type #{node.type.inspect} #{node.inspect}"
+        Spektr::Logger.debug "Unknown argument type #{node.type.inspect} #{node.inspect}"
       end
       false
     end
 
     # TODO: this doesn't work properly
     def model_attribute?(node)
+      return false if node.nil?
       model_names = @app.models.collect(&:name)
       case node.type
-      when :local_variable_read_node, :instance_variable_read_node
+      when :call_node
+        return model_attribute?(node.receiver) if node.receiver
+        if node.arguments
+          node.arguments.arguments.each do |argument|
+            return true if model_attribute?(argument)
+          end
+        end
+      when :embedded_statements_node, :if_node, :else_node, :case_node, :embedded_variable_node
+        node.statements.body.each do |item|
+          return true if model_attribute? item
+        end
+      when :interpolated_string_node, :interpolated_x_string_node, :interpolated_symbol_node, :interpolated_regular_expression_node
+        node.parts.each do |part|
+          return true if model_attribute?(part)
+        end
+      when :keyword_hash_node, :hash_node
+        node.elements.each do |element|
+          return true if model_attribute?(element.key)
+          return true if model_attribute?(element.value)
+        end
+      when :array_node
+        node.elements.each do |element|
+          return true if model_attribute?(element)
+        end
+      # TODO: make this better. ivars can be overridden in the view as well and
+      # can be set in non controller targets too
+      when :_instance_variable_read_node
+        return false unless @target.respond_to?(:view_path)
+        actions = []
+        @app.controllers.each do |controller|
+          actions = actions.concat controller.actions.select { |action|
+            action.template == @target.view_path
+          }
+        end
+        actions.each do |action|
+          next unless action.body
+          action.body.each do |exp|
+            return true if exp.name == node.name && model_attribute?(exp)
+          end
+        end
+      when :local_variable_read_node
+        variable = @target.lvars.find do |n|
+          n.name == node.name
+        end
+        return if variable && variable.location.start_line == node.location.start_line
+        return model_attribute?(variable)
+      when :instance_variable_read_node
         # TODO: handle helpers here too
         if ["Spektr::Targets::Controller", "Spektr::Targets::View"].include?(@target.class.name)
           actions = []
@@ -134,53 +181,25 @@ module Spektr
             end
           end
         end
-      when :local_variable_or_write_node
+      when :instance_variable_or_write, :local_variable_or_write_node
         return model_attribute?(node.value)
+      when :instance_variable_write_node, :local_variable_write_node
+        return model_attribute? node.value
       when :and_node, :or_node
         return model_attribute?(node.left)
         return model_attribute?(node.right)
-      when :call_node
-        return model_attribute?(node.receiver) if node.receiver
-        if node.arguments
-          node.arguments.arguments.each do |argument|
-            return true if model_attribute?(argument)
-          end
-        end
-      when :keyword_hash_node, :hash_node
-        node.elements.each do |element|
-          return true if model_attribute?(element.key)
-          return true if model_attribute?(element.value)
-        end
-      when :array_node
-        node.elements.each do |element|
-          return true if model_attribute?(element)
-        end
+      when :splat_node
+        return model_attribute? node.expression
       when :parentheses_node
         node.body.body.each do |item|
           return model_attribute? item
         end
-      when :interpolated_string_node, :interpolated_x_string_node, :interpolated_symbol_node
-        node.parts.each do |part|
-          return true if model_attribute?(part)
-        end
-      when :embedded_statements_node, :if_node, :else_node
-        node.statements.body.each do |item|
-          return true if model_attribute? item
-        end
-      when :instance_variable_write_node, :local_variable_write_node
-        return model_attribute? node.value
       when :constant_read_node
         return true if model_names.include? node.name.to_s
-      when :interpolated_string_node
-        node.parts.each do |item|
-          return model_attribute? item
-        end
-      when :splat_node
-        return model_attribute? node.expression
       when :string_node, :symbol_node, :integer_node, :constant_path_node, :nil_node, :true_node, :false_node, :self_node, :global_variable_read_node
         # do nothing
       else
-        raise "Unknown argument type #{node.type}"
+        Spektr::Logger.debug "Unknown argument type #{node.type}"
       end
     end
 

data/lib/spektr/version.rb

@@ -1,3 +1,3 @@
 module Spektr
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spektr
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Greg Molnar