utopia 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3881efaedf6400b258104215042b8030b69ca3e
-  data.tar.gz: e59045a36657c40b04bc30331fa0c15acc19b41b
+  metadata.gz: 0a8ab7d4e3b2ae63d567e00b81cb6a0eca2faebb
+  data.tar.gz: 354541a358b910c86713a002411af739eda77d68
 SHA512:
-  metadata.gz: 20c2d659623389861d7636e79f81f5349c85a039e629c7926e12afa59cd2fe339dd8ae8f279ca81b792c6c39a8a6a6ed263c336f8ac20e8841abd2328ae3de03
-  data.tar.gz: 9e7daab38c5752fe5d896dc0466b399a90947f30692b66f7505bb6051537d298ab435d17cefdbb2ee7476a250a6889ecc11ed971d4038a220564a4e1ac61c61b
+  metadata.gz: 1e580af2a4540e8456cb892f3fadeda156213720a2cfe7f3779f62eaf09d0152cbe5ce8ef9132cffc0a79b4e726321b3685ca63e44acfdab1eaa3e42c0b5b753
+  data.tar.gz: 88ec745909cbc0b8e2a96a4f18cf6a3d63f20fb80f356a6ecbe644dee614ec0cae5045cd949a07f8d243dfacb419d973c7cec02db7468731d1fb50fb5e2c2e0d

data/.travis.yml

@@ -8,6 +8,7 @@ before_install:
   - git config --global user.name "Samuel Williams"
   # https://github.com/rubygems/rubygems/issues/1448
   - gem update --system
+  - gem install bundler
 rvm:
   - 2.2
   - 2.3

data/Gemfile

@@ -19,7 +19,7 @@ group :test do
 	gem 'benchmark-ips'
 	gem 'ruby-prof', platforms: :mri
 	
-	gem 'guard-puma'
+	gem 'guard-falcon'
 	
 	gem 'rack-test'
 	gem 'rack-freeze', '~> 1.2'

data/lib/utopia/content/link.rb

@@ -41,10 +41,13 @@ module Utopia
 					@name, @locale = path.last.split('.', 2)
 					@path = path
 				when :directory
-					# raise ArgumentError unless path.last.start_with? INDEX
+					@name = path.basename
 					
-					@name = path.dirname.last
-					@locale = path.last.split('.', 2)[1]
+					if @name == INDEX
+						@name = path.dirname.basename
+					end
+					
+					@locale = path.extension
 					@path = path
 				when :virtual
 					@name, @locale = path.to_s.split('.', 2)

data/lib/utopia/content/links.rb

@@ -187,7 +187,7 @@ module Utopia
 				
 				if indices_count == 0
 					# Specify a nil uri if no index could be found for the directory:
-					yield Link.new(:directory, top + [name, ""], {:uri => nil}.merge(directory_metadata))
+					yield Link.new(:directory, top + [name], {:uri => nil}.merge(directory_metadata))
 				end
 			end
 			

data/lib/utopia/content/node.rb

@@ -67,7 +67,7 @@ module Utopia
 			end
 
 			def parent_path
-				uri_path.dirname
+				@uri_path.dirname
 			end
 
 			def links(path = '.', **options, &block)
@@ -82,15 +82,13 @@ module Utopia
 			end
 
 			def related_links
-				name = @uri_path.last.split('.', 2).first
+				name = @uri_path.basename
 				
-				return Links.index(@controller.root, uri_path.dirname, :name => name, :indices => true)
+				return Links.index(@controller.root, @uri_path.dirname, :name => @uri_path.basename, :indices => true)
 			end
 
 			def siblings_path
-				name = @uri_path.last.split('.', 2).first
-				
-				if name == INDEX
+				if @uri_path.basename == INDEX
 					@uri_path.dirname(2)
 				else
 					@uri_path.dirname

data/lib/utopia/version.rb

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

data/utopia.gemspec

@@ -39,6 +39,6 @@ Gem::Specification.new do |spec|
 	
 	spec.add_development_dependency 'bundler', '~> 1.3'
 	spec.add_development_dependency 'rspec', '~> 3.6'
-	spec.add_development_dependency 'puma'
+	spec.add_development_dependency 'falcon'
 	spec.add_development_dependency 'rake'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: falcon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -549,7 +549,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Utopia is a framework for building dynamic content-driven websites.