relaxo-model 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47752f1b7559c0d9655e5e672a02be42349906ff
-  data.tar.gz: 35fadf3fe42a32cd640272232224f3f92fef8c90
+  metadata.gz: baa54b93545e3c7e489fcdb605dbd7aeb216ad69
+  data.tar.gz: f175fdcf840161c8af177715f6e0fc712e14b3ab
 SHA512:
-  metadata.gz: e02d21e29e82f65f25a08c3580db7028c770d35f84810a38821065bf49b695c4b190f18e63226de8e722c8148f7145c61a2d5f3dbda715996053a49e3309e6b9
-  data.tar.gz: dbe2d8acaf7fc724a6fb63c4b7ca1d0d9ea4067dfbcfb410f6af98d0e0a3fcb19b057601743cea5bf85f4e7a3136ce12fa59e88c45b2067a23624a4ce915ad3c
+  metadata.gz: a3b93c725265744543dbd0bdce343ec5ffa0f9bd02fa70ad25abce0a7d01bdb3e92c5b73c1fd149463d7403c0ba30b755508dee4d8229b4e00ba5c7908254b41
+  data.tar.gz: 3b859844d5a4128604a0c55b8c8cd5d60a14af3bc47733d6bde81bae397c14f93684013fe09649bcd8446eb1eadd98c926a002ad2074c4be97b72de4e57b6540

data/Gemfile

@@ -7,6 +7,7 @@ gem 'rugged', git: 'git://github.com/libgit2/rugged.git', submodules: true
 
 group :development do
 	gem "pry"
+	gem "bcrypt"
 end
 
 group :test do

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

@@ -25,16 +25,22 @@ module Relaxo
 		module Properties
 			Attribute.for_class(BCrypt::Password) do
 				def convert_to_primative(value)
+					unless value.is_a? BCrypt::Password
+						value = BCrypt::Password.create(value)
+					end
+					
 					[value.salt, value.checksum]
 				end
 
 				def convert_from_primative(dataset, 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:
+					if value.is_a? Array
+						# The password is given by an array containing the salt and checksum:
 						BCrypt::Password.new(value.join)
+					elsif BCrypt::Password.valid_hash?(value)
+						BCrypt::Password.new(value)
+					else
+						# Try to create a password from the supplied value:
+						BCrypt::Password.create(value)
 					end
 				end
 			end

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

@@ -29,7 +29,7 @@ module Relaxo
 				end
 
 				def convert_from_primative(dataset, value)
-					if Array === value
+					if value.is_a? Array
 						@klass.new(value[0], value[1])
 					else
 						@klass.parse(value)

data/lib/relaxo/model/version.rb

@@ -20,6 +20,6 @@
 
 module Relaxo
 	module Model
-		VERSION = "0.12.1"
+		VERSION = "0.13.0"
 	end
 end

data/spec/relaxo/model/model_context.rb

@@ -1,6 +1,8 @@
 
 require 'relaxo/model'
 
+require 'relaxo/model/properties/bcrypt'
+
 class Invoice
 	class Transaction; end
 	
@@ -43,6 +45,7 @@ class User
 	
 	property :email, Attribute[String]
 	property :name
+	property :password, Attribute[BCrypt::Password]
 	property :intro
 	
 	view :all, :type, index: unique(:email)

data/spec/relaxo/model/properties/bcrypt_spec.rb

@@ -0,0 +1,62 @@
+
+require_relative '../model_context'
+
+RSpec.describe Relaxo::Model::Properties do
+	context BCrypt::Password do
+		include_context "model"
+		
+		it "can set password string" do
+			database.commit(message: "Add new user") do |changeset|
+				User.insert(changeset, email: "its@complicated.com", name: "Bob", password: "foobar")
+			end
+			
+			bob = User.fetch_by_name(database.current, name: "Bob")
+			expect(bob).to_not be nil
+			
+			expect(bob.password == "foobar").to be_truthy
+		end
+		
+		it "can set password instance" do
+			database.commit(message: "Add new user") do |changeset|
+				User.insert(changeset, email: "its@complicated.com", name: "Bob", password: BCrypt::Password.create("foobar"))
+			end
+			
+			bob = User.fetch_by_name(database.current, name: "Bob")
+			expect(bob).to_not be nil
+			
+			expect(bob.password == "foobar").to be_truthy
+		end
+		
+		it "can assign password string" do
+			database.commit(message: "Add new user") do |changeset|
+				user = User.insert(changeset, email: "its@complicated.com", name: "Bob")
+				
+				user.assign(password: "foobar")
+				
+				user.save(changeset)
+			end
+			
+			bob = User.fetch_by_name(database.current, name: "Bob")
+			expect(bob).to_not be nil
+			
+			expect(bob.password == "foobar").to be_truthy
+		end
+		
+		it "can assign password hash" do
+			password = BCrypt::Password.create("foobar")
+			
+			database.commit(message: "Add new user") do |changeset|
+				user = User.insert(changeset, email: "its@complicated.com", name: "Bob")
+				
+				user.assign(password: password.to_s)
+				
+				user.save(changeset)
+			end
+			
+			bob = User.fetch_by_name(database.current, name: "Bob")
+			expect(bob).to_not be nil
+			
+			expect(bob.password == "foobar").to be_truthy
+		end
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaxo-model
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -113,6 +113,7 @@ files:
 - spec/relaxo/model/attribute_spec.rb
 - spec/relaxo/model/document_spec.rb
 - spec/relaxo/model/model_context.rb
+- spec/relaxo/model/properties/bcrypt_spec.rb
 - spec/relaxo/model/recordset_spec.rb
 homepage: http://www.codeotaku.com/projects/relaxo/model
 licenses:
@@ -142,4 +143,5 @@ test_files:
 - spec/relaxo/model/attribute_spec.rb
 - spec/relaxo/model/document_spec.rb
 - spec/relaxo/model/model_context.rb
+- spec/relaxo/model/properties/bcrypt_spec.rb
 - spec/relaxo/model/recordset_spec.rb