snuffle 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a1b604dec6afc7cf79045077c72b20027e6671b
-  data.tar.gz: 435b312222a5e25db5a34bb9d07e008b31c806f7
+  metadata.gz: be82187f6d2b734240dd36555ab530cfbfe6e4be
+  data.tar.gz: eb57d17b6d4aba3c8114e55169b60b099715254a
 SHA512:
-  metadata.gz: c41a7dc5273f10e51e33da5ad1fc56e8004cb480e38dca2d2fbc0af0fd3b0513ed8d1a0e6520674969c525b28a8d4e1360954aba66e09cc9b135142ed11e3a60
-  data.tar.gz: c71957bf19e0c78af28d374b4f46253594ef3782fdc67f8910965fdaaf2d4dad739ea1945952fc40c843fb2bed6a82fefe55efaec25f37efe057da922f3b7c51
+  metadata.gz: 80457fff5e73a70dfbf62ce6fd3b7ae86f4076dfe1abc103f6b4f6be3f0623357063d13e2419861be4a4ab37ea958e93d8907e9a083c67997a6d0f301e35bb4d
+  data.tar.gz: aa36f7fc893adbf5c098fbea48226ce33947d074159a2a8751fb4ffd9c2565e1a94f21a77de8d11c7c9ab27e78daa7bfc7ef8d4f87580a178e9a7d23e734bcc4

data/lib/snuffle.rb

@@ -12,6 +12,7 @@ require_relative "snuffle/formatters/csv"
 require_relative "snuffle/formatters/html"
 require_relative "snuffle/formatters/html_index"
 require_relative "snuffle/formatters/text"
+require_relative "snuffle/args_clump"
 require_relative "snuffle/latent_object"
 require_relative "snuffle/line_of_code"
 require_relative "snuffle/node"

data/lib/snuffle/args_clump.rb

@@ -0,0 +1,46 @@
+require 'pry'
+module Snuffle
+
+  class ArgsClump
+
+    include PoroPlus
+    attr_accessor :element, :neighbors, :line_numbers
+
+    def self.from(nodes)
+      nodes = nodes.method_defs
+      clumps = Element::MethodDefinition.materialize(nodes.to_a).inject([]) do |clumps, element|
+        clump = ArgsClump.new(element: element, line_numbers: element.node.line_numbers.first )
+        if clump.values.count > 1 && clump.near_neighbors.any?
+          clumps << clump
+        end
+        clumps
+      end
+    end
+
+    def has_near_neighbors?
+      near_neighbors.present?
+    end
+
+    def near_neighbors
+      @near_neighbors ||= neighbors.select{ |n| (n.values & values).size > 0 }
+    end
+
+    def neighbors
+      @neighbors ||= [element.node.siblings - [self.element.node]].flatten.map{|sibling| Element::MethodDefinition.materialize([sibling]).first}
+    end
+
+    def values
+      @values ||= self.element.values
+    end
+
+    def neighbor
+      Struct.new(:element, :distance)
+    end
+
+    def distance(primary_matrix, token_matrix)
+      Snuffle::Util::Correlation.distance(primary_matrix, token_matrix)
+    end
+
+  end
+
+end

data/lib/snuffle/cli.rb

@@ -36,7 +36,6 @@ module Snuffle
     def report(summary, source)
       text_report(summary)
       cvs_report(summary)
-
     end
 
     def create_html_index(summaries, start_path)

data/lib/snuffle/elements/method_definition.rb

@@ -14,4 +14,14 @@ class Snuffle::Element::MethodDefinition
     node.name
   end
 
+  def values
+    begin
+      return [] unless node.children.objects.any?
+      node.children.objects[1].children.map{|child| child.name}.flatten
+    rescue
+      []
+    end
+  end
+
+
 end

data/lib/snuffle/formatters/base.rb

@@ -39,8 +39,7 @@ module Snuffle
       end
 
       def filename
-        base = "#{summary.filename}"
-        base + file_extension
+        "#{summary.filename}" + file_extension
       end
 
       def file_extension

data/lib/snuffle/formatters/templates/output.html.haml

@@ -74,7 +74,7 @@
       %div.column
         %h3.indented.highlighted
           Data Clumps:
-        - if summary.cohorts.count == 0
+        - unless summary.cohorts.any? || summary.arg_clumps.any?
           %p.indented
             %em None
         - else
@@ -87,6 +87,14 @@
                   (line
                   = ":#{cohorts.map(&:line_numbers).join(', :')}"
                   )
+            - summary.arg_clumps.group_by{|c| c.values.sort }.each do |args, clumps|
+              - if clumps.count > 0
+                %li
+                  = args.map{|c| ".#{c}" }.join(", ")
+                  %br
+                  (line
+                  = ":#{clumps.map(&:line_numbers).join(', :')}"
+                  )
       %div.column
         %h3.indented.highlighted-method
           Possible Latent Objects:

data/lib/snuffle/latent_object.rb

@@ -28,13 +28,13 @@ class Snuffle::LatentObject
   end
 
   def self.potential_objects_with_methods(nodes, threshold=DUPLICATE_THRESHOLD)
-    method_candidates = Snuffle::Element::MethodDefinition.materialize(nodes.methods)
+    method_candidates = Snuffle::Element::MethodDefinition.materialize(nodes.method_defs)
     extract_candidates(method_candidates).select{|k,v| v.count > threshold }
   end
 
-  def self.extract_candidates(methods)
+  def self.extract_candidates(method_defs)
     stemmer = UEAStemmer.new
-    methods.map(&:method_name).inject({}) do |words, method_name|
+    method_defs.map(&:method_name).inject({}) do |words, method_name|
       atoms = method_name.split('_') - STOPWORDS
       atoms = atoms.map{|atom| stemmer.stem(atom.to_s)}
       atoms.each{ |word| words[word] ||= []; words[word] << method_name }

data/lib/snuffle/node.rb

@@ -5,13 +5,12 @@ module Snuffle
     include Ephemeral::Base
     include PoroPlus
 
-    attr_accessor :id, :name, :type, :child_ids, :parent_id, :line_numbers
+    attr_accessor :id, :name, :type, :child_ids, :parent_id, :line_numbers, :args
 
-    scope :by_id,       lambda{|id| where(:id => id)}
     scope :by_type,     lambda{|type| where(:type => type)}
     scope :with_parent, lambda{|parent_id| where(parent_id: parent_id) }
     scope :hashes,      {type: :hash}
-    scope :methods,     {is_method: true}
+    scope :method_defs, {is_method: true}
     scope :non_sends,   {is_send: false}
 
     def self.nil

data/lib/snuffle/source_file.rb

@@ -19,6 +19,10 @@ module Snuffle
       @nodes ||= extract_nodes_from(ast)
     end
 
+    def arg_clumps
+      @arg_clumps ||= ArgsClump.from(self.nodes)
+    end
+
     def cohorts
       @cohorts ||= Cohort.from(self.nodes)
     end
@@ -47,6 +51,7 @@ module Snuffle
         path_to_file: self.path_to_file,
         cohorts: cohorts,
         latent_objects: latent_objects,
+        arg_clumps: arg_clumps,
         source: self.source
       )
     end

data/lib/snuffle/summary.rb

@@ -3,9 +3,10 @@ module Snuffle
   class Summary
     include PoroPlus
     attr_accessor :class_name, :path_to_file, :cohorts, :latent_objects, :source
+    attr_accessor :arg_clumps
 
    def has_results?
-      self.cohorts.count != 0 || self.latent_objects.count != 0
+      self.cohorts.count != 0 || self.latent_objects.count != 0 || self.arg_clumps.count != 0
     end
 
     def path_to_results

data/lib/snuffle/version.rb

@@ -1,3 +1,3 @@
 module Snuffle
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

data/spec/fixtures/program_2.rb

@@ -2,51 +2,41 @@ class Customer
 
   attr_accessor :customer_id, :customer_name, :company_name
   attr_accessor :street_address_1, :street_address_2
-  # attr_accessor :city, :state, :postal_code
+  attr_accessor :city, :state, :postal_code, :phone_number
 
   MY_CONSTANT = "TheOtherZachIsThePrimaryZach"
 
   def self.api_root
-  end
-
-  def my_condition
-    puts "MAGIC" if true == false
+    "http://localhost/api/"
   end
 
   def address_is_residence?
     self.company_name.nil?
   end
 
-  def get_coords_for_address
- #   fake_api_call(city: city, state: state, postal_code: postal_code)
-  end
-
   def neighborhood
-    make_neighborhood_api_call(state: self.state, city: self.city, postal_code: self.postal_code)
-  end
-
-  def something_else
-#    fake_neighborhood_api_call(city: self.city, state: self.state)
+    NeighborhoodApi.post(
+      state: self.state,
+      city: self.city,
+      postal_code: self.postal_code
+    ).results[:neighborhood]
   end
 
-  def and_something_else_again
-    fake_neighborhood_api_call(city: self.city)
+  def verified_state
+    NeighborhoodApi.post(
+      city: self.city,
+      postal_code: self.postal_code
+    ).results[:state]
   end
 
-  def and_something_else_again_and_again
-    fake_neighborhood_api_call(state: self.state)
-  end
-
-  def fake_neighborhood_api_call(args={})
-    "Probably River North"
-  end
-
-  def fake_api_call(args={})
-    [112.32, 124.11]
+  def verified_country
+    NeighborhoodApi.post(
+      state: self.state,
+    ).results[:country]
   end
 
   def business_card_api_call
-    {name: customer_name, business: company_name}
+    {name: customer_name, business: company_name, phone: phone_number}
   end
 
   def letterhead_api_call
@@ -63,7 +53,7 @@ class Customer
     string << self.company_name if address_is_residence?
     string << self.street_address_1
     string << self.street_address_2 if street_address_2.present?
-#    string << "#{self.city}, #{self.state} #{self.postal_code}"
+    string << "#{self.city}, #{self.state} #{self.postal_code}"
     string.join", "
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snuffle
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Coraline Ada Ehmke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -213,6 +213,7 @@ files:
 - images/detail.png
 - images/overview.png
 - lib/snuffle.rb
+- lib/snuffle/args_clump.rb
 - lib/snuffle/cli.rb
 - lib/snuffle/cohort.rb
 - lib/snuffle/elements/hash.rb
@@ -266,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Snuffle detects data clumps in your Ruby code.
@@ -284,3 +285,4 @@ test_files:
 - spec/snuffle/source_file_spec.rb
 - spec/snuffle/util/histogram_spec.rb
 - spec/spec_helper.rb
+has_rdoc: