ditto_code 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94116e826c5c80e1677bb93fa0995931aa91a846
-  data.tar.gz: a7bb58d325d8ba77a5397e9bf46939ed8d6c73e8
+  metadata.gz: 0ea196dce723d0ac359698050ce90f82f8f0e881
+  data.tar.gz: 49835ff70f702190110698aec6b36d574194a949
 SHA512:
-  metadata.gz: ffc4edeb0b21be03a544bde6efb05653554cc510f719b52506f7b39b1af62f0e02ca88cc9758cffc9ffc9f91a8ffdb6e4803ce5d7f8706079a045e8ac46839bb
-  data.tar.gz: e3d830ff566898824715a0728e61ec574a19c883f873c054ccdb19d0e29baa3f4a1c34071dbf07470766cba2edd547bcaf01f4729b500272c4523eaee43613de
+  metadata.gz: 7076a4c538c10972d81f43f625d87cfeea2dcc3b97c29ef253f69dc875dd00b6a61d85c3209f2f62365f4780efa9f3368a41e0d4bdb0e389c73c4b0803bff39d
+  data.tar.gz: b137220d26735421ac0a6955e976a982cb2bdd8a6dae9131c5617fc9eed82a1015e176cd2ad30f6eb00322f2d814cf16b43969bd7b1cc0ca5307a81a52d668df

data/bin/dittoc

@@ -7,7 +7,7 @@ require 'ditto_code'
 
 def usage(s)
     $stderr.puts("Ditto say -> [Err] " + s)
-    $stderr.puts("Ditto say -> [Usage] #{File.basename($0)}: [-v <verbose>] [-f <folder>] [-r <recursive>] [-o <override files>] ENVIRONMENT file|folder")
+    $stderr.puts("Ditto say -> [Usage] #{File.basename($0)}: [-v <verbose>] [-f <folder>] [-r <recursive>] [-o <override files>] [--allow-views <search in views>] ENVIRONMENT file|folder")
     exit(1)
 end
 
@@ -37,8 +37,14 @@ def iterateFolder(folder)
 
   		filepath = "#{folder}#{rb_file}"
 
-  		if isFile?(filepath) && rb_file.end_with?('.rb')
-  			@ditto.transformation(filepath)
+  		if isFile?(filepath) 
+
+  			if rb_file.end_with?('.rb')
+  				@ditto.transformation(filepath, false)
+  			elsif rb_file.end_with?('.erb') && @allow_views
+  				@ditto.transformation(filepath, true)
+  			end
+  			
   		elsif isDirectory?(filepath) && @recursive
   			# Recursive
   			iterateFolder("#{filepath}/")
@@ -57,6 +63,7 @@ $environment = "";
 $verbose = false;
 $override = false;
 @recursive = false
+@allow_views = false
 
 # ===============================================================
 # INITIATION
@@ -76,6 +83,9 @@ while ARGV[0]
 	    when '-r' 
 	    	ARGV.shift
 	    	@recursive = true
+	     when '--allow-views' 
+	    	ARGV.shift
+	    	@allow_views = true	
 	    when /^-/ 
 	    	usage("Unknown option: #{ARGV[0].inspect}"); 
 	    else 

data/lib/dittocode/parse.rb

@@ -16,7 +16,7 @@ module DittoCode
     end
 
     # Transform the file based in the environment
-    def transformation(file_path)
+    def transformation(file_path, @isView)
 
       # Start to read the file
       file = File.open(file_path)
@@ -37,7 +37,11 @@ module DittoCode
         # Each line........
         text.each_line do | line |
 
-          m = /[\s]*DittoCode::Exec.if[\s]+['|"](?<environment>[a-zA-Z]+)['|"] do/.match(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
 
           if m 
             actions[:env] = m[:environment]
@@ -113,10 +117,14 @@ module DittoCode
       # Detect if we need to add a new end
       def moreEnds?(line)
 
-        # Get the initializers of blocks
-        initializers = line.scan(/^(if|do|def)[\s]+/).size + line.scan(/[\s]+(if|do|def)[\s]+/).size + line.scan(/[\s]+(if|do|def)$/).size
-        # Get the ends blocks
-        finals = line.scan(/[\s]+(end)[\s]+/).size + line.scan(/^(end)[\s]+/).size + line.scan(/[\s]+(end)$/).size
+        # Get the initializers and the ends of the blocks
+        if @isView
+          initializers = line.scan(/<%[\s]*(if|do|def)[\s]+/).size + line.scan(/<%[@=;\s\w\d]*(if|do|def)[\s]+/).size
+          finals = line.scan(/[\s]+(end)[\s]*%>/).size + line.scan(/<%[\s]*(end)[\s]*%>/).size
+        else
+          initializers = line.scan(/^(if|do|def)[\s]+/).size + line.scan(/[\s]+(if|do|def)[\s]+/).size + line.scan(/[\s]+(if|do|def)$/).size
+          finals = line.scan(/[\s]+(end)[\s]+/).size + line.scan(/^(end)[\s]+/).size + line.scan(/[\s]+(end)$/).size
+        end
 
         # Return the difference
         initializers - finals

metadata

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