rack-blogengine 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c4c77afa0dea08adb6a4132ab7fb0558236f726
-  data.tar.gz: ecea1dcb841499269f9fc4001ef1bf26c4089813
+  metadata.gz: 7aa9f7345a6ce8fe4d9db0a916d6fd8532717ea3
+  data.tar.gz: caba5a9583c222feae1ac9353afcd2795a9e0740
 SHA512:
-  metadata.gz: 1fe14fb5518c1474c4029e6b64876c7f98264b65609b608e0613480a7de4e85f7331be316849ccdcbb604199821abf49f84b31c9c7847eb46e11366946c82f90
-  data.tar.gz: f2089d8343898c35f138e02736f07b7adf378fcd46431e29ac9442f1f2b88b16f795ee996d754e85ba17a5b1eb736c37dfb3e2596c2bb2903c4fa0ab7820cb55
+  metadata.gz: fcd1c84cb6d85a0f915d01db281f7229e435fea47c77dacc0c2ca1da4a169918909c4f567d9ac4e02578ac77c7073232d964bd579cd5184a1b00d4e62cdc627c
+  data.tar.gz: 654e2452901577730a41e5901ac18d58fcaecf31e2ab47f249b7c2bd1a35f5d6a5d621500686bbb946c571033af5a324c776cbb1d5513ef40da0960db8cd111a

data/bin/rack-blogengine

@@ -2,15 +2,15 @@
 require 'rack/blogengine/command_line_interface' 
 
 if ARGV[0]
-	command = ARGV[0].to_sym
+  command = ARGV[0].to_sym
 else
-	command = "".to_sym
+  command = "".to_sym
 end
 
 target = ARGV[1]
 target = "" if !ARGV[1]
 
-cli = Rack::Blogengine::CommandLineInterface.new 
+cli = Rack::Blogengine::CommandLineInterface.new
 
 if target != ""
   cli.send(command, target)

data/lib/rack/blogengine/application_router.rb

@@ -15,8 +15,6 @@ module Rack
        
            
         # Iterate through available docs, if nothing matched return nil
-        # TODO: Dont iterate through every doc, get requested doc from DocParser
-        # Operators should have access to ALL available docs (title, path, html etc)
         documents.each do |doc|
           if doc[:path] == path
             route_response = {

data/lib/rack/blogengine/command_line_interface.rb

@@ -1,5 +1,4 @@
 require 'rack'
-#require 'rack/attack'
 require 'rack/blogengine'
 require 'yaml'
 
@@ -55,11 +54,57 @@ module Rack
 
       # Command to generate the folder skeleton
       # @param [String] folder
+      # TODO: refactor this - similar functions for each set up set => outsource to a method setup()
       def generate(folder)
-        puts "Generating folder skeleton"
-        system("mkdir #{folder} && mkdir #{folder}/assets && mkdir #{folder}/assets/layout && mkdir #{folder}/assets/js && mkdir #{folder}/assets/style && mkdir #{folder}/assets/images")
+        puts "\tGenerating folder skeleton\n"
+        system("mkdir #{folder}")
+        system("mkdir #{folder}/assets")
+        system("mkdir #{folder}/assets/layout")
+        system("mkdir #{folder}/assets/js")
+        system("mkdir #{folder}/assets/style")
+        system("mkdir #{folder}/assets/images")
+        system("mkdir #{folder}/operator")
+
+        puts "\n\tSetting up essential Files\n"
+
+        # SET UP operator.rb
+        puts "\tSet up #{folder}/operator/operator.rb\n"
+        system("touch #{folder}/operator/operator.rb")
+        content = IO.read("#{::File.dirname(__FILE__)}/files/operator.rb")
+        ::File.open("#{folder}/operator/operator.rb", 'w') { |file| file.write(content) }
+
+        # SET UP config.yml
+        puts "\tSet up config.yml\n"
+        system("touch #{folder}/config.yml")
+        content = IO.read("#{::File.dirname(__FILE__)}/files/config.yml")
+        ::File.open("#{folder}/config.yml", 'w') { |file| file.write(content) }
+
+        # SET UP index.content
+        puts "\tSet up #{folder}/index.content\n"
+        system("touch #{folder}/index.content")
+        content = IO.read("#{::File.dirname(__FILE__)}/files/index.content")
+        ::File.open("#{folder}/index.content", 'w') { |file| file.write(content) }
+
+        # SET UP layout.html
+        puts "\tSet up #{folder}/assets/layout/layout.html\n"
+        system("touch #{folder}/assets/layout/layout.html")
+        content = IO.read("#{::File.dirname(__FILE__)}/files/layout.html")
+        ::File.open("#{folder}/assets/layout/layout.html", 'w') { |file| file.write(content) }
+
+        # SET UP style.css
+        puts "\tSet up #{folder}/assets/style/style.css\n"
+        system("touch #{folder}/assets/style/style.css")
+
+        # SET UP style.css
+        puts "\tSet up #{folder}/assets/js/script.js\n"
+        system("touch #{folder}/assets/js/script.js")
+
+        puts "\n\tSetup finished! Have Fun\n"
+        puts "\tTo test it type rack-blogengine run #{folder}"
       end
 
+      # Display Version
+      # return [String] VERSION
       def version?
         puts Rack::Blogengine::VERSION
       end

data/lib/rack/blogengine/doc_parser.rb

@@ -22,10 +22,13 @@ module Rack
           @document.path = @path
           @document.html = @html
           @document.title = @title
+          @document.date = @date
 
           documents << @document
         end
 
+        sort documents
+
         # Has to exec operator after all docs were read, so documents are available for operators (list all docs, etc...)
         documents.each do |document|
           document.exec_content_operator(documents, @target)
@@ -39,7 +42,7 @@ module Rack
       end
 
       # Get File Contents (path, title, content)
-      # @param file
+      # @param [String] file
       def self.getFileContents(file)
         content_file = ::File.open("#{@target}/#{file}");
         content = content_file.read
@@ -48,6 +51,7 @@ module Rack
         content["/path"] = "/close"
         content["/title"] = "/close"
         content["/content"] = "/close"
+        content["/date"] = "/close"
   
         contentarray = content.split("[/close]")
 
@@ -59,27 +63,47 @@ module Rack
 
           if contentblock.include? "[title]:"
             contentblock["[title]:"] = ""
-            @title = contentblock
+            @title = contentblock.strip
           end
 
           if contentblock.include? "[content]:"
             contentblock["[content]:"] = ""
-            @content = contentblock
+            @content = contentblock.strip
+          end
+
+          if contentblock.include? "[date]:"
+            contentblock["[date]:"] = ""
+            #TODO: Generate Date out of [date] string
+            #@date = Date.new(..splitted date string..)
+            @date = contentblock.strip
           end
         end
       end
 
 	    # Replace layout placeholder with content from .content file
-	    # @param layout
+	    # @param [String] layout
 	    # return [String] html placeholder replaced with content
       def self.fillFileContents(layout)
         html = layout.dup
 
         html.gsub! "{title}", @title
         html["{content}"] = @content
+        html.gsub! "{date}", @date
 
         return html
       end
+
+      # Sort documents array by date of each documenthash
+      # @param [Array] documents
+      # return [Array] documents (sorted)
+      # Should it be sorted in Core or in the operator??
+      def self.sort(documents)
+        documents.sort! do | a, b |
+          a.date.to_time.to_i <=> b.date.to_time.to_i
+        end
+
+        return documents
+      end
     end
   end
 end

data/lib/rack/blogengine/document.rb

@@ -1,12 +1,14 @@
 module Rack
   module Blogengine
     class Document
-      attr_accessor :path, :html, :title
+      attr_accessor :path, :html, :title, :date
 
       def to_hash
         hash = {}
-        instance_variables.each do |var| 
-          hash[var.to_s.delete("@").to_sym] = instance_variable_get(var) unless var.to_s == "@title"
+        instance_variables.each do |var|
+          unless var.to_s == "@title" || var.to_s == "@date"
+            hash[var.to_s.delete("@").to_sym] = instance_variable_get(var)
+          end 
         end
         hash
       end

data/lib/rack/blogengine/files/config.yml

@@ -0,0 +1,2 @@
+Port: 3000
+Server: "webrick"

data/lib/rack/blogengine/files/index.content

@@ -0,0 +1,6 @@
+[path]:[/path]
+[title]:INDEX[/title]
+[date]:2013,01,01[/date]
+[content]:
+<h2>This is the Index Page</h2>
+[/content]

data/lib/rack/blogengine/files/layout.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>{title}</title>
+	</head>
+	<body>
+		{date}
+		{content}
+	</body>
+</html>

data/lib/rack/blogengine/files/operator.rb

@@ -0,0 +1,3 @@
+module UserOperator
+  #define your operators here
+end

data/lib/rack/blogengine/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Blogengine
-    VERSION = "0.1.6".freeze
+    VERSION = "0.1.7".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-blogengine
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Benny1992
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,10 @@ files:
 - lib/rack/blogengine/command_line_interface.rb
 - lib/rack/blogengine/doc_parser.rb
 - lib/rack/blogengine/document.rb
+- lib/rack/blogengine/files/config.yml
+- lib/rack/blogengine/files/index.content
+- lib/rack/blogengine/files/layout.html
+- lib/rack/blogengine/files/operator.rb
 - lib/rack/blogengine/operator.rb
 - lib/rack/blogengine/version.rb
 - rack-blogengine.gemspec