rack-blogengine 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 6d1d461e13788b067f570f69315af3379f17c89d
-  data.tar.gz: bac62b1d82b17e8cc097ebc83f94b23bfe077a20
+  metadata.gz: be673f3f32e05e24da51c8cf90e8ef3904df61b8
+  data.tar.gz: c960faa025ed506ae5c96737de9126de91bdd356
 SHA512: 
-  metadata.gz: 21729aaf42d0acee7106f1789c4aa0cac38837aa28668b1ce1fd84d29adeb3e70c5b9514fcd8e401e9bfd4e16767588e82039af8d594972ba87799cd66ac5c4c
-  data.tar.gz: 6ecb1d38bd634db4f40be15f27fc512b003208c8c3f7a5a9ea7c775c5d5310272e1151eb6e576e36273a3f57f20c84e372f60b0af3e5958377aaa430289aa113
+  metadata.gz: 5003c80502f0b50d63c1157fbec62be65fd530417a21c03b8cbbf83a0058b8f4213bc1664187fb4f84e834494465fc85610f9490cb8c461af2c91f6d33a8f30b
+  data.tar.gz: 82c214bc379dea1aa34092306f99966e4e6ec087e15244122bac5f800722ad5d9ad1889317e8ff5a3f0146187167a9e6d3e763e1974981c2f0a130a13b8b82e4

data/lib/rack/blogengine/application_router.rb

@@ -28,9 +28,14 @@ module Rack
             end
           end
 
-          { 'path' => '/error',
+          # if no document matches -> return error page
+          return errorpage(env, documents)
+        end
+
+        def errorpage(env, documents)
+          { 'path' => env['PATH_INFO'],
             'response' =>
-            [404, { 'Content-Type' => 'text/html; charset=UTF-8' }, ['Page not found && no error page found']]
+            [404, { 'Content-Type' => 'text/html; charset=UTF-8' }, ['Page not found']]
           }
         end
       end

data/lib/rack/blogengine/document_parser.rb

@@ -68,22 +68,34 @@ module Rack
 
           if contentblock.include? '[title]:'
             contentblock['[title]:'] = ''
-            @title = contentblock.strip
+            if contentblock.empty?
+              raise "Title in #{file} is empty"
+            else
+              @title = contentblock.strip
+            end
           end
 
           if contentblock.include? '[content]:'
             contentblock['[content]:'] = ''
-            @content = contentblock.strip
+            if contentblock.empty?
+              raise "Content in #{file} is empty"
+            else
+              @content = contentblock.strip
+            end
           end
 
           if contentblock.include? '[date]:'
             contentblock['[date]:'] = ''
-            datearray = contentblock.split(',')
-            datearray = datearray.map do |date|
-              date.to_i
+            if /\d/.match( contentblock )
+              datearray = contentblock.split(',')
+              datearray = datearray.map do |date|
+                date.to_i
+              end
+
+              @date = Date.new(datearray[0], datearray[1], datearray[2])
+            else
+              raise "Invalid Date in #{file}\n [date]:#{contentblock}[/date]"
             end
-
-            @date = Date.new(datearray[0], datearray[1], datearray[2])
           end
         end
       end

data/lib/rack/blogengine/operator.rb

@@ -9,7 +9,7 @@ class Operator
     Dir.foreach("#{target}/operator/") do |item|
       extension = item.split('.')[1]
       next if item == '.' || item == '..' || extension != 'rb'
-      require "#{Dir.pwd}/#{target}/operator/#{item}"
+      require "#{target}/operator/#{item}"
     end
 
     extend UserOperator # load user operators

data/lib/rack/blogengine/version.rb

@@ -6,6 +6,6 @@ module Rack
   # @author [benny]
   #
   module Blogengine
-    VERSION = '0.2.2'.freeze
+    VERSION = '0.2.3'.freeze
   end
 end

data/test/rack/blogengine/document_test.rb

@@ -39,7 +39,7 @@ class DocumentTest < MiniTest::Unit::TestCase
     document = Rack::Blogengine::Document.new
     document.html = '{% test_operator %}'
 
-    document.exec_content_operator(document, 'testfolder')
+    document.exec_content_operator(document, "#{testpath}")
 
     assert_equal('test', document.html, 'Documents html should contain test_operators return value')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-blogengine
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Benny1992
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-16 00:00:00 Z
+date: 2014-02-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement