code_analyzer 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 181ca088af7fc724c6d7a7085e3dd50b90d31a49
-  data.tar.gz: 70b0d7541e77386f21d5fc0e99ae0176beaa8aaa
+  metadata.gz: 53fb6c883111cef067134b5b5fe328791ae6ccd9
+  data.tar.gz: 0fb961476a2a02aac6ecb2d43a3dc7c08fb9d5e1
 SHA512:
-  metadata.gz: 5eea1a16c0f746a013ebf8b2a7a8cd46178aa5e2e3151ecd43d2a7977af4472bd1f5d18eaa7c842c70ed3bc598d5af1465cc9ec2efa03ea4b5a6e6dfaa3a6b85
-  data.tar.gz: 3b61e0c6959affae821256498031bd124f05ba6140e970f47a6a196155f43f4ca121a3c93c28ae88373fd6a62067b444bbf122cdaadb2482fdd37ca9c5a82a4d
+  metadata.gz: f4f0f07ebcd584a6747d1320a60ee7ce72e1fdd21e452b8a20df1d269f8c8596cbf8a0a14152723d2a27c1c40bcb92a8b7c2f657f120f9a1450d801277f5b87f
+  data.tar.gz: 2c843a87027189ebc42acecbcefd6c92aba0078ed66cdb2a3e71fa9a474db1ff4179e927d18f9631674be6d57755c23c2507ab5fd8f5d320b913b7d67c9d3028

data/lib/code_analyzer/sexp.rb

@@ -735,15 +735,30 @@ class Sexp
   #
   # @return [Array] array values
   def array_values
-    if :array == sexp_type
+    case sexp_type
+    when :array
       if nil == self[1]
         []
+      elsif :words_add == self[1].sexp_type
+        self[1].array_values
       elsif :qwords_add == self[1].sexp_type
         self[1].array_values
       else
         arguments.all
       end
-    elsif :qwords_add
+    when :words_add
+      values = []
+      node = self
+      while true
+        if :words_add == node.sexp_type
+          values.unshift node[2]
+          node = node[1]
+        elsif :words_new == node.sexp_type
+          break
+        end
+      end
+      values
+    when :qwords_add
       values = []
       node = self
       while true
@@ -755,6 +770,8 @@ class Sexp
         end
       end
       values
+    else
+      []
     end
   end
 
@@ -822,11 +839,9 @@ class Sexp
         self[1].to_s
       end
     when :qwords_add
-      if s(:qwords_new) == self[1]
-        self[2].to_s
-      else
-        self[1].to_s
-      end
+      self[2].to_s
+    when :word_add
+      self[2].to_s
     when :const_path_ref
       "#{self[1]}::#{self[2]}"
     when :@label

data/lib/code_analyzer/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module CodeAnalyzer
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/code_analyzer/sexp_spec.rb

@@ -558,8 +558,13 @@ describe Sexp do
       node.array_values.should == []
     end
 
-    it "should get array value with qwords" do
-      node = parse_content("%w(first_name last_name)").grep_node(sexp_type: :qwords_add)
+    it "should get array value with array and words_add" do
+      node = parse_content("%W{day week fortnight}").grep_node(sexp_type: :array)
+      node.array_values.map(&:to_s).should == ["day", "week", "fortnight"]
+    end
+
+    it "should get array value with array and qwords_add" do
+      node = parse_content("%w(first_name last_name)").grep_node(sexp_type: :array)
       node.array_values.map(&:to_s).should == ["first_name", "last_name"]
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code_analyzer
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Richard Huang