javaparse 0.1.0 → 0.1.1

data/lib/javaparse/java_unit.rb

@@ -1,10 +1,10 @@
 module JavaParse 
-  
-  JAVA_COMMENTS_RE = /^\s*\/\/|^\s*\/\*|^\s*\*/ 
-  
+    
   class JavaUnit
     
-    attr_reader :file_name, :body, :head, :loc, :bloc, :cloc, :all_lines
+    include LineCounter, MethodGraber
+    
+    attr_reader :file_name, :unit_name, :body, :head, :methods, :loc, :bloc, :cloc, :all_lines
     
     def initialize(java_file_path)
       @file_path = java_file_path
@@ -13,6 +13,7 @@ module JavaParse
       @content = File.open(@file_path) { |file| file.read }
       validate_unit
       @head, @body = partition_unit
+      @methods = grab_methods(@body)
       count_lines
     end
     
@@ -39,21 +40,6 @@ module JavaParse
       raise RuntimeError, "Mismatch between filename and declared name for #{@file_path}" unless unit_declaration_line
     end
     
-    def count_lines
-      @all_lines, @loc, @bloc, @cloc = 0, 0, 0, 0
-      @content.each_line { |line|
-        @all_lines += 1
-        if line.strip.empty?
-          @bloc += 1
-        elsif JAVA_COMMENTS_RE.match(line) 
-          @cloc += 1 
-        else 
-          @loc += 1
-        end
-      }
-      [@loc, @cloc, @bloc, @all_lines]
-    end
-    
     def unit_declaration_line
       declaration_line_match = /^.*(?<=class|enum|interface)\s*#{@unit_name}.*$/.match(@content)
       declaration_line_match[0] unless declaration_line_match.nil?

data/lib/javaparse.rb

@@ -1,5 +1,8 @@
 $LOAD_PATH.unshift File.dirname(__FILE__)
 
+require 'javaparse/line_counter.rb'
+require 'javaparse/method_graber.rb'
 require 'javaparse/java_unit.rb'
+require 'javaparse/java_method.rb'
 require 'javaparse/java_section.rb'
-require 'javaparse/java_files.rb'
+require 'javaparse/java_files.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: javaparse
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-12 00:00:00.000000000 Z
+date: 2012-08-25 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: