utopia 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9b84866dc9a4e796ebaffd27ee38df2cee16696
-  data.tar.gz: edcd684c8824131adbf28b3c71a80cd71be5280c
+  metadata.gz: f3881efaedf6400b258104215042b8030b69ca3e
+  data.tar.gz: e59045a36657c40b04bc30331fa0c15acc19b41b
 SHA512:
-  metadata.gz: f685a90bf068c361c741fd7dc0b5c5a175498da59f08a2d85278a023a19a1f091df4353807ba4248b19b65906cba4e86a56c717604bea86cf847db0d6d567d8e
-  data.tar.gz: e4619667aaeb96c6a7b10839aa45c749030ef1571e156accbde3a856e94b9d54b8496c9636aef404e3fea8a5ac04b874b832f0186102c6170856c68602784a2b
+  metadata.gz: 20c2d659623389861d7636e79f81f5349c85a039e629c7926e12afa59cd2fe339dd8ae8f279ca81b792c6c39a8a6a6ed263c336f8ac20e8841abd2328ae3de03
+  data.tar.gz: 9e7daab38c5752fe5d896dc0466b399a90947f30692b66f7505bb6051537d298ab435d17cefdbb2ee7476a250a6889ecc11ed971d4038a220564a4e1ac61c61b

data/lib/utopia/path.rb

@@ -117,11 +117,11 @@ module Utopia
 				return self.new([path])
 			end
 		end
-		
+
 		def replace(other_path)
 			@components = other_path.components.dup
 		end
-		
+
 		def include?(*args)
 			@components.include?(*args)
 		end
@@ -232,7 +232,15 @@ module Utopia
 		end
 
 		def basename
-			@components.last
+			basename, _ = @components.last.split('.', 2)
+			
+			return basename || ''
+		end
+		
+		def extension
+			_, extension = @components.last.split('.', 2)
+			
+			return extension
 		end
 		
 		def dirname(count = 1)
@@ -344,10 +352,6 @@ module Utopia
 			end
 		end
 		
-		def extension
-			basename(true).extension
-		end
-		
 		private
 		
 		# We adjust the index slightly so that indices reference path components rather than the directory markers at the start and end of the path components array.

data/lib/utopia/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Utopia
-	VERSION = "2.1.1"
+	VERSION = "2.1.2"
 end

data/spec/utopia/path_spec.rb

@@ -72,6 +72,13 @@ RSpec.describe Utopia::Path do
 		expect(path.simplify.components).to be == ['', 'foo', 'baz', '']
 	end
 	
+	it "should remove the extension from the basename" do
+		path = Utopia::Path["dir/foo.html"]
+		
+		expect(path.basename).to be == 'foo'
+		expect(path.extension).to be == 'html'
+	end
+	
 	it "should be able to convert into a directory" do
 		path = Utopia::Path["foo/bar"]
 		
@@ -105,6 +112,18 @@ RSpec.describe Utopia::Path do
 		expect{path[0] = 'bob'}.to raise_exception(RuntimeError)
 	end
 	
+	it "should give the correct locale" do
+		path = Utopia::Path["foo.en"]
+		
+		expect(path.extension).to be == 'en'
+	end
+	
+	it "should give no locale" do
+		path = Utopia::Path["foo"]
+		
+		expect(path.extension).to be == nil
+	end
+	
 	it "should expand relative paths" do
 		root = Utopia::Path['/root']
 		path = Utopia::Path["dir/foo.html"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni