pg_array_parser 0.0.2 → 0.0.3

data/.gitignore

@@ -18,3 +18,4 @@ tmp
 benchmark.rb
 bin/*
 .rbenv-version
+lib/pg_array_parser.bundle

data/.travis.yml

@@ -4,8 +4,7 @@ rvm:
   - 1.9.3
   - jruby-18mode
   - jruby-19mode
-before_script:
-  - rake install
 
 notifications:
-  email: false
+  email:
+   - travis@danmcclain.net

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.0.3
+ * Refactored Java to ensure thread safety - [mauricio](https://github.com/mauricio) -
+   Merged at [a30aba](https://github.com/dockyard/pg_array_parser/commit/a30aba4885812290f83c693e6b68c697b0dac675)
+
 # 0.0.2
  * Refactored C extension - [jeremyevans](https://github.com/jeremyevens) - Merged at [ad4987](https://github.com/dockyard/pg_array_parser/commit/ad4987dba411decca4aebd0750c990212dc81039)  
  * Adds JRuby support - thanks to [tychobrailleur](https://github.com/tychobrailleur) for help with the java class

data/README.md

@@ -1,12 +1,15 @@
 # PgArrayParser
+[![Build Status](http://travis-ci.org/dockyard/easy_auth.png)](http://travis-ci.org/dockyard/pg_array_parser)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/dockyard/pg_array_parser)
 
 Fast PostreSQL array parsing.
-
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'pg_array_parser'
+```ruby
+gem 'pg_array_parser'
+```
 
 And then execute:
 
@@ -39,12 +42,29 @@ parser.parse_pg_array '{some,strings that,"May have some ,\'s"}'
 
 ## Authors
 
-Dan McClain [twitter](http://twitter.com/_danmcclain) [github](http://github.com/danmcclain)
+[Dan McClain](http://github.com/danmcclain) [twitter](http://twitter.com/_danmcclain) 
+
+## Versioning ##
+
+This gem follows [Semantic Versioning](http://semver.org)
+
+## Want to help? ##
+
+Stable branches are created based upon each minor version. Please make
+pull requests to specific branches rather than master.
+
+Please make sure you include tests!
+
+Unles Rails drops support for Ruby 1.8.7 we will continue to use the
+hash-rocket syntax. Please respect this.
+
+Don't use tabs to indent, two spaces are the standard.
+
+## Legal ##
+
+[DockYard](http://dockyard.com), LLC © 2012
 
-## Contributing
+[@dockyard](http://twitter.com/dockyard)
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+[Licensed under the MIT
+license](http://www.opensource.org/licenses/mit-license.php)

data/Rakefile

@@ -6,10 +6,14 @@ require 'rspec/core/rake_task'
 spec = Gem::Specification.load('pg_array_parser.gemspec')
 
 if RUBY_PLATFORM =~ /java/
-    require 'rake/javaextensiontask'
-    Rake::JavaExtensionTask.new('pg_array_parser', spec)
+  require 'rake/javaextensiontask'
+  Rake::JavaExtensionTask.new('pg_array_parser', spec)
+else
+  require 'rake/extensiontask'
+  Rake::ExtensionTask.new('pg_array_parser', spec)
 end
 
+task :install => :compile
 task :spec => :install
 
 RSpec::Core::RakeTask.new(:spec)

data/ext/pg_array_parser/PgArrayParserEngine.java

@@ -1,113 +1,118 @@
 package pgarrayparser;
 
-import org.jruby.Ruby;
-import org.jruby.RubyArray;
-import org.jruby.RubyClass;
-import org.jruby.RubyFixnum;
-import org.jruby.RubyString;
-import org.jruby.RubyNil;
-import org.jruby.RubyModule;
-import org.jruby.RubyObject;
-import org.jruby.anno.JRubyMethod;
+import org.jruby.*;
 import org.jruby.anno.JRubyClass;
-import org.jruby.runtime.ObjectAllocator;
+import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.runtime.load.BasicLibraryService;
 
-  @JRubyClass(name = "PgArrayParser::PgArrayParserEngine")
-  public class PgArrayParserEngine extends RubyObject {
+@JRubyClass(name = "PgArrayParser::PgArrayParserEngine")
+public class PgArrayParserEngine extends RubyObject {
+
     public PgArrayParserEngine(final Ruby runtime, RubyClass rubyClass) {
-      super(runtime, rubyClass);
+        super(runtime, rubyClass);
     }
 
-    private Ruby runtime;
-    private int index;
-    private String arrayString;
     @JRubyMethod(name = "parse_pg_array")
-    public IRubyObject parse_pg_array(ThreadContext context, IRubyObject value) {
-      runtime = context.getRuntime();
-      index = 1;
-      arrayString = value.asJavaString();
-      IRubyObject returnValue = readArray();
-      return returnValue;
-
+    public RubyArray parse_pg_array( ThreadContext context, IRubyObject value) {
+        String content = value.asJavaString();
+        return parseData(context, content, 0);
     }
 
-    private RubyArray readArray()
+    private static RubyArray parseData( ThreadContext context, String content, int index)
     {
-      RubyArray array = RubyArray.newArray(runtime, 1);
-
-      int openQuote = 0;
-      boolean escapeNext = false;
-      char currentChar;
-      StringBuilder word = new StringBuilder();
-
-      if(index < arrayString.length() && arrayString.charAt(index) == '}')
-      {
-        return array;
-      }
-
-      for(;index < arrayString.length(); ++index)
-      {
-        currentChar = arrayString.charAt(index);
-        if(openQuote < 1)
-        {
-          if(currentChar == ',' || currentChar == '}')
-          {
-            if(!escapeNext)
-            {
-              if(openQuote == 0 && word.length() == 4 && word.toString().equals("NULL"))
-              {
-                array.append(runtime.getNil());
-              }
-              else
-              {
-                array.append(RubyString.newString(runtime, word.toString()));
-              }
-            }
-            if(currentChar == '}')
-            {
-              return array;
+        RubyArray items = RubyArray.newArray(context.getRuntime());
+
+        for( int x = index; x < content.length(); x++ ) {
+
+            char token = content.charAt(x);
+
+            switch (token) {
+                case '{':
+                    x = parseArrayContents( context, items, content, x + 1 );
+                    break;
+                case '}':
+                    return items;
             }
-            escapeNext = false;
-            openQuote = 0;
-            word = new StringBuilder();
-          }
-          else if(currentChar == '"')
-          {
-            openQuote = 1;
-          }
-          else if(currentChar == '{')
-          {
-            index++;
-            array.append(readArray());
-            escapeNext = true;
-          } 
-          else
-          {
-            word.append(String.valueOf(currentChar));
-          }
-        }
-        else if(escapeNext)
-        {
-          word.append(String.valueOf(currentChar));
-          escapeNext = false;
-        }
-        else if(currentChar == '\\')
-        {
-          escapeNext = true;
+
         }
-        else if(currentChar == '"')
-        {
-          openQuote = -1;
+
+        return items;
+    }
+
+    private static int parseArrayContents( ThreadContext context, RubyArray items, String content, int index ) {
+
+        StringBuilder currentItem = new StringBuilder();
+        boolean isEscaping = false;
+        boolean isQuoted = false;
+        boolean wasQuoted = false;
+
+        int x = index;
+
+        for(; x < content.length(); x++ ) {
+
+            char token = content.charAt(x);
+
+            if ( isEscaping ) {
+                currentItem.append( token );
+                isEscaping = false;
+            } else {
+                if ( isQuoted ) {
+                    switch (token) {
+                        case '"':
+                            isQuoted = false;
+                            wasQuoted = true;
+                            break;
+                        case '\\':
+                            isEscaping = true;
+                            break;
+                        default:
+                            currentItem.append(token);
+                    }
+                } else {
+                    switch (token) {
+                        case '\\':
+                            isEscaping = true;
+                            break;
+                        case ',':
+                            addItem(context, items, currentItem, wasQuoted);
+                            currentItem = new StringBuilder();
+                            wasQuoted = false;
+                            break;
+                        case '"':
+                            isQuoted = true;
+                            break;
+                        case '{':
+                            RubyArray internalItems = RubyArray.newArray(context.getRuntime());
+                            x = parseArrayContents( context, internalItems, content, x + 1 );
+                            items.add(internalItems);
+                            break;
+                        case '}':
+                            addItem(context, items, currentItem, wasQuoted);
+                            return x;
+                        default:
+                            currentItem.append(token);
+                    }
+                }
+            }
+
         }
-        else
-        {
-          word.append(String.valueOf(currentChar));
+
+        return x;
+    }
+
+    private static void addItem( ThreadContext context, RubyArray items, StringBuilder builder, boolean quoted ) {
+        String value = builder.toString();
+
+        if ( value.length() == 0 ) {
+            return;
         }
-      }
 
-      return array;
+        if ( !quoted && "NULL".equalsIgnoreCase( value ) ) {
+            items.add(context.getRuntime().getNil());
+        } else {
+            items.add(RubyString.newString( context.getRuntime(), value ));
+        }
     }
-  }
+
+}

data/ext/pg_array_parser/PgArrayParserEngineService.java

@@ -1,32 +1,26 @@
 package pgarrayparser;
 
-import java.lang.Long;
-import java.io.IOException;
-
 import org.jruby.Ruby;
-import org.jruby.RubyArray;
 import org.jruby.RubyClass;
-import org.jruby.RubyFixnum;
 import org.jruby.RubyModule;
-import org.jruby.RubyObject;
-import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.load.BasicLibraryService;
 
+import java.io.IOException;
+
 public class PgArrayParserEngineService implements BasicLibraryService {
 
-  public boolean basicLoad(Ruby runtime) throws IOException {
+    public boolean basicLoad(Ruby runtime) throws IOException {
 
-    RubyModule pgArrayParser = runtime.defineModule("PgArrayParser");
-    RubyClass pgArrayParserEngine = pgArrayParser.defineClassUnder("PgArrayParserEngine", runtime.getObject(), new ObjectAllocator() {
-      public IRubyObject allocate(Ruby runtime, RubyClass rubyClass) {
-        return new PgArrayParserEngine(runtime, rubyClass);
-      }
-    });
+        RubyModule pgArrayParser = runtime.defineModule("PgArrayParser");
+        RubyClass pgArrayParserEngine = pgArrayParser.defineClassUnder("PgArrayParserEngine", runtime.getObject(), new ObjectAllocator() {
+            public IRubyObject allocate(Ruby runtime, RubyClass rubyClass) {
+                return new PgArrayParserEngine(runtime, rubyClass);
+            }
+        });
 
-    pgArrayParserEngine.defineAnnotatedMethods(PgArrayParserEngine.class);
-    return true;
-  }
-}
+        pgArrayParserEngine.defineAnnotatedMethods(PgArrayParserEngine.class);
+        return true;
+    }
+}

data/lib/pg_array_parser.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../pg_array_parser/version', __FILE__)
-require File.expand_path('../pg_array_parser', __FILE__)
 
 if RUBY_PLATFORM =~ /java/
   module PgArrayParser
@@ -13,6 +12,10 @@ if RUBY_PLATFORM =~ /java/
     end
   end
 else
-  require 'pg_array_parser/pg_array_parser'
+  begin
+    require "pg_array_parser/pg_array_parser.#{RbConfig::CONFIG['DLEXT']}"
+  rescue LoadError
+    require "pg_array_parser.#{RbConfig::CONFIG['DLEXT']}"
+  end
 end
 

data/lib/pg_array_parser/version.rb

@@ -1,3 +1,3 @@
 module PgArrayParser
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,77 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: pg_array_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  prerelease:
+  version: 0.0.3
 platform: ruby
 authors:
 - Dan McClain
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2.2
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
+  type: :development
 description: Simple library to parse PostgreSQL arrays into a array of strings
 email:
 - git@danmcclain.net
 executables: []
-extensions:
-- ext/pg_array_parser/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
-- LICENSE
 - README.md
 - Rakefile
 - ext/pg_array_parser/PgArrayParserEngine.java
@@ -86,29 +84,30 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
-post_install_message: 
+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
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: Converts PostgreSQL array strings into arrays of strings
 test_files:
 - spec/parser_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 
+has_rdoc:
+...

data/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2012 Dan McClain
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.