relaxo-model 0.3.6 → 0.3.8

data/lib/relaxo/model/base.rb

@@ -66,29 +66,19 @@ module Relaxo
 				# This reduction returns a single result, so just provide the first row directly:
 				reduction = options.delete(:reduction)
 
-				# Specify a composite key, e.g. :key => :self or :key => [:self]
-				if key = options[:key]
-					options = options.dup
-					
-					if key == :self
-						options[:key] = lambda do |object, query|
-							query[:key] = object.id
-						end
-					elsif Array === key
-						index = key.index(:self)
-						
-						options[:key] = lambda do |object, query|
-							query[:key] = key.dup
-							query[:key][index] = object.id
-						end
-					end
-				end
+				options = options.dup
+
+				update_key_function(options, :key)
+				update_key_function(options, :startkey)
+				update_key_function(options, :endkey)
 
 				self.send(:define_method, name) do |query = {}|
 					query = query.merge(options)
 
-					if options[:key].respond_to? :call
-						options[:key].call(self, query)
+					[:key, :startkey, :endkey].each do |name|
+						if options[name].respond_to? :call
+							options[name].call(self, query)
+						end
 					end
 
 					recordset = Recordset.new(@database, @database.view(path, query), klass)
@@ -138,6 +128,26 @@ module Relaxo
 					end
 				end
 			end
+			
+			private
+
+			# Used for generating key functions for relationships - subject to change so private for now.
+			def update_key_function(options, name)
+				key = options[name]
+				
+				if key == :self
+					options[name] = lambda do |object, query|
+						query[name] = object.id
+					end
+				elsif Array === key
+					index = key.index(:self)
+					
+					options[name] = lambda do |object, query|
+						query[name] = key.dup
+						query[name][index] = object.id
+					end
+				end
+			end
 		end
 	end
 end

data/lib/relaxo/model/properties/bcrypt.rb

@@ -0,0 +1,43 @@
+# 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.
+
+require 'bcrypt'
+
+module Relaxo
+	module Model
+		module Properties
+			Attribute.for_class(BCrypt::Password) do
+				def convert_to_primative(value)
+					[value.salt, value.checksum]
+				end
+
+				def convert_from_primative(database, value)
+					if String === value
+						# If the primative value is a string, we are saving the password:
+						BCrypt::Password.create(value)
+					else
+						# Otherwise the password is given by an array containing the salt and checksum:
+						BCrypt::Password.new(value.join)
+					end
+				end
+			end
+		end
+	end
+end

data/lib/relaxo/model/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaxo-model
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaxo
@@ -53,6 +53,7 @@ files:
 - lib/relaxo/model/component.rb
 - lib/relaxo/model/document.rb
 - lib/relaxo/model/properties/attribute.rb
+- lib/relaxo/model/properties/bcrypt.rb
 - lib/relaxo/model/properties/bigdecimal.rb
 - lib/relaxo/model/properties/composite.rb
 - lib/relaxo/model/properties/latinum.rb