leftovers 0.4.3 → 0.5.0

data/lib/config/rails.yml

@@ -1,457 +1,18 @@
-
-exclude_paths:
-  - db/migrate/*
-include_paths:
-  - '*.rjs'
-  - '*.rhtml'
-requires:
-  - 'active_support/core_ext/string'
-  - 'active_support/inflections'
-  - './config/initializers/inflections'
-
 # THIS IS INCOMPLETE (you can help by expanding it)
 # rails is _really complicated_ and has a lot of magic which calls methods for you.
 # some is currently impossible to handle (with_options).
 # Some is just corners of rails I haven't hit yet.
+gems:
+  - actioncable
+  - actionmailer
+  - actionpack
+  - actionview
+  - activejob
+  - activemodel
+  - activerecord
+  - activesupport
+
 keep:
-  - ClassMethods # ActiveSupport::Concern
-  - process_action # ActiveSupport::LogSubscriber
-  - validate_each # ActiveModel::EachValidator
-  - format_message # ActiveSupport::Logger
-  - ssl_configured? # ApplicationController
-  - default_url_options # called by url_for
+  - default_url_options # called by url_for, unsure what gem does
   - APP_PATH
   - APP_ROOT
-  - has_suffix: Helper
-    path: /app/helpers
-  - has_suffix: Preview
-    path: '**/mailers/previews/**/*_preview.rb'
-
-dynamic:
-  - names:
-      - after_initialize
-      - after_find
-      - after_touch
-      - before_validation
-      - after_validation
-      - before_save
-      - around_save
-      - after_save
-      - before_create
-      - around_create
-      - after_create
-      - before_update
-      - around_update
-      - after_update
-      - before_destroy
-      - around_destroy
-      - after_destroy
-      - after_commit
-      - after_rollback
-      - after_create_commit
-      - after_update_commit
-      - after_destroy_commit
-      - after_save_commit
-    calls:
-      - arguments: 0
-      - arguments: [if, unless]
-        nested:
-          arguments: '*'
-  - name:
-      - after_action
-      - append_after_action
-      - append_around_action
-      - append_before_action
-      - around_action
-      - before_action
-      - prepend_after_action
-      - prepend_around_action
-      - prepend_before_action
-      - skip_before_action
-      - skip_after_action
-      - skip_around_action
-      - validates_associated
-    calls:
-      - arguments: ['*', if, unless]
-  - name: validates
-    calls:
-      - arguments:
-          - '*'
-          - within
-          - inclusion
-          - scope
-          - if
-          - unless
-      - arguments: inclusion
-        nested:
-          arguments: 'in'
-      - keywords:
-          unless: [if, unless]
-        camelize: true
-        add_suffix: Validator
-        split: '::'
-  - names:
-      - validate
-      - validate_associated
-    calls:
-      - arguments: ['*', if, unless]
-  - name:
-    - check_box
-    - date_select
-    - datetime_select
-    - file_field
-    - hidden_field
-    - label
-    - radio_button
-    - select
-    - time_select
-    - time_zone_select
-    - color_field
-    - date_field
-    - datetime_field
-    - datetime_local_field
-    - email_field
-    - month_field
-    - number_field
-    - password_field
-    - phone_field
-    - range_field
-    - search_field
-    - telephone_field
-    - text_area
-    - text_field
-    - time_field
-    - url_field
-    - week_field
-    calls:
-      - arguments: [0,1] # 0: with a receiver, 1: with no receiver
-      - arguments: [0,1]
-        add_suffix: '='
-  - name: fields_for
-    calls:
-      argument: 1
-      add_suffix: _attributes
-  - name: options_from_collection_for_select
-    calls:
-      - arguments: [1,2]
-  - name:
-      - collection_select
-      - collection_check_boxes
-      - collection_radio_buttons
-    calls:
-      - argument: 1
-        add_suffix: '='
-      - arguments: [3,4]
-  - name: grouped_collection_select
-    calls:
-      - argument: 1
-        add_suffix: '='
-      - arguments: [3,4,5,6]
-  - name: option_groups_from_collection_for_select
-    calls:
-      - arguments: [0,1,2,3]
-  - name: scope
-    path: /app/models
-    defines:
-      argument: 0 # ar
-  - name: scope
-    path: /config/routes*
-    calls:
-      argument: module # routes
-      camelize: true
-      split: '::'
-  - name: namespace
-    calls:
-      - argument: 0
-        camelize: true
-        split: '::'
-  - name:
-      - attribute
-      - alias_attribute
-    path: app/models/*
-    defines:
-      argument: 0
-      transforms:
-        - original
-        - add_suffix: '?'
-        - add_suffix: '='
-  - name: alias_attribute
-    calls:
-      - argument: 1
-      - argument: 1
-        add_suffix: '?'
-      - argument: 1
-        add_suffix: '='
-  - name:
-    - has_one
-    - belongs_to
-    unless:
-      has_argument: class_name
-    calls:
-      argument: 0
-      camelize: true
-      split: '::'
-
-  - name:
-    - has_many
-    - has_and_belongs_to_many
-    unless:
-      has_argument: class_name
-    calls:
-      - argument: 0
-        camelize: true
-        singularize: true
-        split: '::'
-  - name:
-    - has_many
-    - has_and_belongs_to_many
-    defines:
-      - argument: 0
-        transforms:
-          - original
-          - add_suffix: '='
-          - singularize: true
-            add_suffix: _ids
-          - singularize: true
-            add_suffix: _ids=
-  - name:
-    - has_many
-    - has_one
-    - has_and_belongs_to_many
-    calls:
-      argument:
-        - as
-  - name:
-    - has_one
-    - has_many
-    calls:
-      - argument:
-          - source_type
-          - source
-          - through
-  - name:
-      - has_one
-      - belongs_to
-    defines:
-      - argument: 0
-        transforms:
-          - original
-          - add_suffix: '='
-          - add_prefix: build_
-          - add_prefix: create_
-          - add_prefix: create_
-            add_suffix: '!'
-          - add_prefix: reload
-  - name: belongs_to
-    unless:
-      has_argument:
-        at: optional
-        has_value: true
-    calls:
-      argument: 0
-
-  - name:
-     - has_one
-     - has_many
-     - belongs_to
-     - has_and_belongs_to_many
-    calls:
-      - argument: class_name
-        split: '::'
-      - argument: inverse_of
-      - argument: touch
-        add_suffix: '='
-  - name:
-     - has_one
-     - has_many
-     - belongs_to
-     - has_and_belongs_to_many
-    has_argument:
-      at: [dependent, inverse_of, touch, validate]
-      unless:
-        has_value: false
-    calls:
-      argument: 0
-
-  - name:
-      - rescue_from
-    calls:
-      - argument: with
-  - name:
-      - match
-      - delete
-      - get
-      - patch
-      - post
-      - put
-      - root
-    calls:
-      - arguments: [0, action]
-      - argument: '**'
-        delete_before: '#'
-      - argument: '**'
-        delete_after: '#'
-        camelize: true
-        add_suffix: Controller
-        split: '::'
-  - name: delegate
-    has_argument:
-      at: prefix
-      has_value: true
-    defines:
-      - argument: '*'
-        add_prefix:
-          argument: to
-          add_suffix: '_'
-    calls:
-      - argument: to
-      - argument: '*'
-  - name: delegate
-    has_argument:
-      at: prefix
-      has_value_type: [String, Symbol]
-    defines:
-      - argument: '*'
-        add_prefix:
-          argument: prefix
-          add_suffix: '_'
-    calls:
-      - argument: to
-      - argument: '*'
-  - name: delegate
-    unless:
-      has_argument:
-        - at: prefix
-          has_value: true
-        - at: prefix
-          has_value_type: [String, Symbol]
-    calls:
-      - argument: to
-  - name:
-      - resource
-      - resources
-    calls:
-      - argument: only
-      - argument: controller
-        camelize: true
-        add_suffix: Controller
-        split: '::'
-  - name:
-      - resources
-      - controller
-      - namespace
-    calls:
-      - argument: 0
-        camelize: true
-        add_suffix: Controller
-        split: '::'
-  - name: accepts_nested_attributes_for
-    defines:
-      argument: '*'
-      transforms:
-        - add_suffix: _attributes
-        - add_suffix: _attributes=
-    calls:
-      argument: reject_if
-  - name: resource
-    calls:
-      - argument: 0
-        camelize: true
-        pluralize: true
-        add_suffix: Controller
-        split: '::'
-  - name:
-    - new
-    - create
-    - create!
-    - update
-    - update!
-    - assign_attributes
-    calls:
-      keyword: '**'
-      add_suffix: '='
-  - name: permit
-    calls:
-      arguments: ['*', '**']
-      keywords: '**'
-      add_suffix: "="
-      recursive: true
-  - name: layout
-    calls:
-      argument: 0
-  - name:
-      - includes
-      - preload
-      - eager_load
-      - joins
-      - left_joins
-      - left_outer_joins
-    calls:
-      arguments: ['*', '**']
-      keywords: '**'
-  - name:
-      - string
-      - text
-      - integer
-      - bigint
-      - float
-      - decimal
-      - numeric
-      - datetime
-      - time
-      - date
-      - binary
-      - boolean
-    path: /db/schema.rb
-    calls:
-      argument: 0
-      transforms:
-        - original
-        - add_suffix: '='
-        - add_suffix: '?'
-  - name:
-      - cattr_accessor
-      - mattr_accessor
-    defines:
-      - argument: '*'
-      - argument: '*'
-        add_suffix: '='
-    calls:
-      - argument: '*'
-        add_prefix: '@'
-  - name:
-      - cattr_reader
-      - mattr_reader
-    defines:
-      - argument: '*'
-    calls:
-      - argument: '*'
-        add_prefix: '@'
-  - name:
-      - cattr_writer
-      - mattr_writer
-    defines:
-      - argument: '*'
-        add_suffix: '='
-
-  - name:
-    - thread_cattr_accessor
-    - thread_mattr_accessor
-    defines:
-      - argument: '*'
-      - argument: '*'
-        add_suffix: '='
-  - name:
-    - thread_cattr_reader
-    - thread_mattr_reader
-    defines:
-      argument: '*'
-  - name:
-    - thread_cattr_writer
-    - thread_mattr_writer
-    defines:
-      argument: '*'
-      add_suffix: '='
-  - name: delegate_missing_to
-    calls:
-      argument: 0

data/lib/config/ruby.yml

@@ -14,6 +14,12 @@ test_paths:
   - /tests/
   - /test/
 
+erb_paths:
+  - '*.erb'
+
+haml_paths:
+  - '*.haml'
+
 keep:
   - initialize # called by new
   - inspect # called by repl, to_s

data/lib/leftovers/ast/node.rb

@@ -78,6 +78,13 @@ module Leftovers
         type == :str || type == :sym
       end
 
+      def proc?
+        return unless type == :block
+
+        name = first.name
+        name == :lambda || name == :proc
+      end
+
       def arguments
         @memo.fetch(:arguments) do
           @memo[:arguments] = case type
@@ -106,6 +113,13 @@ module Leftovers
         end
       end
 
+      def receiver
+        case type
+        when :const, :csend, :send
+          first
+        end
+      end
+
       def unwrap_freeze
         return self unless type == :send && name == :freeze
 

data/lib/leftovers/config.rb

@@ -32,6 +32,14 @@ module Leftovers
       @test_paths ||= Array(yaml[:test_paths])
     end
 
+    def haml_paths
+      @haml_paths ||= Array(yaml[:haml_paths])
+    end
+
+    def erb_paths
+      @erb_paths ||= Array(yaml[:erb_paths])
+    end
+
     def dynamic
       @dynamic ||= ::Leftovers::ProcessorBuilders::Dynamic.build(yaml[:dynamic])
     end

data/lib/leftovers/config_validator/schema_hash.rb

@@ -91,7 +91,7 @@ module Leftovers
         },
         'valueType' => {
           'type' => 'string',
-          'enum' => %w{String Symbol Integer Float}
+          'enum' => %w{String Symbol Integer Float Array Hash Proc}
         },
         'valueTypeList' => {
           'anyOf' => [
@@ -110,7 +110,41 @@ module Leftovers
             { 'type' => 'integer' },
             { 'type' => 'number' },
             { 'type' => 'boolean' },
-            { 'type' => 'null' }
+            { 'type' => 'null' },
+            { 'allOf' => [
+              { '$ref' => '#/definitions/stringPattern' },
+              {
+                'type' => 'object',
+                'properties' => {
+                  'match' => true, 'matches' => true,
+                  'has_prefix' => true, 'has_suffix' => true,
+                  'at' => { '$ref' => '#/definitions/argumentPositionList' },
+                  'has_value' => { '$ref' => '#/definitions/hasValueList' },
+                  'has_receiver' => { '$ref' => '#/definitions/hasValueList' },
+                  'type' => { '$ref' => '#/definitions/valueTypeList' },
+                  'unless' => { '$ref' => '#/definitions/hasValueList' }
+                },
+                'minProperties' => 1,
+                'additionalProperties' => false,
+                'allOf' => [
+                  # incompatible groups
+                  { 'not' => { 'required' => %w{match at} } },
+                  { 'not' => { 'required' => %w{match has_value} } },
+                  { 'not' => { 'required' => %w{match type} } },
+                  { 'not' => { 'required' => %w{matches at} } },
+                  { 'not' => { 'required' => %w{matches has_value} } },
+                  { 'not' => { 'required' => %w{matches type} } },
+                  { 'not' => { 'required' => %w{has_prefix at} } },
+                  { 'not' => { 'required' => %w{has_prefix has_value} } },
+                  { 'not' => { 'required' => %w{has_prefix type} } },
+                  { 'not' => { 'required' => %w{has_suffix at} } },
+                  { 'not' => { 'required' => %w{has_suffix has_value} } },
+                  { 'not' => { 'required' => %w{has_suffix type} } },
+                  { 'not' => { 'required' => %w{at type} } },
+                  { 'not' => { 'required' => %w{has_value type} } }
+                ]
+              }
+            ] }
           ]
         },
         'hasValueList' => {
@@ -133,11 +167,14 @@ module Leftovers
               'properties' => {
                 'at' => { '$ref' => '#/definitions/argumentPositionList' },
                 'has_value' => { '$ref' => '#/definitions/hasValueList' },
-                'has_value_type' => { '$ref' => '#/definitions/valueTypeList' },
                 'unless' => { '$ref' => '#/definitions/hasArgumentList' }
               },
               'minProperties' => 1,
-              'additionalProperties' => false
+              'additionalProperties' => false,
+              'allOf' => [
+                # synonyms
+                { 'not' => { 'required' => %w{has_argument has_arguments} } }
+              ]
             }
           ]
         },
@@ -160,7 +197,8 @@ module Leftovers
             'path' => { '$ref' => '#/definitions/stringList' },
             'paths' => { '$ref' => '#/definitions/stringList' },
             'has_argument' => { '$ref' => '#/definitions/hasArgumentList' },
-            'has_arguments' => { '$ref' => '#/definitions/hasArgumentList' }
+            'has_arguments' => { '$ref' => '#/definitions/hasArgumentList' },
+            'has_receiver' => { '$ref' => '#/definitions/hasValueList' }
           },
           'minProperties' => 1,
           'allOf' => [
@@ -390,6 +428,7 @@ module Leftovers
               { 'required' => ['name'] }, { 'required' => ['names'] },
               { 'required' => ['path'] }, { 'required' => ['paths'] },
               { 'required' => ['has_argument'] }, { 'required' => ['has_arguments'] },
+              { 'required' => ['has_receiver'] },
               { 'required' => ['unless'] }
             ] },
             {
@@ -399,6 +438,7 @@ module Leftovers
                 'name' => true, 'names' => true,
                 'path' => true, 'paths' => true,
                 'has_argument' => true, 'has_arguments' => true,
+                'has_receiver' => true,
                 'unless' => { '$ref' => '#/definitions/ruleMatcherList' }
 
               },
@@ -415,6 +455,7 @@ module Leftovers
               { 'required' => ['name'] }, { 'required' => ['names'] },
               { 'required' => ['path'] }, { 'required' => ['paths'] },
               { 'required' => ['has_argument'] }, { 'required' => ['has_arguments'] },
+              { 'required' => ['has_receiver'] },
               { 'required' => ['unless'] }
             ] },
             {
@@ -424,6 +465,7 @@ module Leftovers
                 'name' => true, 'names' => true,
                 'path' => true, 'paths' => true,
                 'has_argument' => true, 'has_arguments' => true,
+                'has_receiver' => true,
                 'unless' => { '$ref' => '#/definitions/ruleMatcherList' },
 
                 'call' => true, 'calls' => true,
@@ -460,6 +502,7 @@ module Leftovers
                     'has_prefix' => true, 'has_suffix' => true, 'matches' => true,
                     'path' => true, 'paths' => true,
                     'has_argument' => true, 'has_arguments' => true,
+                    'has_receiver' => true,
                     'unless' => { '$ref' => '#/definitions/keepTestOnlyList' }
                   },
                   'additionalProperties' => false,
@@ -485,6 +528,8 @@ module Leftovers
         'include_paths' => { '$ref' => '#/definitions/stringList' },
         'exclude_paths' => { '$ref' => '#/definitions/stringList' },
         'test_paths' => { '$ref' => '#/definitions/stringList' },
+        'haml_paths' => { '$ref' => '#/definitions/stringList' },
+        'erb_paths' => { '$ref' => '#/definitions/stringList' },
         'requires' => { '$ref' => '#/definitions/stringList' },
         'gems' => { '$ref' => '#/definitions/stringList' },
         'keep' => { '$ref' => '#/definitions/keepTestOnlyList' },

data/lib/leftovers/file.rb

@@ -15,10 +15,9 @@ module Leftovers
     end
 
     def ruby
-      case extname
-      when '.haml'
+      if Leftovers.config.haml_paths.allowed?(relative_path)
         ::Leftovers::Haml.precompile(read, self)
-      when '.rhtml', '.rjs', '.erb'
+      elsif Leftovers.config.erb_paths.allowed?(relative_path)
         ::Leftovers::ERB.precompile(read)
       else
         read

data/lib/leftovers/matcher_builders/node.rb

@@ -21,6 +21,7 @@ module Leftovers
         names: nil, match: nil, has_prefix: nil, has_suffix: nil,
         paths: nil,
         has_arguments: nil,
+        has_receiver: nil,
         unless_arg: nil
       )
         ::Leftovers::MatcherBuilders::And.build([
@@ -30,6 +31,7 @@ module Leftovers
           ]),
           ::Leftovers::MatcherBuilders::NodePath.build(paths),
           ::Leftovers::MatcherBuilders::NodeHasArgument.build(has_arguments),
+          ::Leftovers::MatcherBuilders::NodeHasReceiver.build(has_receiver),
           ::Leftovers::MatcherBuilders::Unless.build(
             (::Leftovers::MatcherBuilders::Node.build(unless_arg) if unless_arg)
           )