jsminc 1.1.1 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6be255c5b142e78b904ef8ab6948630ab86c67e9
+  data.tar.gz: 4482f12697501691d2d021a4ec4ddfc0af3cbbc3
+SHA512:
+  metadata.gz: 1941945c97d9bdd864bab7e3f526d3dd0b84a95715c1a7c40fcd5a5ae058393d92fc2ce15702bd28bca58a81ff9b65f3dc52c46a6fd32ce0fba80d08fb7aa394
+  data.tar.gz: ce759234d390c32c96b1333947993a6c1039e769babfdc7699b2d6bf7bf9960929b0e65fee4bb7ac7eb10f49c1fc82283a49015f165a0b9a4b4ba89077ce9f8e

data/ext/jsminc/extconf.rb

@@ -4,10 +4,6 @@ extension_name = 'jsminc'
 
 dir_config extension_name
 
-if RUBY_VERSION =~ /1.9/ then
-  $CPPFLAGS += "-DRUBY_19"
-end
-
 with_cflags '-funsigned-char' do
   create_makefile extension_name
 end

data/ext/jsminc/jsminc.c

@@ -3,6 +3,8 @@
 typedef struct jsmin_struct {
 	char theA;
 	char theB;
+	char theX;
+	char theY;
 	char theLookahead;
 	char *in;
 	char *out;
@@ -47,7 +49,7 @@ static void
 write_char(jsmin_struct *s, const char c)
 {
     *(s->out) = c;
-	*(s->out)++;
+    *(s->out)++;
 }
 
 /* peek -- get the next character without getting it.
@@ -75,27 +77,29 @@ next(jsmin_struct *s)
             for (;;) {
                 c = get(s);
                 if (c <= '\n') {
-                    return c;
+                    break;
                 }
             }
+            break;
         case '*':
             get(s);
-            for (;;) {
+            while (c != ' ') {
                 switch (get(s)) {
                 case '*':
                     if (peek(s) == '/') {
                         get(s);
-                        return ' ';
+                        c = ' ';
                     }
                     break;
                 case '\0':
                     rb_raise(rb_eStandardError, "unterminated comment");
                 }
             }
-        default:
-            return c;
+            break;
         }
     }
+    s->theY = s->theX;
+    s->theX = c;
     return c;
 }
 
@@ -114,6 +118,11 @@ action(jsmin_struct *s, int d)
     switch (d) {
     case 1:
         write_char(s, s->theA);
+        if ((s->theY == '\n' || s->theY == ' ') &&
+                (s->theA == '+' || s->theA == '-' || s->theA == '*' || s->theA == '/') &&
+                (s->theB == '+' || s->theB == '-' || s->theB == '*' || s->theB == '/')) {
+            write_char(s, s->theY);
+        }
     case 2:
         s->theA = s->theB;
         if (s->theA == '\'' || s->theA == '"' || s->theA == '`') {
@@ -134,12 +143,15 @@ action(jsmin_struct *s, int d)
         }
     case 3:
         s->theB = next(s);
-        if (s->theB == '/' && (s->theA == '(' || s->theA == ',' || s->theA == '=' ||
-                    s->theA == ':' || s->theA == '[' || s->theA == '!' ||
-                    s->theA == '&' || s->theA == '|' || s->theA == '?' ||
-                    s->theA == '{' || s->theA == '}' || s->theA == ';' ||
-                    s->theA == '\n')) {
+        if (s->theB == '/' && (
+                    s->theA == '(' || s->theA == ',' || s->theA == '=' || s->theA == ':' ||
+                    s->theA == '[' || s->theA == '!' || s->theA == '&' || s->theA == '|' ||
+                    s->theA == '?' || s->theA == '+' || s->theA == '-' || s->theA == '~' ||
+                    s->theA == '*' || s->theA == '/' || s->theA == '{' || s->theA == '\n')) {
             write_char(s, s->theA);
+            if (s->theA == '/' || s->theA == '*') {
+                write_char(s, ' ');
+            }
             write_char(s, s->theB);
             for (;;) {
                 s->theA = get(s);
@@ -159,6 +171,11 @@ action(jsmin_struct *s, int d)
                         }
                     }
                 } else if (s->theA == '/') {
+                    switch (peek(s)) {
+                    case '/':
+                    case '*':
+                        rb_raise(rb_eStandardError, "unterminated set in regex literal");
+                    }
                     break;
                 } else if (s->theA =='\\') {
                     write_char(s, s->theA);
@@ -184,18 +201,18 @@ action(jsmin_struct *s, int d)
 static void
 jsmin(jsmin_struct *s)
 {
+    if (peek(s) == 0xEF) {
+        get(s);
+        get(s);
+        get(s);
+    }
     s->theA = '\n';
-	s->theLookahead = '\0';
 
     action(s, 3);
     while (s->theA != '\0') {
         switch (s->theA) {
         case ' ':
-            if (isAlphanum(s->theB)) {
-                action(s, 1);
-            } else {
-                action(s, 2);
-            }
+            action(s, isAlphanum(s->theB) ? 1 : 2);
             break;
         case '\n':
             switch (s->theB) {
@@ -204,27 +221,21 @@ jsmin(jsmin_struct *s)
             case '(':
             case '+':
             case '-':
+            case '!':
+            case '~':
                 action(s, 1);
                 break;
             case ' ':
                 action(s, 3);
                 break;
             default:
-                if (isAlphanum(s->theB)) {
-                    action(s, 1);
-                } else {
-                    action(s, 2);
-                }
+                action(s, isAlphanum(s->theB) ? 1 : 2);
             }
             break;
         default:
             switch (s->theB) {
             case ' ':
-                if (isAlphanum(s->theA)) {
-                    action(s, 1);
-                    break;
-                }
-                action(s, 3);
+                action(s, isAlphanum(s->theA) ? 1 : 3);
                 break;
             case '\n':
                 switch (s->theA) {
@@ -239,11 +250,7 @@ jsmin(jsmin_struct *s)
                     action(s, 1);
                     break;
                 default:
-                    if (isAlphanum(s->theA)) {
-                        action(s, 1);
-                    } else {
-                        action(s, 3);
-                    }
+                    action(s, isAlphanum(s->theA) ? 1 : 3);
                 }
                 break;
             default:
@@ -263,19 +270,16 @@ static VALUE minify(VALUE self, VALUE _in_s) {
     long in_length = strlen(in_s);
     char out_s[in_length + 1];
 
-#ifdef RUBY_19
     VALUE prev_encoding = rb_funcall(_in_s, rb_intern("encoding"), 0);
-#endif
 
+    s.theLookahead = '\0';
+    s.theX = '\0';
+    s.theY = '\0';
     s.in = in_s;
     s.out = out_s;
     jsmin(&s);
 
-#ifdef RUBY_19
     return rb_funcall(rb_str_new2(out_s + 1), rb_intern("force_encoding"), 1, prev_encoding);
-#else
-    return rb_str_new2(out_s + 1);
-#endif
 }
 
 

data/lib/jsminc/version.rb

@@ -1,3 +1,3 @@
 module JSMinC
-  VERSION = "1.1.1"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,27 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jsminc
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Ryan Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000 Z
+date: 2016-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70186912906920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70186912906920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: JSMinC is the original C version of JSMin, embedded in Ruby.
 email:
 - rwfitzge@gmail.com
@@ -30,7 +32,7 @@ extensions:
 - ext/jsminc/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - Rakefile
@@ -41,26 +43,25 @@ files:
 - lib/jsminc/version.rb
 homepage: http://rynftz.gr/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: jsminc
-rubygems_version: 1.8.10
+rubygems_version: 2.5.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A fast JavaScript minifier written in C (by Douglas Crockford)
 test_files: []