relaxo-query-server 0.1.0 → 0.1.1

data/README.md

@@ -23,6 +23,12 @@ Edit your etc/couchdb/local.ini and add the following:
 
 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
+
+(You can also load code by specifying libraries in your design documents and views.)
+
 To build and install the gem from source:
 
 	cd build/

data/bin/relaxo-query-server

@@ -4,7 +4,7 @@ require 'relaxo/query_server'
 require 'optparse'
 
 OPTIONS = {
-	:safe => 4,
+	:safe => 2
 }
 
 ARGV.options do |o|

data/lib/relaxo/query_server.rb

@@ -21,10 +21,6 @@
 require 'relaxo/query_server/context'
 require 'relaxo/query_server/shell'
 
-# Provide useful standard functionality:
-require 'bigdecimal'
-require 'date'
-
 module Relaxo
 	module QueryServer
 		# Run the query server using `$stdin` and `$stdout` for communication.

data/lib/relaxo/query_server/context.rb

@@ -34,7 +34,7 @@ module Relaxo
 			def parse_function(text, scope, filename = 'query-server')
 				safe_level = @options[:safe] || 0
 			
-				function = lambda { $SAFE = safe_level; eval(text, scope.send(:binding), filename) }.call
+				function = lambda { $SAFE = safe_level; eval(text, scope, filename) }.call
 			
 				unless function.respond_to? :call
 					raise CompilationError.new('Expression does not evaluate to procedure!')
@@ -68,6 +68,8 @@ module Relaxo
 				# ** Map functionality
 				when 'add_fun'
 					@mapper.add_function command[1]; true
+				when 'add_lib'
+					@mapper.add_libraries command[1]; true
 				when 'map_doc'
 					@mapper.map command[1]
 				when 'reset'

data/lib/relaxo/query_server/designer.rb

@@ -176,7 +176,7 @@ module Relaxo
 
 			# Implements the `validates_doc_update` action.
 			def validates(function, new_document, old_document, user_context)
-				ValidationProcess.new(@context, function).run(new_document, old_document, user_context)
+				Process.new(@context, function).run(new_document, old_document, user_context)
 				
 				# Unless ValidationError was raised, we are okay.
 				return VALIDATED
@@ -193,7 +193,7 @@ module Relaxo
 
 			# Looks a up a function given a key path into the design document.
 			def function_for(path)
-				parent = self
+				parent = @attributes
 
 				function = path.inject(parent) do |current, key|
 					parent = current
@@ -205,7 +205,7 @@ module Relaxo
 
 				# Compile the function if required:
 				if String === function
-					parent[path.last] = @context.parse_function(function, self, 'design-document')
+					parent[path.last] = @context.parse_function(function, binding, 'design-document')
 				else
 					function
 				end

data/lib/relaxo/query_server/library.rb

@@ -0,0 +1,80 @@
+# Copyright (c) 2012 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+# 
+# 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.
+
+module Relaxo
+	module QueryServer
+		class Library
+			def self.for(root, path)
+				parent = root
+
+				path = path.split('/') unless Array === path
+
+				library = path.inject(parent) do |current, name|
+					return nil if current == nil
+
+					parent = current
+
+					current[name]
+				end
+
+				return nil if library == nil
+
+				unless Library === library
+					library = parent[path.last] = Library.new(root, path, library)
+				end
+
+				return library.instance
+			end
+
+			def initialize(root, path, code)
+				@root = root
+				@path = path
+				@code = code
+
+				@klass = nil
+				@instance = nil
+			end
+
+			def instance
+				unless @klass
+					@klass = Class.new
+
+					# Not sure if this is the best way to implement the `load` function
+					@klass.const_set('ROOT', @root)
+					@klass.class_exec(@root) do |root|
+						@@root = root
+
+						def self.load(path)
+							Library.for(@@root, path)
+						end
+
+						def load(path)
+							self.class.load(path)
+						end
+					end
+
+					@klass.class_eval @code, @path.join('/')
+				end
+
+				@instance ||= @klass.new
+			end
+		end
+	end
+end

data/lib/relaxo/query_server/mapper.rb

@@ -19,13 +19,16 @@
 # THE SOFTWARE.
 
 require 'relaxo/query_server/process'
+require 'relaxo/query_server/library'
 
 module Relaxo
 	module QueryServer
 		# Supports `Mapper` by providing a context with an `emit` method that collects the results from the mapping function.
 		class MappingProcess < Process
-			def initialize(context, function)
+			def initialize(context, mapper, function)
 				super(context, function)
+				
+				@mapper = mapper
 				@results = []
 			end
 			
@@ -34,6 +37,10 @@ module Relaxo
 				@results << [key, value]
 			end
 			
+			def load(name)
+				@mapper.load(name)
+			end
+			
 			def run(*args)
 				begin
 					call(*args)
@@ -47,20 +54,36 @@ module Relaxo
 		end
 		
 		class Mapper
+			# The default library name
+			DEFAULT = ['_default']
+			
 			def initialize(context)
 				@context = context
 				@functions = []
+				
+				@libraries = {}
 			end
 			
 			# Adds a function by parsing the text, typically containing a textual representation of a lambda.
 			def add_function text
-				@functions << @context.parse_function(text, self)
+				@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)
+				
 				@functions.map do |function|
-					MappingProcess.new(@context, function).run(document)
+					MappingProcess.new(@context, @libraries, function).run(document)
 				end
 			end
 		end

data/lib/relaxo/query_server/reducer.rb

@@ -54,7 +54,7 @@ module Relaxo
 			#     A composite list of items.
 			def reduce(functions, items)
 				functions = functions.collect do |function_text|
-					@context.parse_function(function_text, self)
+					@context.parse_function(function_text, binding)
 				end
 				
 				keys, values = [], []
@@ -80,7 +80,7 @@ module Relaxo
 			#     An array of values to reduce
 			def rereduce(functions, values)
 				functions = functions.collect do |function_text|
-					@context.parse_function(function_text, self)
+					@context.parse_function(function_text, binding)
 				end
 				
 				result = functions.map do |function|

data/lib/relaxo/query_server/version.rb

@@ -23,7 +23,7 @@ module Relaxo
 		module VERSION
 			MAJOR = 0
 			MINOR = 1
-			TINY  = 0
+			TINY  = 1
 
 			STRING = [MAJOR, MINOR, TINY].join('.')
 		end

data/test/context_test.rb

@@ -17,7 +17,7 @@ class ContextTest < Test::Unit::TestCase
 	end
 	
 	def setup
-		setup_context :safe => 0
+		setup_context :safe => 2
 	end
 	
 	def teardown

data/test/test_libraries.rb

@@ -0,0 +1,59 @@
+
+require 'context_test'
+require 'relaxo/query_server/library'
+
+class LibrariesTest < ContextTest
+	def test_libraries
+		root = {
+			'lib' => {
+				'all' => %q{
+					require 'bigdecimal'
+					require 'bigdecimal/util'
+				},
+				'bar' => %q{
+					load('lib/all')
+
+					def bar
+						10.to_d
+					end
+				}
+			}
+		}
+		
+		object = Relaxo::QueryServer::Library.for(root, 'lib/bar')
+		
+		assert_not_nil object
+		assert object.respond_to? :bar
+		
+		assert_equal 10.to_d, object.bar
+		
+		# For efficiency, the same object is returned both times
+		same_object = Relaxo::QueryServer::Library.for(root, 'lib/bar')
+		assert_equal object, same_object
+	end
+	
+	def test_map_reduce_libraries
+		library_code = %q{
+			def check_bar(doc)
+				yield doc if doc['bar'] == true
+			end
+		}
+		
+		map_function_code = %q{
+			foo = load('foo')
+			
+			lambda {|doc|
+				foo.check_bar(doc) {emit(true)}
+			}
+		}
+		
+		response = @context.run ['add_lib', {'foo' => library_code}]
+		assert_equal true, response
+		
+		response = @context.run ['add_fun', map_function_code]
+		assert_equal true, response
+		
+		response = @context.run ['map_doc', {'bar' => true}]
+		assert_equal [[[true, nil]]], response
+	end
+end

data/test/test_validations.rb

@@ -14,7 +14,7 @@ class ValidationsTest < ContextTest
 		}
 		
 		response = @context.run ['ddoc', 'test', ['validate_doc_update'], [{'good' => true}, {'good' => true}, {}]]
-		assert_equal true, response
+		assert_equal 1, response
 		
 		response = @context.run ['ddoc', 'test', ['validate_doc_update'], [{'bad' => true}, {'good' => true}, {}]]
 		assert_equal({'forbidden' => 'bad'}, response)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaxo-query-server
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -53,6 +53,7 @@ files:
 - bin/relaxo-query-server
 - lib/relaxo/query_server/context.rb
 - lib/relaxo/query_server/designer.rb
+- lib/relaxo/query_server/library.rb
 - lib/relaxo/query_server/mapper.rb
 - lib/relaxo/query_server/process.rb
 - lib/relaxo/query_server/reducer.rb
@@ -61,6 +62,7 @@ files:
 - lib/relaxo/query_server.rb
 - test/context_test.rb
 - test/test_filters.rb
+- test/test_libraries.rb
 - test/test_lists.rb
 - test/test_map.rb
 - test/test_reduce.rb