cobplexity 0.1.0 → 0.1.1

data/lib/cobplexity/line.rb

@@ -2,7 +2,7 @@ module Cobplexity
 
   class Line
     def initialize line
-      @line = line.strip
+      @line = line.rstrip
     end
     def code?
       !self.blank? && !self.comment? && !self.continuation? && !self.paragraph? && !self.procedure_division?
@@ -10,6 +10,9 @@ module Cobplexity
     def blank?
       self.statement.empty?
     end
+    def paragraph?
+      !self.comment? && !self.continuation? && !self.area_a.empty? && !self.copy_statement?
+    end
     def comment?
       self.control == '*'
     end
@@ -18,26 +21,26 @@ module Cobplexity
     end
     def branches
       self.statement.split.count do |item|
-        ['IF', 'ELSE', 'WHEN', 'WHILE', 'UNTIL'].include? item.upcase
+        ['IF', 'ELSE', 'WHEN', 'WHILE', 'UNTIL', 'AND', 'OR'].include? item.upcase
       end
     end
-    def paragraph?
-      !self.statement.match(/COPY /i) && !self.area_a.strip.empty?
-    end
     def paragraph_name
       self.statement.strip.delete '.'
     end
+    def copy_statement?
+      self.statement.match /COPY /i
+    end
+    def procedure_division?
+      self.statement.match /PROCEDURE DIVISION\./i
+    end
     def area_a
-      self.statement[0..3]
+      self.statement[0..3].strip
     end
     def control
       @line.length > 6 ? @line[6] : ' '
     end
     def statement
-      @line.length > 7 ? @line[7..@line.length] : ''
-    end
-    def procedure_division?
-      @line.match /PROCEDURE DIVISION/i
+      @line.length > 7 ? @line[7..71] : ''
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cobplexity
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: