relaxo-model 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5def3272125e8d0a5f3bbcb3301d57a18d1c8e4e
-  data.tar.gz: 747e5bba75ae446c8448936c8b5d691e96fa5464
+  metadata.gz: dc3e60e23bca41d0d857ae65662634c291e23b37
+  data.tar.gz: c69edbdbdf47dd0e233f79e5dac18aeeaecab191
 SHA512:
-  metadata.gz: ead5de341dfe6f70187fb0fd06f0a90826eeb053cac2f04440dd2c2394b12da022319c5743c008f6f032ad5f717221034c2a29637c36f6eddc41872af0dd11d2
-  data.tar.gz: 753db55e2e73981dc8d7daf089a4687474b831dcb7459aaa46ceeee477ac43b6e1ec2bee374e29cb3df82c3dbbc99d7fdfc15745db638133709d53e35021f4fe
+  metadata.gz: 6ddcedd238f098e276c693e75cb67f87bdee8eea27ad2a76ada6e402b004ea0e20c65712a5cc974d0e56db556809e25188f259738a08b146d6ae50a2374f0c3c
+  data.tar.gz: d30f14e112a4ef9967568658c7d433046c2f65b9a3aef3815a0ae8946fcca6cb6d8615b6dd874c04379dccb7e71a17671b76cac60ab7af6ebfb7b992661cf257

data/lib/relaxo/model/base.rb

@@ -23,12 +23,39 @@ require 'uri'
 
 module Relaxo
 	module Model
+		# A string that won't be escaped when concatenating with a path:
+		class Path < String
+			ENCODE = {'/' => '%2F', '%' => '%25'}
+			
+			def to_s
+				self
+			end
+			
+			def to_str
+				self
+			end
+			
+			def self.join(path)
+				joined_path = path.map do |part|
+					part = part.to_s
+					
+					if part.is_a? Path
+						part
+					else
+						part.to_s.gsub(/[\/%]/, ENCODE)
+					end
+				end.join('/')
+				
+				return self.new(joined_path)
+			end
+		end
+		
 		Key = Struct.new(:prefix, :index) do
 			def resolve(key_path, model, **arguments)
 				key_path.collect do |component|
 					case component
 					when Symbol
-						arguments[component] || model.send(component) || "null"
+						arguments[component] || model.send(component) || 'null'
 					when Array
 						resolve(component, model, arguments).join('-')
 					when Proc
@@ -40,19 +67,11 @@ module Relaxo
 			end
 			
 			def object_path(model, **arguments)
-				encode resolve(self.prefix + self.index, model, **arguments)
+				Path.join resolve(self.prefix + self.index, model, **arguments)
 			end
 			
 			def prefix_path(model, **arguments)
-				encode resolve(self.prefix, model, **arguments)
-			end
-			
-			private
-			
-			ENCODE = {'/' => '%2F', '%' => '%25'}
-			
-			def encode(path)
-				path.collect{|part| part.to_s.gsub(/[\/%]/, ENCODE)}.join('/')
+				Path.join resolve(self.prefix, model, **arguments)
 			end
 		end
 		
@@ -81,7 +100,7 @@ module Relaxo
 			attr :primary_key
 			
 			def parent_type klass
-				@type = [klass.type, self.type].join('/')
+				@type = Path.join([klass.type, self.type])
 			end
 			
 			def view(name, path = nil, klass: self, index: nil)

data/lib/relaxo/model/document.rb

@@ -105,7 +105,7 @@ module Relaxo
 			end
 
 			def type
-				@attributes[:type]
+				Path.new @attributes[:type]
 			end
 
 			def valid_type?

data/lib/relaxo/model/version.rb

@@ -20,6 +20,6 @@
 
 module Relaxo
 	module Model
-		VERSION = "0.10.2"
+		VERSION = "0.10.3"
 	end
 end

data/spec/relaxo/model/document_spec.rb

@@ -78,6 +78,10 @@ RSpec.describe Relaxo::Model::Document do
 		expect(Invoice.all(database.current).count).to be == 3
 	end
 	
+	it "should have resolved type" do
+		expect(Invoice::Transaction.type).to be_a Relaxo::Model::Path
+	end
+	
 	it "should create model indexes" do
 		database.commit(message: "Adding test model") do |dataset|
 			invoice = Invoice.create(dataset, name: "Software Development")
@@ -94,7 +98,11 @@ RSpec.describe Relaxo::Model::Document do
 		expect(invoice).to_not be nil
 		
 		transactions = Invoice::Transaction.by_invoice(database.current, invoice: invoice)
+		expect(transactions.path).to be == "invoice/transaction/by_invoice/invoice/#{invoice.id}"
 		expect(transactions).to_not be_empty
+		
+		transaction = transactions.first
+		expect(transaction.to_s).to be == "invoice/transaction/#{transaction.id}"
 	end
 	
 	it "updates indexes correctly" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaxo-model
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaxo