relaxo-query-server 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDVhYmYxZWNlYmQwNmQzNGRmYzdiYzJhMTQxY2Y3MTY2N2E1MjBlNw==
-  data.tar.gz: !binary |-
-    MDUzMmI3YjIzNWZmMzU3NTNjNDBmNmUwYTVmM2ExYjU2NzMzMWYyNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YTgxMjllODIyMjhmM2JmYzA2ODMxZmM0M2I2YWQ1MjRhYzE0ZDgyYmFhMjQy
-    ZGVjYzEwMzQ5MDBiOTNkNjIwYmM1NTJiZDc0MDg4OGFkNGM3NmNkNmIzNjA3
-    ZjY1ZjRiYzJhMzQxOGQ5MmZjMWQzNzJlMGVkYjZmMTNkOTMzNzY=
-  data.tar.gz: !binary |-
-    YmJhZjVhNmU4ZmRiM2FiMTc1NWU2Nzg4MDRmYTgwNDU1MDYyODE2YmU4ZDIy
-    M2UwZTJhOTI1NDBlNWFmMWFiMzYyNWNiMDI5NDljMzNhYTIyNDllNmZiOTli
-    MGQ1YzcxOTZkOTAzZDlhMjY3NGUyZWMyYmIyY2M5M2ExYTAxNmY=
+SHA1:
+  metadata.gz: 78944e73c0640d81426a896195caf1dac016cccf
+  data.tar.gz: 32d6f60802a40842fbea80820c1914f06e6409cf
+SHA512:
+  metadata.gz: 5df2161444eee230a5eff87830986c5b060ea38d53e3823c48bc94c3a54969760c6ba91bd7bcb23a30673afafe654901305476efa7aec2c956b3e8c58a941f32
+  data.tar.gz: 403b146fb25f50a0dfc71b6d8cc845159c86d0491954d505af9f08419f64db569d0598ca68386c526779a1a0a96bdd0f887b4d42fa65492c728406f110038728

data/.simplecov

@@ -0,0 +1,9 @@
+
+SimpleCov.start do
+	add_filter "/spec/"
+end
+
+if ENV['TRAVIS']
+	require 'coveralls'
+	Coveralls.wear!
+end

data/.travis.yml

@@ -1,11 +1,8 @@
 language: ruby
 rvm:
-  - "1.8.7"
-  - "1.9.2"
-  - "1.9.3"
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode
+  - 2.0
+  - 2.1
+  - 2.2
 services:
   - couchdb
+env: COVERAGE=true

data/Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in relaxo-query-server.gemspec
 gemspec
 
-platforms :jruby do
-  gem 'jruby-openssl'
+group :test do
+	gem 'simplecov'
+	gem 'coveralls', require: false
 end

data/README.md

@@ -2,11 +2,10 @@
 
 The Relaxo Query Server implements the CouchDB Query Server protocol for CouchDB 1.1.0+. It provides a comprehensive Ruby-style view server along with full support for Design Document based processing.
 
-For more information and examples please see the main [project page][1].
-
-[1]: http://www.codeotaku.com/projects/relaxo/query-server
 
 [![Build Status](https://secure.travis-ci.org/ioquatix/relaxo-query-server.png)](http://travis-ci.org/ioquatix/relaxo-query-server)
+[![Code Climate](https://codeclimate.com/github/ioquatix/relaxo-query-server.png)](https://codeclimate.com/github/ioquatix/relaxo-query-server)
+[![Coverage Status](https://coveralls.io/repos/ioquatix/relaxo-query-server/badge.svg)](https://coveralls.io/r/ioquatix/relaxo-query-server)
 
 ## Installation
 
@@ -23,7 +22,7 @@ Make sure the `relaxo-query-server` executable is accessible from `$PATH`.
 
 `relaxo-query-server` includes a variety of 3rd party modules by default, but it can include other libraries by specifying them on the command line:
 
-	relaxo-ruby = ruby1.9 -rdate -rbigdecimal relaxo-query-server
+	relaxo-ruby = ruby -rdate -rbigdecimal relaxo-query-server
 
 (You can also load code by specifying libraries in your design documents and views.)
 
@@ -116,7 +115,9 @@ The previous `design.yaml` document can be loaded using the `relaxo` client comm
 
 ## License
 
-Copyright (c) 2010, 2012 Samuel G. D. Williams. <http://www.codeotaku.com>
+Released under the MIT license.
+
+Copyright, 2015, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -0,0 +1,8 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec) do |task|
+	task.rspec_opts = ["--require", "simplecov"] if ENV['COVERAGE']
+end
+
+task :default => :spec

data/bin/relaxo-query-server

@@ -17,7 +17,7 @@ ARGV.options do |o|
 	o.separator ""
 	o.separator "Help and Copyright information"
 
-	o.on("--safe [level]", "Set the ruby $SAFE level to product the execution environment.") do |level|
+	o.on("--safe [level]", "Set the ruby $SAFE level to protect the execution environment.") do |level|
 		OPTIONS[:safe] = level.to_i
 	end
 

data/lib/relaxo/query_server/version.rb

@@ -20,6 +20,6 @@
 
 module Relaxo
 	module QueryServer
-		VERSION = "0.1.3"
+		VERSION = "0.1.4"
 	end
 end

data/relaxo-query-server.gemspec

@@ -23,11 +23,12 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
-
-	spec.add_development_dependency "bundler", "~> 1.3"
-	spec.add_development_dependency "rake"
 	
-	spec.add_dependency "relaxo", "~> 0.4.0"
-	spec.add_dependency "json", "~> 1.7.3"
+	spec.add_dependency "relaxo", "~> 0.4.4"
+	spec.add_dependency "json", "~> 1.8"
 	spec.add_dependency "rest-client"
+	
+	spec.add_development_dependency "rspec", "~> 3.1.0"
+	spec.add_development_dependency "bundler", "~> 1.3"
+	spec.add_development_dependency "rake"
 end

data/spec/relaxo/query_server/filters_spec.rb

@@ -0,0 +1,28 @@
+
+require_relative 'spec_helper'
+
+RSpec.describe "Relaxo Filters" do
+	before :all do
+		@shell = Relaxo::QueryServer::MockShell.new
+		@context = Relaxo::QueryServer::Context.new(@shell, safe: 2)
+	end
+	
+	def run_filter(opts={})
+		opts[:docs] ||= []
+		opts[:req] ||= {}
+		
+		@context.run ["ddoc", "foo", ["filters", "basic"], [opts[:docs], opts[:req]]]
+	end
+	
+	it "should apply filters" do
+		basic = "lambda{|doc, req| doc['good'] == true}"
+		@context.run ["ddoc", "new", "foo", {"filters" => {"basic" => basic}}]
+		
+		docs = (1..3).map do |i|
+			{"good" => i.odd?}
+		end
+		
+		results = run_filter({:docs => docs})
+		expect(results).to be == [true, [true, false, true]]
+	end
+end

data/{test/test_libraries.rb → spec/relaxo/query_server/libraries_spec.rb}

@@ -1,12 +1,18 @@
 
-require 'helper'
 require 'relaxo/query_server/library'
 
 require 'bigdecimal'
 require 'bigdecimal/util'
 
-class LibrariesTest < ContextualTestCase
-	def test_libraries
+require_relative 'spec_helper'
+
+RSpec.describe "Libraries" do
+	before :all do
+		@shell = Relaxo::QueryServer::MockShell.new
+		@context = Relaxo::QueryServer::Context.new(@shell, safe: 2)
+	end
+	
+	it "should load a library" do
 		root = {
 			'lib' => {
 				'all' => %q{
@@ -24,18 +30,15 @@ class LibrariesTest < ContextualTestCase
 		}
 		
 		object = Relaxo::QueryServer::Library.for(root, 'lib/bar')
-		
-		assert_not_nil object
-		assert object.respond_to? :bar
-		
-		assert_equal "10".to_d, object.bar
+		expect(object).to be_respond_to :bar
+		expect(object.bar).to be == "10".to_d
 		
 		# For efficiency, the same object is returned both times
 		same_object = Relaxo::QueryServer::Library.for(root, 'lib/bar')
-		assert_equal object, same_object
+		expect(same_object).to be object
 	end
 	
-	def test_map_reduce_libraries
+	it "should use library functions for map/reduce" do
 		library_code = %q{
 			def check_bar(doc)
 				yield doc if doc['bar'] == true
@@ -51,12 +54,12 @@ class LibrariesTest < ContextualTestCase
 		}
 		
 		response = @context.run ['add_lib', {'foo' => library_code}]
-		assert_equal true, response
+		expect(response).to be true
 		
 		response = @context.run ['add_fun', map_function_code]
-		assert_equal true, response
+		expect(response).to be true
 		
 		response = @context.run ['map_doc', {'bar' => true}]
-		assert_equal [[[true, nil]]], response
+		expect(response).to be == [[[true, nil]]]
 	end
 end

data/spec/relaxo/query_server/lists_spec.rb

@@ -0,0 +1,49 @@
+
+require_relative 'spec_helper'
+
+RSpec.describe "Lists" do
+	before :all do
+		@shell = Relaxo::QueryServer::MockShell.new
+		@context = Relaxo::QueryServer::Context.new(@shell, safe: 2)
+	end
+	
+	def create_design_document name, attributes
+		@context.run ['ddoc', 'new', name, attributes]
+	end
+	
+	it "should list all items" do
+		create_design_document "test", {
+			'lists' => {
+				'entire' => <<-EOF
+					lambda{|head,request|
+						send "<ul>"
+						each do |row|
+							send "<li>" + row['count'] + "</li>"
+						end
+						send "</ul>"
+					}
+				EOF
+			}
+		}
+		
+		rows = [
+			["list_row", {"count"=>"Neko"}],
+			["list_row", {"count"=>"Nezumi"}],
+			["list_row", {"count"=>"Zoe"}],
+			["list_end"]
+		]
+		
+		rows.each {|row| @shell.input << row}
+		
+		result = @context.run ['ddoc', 'test', ['lists', 'entire'], [{}, {}]]
+		
+		expect(@shell.output).to be == [
+			["start", ["<ul>"], {:headers=>{}}],
+			["chunks", ["<li>Neko</li>"]],
+			["chunks", ["<li>Nezumi</li>"]],
+			["chunks", ["<li>Zoe</li>"]]
+		]
+			
+		expect(result).to be == ["end", ["</ul>"]]
+	end
+end

data/spec/relaxo/query_server/map_spec.rb

@@ -0,0 +1,23 @@
+
+require_relative 'spec_helper'
+
+RSpec.describe "Map Functions" do
+	before :all do
+		@shell = Relaxo::QueryServer::MockShell.new
+		@context = Relaxo::QueryServer::Context.new(@shell, safe: 2)
+	end
+	
+	it "should map values using a function" do
+		response = @context.run ["add_fun", "lambda{|doc| emit('foo', doc['a']); emit('bar', doc['a'])}"]
+		expect(response).to be true
+		
+		response = @context.run ["add_fun", "lambda{|doc| emit('baz', doc['a'])}"]
+		expect(response).to be true
+		
+		response = @context.run(["map_doc", {"a" => "b"}])
+		expect(response).to be == [
+			[["foo", "b"], ["bar", "b"]],
+			[["baz", "b"]]
+		]
+	end
+end

data/spec/relaxo/query_server/reduce_spec.rb

@@ -0,0 +1,42 @@
+
+require_relative 'spec_helper'
+
+RSpec.describe "Reduce Functions" do
+	before :all do
+		@shell = Relaxo::QueryServer::MockShell.new
+		@context = Relaxo::QueryServer::Context.new(@shell, safe: 2)
+	end
+	
+	it "should reduce values" do
+		sum = "lambda{|k,v,r| v.inject &:+ }"
+		concat = "lambda{|k,v,r| r ? v.join('_') : v.join(':') }"
+		
+		response = @context.run ["reduce", [sum, concat], (0...10).map{|i|[i,i*2]}]
+		expect(response).to be == [true, [90, "0:2:4:6:8:10:12:14:16:18"]]
+		
+		response = @context.run ["rereduce", [sum, concat], (0...10).map{|i|i}]
+		expect(response).to be == [true, [45, "0_1_2_3_4_5_6_7_8_9"]]
+	end
+	
+	it "should reduce using library functions" do
+		library_code = %q{
+			def sum(values)
+				values.inject(&:+)
+			end
+		}
+		
+		reduce_function = %q{
+			foo = load('foo')
+			
+			lambda {|k,v,r|
+				foo.sum(v)
+			}
+		}
+		
+		response = @context.run ['add_lib', {'foo' => library_code}]
+		expect(response).to be true
+		
+		response = @context.run ['reduce', [reduce_function], (0...10).map{|i|[i,i]}]
+		expect(response).to be == [true, [45]]
+	end
+end

data/spec/relaxo/query_server/shows_spec.rb

@@ -0,0 +1,54 @@
+#!/usr/bin/env rspec
+
+require_relative 'spec_helper'
+
+RSpec.describe "Document Shows" do
+	STRING = "lambda{|doc, req| [doc['title'], doc['body']].join(' - ') }"
+	
+	HASH = <<-EOF
+		lambda{|doc, req|
+			resp = {"code" => 200, "headers" => {"X-Foo" => "Bar"}}
+			resp["body"] = [doc['title'], doc['body']].join(' - ')
+			resp
+		}
+	EOF
+	
+	ERROR = "lambda{|doc,req| raise StandardError.new('error message') }"
+	
+	before :all do
+		@shell = Relaxo::QueryServer::MockShell.new
+		@context = Relaxo::QueryServer::Context.new(@shell, safe: 2)
+		
+		@context.run ["ddoc", "new", "foo", {
+				"shows" => {
+					"string" => STRING,
+					"hash" => HASH,
+					"error" => ERROR
+				}
+			}
+		]
+	end
+	
+	def run_show(opts={})
+		opts[:doc] ||= {"title" => "foo", "body" => "bar"}
+		opts[:req] ||= {}
+		opts[:design] ||= "string"
+		
+		@context.run(["ddoc", "foo", ["shows", opts[:design]], [opts[:doc], opts[:req]]])
+	end
+	
+	it "should process string" do
+		result = run_show
+		expect(result).to be == ["resp", {"body" => "foo - bar"}]
+	end
+	
+	it "should process hash" do
+		result = run_show({:design => "hash"})
+		expect(result).to be == ["resp", {"body" => "foo - bar", "headers" => {"X-Foo" => "Bar"}, "code" => 200}]
+	end
+	
+	it "should give an error" do
+		result = run_show({:design => "error"})
+		expect(result[0...3]).to be == ["error", "StandardError", "error message"]
+	end
+end

data/spec/relaxo/query_server/spec_helper.rb

@@ -0,0 +1,6 @@
+
+require 'rubygems'
+require 'stringio'
+
+require "relaxo/json"
+require "relaxo/query_server"

data/spec/relaxo/query_server/updates_spec.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/env rspec
+
+require_relative 'spec_helper'
+
+RSpec.describe "Document Validations" do
+	before :all do
+		@shell = Relaxo::QueryServer::MockShell.new
+		@context = Relaxo::QueryServer::Context.new(@shell, safe: 2)
+	end
+	
+	def create_design_document name, attributes
+		@context.run ['ddoc', 'new', name, attributes]
+	end
+	
+	it "should run update function" do
+		create_design_document "test", {
+			"updates" => {
+				"bar" => %q{
+					lambda{|doc, request| doc['updated'] = true; [doc, 'OK']}
+				}
+			}
+		}
+		
+		document = {"foo" => "bar"}
+		response = @context.run ['ddoc', 'test', ['updates', 'bar'], [document, {'method' => 'POST'}]]
+		
+		expect(response).to be == ["up", document.update('updated' => true), {'body' => 'OK'}]
+	end
+end

data/{test/test_validations.rb → spec/relaxo/query_server/validations_spec.rb}

@@ -1,8 +1,18 @@
+#!/usr/bin/env rspec
 
-require 'helper'
+require_relative 'spec_helper'
 
-class ValidationsTest < ContextualTestCase
-	def test_compiles_functions
+RSpec.describe "Document Validations" do
+	before :all do
+		@shell = Relaxo::QueryServer::MockShell.new
+		@context = Relaxo::QueryServer::Context.new(@shell, safe: 2)
+	end
+	
+	def create_design_document name, attributes
+		@context.run ['ddoc', 'new', name, attributes]
+	end
+	
+	it "should validate document updates" do
 		create_design_document "test", {
 			"validate_doc_update" => %q{
 				lambda{|new_document, old_document, user_context|
@@ -14,9 +24,9 @@ class ValidationsTest < ContextualTestCase
 		}
 		
 		response = @context.run ['ddoc', 'test', ['validate_doc_update'], [{'good' => true}, {'good' => true}, {}]]
-		assert_equal 1, response
+		expect(response).to be == 1
 		
 		response = @context.run ['ddoc', 'test', ['validate_doc_update'], [{'bad' => true}, {'good' => true}, {}]]
-		assert_equal({'forbidden' => 'bad'}, response)
+		expect(response).to be == {'forbidden' => 'bad'}
 	end
 end

data/spec/relaxo/query_server/view_spec.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env rspec
+
+require_relative 'spec_helper'
+
+RSpec.describe "View Functions" do
+	before :all do
+		@shell = Relaxo::QueryServer::MockShell.new
+		@context = Relaxo::QueryServer::Context.new(@shell, safe: 2)
+	end
+	
+	it "should compile function" do
+		response = @context.run ["add_fun", "lambda {|doc| emit(nil, nil)}"]
+		expect(response).to be true
+	end
+	
+	it "should have syntax error" do
+		response = @context.run ["add_fun", "lambda {"]
+		expect(response[0]).to be == "error"
+		expect(response[1]).to be == "SyntaxError"
+	end
+	
+	it "should fail on non-function" do
+		response = @context.run ["add_fun", "10"]
+		expect(response[0]).to be == "error"
+		expect(response[1]).to be == "Relaxo::QueryServer::CompilationError"
+	end
+end

metadata

@@ -1,90 +1,103 @@
 --- !ruby/object:Gem::Specification
 name: relaxo-query-server
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: relaxo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: 0.4.4
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: relaxo
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
+        version: 3.1.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.3
-  type: :runtime
+        version: '1.3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "\tRelaxo Query Server is a query server for CouchDB which provides
-  full\n\tsupport for map/reduce functionality using Ruby code. It's main purpose\n\tis
-  to provide a consistent backend for Ruby based clients to CouchDB.\n\tIn practice,
-  it allows code to be shared between Ruby based client \n\tapplications and CouchDB
-  servers.\n"
+description: "\tRelaxo Query Server is a query server for CouchDB which provides full\n\tsupport
+  for map/reduce functionality using Ruby code. It's main purpose\n\tis to provide
+  a consistent backend for Ruby based clients to CouchDB.\n\tIn practice, it allows
+  code to be shared between Ruby based client \n\tapplications and CouchDB servers.\n"
 email:
 - samuel.williams@oriontransfer.co.nz
 executables:
@@ -92,10 +105,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".simplecov"
+- ".travis.yml"
 - Gemfile
 - README.md
+- Rakefile
 - bin/relaxo-query-server
 - lib/relaxo/query_server.rb
 - lib/relaxo/query_server/context.rb
@@ -106,18 +121,17 @@ files:
 - lib/relaxo/query_server/reducer.rb
 - lib/relaxo/query_server/shell.rb
 - lib/relaxo/query_server/version.rb
-- rakefile.rb
 - relaxo-query-server.gemspec
-- test/helper.rb
-- test/test_filters.rb
-- test/test_libraries.rb
-- test/test_lists.rb
-- test/test_map.rb
-- test/test_reduce.rb
-- test/test_shows.rb
-- test/test_updates.rb
-- test/test_validations.rb
-- test/test_views.rb
+- spec/relaxo/query_server/filters_spec.rb
+- spec/relaxo/query_server/libraries_spec.rb
+- spec/relaxo/query_server/lists_spec.rb
+- spec/relaxo/query_server/map_spec.rb
+- spec/relaxo/query_server/reduce_spec.rb
+- spec/relaxo/query_server/shows_spec.rb
+- spec/relaxo/query_server/spec_helper.rb
+- spec/relaxo/query_server/updates_spec.rb
+- spec/relaxo/query_server/validations_spec.rb
+- spec/relaxo/query_server/view_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -128,29 +142,29 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Relaxo Query Server provides support for executing CouchDB functions using
   Ruby.
 test_files:
-- test/helper.rb
-- test/test_filters.rb
-- test/test_libraries.rb
-- test/test_lists.rb
-- test/test_map.rb
-- test/test_reduce.rb
-- test/test_shows.rb
-- test/test_updates.rb
-- test/test_validations.rb
-- test/test_views.rb
+- spec/relaxo/query_server/filters_spec.rb
+- spec/relaxo/query_server/libraries_spec.rb
+- spec/relaxo/query_server/lists_spec.rb
+- spec/relaxo/query_server/map_spec.rb
+- spec/relaxo/query_server/reduce_spec.rb
+- spec/relaxo/query_server/shows_spec.rb
+- spec/relaxo/query_server/spec_helper.rb
+- spec/relaxo/query_server/updates_spec.rb
+- spec/relaxo/query_server/validations_spec.rb
+- spec/relaxo/query_server/view_spec.rb

data/rakefile.rb

@@ -1,9 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-Rake::TestTask.new do |t|
-	t.libs << 'test'
-end
-
-desc "Run tests"
-task :default => :test

data/test/helper.rb

@@ -1,38 +0,0 @@
-
-$LOAD_PATH.unshift File.expand_path("../../lib/", __FILE__)
-
-require 'rubygems'
-require 'test/unit'
-require 'stringio'
-
-require "relaxo/json"
-require "relaxo/query_server"
-
-class Test::Unit::TestCase
-	def self.abstract_test_case!
-		self.class_eval do
-			def test_default
-			end
-		end
-	end
-end
-
-class ContextualTestCase < Test::Unit::TestCase
-	abstract_test_case!
-	
-	def setup_context(options)
-		@shell = Relaxo::QueryServer::MockShell.new
-		@context = Relaxo::QueryServer::Context.new(@shell, options)
-	end
-	
-	def create_design_document name, attributes
-		@context.run ['ddoc', 'new', name, attributes]
-	end
-	
-	def setup
-		setup_context :safe => 2
-	end
-	
-	def teardown
-	end
-end

data/test/test_filters.rb

@@ -1,24 +0,0 @@
-
-require 'helper'
-
-class FiltersTest < ContextualTestCase
-	BASIC = "lambda{|doc, req| doc['good'] == true}"
-	
-	def run_filter(opts={})
-		opts[:docs] ||= []
-		opts[:req] ||= {}
-		
-		@context.run ["ddoc", "foo", ["filters", "basic"], [opts[:docs], opts[:req]]]
-	end
-	
-	def test_filters_updated
-		@context.run ["ddoc", "new", "foo", {"filters" => {"basic" => BASIC}}]
-		
-		docs = (1..3).map do |i|
-			{"good" => i.odd?}
-		end
-		
-		results = run_filter({:docs => docs})
-		assert_equal [true, [true, false, true]], results
-	end
-end

data/test/test_lists.rb

@@ -1,46 +0,0 @@
-
-require 'helper'
-
-class ListsTest < ContextualTestCase
-	ENTIRE = <<-RUBY
-		lambda{|head,request|
-			send "<ul>"
-			each do |row|
-				send "<li>" + row['count'] + "</li>"
-			end
-			send "</ul>"
-		}
-	RUBY
-	
-	def setup
-		super
-		
-		@rows = [
-			["list_row", {"count"=>"Neko"}],
-			["list_row", {"count"=>"Nezumi"}],
-			["list_row", {"count"=>"Zoe"}],
-			["list_end"]
-		]
-	end
-	
-	def test_lists_rows
-		create_design_document "test", {
-			'lists' => {
-				'entire' => ENTIRE
-			}
-		}
-		
-		@rows.each {|row| @shell.input << row}
-		
-		result = @context.run ['ddoc', 'test', ['lists', 'entire'], [{}, {}]]
-		
-		assert_equal [
-			["start", ["<ul>"], {:headers=>{}}],
-			["chunks", ["<li>Neko</li>"]],
-			["chunks", ["<li>Nezumi</li>"]],
-			["chunks", ["<li>Zoe</li>"]]
-			], @shell.output
-			
-		assert_equal ["end", ["</ul>"]], result
-	end
-end

data/test/test_map.rb

@@ -1,20 +0,0 @@
-
-require 'helper'
-
-class MapTest < ContextualTestCase
-	def test_map
-		response = @context.run ["add_fun", "lambda{|doc| emit('foo', doc['a']); emit('bar', doc['a'])}"]
-		assert_equal true, response
-		
-		response = @context.run ["add_fun", "lambda{|doc| emit('baz', doc['a'])}"]
-		assert_equal true, response
-		
-		response = @context.run(["map_doc", {"a" => "b"}])
-		expected = [
-			[["foo", "b"], ["bar", "b"]],
-			[["baz", "b"]]
-		]
-		
-		assert_equal expected, response
-	end
-end

data/test/test_reduce.rb

@@ -1,38 +0,0 @@
-
-require 'helper'
-
-class ReduceTest < ContextualTestCase
-	SUM = "lambda{|k,v,r| v.inject &:+ }"
-	CONCAT = "lambda{|k,v,r| r ? v.join('_') : v.join(':') }"
-	
-	def test_reduce
-		response = @context.run ["reduce", [SUM, CONCAT], (0...10).map{|i|[i,i*2]}]
-		assert_equal [true, [90, "0:2:4:6:8:10:12:14:16:18"]], response
-		
-		response = @context.run ["rereduce", [SUM, CONCAT], (0...10).map{|i|i}]
-		assert_equal [true, [45, "0_1_2_3_4_5_6_7_8_9"]], response
-	end
-	
-	def test_reduce_libraries
-		library_code = %q{
-			def sum(values)
-				values.inject(&:+)
-			end
-		}
-		
-		reduce_function = %q{
-			foo = load('foo')
-			
-			lambda {|k,v,r|
-				puts v.inspect
-				foo.sum(v)
-			}
-		}
-		
-		response = @context.run ['add_lib', {'foo' => library_code}]
-		assert_equal true, response
-		
-		response = @context.run ['reduce', [reduce_function], (0...10).map{|i|[i,i]}]
-		assert_equal [true, [45]], response
-	end
-end

data/test/test_shows.rb

@@ -1,53 +0,0 @@
-
-require 'helper'
-
-class ShowsTest < ContextualTestCase
-	STRING = "lambda{|doc, req| [doc['title'], doc['body']].join(' - ') }"
-	HASH = <<-EOF
-      lambda{|doc, req|
-        resp = {"code" => 200, "headers" => {"X-Foo" => "Bar"}}
-        resp["body"] = [doc['title'], doc['body']].join(' - ')
-        resp
-      }
-    EOF
-	ERROR = "lambda{|doc,req| raise StandardError.new('error message') }"
-	
-	def setup
-		super
-		
-		@context.run ["ddoc", "new", "foo", {
-				"shows" => {
-					"string" => STRING,
-					"hash" => HASH,
-					"error" => ERROR
-				}
-			}
-		]
-	end
-	
-	def run_show(opts={})
-		opts[:doc] ||= {"title" => "foo", "body" => "bar"}
-		opts[:req] ||= {}
-		opts[:design] ||= "string"
-		
-		@context.run(["ddoc", "foo", ["shows", opts[:design]], [opts[:doc], opts[:req]]])
-	end
-	
-	def test_string
-		result = run_show
-		expected = ["resp", {"body" => "foo - bar"}]
-		assert_equal expected, result
-	end
-	
-	def test_hash
-		result = run_show({:design => "hash"})
-		expected = ["resp", {"body" => "foo - bar", "headers" => {"X-Foo" => "Bar"}, "code" => 200}]
-		assert_equal expected, result
-	end
-	
-	def test_error
-		result = run_show({:design => "error"})
-		expected = ["error", "StandardError", "error message"]
-		assert_equal expected, result[0...3]
-	end
-end

data/test/test_updates.rb

@@ -1,19 +0,0 @@
-
-require 'helper'
-
-class UpdatesTest < ContextualTestCase
-	def test_compiles_functions
-		create_design_document "test", {
-			"updates" => {
-				"bar" => %q{
-					lambda{|doc, request| doc['updated'] = true; [doc, 'OK']}
-				}
-			}
-		}
-		
-		document = {"foo" => "bar"}
-		response = @context.run ['ddoc', 'test', ['updates', 'bar'], [document, {'method' => 'POST'}]]
-		
-		assert_equal ["up", document.update('updated' => true), {'body' => 'OK'}], response
-	end
-end

data/test/test_views.rb

@@ -1,17 +0,0 @@
-
-require 'helper'
-
-class ViewsTest < ContextualTestCase
-	def test_compiles_functions
-		response = @context.run ["add_fun", "lambda {|doc| emit(nil, nil)}"]
-		assert_equal true, response
-		
-		response = @context.run ["add_fun", "lambda {"]
-		assert_equal "error", response[0]
-		assert_equal "SyntaxError", response[1]
-		
-		response = @context.run ["add_fun", "10"]
-		assert_equal "error", response[0]
-		assert_equal "Relaxo::QueryServer::CompilationError", response[1]
-	end
-end