relaxo-query-server 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!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=

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.travis.yml

@@ -0,0 +1,11 @@
+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
+services:
+  - couchdb

data/Gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in relaxo-query-server.gemspec
+gemspec
+
+platforms :jruby do
+  gem 'jruby-openssl'
+end

data/README.md

@@ -1,14 +1,14 @@
-Relaxo Query Server
-===================
-
-* Author: Samuel G. D. Williams (<http://www.oriontransfer.co.nz>)
-* Copyright (C) 2012 Samuel G. D. Williams.
-* Released under the MIT license.
+# Relaxo Query Server
 
 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.
 
-Installation
-------------
+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)
+
+## Installation
 
 Install the ruby gem as follows:
 
@@ -27,15 +27,9 @@ Make sure the `relaxo-query-server` executable is accessible from `$PATH`.
 
 (You can also load code by specifying libraries in your design documents and views.)
 
-To build and install the gem from source:
+##Usage
 
-	cd build/
-	sudo GEM=gem1.9 rake1.9 install_gem
-
-Usage
------
-
-### Mapping Function ###
+### Mapping Function
 
 Select documents of `type == 'user'`:
 
@@ -45,7 +39,7 @@ Select documents of `type == 'user'`:
 		end
 	end
 
-### Reduction Function ###
+### Reduction Function
 
 Calculate the sum:
 
@@ -53,7 +47,7 @@ Calculate the sum:
 		values.inject &:+
 	end
 
-### Design Document ###
+### Design Document
 
 A simple application:
 
@@ -105,18 +99,24 @@ The previous `design.yaml` document can be loaded using the `relaxo` client comm
 
 	relaxo http://localhost:5984/test design.yaml
 
-To Do
------
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+## To Do
 
 - Improve documentation, including better sample code.
 - More tests, including performance benchmarks.
 - Explore `parse_function` to improve performance of code execution by caching functions.
 - Helper methods for commonly used mapping functions.
 
-License
--------
+## License
 
-Copyright (c) 2010, 2012 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+Copyright (c) 2010, 2012 Samuel G. D. Williams. <http://www.codeotaku.com>
 
 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/lib/relaxo/query_server/context.rb

@@ -69,7 +69,8 @@ module Relaxo
 				when 'add_fun'
 					@mapper.add_function command[1]; true
 				when 'add_lib'
-					@mapper.add_libraries command[1]; true
+					@mapper.add_libraries command[1]
+					@reducer.add_libraries command[1]; true
 				when 'map_doc'
 					@mapper.map command[1]
 				when 'reset'

data/lib/relaxo/query_server/library.rb

@@ -78,5 +78,26 @@ module Relaxo
 				@instance ||= @klass.new
 			end
 		end
+		
+		class Loader
+			# The default library name
+			DEFAULT = ['_default']
+			
+			def initialize
+				@libraries = {}
+			end
+			
+			def load(path)
+				Library.for(@libraries, path)
+			end
+			
+			def add_libraries(libraries)
+				@libraries.merge!(libraries)
+			end
+			
+			def load_default
+				load(DEFAULT)
+			end
+		end
 	end
 end

data/lib/relaxo/query_server/mapper.rb

@@ -53,34 +53,23 @@ module Relaxo
 			end
 		end
 		
-		class Mapper
-			# The default library name
-			DEFAULT = ['_default']
-			
+		class Mapper < Loader
 			def initialize(context)
+				super()
+				
 				@context = context
 				@functions = []
-				
-				@libraries = {}
 			end
 			
 			# Adds a function by parsing the text, typically containing a textual representation of a lambda.
-			def add_function text
+			def add_function(text)
 				@functions << @context.parse_function(text, binding)
 			end
 			
-			def load(path)
-				Library.for(@libraries, path)
-			end
-			
-			def add_libraries libraries
-				@libraries = libraries
-			end
-			
 			# Map a document to a set of results by appling all functions.
 			def map(document)
 				# Force load the default library:
-				load(DEFAULT)
+				load_default
 				
 				@functions.map do |function|
 					MappingProcess.new(@context, @libraries, function).run(document)

data/lib/relaxo/query_server/reducer.rb

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require 'relaxo/query_server/process'
+require 'relaxo/query_server/library'
 
 module Relaxo
 	module QueryServer
@@ -35,9 +36,11 @@ module Relaxo
 		end
 		
 		# Implements the `reduce` and `rereduce` functions along with all associated state.
-		class Reducer
+		class Reducer < Loader
 			# Create a reducer attached to the given context.
 			def initialize(context)
+				super()
+				
 				@context = context
 			end
 			
@@ -53,6 +56,8 @@ module Relaxo
 			# @param [Array] items
 			#     A composite list of items.
 			def reduce(functions, items)
+				load_default
+				
 				functions = functions.collect do |function_text|
 					@context.parse_function(function_text, binding)
 				end
@@ -79,6 +84,8 @@ module Relaxo
 			# @param [Array] values
 			#     An array of values to reduce
 			def rereduce(functions, values)
+				load_default
+				
 				functions = functions.collect do |function_text|
 					@context.parse_function(function_text, binding)
 				end

data/lib/relaxo/query_server/version.rb

@@ -20,12 +20,6 @@
 
 module Relaxo
 	module QueryServer
-		module VERSION
-			MAJOR = 0
-			MINOR = 1
-			TINY  = 2
-
-			STRING = [MAJOR, MINOR, TINY].join('.')
-		end
+		VERSION = "0.1.3"
 	end
 end

data/rakefile.rb

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

data/relaxo-query-server.gemspec

@@ -0,0 +1,33 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'relaxo/query_server/version'
+
+Gem::Specification.new do |spec|
+	spec.name          = "relaxo-query-server"
+	spec.version       = Relaxo::QueryServer::VERSION
+	spec.authors       = ["Samuel Williams"]
+	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
+	spec.description   = <<-EOF
+	Relaxo Query Server is a query server for CouchDB which provides full
+	support for map/reduce functionality using Ruby code. It's main purpose
+	is to provide a consistent backend for Ruby based clients to CouchDB.
+	In practice, it allows code to be shared between Ruby based client 
+	applications and CouchDB servers.
+	EOF
+	spec.summary       = %q{Relaxo Query Server provides support for executing CouchDB functions using Ruby.}
+	spec.homepage      = ""
+	spec.license       = "MIT"
+
+	spec.files         = `git ls-files`.split($/)
+	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 "rest-client"
+end

data/test/helper.rb

@@ -8,8 +8,17 @@ 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
-	undef_method :default_test
+	abstract_test_case!
 	
 	def setup_context(options)
 		@shell = Relaxo::QueryServer::MockShell.new

data/test/test_reduce.rb

@@ -12,4 +12,27 @@ class ReduceTest < ContextualTestCase
 		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

metadata

@@ -1,60 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: relaxo-query-server
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+version: !ruby/object:Gem::Version
+  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-14 00:00:00 +13:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: relaxo
+date: 2013-04-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: relaxo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
   name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.3
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 7
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.7.3
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: 
-email: samuel.williams@oriontransfer.co.nz
-executables: 
+  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"
+email:
+- samuel.williams@oriontransfer.co.nz
+executables:
 - relaxo-query-server
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- .gitignore
+- .travis.yml
+- Gemfile
+- README.md
 - bin/relaxo-query-server
+- lib/relaxo/query_server.rb
 - lib/relaxo/query_server/context.rb
 - lib/relaxo/query_server/designer.rb
 - lib/relaxo/query_server/library.rb
@@ -63,7 +106,8 @@ files:
 - lib/relaxo/query_server/reducer.rb
 - lib/relaxo/query_server/shell.rb
 - lib/relaxo/query_server/version.rb
-- lib/relaxo/query_server.rb
+- rakefile.rb
+- relaxo-query-server.gemspec
 - test/helper.rb
 - test/test_filters.rb
 - test/test_libraries.rb
@@ -74,37 +118,39 @@ files:
 - test/test_updates.rb
 - test/test_validations.rb
 - test/test_views.rb
-- rakefile.rb
-- README.md
-has_rdoc: true
-homepage: http://www.oriontransfer.co.nz/gems/relaxo
-licenses: []
-
+homepage: ''
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+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: 1.3.6
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
-summary: Relaxo Query Server provides support for executing CouchDB functions using Ruby.
-test_files: []
-
+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