couchdb-ruby-server 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa9cbfeea39a79efb59cfa9b1d278ee06ea5451c
-  data.tar.gz: 1fa6648489a455bc477d446af41b2f84c48eb215
+  metadata.gz: 1e9ffed61239c2bb7d32f8eaa6720683c8baee09
+  data.tar.gz: d0674c1c0e546777f974fa7d381ce5c5cae13c12
 SHA512:
-  metadata.gz: 196f7dd41438a62fe78b9d98c3f6824b04e29639f82fc9994017ad95d3594c8476f01211bdc985405283d1a80c9674f9a443191a8b72afc2ae57a6a8fee287a9
-  data.tar.gz: 1e4608f3551c2937ce0acc9f2a7f13075e2ccb9b079b3c1935cf7e1537af679053c32649c310aa3393ec442ea5eab0d1777053dba02fa6da703bdf6a67a542b7
+  metadata.gz: 360e274df3ae6321d2c091026242796de8d95735a8911b489dd93a039194d101f1e26b79788f09a0eba24263467630a22b00e16991094a148ec0ee69d7eb8022
+  data.tar.gz: 1061aeab8a3d3051ba604f1ddb2e8d38b088d2db976131683c77d4094787b247161554051c2e89ab16a2d45b3143dfdfb93f2c83da61cdcab0b9611169e586f4

data/.gitignore

@@ -19,3 +19,4 @@ Gemfile.lock
 core
 *.gem
 /doc/
+/ext/Rakefile

data/.travis.yml

@@ -5,9 +5,7 @@ rvm:
   - "2.0.0"
   - "2.1" # latest 2.1.x
   - "2.2" # latest 2.2.x
-  - "jruby-18mode"
-  - "jruby-19mode"
-script:
-  CODECLIMATE_REPO_TOKEN=PLACE_TOKEN_HERE bundle exec rake test
+script:   # use QS_TRACE=1 for the tracing
+  CODECLIMATE_REPO_TOKEN=306fa22cbd8a30beb74c4fd7536e659ac9b669147772d9718f0032dcda96e507 bundle exec rake test
 branches:
   - "master"

data/README.md

@@ -26,7 +26,7 @@ You may load your own code into the query server context by providing path to a
 Actually any tagname for the query server may be set in `local.ini` instead of `ruby` so it's possible to run several query servers e.g. per application. Just remember to copy that tagname into couchapp's `language` file.
 
 ## Tests
-`bundle exec rake test`. Gem following original [tests](https://github.com/apache/couchdb/blob/master/test/view_server/query_server_spec.rb).
+`bundle exec rake test`. Gem is trying to follow original [tests](https://github.com/apache/couchdb/blob/master/test/view_server/query_server_spec.rb).
 
 ## Documentation
 This README is all i could say in a rush. No other documentation provided at this moment, see the sources.

data/TODO.md

@@ -2,3 +2,4 @@
 
 3. Client and server libs -- see what i have to copy here
 4. Implement $SAFE=4 thread, set safe level via args
+5. RUBY_GC_MALLOC_LIMIT=24000000

data/bin/couchdb-ruby-server

@@ -1,18 +1,22 @@
-#!/usr/bin/env RUBY_GC_MALLOC_LIMIT=24000000 ruby
+#!/usr/bin/env ruby
 require 'couchdb-ruby-server'
 require 'argparser'
 
-args = ArgParser.new  :program  => 'couchdb-ruby-server',
-                      :version  => CouchdbRubyServer::VERSION,
-                      :info     => 'CouchDB query server to run ruby design docs.',
-                      :licence  => 'MIT',
-                      :copyright=> '2014-2015 sinmsinm@gmail.com',
-                      :options  => [{ :names    => %w[r require],
-                                      :argument => 'LIB',
-                                      :multiple => true,
-                                      :help     => 'Aux library to require.' }]
-args['require'].value.each do |r|
-  require r
-end
+module CouchdbRubyServer
+  trace {'+ bin/couchdb-ruby-server'}
+  at_exit { trace {'- bin/couchdb-ruby-server' } }
+  args = ArgParser.new  :program  => 'couchdb-ruby-server',
+                        :version  => CouchdbRubyServer::VERSION,
+                        :info     => 'CouchDB query server to run ruby design docs.',
+                        :licence  => 'MIT',
+                        :copyright=> '2014-2015 sinmsinm@gmail.com',
+                        :options  => [{ :names    => %w[r require],
+                                        :argument => 'LIB',
+                                        :multiple => true,
+                                        :help     => 'Aux library to require.' }]
+  args['require'].value.each do |r|
+    require r
+  end
 
-CouchdbRubyServer.run
+  run
+end

data/couchdb-ruby-server.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
   #                      '--main'   << 'README'             <<
   #                      '--markup' << 'markdown'           <<
   #                      '--line-numbers'
-  s.add_development_dependency 'bundler',    '~> 1'
-  s.add_development_dependency 'rake',       '~> 10'
-  s.add_development_dependency 'minitest',   '~> 4'
-  s.add_dependency 'argparser', '~> 1'
-  s.add_dependency 'oj',        '~> 2.7'
+  s.add_development_dependency  'bundler',    '~> 1.7'
+  s.add_development_dependency  'rake',       '~> 10.1'
+  s.add_development_dependency  'minitest',   '~> 4.7'
+  s.add_dependency              'argparser',  '~> 1.0'
+  s.add_dependency              'oj',         '~> 2.7'
 end

data/lib/couchdb-ruby-server/serializer.rb

@@ -0,0 +1,17 @@
+# coding: utf-8
+
+module CouchdbRubyServer
+  module Serializer
+      require 'oj'
+      ::Oj.default_options = {:mode        => :compat,
+                              :class_cache => true }
+      def self.dump(obj)
+        Oj.dump(obj)
+      end
+
+      def self.load(str)
+        return nil if str.nil?
+        Oj.load(str)
+      end
+  end
+end

data/lib/couchdb-ruby-server/server.rb

@@ -1,9 +1,5 @@
 # coding: utf-8
 
-
-$stdin.sync = true
-$stdout.sync = true
-
 module CouchdbRubyServer
   class Error < RuntimeError
     attr_reader :key
@@ -39,23 +35,15 @@ module CouchdbRubyServer
 
   TYPES_MIME = Hash[MIME_TYPES.map {|k, v| [v, k] }]
 
-  def self.to_json(obj)
-    Oj.dump(obj)
-  end
-
-  def self.json_parse(str)
-    return nil if str.nil?
-    Oj.load str
-  end
-
   def self.log message
     respond ['log', "#{message}"]
   end
 
   def self.respond obj
-    puts to_json obj
+    trace {"+ respond(#{obj.inspect})"}
+    puts Serializer.dump(obj)
   rescue
-    log "respond error converting object to JSON: #{$!.message}\n#{$!.backtrace.join("\n")}"
+    puts('["log", "' + "respond error converting object to JSON: #{$!.message}\n#{$!.backtrace.join("\n")}" + '"]')
     puts 'false'
   end
 
@@ -136,7 +124,7 @@ module CouchdbRubyServer
       respond ["chunks", @@chunks]
     end
     @@chunks = []
-    json = json_parse ARGF.gets
+    json = Serializer.load($stdin.gets)
     if json[0] == 'list_end'
       @@last_row = true
       return nil
@@ -209,10 +197,13 @@ module CouchdbRubyServer
   end
 
   def self.run
+    trace {'+ run'}
+    $stdout.sync = true
     log "CouchdbRubyServer started, RUBY_VERSION: #{RUBY_VERSION}"
     log "RUBY_GC_MALLOC_LIMIT=#{ENV['RUBY_GC_MALLOC_LIMIT']}"
     while cmd = $stdin.gets
-      cmd = json_parse cmd
+      cmd = Serializer.load(cmd)
+      trace {"cmd = #{cmd.inspect}"}
       case cmd[0]
       when "reset"
         @@callables = []

data/lib/couchdb-ruby-server/tracer.rb

@@ -0,0 +1,7 @@
+module CouchdbRubyServer
+  @@trace = ENV['QS_TRACE']
+  def self.trace(str = nil)
+    return unless @@trace
+    $stderr.puts("QS_TRACE: #{block_given? ? yield : str}")
+  end
+end

data/lib/couchdb-ruby-server/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module CouchdbRubyServer
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/couchdb-ruby-server.rb

@@ -1,8 +1,6 @@
 # coding: utf-8
 
-require 'oj'
-::Oj.default_options = {:mode        => :compat,
-                        :class_cache => true }
-
 require 'couchdb-ruby-server/version'
+require 'couchdb-ruby-server/serializer'
+require 'couchdb-ruby-server/tracer'
 require 'couchdb-ruby-server/server'

data/spec/couchdb-ruby-server_spec.rb

@@ -19,32 +19,27 @@
 #   QS_LANG=lang
 #     run tests on the query server (for now, one of: js, erlang)
 #
-require 'json'
 
 COUCH_ROOT = "#{File.dirname(__FILE__)}/../.." unless defined?(COUCH_ROOT)
 LANGUAGE = ENV["QS_LANG"] || "ruby"
+COMMANDS = {
+  "js" => "#{COUCH_ROOT}/bin/couchjs #{COUCH_ROOT}/share/server/main.js",
+  "erlang" => "#{COUCH_ROOT}/test/view_server/run_native_process.es",
+  "ruby" => "bin/couchdb-ruby-server"
+}
 
 puts "Running query server specs for #{LANGUAGE} query server"
 
 require 'spec_helper'
 
-class OSProcessRunner
-  def self.run
-    trace = ENV["QS_TRACE"] || false
-    puts "launching #{run_command}" if trace
-    if block_given?
-      IO.popen(run_command, "r+") do |io|
-        qs = QueryServerRunner.new(io, trace)
-        yield qs
-      end
-    else
-      io = IO.popen(run_command, "r+")
-      QueryServerRunner.new(io, trace)
-    end
+class QueryServerRunner
+  def trace str=nil, &block
+    CouchdbRubyServer.trace str, &block
   end
-  def initialize io, trace = false
-    @qsio = io
-    @trace = trace
+
+  def initialize
+    trace {"launching #{COMMANDS[LANGUAGE]}"}
+    @qsio = IO.popen(COMMANDS[LANGUAGE], "w+")
   end
   def close
     @qsio.close
@@ -76,59 +71,21 @@ class OSProcessRunner
     jsgets
   end
   def rrun json
-    line = json.to_json
-    puts "run: #{line}" if @trace
-    @qsio.puts line
+    line = CouchdbRubyServer::Serializer.dump(json)
+    trace { "run: #{line}" }
+    @qsio.puts(line)
   end
   def rgets
-    resp = @qsio.gets
-    puts "got: #{resp}"  if @trace
+    resp = @qsio.closed? ? '' : @qsio.gets
+    trace { "got: #{resp}" }
     resp
   end
   def jsgets
-    resp = rgets
-    # err = @qserr.gets
-    # puts "err: #{err}" if err
-    if resp
-      begin
-        rj = JSON.parse("[#{resp.chomp}]")[0]
-      rescue JSON::ParserError
-        puts "JSON ERROR (dump under trace mode)"
-        # puts resp.chomp
-        while resp = rgets
-          # puts resp.chomp
-        end
-      end
-      if rj.respond_to?(:[]) && rj.is_a?(Array)
-        if rj[0] == "log"
-          log = rj[1]
-          puts "log: #{log}" if @trace
-          rj = jsgets
-        end
-      end
-      rj
-    else
-      raise "no response"
-    end
-  end
-end
-
-class QueryServerRunner < OSProcessRunner
-
-  COMMANDS = {
-    "js" => "#{COUCH_ROOT}/bin/couchjs #{COUCH_ROOT}/share/server/main.js",
-    "erlang" => "#{COUCH_ROOT}/test/view_server/run_native_process.es",
-    "ruby" => "bin/couchdb-ruby-server"
-  }
-
-  def self.run_command
-    COMMANDS[LANGUAGE]
-  end
-end
-
-class ExternalRunner < OSProcessRunner
-  def self.run_command
-    "#{COUCH_ROOT}/src/couchdb/couchjs #{COUCH_ROOT}/share/server/echo.js"
+    raise "no response" unless resp = rgets
+    rj = CouchdbRubyServer::Serializer.load("[#{resp}]").first
+    return rj unless rj.is_a?(Array) && rj[0] == "log"
+    trace { "log: #{rj[1]}" }
+    jsgets
   end
 end
 
@@ -618,7 +575,7 @@ end
 describe "query server normal case" do
   before(:all) do
     `cd #{COUCH_ROOT} && make` unless LANGUAGE == 'ruby'
-    @qs = QueryServerRunner.run
+    @qs = QueryServerRunner.new
   end
   after(:all) do
     @qs.close
@@ -892,7 +849,7 @@ end
 
 describe "query server that exits" do
   before(:each) do
-    @qs = QueryServerRunner.run
+    @qs = QueryServerRunner.new
     @ddoc = {
       "_id" => "foo",
       "lists" => {

data/spec/spec_helper.rb

@@ -5,6 +5,8 @@ rescue LoadError
   $stderr.puts "CodeClimate is not started: #{$!.message}"
 end
 
-#require 'couchdb-ruby-server' INTENTIONALLY, TESTING COMMAND LINE CALL
+require 'couchdb-ruby-server/tracer'
+require 'couchdb-ruby-server/serializer'
+
 require 'minitest/autorun'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchdb-ruby-server
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - sinm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: argparser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,9 @@ files:
 - couchdb-ruby-server.gemspec
 - couchdb-ruby-server.sublime-project
 - lib/couchdb-ruby-server.rb
+- lib/couchdb-ruby-server/serializer.rb
 - lib/couchdb-ruby-server/server.rb
+- lib/couchdb-ruby-server/tracer.rb
 - lib/couchdb-ruby-server/version.rb
 - spec/couchdb-ruby-server_spec.rb
 - spec/spec_helper.rb