groovy_oneliner 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d318fc216012756da8687ec71f1a7f8454246b6
-  data.tar.gz: c80ee2b0e416668a5a272bd398886412d5ee70c9
+  metadata.gz: becb9184b8f80f893eacae6964412b6a68436292
+  data.tar.gz: feb97a340c04d053cb700d177dcdbb8c68b277f6
 SHA512:
-  metadata.gz: 4fe72e995977a35e1aa9c8eb1edf4aa61f3658d31437532a340642a463933388979dd9c84794d1dc05c00d3ae05c6f340ba9ba3f6f7e5fa2c07596b265b940d2
-  data.tar.gz: 1c41cea35991ee25f034e2f0017dbc2c80187caec1f042e5c53f93834c7cca24eb27735fa88e4fcb1a850c93477a166dbe7100c90a052171d57ceb895255f00a
+  metadata.gz: 04a64e75d13f1b0f271a697595209fa48664d17497c38dbaa85e8735f037ef9557414bc0b8cb80d76d5d378335199b8d97329af8af4ec9cb79fc29560643fa81
+  data.tar.gz: ac765a3f0f7aa37a6e56753b41eaed69677f6acd163a38512c198987e7c5b9aa4851396074295212d854fe51b3e8aa4e0f8c12df5ad6df56a13de886e12066a2

data/lib/groovy_oneliner/converter.rb

@@ -9,12 +9,14 @@ class GroovyOneliner
 
     def compute
       @content
-           .gsub(/\/\/.*$/, '')      # remove all comments //
-           .gsub("\n", '')           # remove all line-breaks
-           .gsub("\"", "'")          # substitute all double-quote to single-quote
-           .gsub(/^$/, '')           # remove all empty lines
-           .gsub(/;\s*/, ';')        # remove all whitespace after ;
-           .gsub(%r{/\*.*\*\/}, '')  # remove all comments /* ... */
+           .gsub(/\/\/.*$/, '')                    # remove all comments //
+           .gsub("\n", '')                         # remove all line-breaks
+           .gsub("\"", "'")                        # substitute all double-quote to single-quote
+           .gsub(/^$/, '')                         # remove all empty lines
+           .gsub(%r{\/\*(\*(?!\/)|[^*])*\*\/}, '') # remove all /* */ comments
+           .gsub(/\s*;\s*/, ';')                   # remove all whitespace before and after ;
+           .gsub(/\s*=\s*/, '=')                   # remove all whitespace before and after ;
+           .strip
     end
   end
 end

data/lib/groovy_oneliner/version.rb

@@ -1,3 +1,3 @@
 class GroovyOneliner
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/groovy_oneliner/converter_spec.rb

@@ -29,7 +29,7 @@ a = 3;
 return 1;
       TEXT
 
-      expect(subject.compute).to eql("a = 3;return 1;")
+      expect(subject.compute).to eql("a=3;return 1;")
     end
 
     it 'removes all empty lines' do
@@ -39,27 +39,56 @@ a = 4;
 b = 5;
       TEXT
 
-      expect(subject.compute).to eql("a = 4;b = 5;")
+      expect(subject.compute).to eql("a=4;b=5;")
     end
 
-    it 'removes all whitespace after ;' do
-      subject = described_class.new <<-TEXT
+    context 'when removing whitespace' do
+      it 'removes all before and after ;' do
+        subject = described_class.new <<-TEXT
 a = 4; b = 5;
-      TEXT
+        TEXT
+
+        expect(subject.compute).to eql("a=4;b=5;")
+      end
+
+      it 'removes all before and after =' do
+        subject = described_class.new <<-TEXT
+a = 4; b = 5;
+        TEXT
 
-      expect(subject.compute).to eql("a = 4;b = 5;")
+        expect(subject.compute).to eql("a=4;b=5;")
+      end
     end
 
-    it 'removes all /* comment */ blocks' do
-      subject = described_class.new <<-TEXT
+    context 'when handling /* */ block' do
+      it 'removes the block' do
+        subject = described_class.new <<-TEXT
 /*
  * This is a comment and will be ignored
  */
 return 1;
-      TEXT
+        TEXT
+
+        expect(subject.compute).to eql("return 1;")
+      end
+
+      it 'handles multiple blocks' do
+        subject = described_class.new <<-TEXT
+/*
+ * This is a comment and will be ignored
+ */
+a = 1;
+/*
+ * This is a comment and will be ignored
+ */
+b = 1;
+        TEXT
+
+        expect(subject.compute).to eql("a=1;b=1;")
+      end
 
-      expect(subject.compute).to eql("return 1;")
     end
 
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groovy_oneliner
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Pedro Cunha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler