ditto_code 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af74379b473320c2e99ed19b96ae0e96be912ef8
-  data.tar.gz: 6a35b34be56aa6b3d06dae11fc466b9411aa8ae9
+  metadata.gz: 5fed41ea34a21cd5ca04e6e1e49170f86c22d196
+  data.tar.gz: cee727cacd7234595c33cd6e716d392842ffa896
 SHA512:
-  metadata.gz: e2910a3048a9ab65e993252e74e24e622b70fcd6c8b1e21432a7989fab05a6f7f3156414aabdfdd803c5c00a1021259a90c85ccc36ba37bceabd36f320cee6ff
-  data.tar.gz: 69b1e8955e98194d41882650fd30015dc6bd225ef259d3d547e4c14e19efc197ba2ff8e07ad476af92b9840b66d8615a63211aaecda5bcc0fc1b0aaaccd1191e
+  metadata.gz: 7138f2589367b8d2c8526bbc4ef4db56226cb804a842610b5f5df878d358e121fd39098def71a255a21c5a7d74e309a23f44abca774ae65becf7f632dbb52175
+  data.tar.gz: a775da4d2ad86fe823d76b72e9d987ca30263cd1321ec047b8ec4bfa8a9218b91f72687e054a40c102fee5f1ecada3c5942a716d9aa3ec5c3beb4e9544ef449e

data/lib/dittocode/parse.rb

@@ -42,54 +42,59 @@ module DittoCode
         # Each line........
         file.each_line do | line |
 
-          if @isView
-            m = /[\s]*<%[\s]*DittoCode::Exec.if[\s]+['|"](?<environment>[a-zA-Z]+)['|"][\s]+do[\s]*%>/.match(line)
-          else
-            m = /[\s]*DittoCode::Exec.if[\s]+['|"](?<environment>[a-zA-Z]+)['|"] do/.match(line)
-          end
+          # Ignore the line require ditto_code to delete it on final releases
+          if /[\s]*require[\s]*['|"](ditto_code)['|"]/.match(line).nil?
 
-          if m 
-            actions[:env] = m[:environment]
-            actions[:atack] = true;
-            actions[:ends] = 1;
-          else
+            if @isView
+              m = /[\s]*<%[\s]*DittoCode::Exec.if[\s]+['|"](?<environment>[a-zA-Z]+)['|"][\s]+do[\s]*%>/.match(line)
+            else
+              m = /[\s]*DittoCode::Exec.if[\s]+['|"](?<environment>[a-zA-Z]+)['|"] do/.match(line)
+            end
 
-            if !actions[:atack] 
-              if file.eof?
-                # Don't print a \n in the last line
-                out_file.print(line)
-              else  
-                out_file.puts(line)
-              end
+            if m 
+              actions[:env] = m[:environment]
+              actions[:atack] = true;
+              actions[:ends] = 1;
+            else
+
+              if !actions[:atack] 
+                if file.eof?
+                  # Don't print a \n in the last line
+                  out_file.print(line)
+                else  
+                  out_file.puts(line)
+                end
 
-            else 
-              # He is transforming
-              dittos += 1
+              else 
+                # He is transforming
+                dittos += 1
 
-              # Check if the line is end
-              if isEnd? line
+                # Check if the line is end
+                if isEnd? line
 
-                # If is the last end, it's coincide with the end of the block
-                if actions[:ends] == 1
-                  actions[:atack] = false
-                elsif actions[:env] == @env
-                  # Only how if we must mantain it
-                  check_with_indent(out_file, line)
-                end
+                  # If is the last end, it's coincide with the end of the block
+                  if actions[:ends] == 1
+                    actions[:atack] = false
+                  elsif actions[:env] == @env
+                    # Only how if we must mantain it
+                    check_with_indent(out_file, line)
+                  end
 
-                actions[:ends] -= 1
+                  actions[:ends] -= 1
 
-              else
+                else
 
-                # prints of coincide with the environment
-                if actions[:env] == @env
-                  check_with_indent(out_file, line)
+                  # prints of coincide with the environment
+                  if actions[:env] == @env
+                    check_with_indent(out_file, line)
+                  end
+
+                  # Check if we need to add a new end
+                  new_ends = moreEnds? line
+                  actions[:ends] += new_ends
+                  dittos += new_ends
                 end
 
-                # Check if we need to add a new end
-                new_ends = moreEnds? line
-                actions[:ends] += new_ends
-                dittos += new_ends
               end
 
             end
@@ -149,11 +154,17 @@ module DittoCode
 
         # Get the initializers and the ends of the blocks
         if @isView
-          initializers = line.scan(/<%[\s]*(case|unless|if|do|def)[\s]+/).size + line.scan(/<%[@=;\s\w\d]*(case|unless|if|do|def)[\s]+/).size
+          initializers = line.scan(/<%[\s]*(case|unless|if|do|def)[\s]+/).size 
+          initializers += line.scan(/<%[@=;\s\w\d]*(case|unless|if|do|def)[\s]+/).size
+          
           finals = line.scan(/[\s]+(end)[\s]*%>/).size
         else
-          initializers = line.scan(/^(case|unless|if|do|def)[\s]+/).size + line.scan(/[\s]+(case|unless|if|do|def)[\s]+/).size + line.scan(/[\s]+(case|unless|if|do|def)$/).size
-          finals = line.scan(/[\s]+(end)[\s]+/).size + line.scan(/^(end)[\s]+/).size + line.scan(/[\s]+(end)$/).size
+          initializers = line.scan(/^[\s\t]*(case|unless|if|do|def)[\s]+/).size                     # If, def, unless... of a start line
+          initializers += line.scan(/[\s\t]+(case|do)[\s]+[|]+/).size                               # Case or do inside a line
+          initializers += line.scan(/[\s\t]+(do)[\s]*$/).size                                       # Finals do
+          initializers += line.scan(/[\s\t]+(if|unless)[\s]+[@=\d\w\s]+(?:then){1}/).size           # Only if|unless + then, this line disable error by: unless|if var
+
+          finals = line.scan(/[\s\t]*(end)[\s]*$/).size
         end
 
         # Return the difference

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ditto_code
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Angel M Miguel