RubyGems - rack-blogengine - Versions diffs - 0.2.1 → 0.2.2 - Mend

rack-blogengine 0.2.1 → 0.2.2

Files changed (29) hide show

checksums.yaml +4 -4
data/.rubocop.yml +1 -1
data/.travis.yml +9 -2
data/Gemfile +3 -1
data/README.md +11 -0
data/Rakefile +18 -2
data/assets/operator.rb +3 -0
data/features/hello.feature +5 -0
data/features/step_definitions/hello_steps.rb +13 -0
data/features/support/env.rb +9 -0
data/lib/rack/blogengine/application.rb +1 -1
data/lib/rack/blogengine/application_router.rb +1 -1
data/lib/rack/blogengine/command_line_interface.rb +9 -15
data/lib/rack/blogengine/{doc_parser.rb → document_parser.rb} +25 -14
data/lib/rack/blogengine/methods.rb +6 -2
data/lib/rack/blogengine/operator.rb +1 -1
data/lib/rack/blogengine/version.rb +1 -1
data/lib/rack/blogengine.rb +1 -1
data/rack-blogengine.gemspec +2 -4
data/spec/rack/blogengine/document_spec.rb +34 -0
data/spec/spec_helper.rb +53 -0
data/test/{application_router_test.rb → rack/blogengine/application_router_test.rb} +10 -14
data/test/rack/blogengine/command_line_interface_test.rb +92 -0
data/test/rack/blogengine/document_parser_test.rb +92 -0
data/test/rack/blogengine/document_test.rb +48 -0
data/test/test_helper.rb +13 -12
metadata +37 -42
data/.rspec +0 -2
data/test/document_test.rb +0 -31

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e31dc4ce6c8c6c9cb2bafc8d24cc0914693897fe
-  data.tar.gz: d26429eab938829b1327c67e63825287d5350b97
+  metadata.gz: 6d1d461e13788b067f570f69315af3379f17c89d
+  data.tar.gz: bac62b1d82b17e8cc097ebc83f94b23bfe077a20
 SHA512:
-  metadata.gz: 28af739b4183e622649a779dff8b54e75fac04ca6eaae4493f3249561891b8b22f80379e3a29a1c9d234fb8b27bd70be6596e779a61b7adfdd48d74bddc0d666
-  data.tar.gz: df05afe21a21150796675188e02fe4092e84af82c4c087ca1fa1bd32e2e1c105344c016d0f088ac328012559ca5da72fb7da40b4f4b39fc03d0f3dff515cf60e
+  metadata.gz: 21729aaf42d0acee7106f1789c4aa0cac38837aa28668b1ce1fd84d29adeb3e70c5b9514fcd8e401e9bfd4e16767588e82039af8d594972ba87799cd66ac5c4c
+  data.tar.gz: 6ecb1d38bd634db4f40be15f27fc512b003208c8c3f7a5a9ea7c775c5d5310272e1151eb6e576e36273a3f57f20c84e372f60b0af3e5958377aaa430289aa113

data/.rubocop.yml CHANGED Viewed

@@ -1,2 +1,2 @@
 LineLength:
-  Max: 120
+  Max: 160

data/.travis.yml CHANGED Viewed

@@ -1,8 +1,15 @@
 language: ruby
+cache: bundler
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.0
   - jruby
-  - rbx
+  - rbx
+matrix:
+  allow_failures:
+    - rvm: rbx
+    - rvm: jruby
+    - rvm: ruby-head

data/Gemfile CHANGED Viewed

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
-# gem "rubysl", "~> 2.0", :platform => :rbx
+gem "rubysl-test-unit", :platform => :rbx
+gem 'coveralls', require: false
 # Specify your gem's dependencies in rack-blogengine.gemspec
 gemspec

data/README.md CHANGED Viewed

@@ -5,6 +5,17 @@ Rack Middleware to serve a simple blog
 ## Build status
 [![Build Status](https://travis-ci.org/Benny1992/rack-blogengine.png?branch=master)](https://travis-ci.org/Benny1992/rack-blogengine)
+[![Coverage Status](https://coveralls.io/repos/Benny1992/rack-blogengine/badge.png?branch=master)](https://coveralls.io/r/Benny1992/rack-blogengine?branch=master)
+[![Gem Version](https://badge.fury.io/rb/rack-blogengine.png)](http://badge.fury.io/rb/rack-blogengine)
+[![Dependency Status](https://gemnasium.com/Benny1992/rack-blogengine.png)](https://gemnasium.com/Benny1992/rack-blogengine)
+## Supported Ruby Versions & Platforms
+- rbx   2.2.5
+- ruby  1.9.3
+- ruby  2.0.0
+- ruby  2.1.0
+- jruby 1.7.9
 ## Installation

data/Rakefile CHANGED Viewed

@@ -1,12 +1,28 @@
 require "bundler/gem_tasks"
 require 'rake/testtask'
+require 'cucumber/rake/task'
 namespace :test do
   Rake::TestTask.new(:unit) do |t|
     t.libs << "test"
-    t.test_files = FileList['test/*_test.rb']
+    t.test_files = FileList['test/**/*_test.rb']
+    t.verbose = true
+  end
+  Rake::TestTask.new(:spec) do |t|
+    t.libs << "spec"
+    t.test_files = FileList['spec/**/spec_*.rb']
     t.verbose = true
   end
+  Cucumber::Rake::Task.new(:feature) do |t|
+    t.cucumber_opts = "features --format pretty"
+  end
 end
-task :default => 'test:unit'
+task :default do
+  Rake::Task['test:unit'].invoke
+  # Rake::Task['test:spec'].invoke
+  Rake::Task['test:feature'].invoke
+end

data/assets/operator.rb CHANGED Viewed

@@ -5,4 +5,7 @@
 #
 module UserOperator
   # define your operators here
+  def test_operator(documents, html)
+    'test'
+  end
 end

data/features/hello.feature ADDED Viewed

@@ -0,0 +1,5 @@
+Feature: The app should Work
+Scenario: View home page
+  Given I am on the home page
+  Then I should see "index"

data/features/step_definitions/hello_steps.rb ADDED Viewed

@@ -0,0 +1,13 @@
+Given(/^I am on the home page$/) do
+  puts  visit 'http://localhost:3000'
+end
+Then(/^I should see "(.*?)"$/) do |text|
+  page.has_content?(text)
+  # page.driver.resize(20,30)
+  # page.save_screenshot("/path/to/test.pdf")
+  # puts page.within_window
+  # puts page.driver.network_traffic
+  # puts page.driver.cookies
+  # puts page.response_headers.to_a
+end

data/features/support/env.rb ADDED Viewed

@@ -0,0 +1,9 @@
+require 'coveralls'
+Coveralls.wear!
+require 'capybara/cucumber'
+require 'rack/blogengine'
+Rack::Blogengine.documents = [{ html: '<!DOCTYPE html><body><h2>index</h2></body></html>',
+                                path: '/' }]
+Capybara.app = Rack::Blogengine::Application

data/lib/rack/blogengine/application.rb CHANGED Viewed

@@ -12,7 +12,7 @@ module Rack
       # @return [Array] response Array
       def self.call(env)
         # Router for map docs to routes
-        route = ApplicationRouter.map_route(env, $documents)
+        route = ApplicationRouter.map_route(env, Rack::Blogengine.documents)
         route['response']
       end

data/lib/rack/blogengine/application_router.rb CHANGED Viewed

@@ -5,7 +5,7 @@ module Rack
     #
     # @author [benny]
     #
-    class ApplicationRouter
+    module ApplicationRouter
       # Maps documents to routes.
       # @param env Env Contains path info etc...
       # @param documents Documents which will be looked at

data/lib/rack/blogengine/command_line_interface.rb CHANGED Viewed

@@ -22,22 +22,15 @@ module Rack
       # @param [String] target
       def run(target)
         if target.empty?
-          puts 'Specify a targetfolder!'
+          print 'Specify a targetfolder!'
         else
-          if target.include?('/')
-            target = target.dup
-            target['/'] = ''
-          end
           if Dir.exists?("#{target}")
             system("cd #{target}")
-            targetfolder = "#{Dir.pwd}/#{target}"
-            config = get_config(targetfolder)
+            config = get_config(target)
             app = Rack::Builder.new do
               map '/assets' do
-                run Rack::Directory.new("#{targetfolder}/assets")
+                run Rack::Directory.new("#{target}/assets")
               end
               use Rack::CommonLogger
@@ -52,14 +45,16 @@ module Rack
               # Parse in all Documents in cli.run(target)
               # -> $documents are parsed in only once and then cached via a global variable
-              $documents = DocParser.parse_in_documents(targetfolder)
+              # Todo Cache without global variable?
+              # Global Variable replaced with module instance variable
+              Rack::Blogengine.documents = DocumentParser.parse_in_documents(target)
-              run Rack::Blogengine::Application
+              run Application
             end
             Rack::Server.start(app: app, Port: config['Port'], server: config['Server'])
           else
-            puts 'Target is not a folder!'
+            print "#{target} is not a folder!"
           end
         end
       end
@@ -103,8 +98,7 @@ module Rack
       # Display Version
       # return [String] VERSION
       def version?
-        puts "\n\tVERSION: #{Rack::Blogengine::VERSION}"
-        puts "\tRack::Blogengine releases are all pre-relases, first production release will be VERSION 1.0.0\n\n"
+        puts "\n\tVERSION: #{Rack::Blogengine::VERSION}\n\tRack::Blogengine releases are all pre-relases, first production release will be VERSION 1.0.0\n\n"
       end
       private

data/lib/rack/blogengine/{doc_parser.rb → document_parser.rb} RENAMED Viewed

@@ -8,7 +8,11 @@ module Rack
     #
     # @author [benny]
     #
-    class DocParser
+    module DocumentParser
+      class << self
+        attr_accessor :title, :content, :date
+      end
       # Parse in .content Documents.
       # @param target.
       # @return [Hash] Documents
@@ -24,11 +28,11 @@ module Rack
           next if item == '.' || item == '..' || extension != 'content'
           get_file_contents(item)
-          @html = fill_file_contents(@layout)
+          @html = fill_file_contents(@layout, @title, @content, @date)
           @document = Document.new
           @document.path = @path
-          @document.html = @html.gsub(/\s+/, ' ').strip
+          @document.html = @html
           @document.title = @title
           @document.date = @date
@@ -54,13 +58,7 @@ module Rack
         content_file = ::File.open("#{@target}/#{file}")
         content = content_file.read
-        # Replace Closing tags
-        content['/path'] = '/close'
-        content['/title'] = '/close'
-        content['/content'] = '/close'
-        content['/date'] = '/close'
-        contentarray = content.split('[/close]')
+        contentarray = get_content_array(content)
         contentarray.each do |contentblock|
           if contentblock.include? '[path]:'
@@ -90,15 +88,28 @@ module Rack
         end
       end
+      def self.get_content_array(content)
+        # Replace Closing tags
+        content['/path'] = '/close'
+        content['/title'] = '/close'
+        content['/content'] = '/close'
+        content['/date'] = '/close'
+        content.split('[/close]')
+      end
       # Replace layout placeholder with content from .content file
       # @param [String] layout
+      # @param [String] title
+      # @param [String] content
+      # @param [Date]   date
       # return [String] html placeholder replaced with content
-      def self.fill_file_contents(layout)
+      def self.fill_file_contents(layout, title, content, date)
         html = layout.dup
-        html.gsub! '{title}', @title
-        html['{content}'] = @content
-        html.gsub! '{date}', @date.strftime('%d.%m.%Y')
+        html.gsub! '{title}', title
+        html['{content}'] = content
+        html.gsub! '{date}', date.strftime('%d.%m.%Y')
       end
       # Sort documents array by date of each documenthash

data/lib/rack/blogengine/methods.rb CHANGED Viewed

@@ -6,8 +6,12 @@ module Rack
   # @author [benny]
   #
   module Blogengine
-    def self.root
-      ::File.dirname(::File.dirname(::File.expand_path('../..', __FILE__)))
+    class << self
+      attr_accessor :documents
+      def root
+        ::File.dirname(::File.dirname(::File.expand_path('../..', __FILE__)))
+      end
     end
   end
 end

data/lib/rack/blogengine/operator.rb CHANGED Viewed

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

data/lib/rack/blogengine/version.rb CHANGED Viewed

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

data/lib/rack/blogengine.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 require 'rack/blogengine/version'
-require 'rack/blogengine/doc_parser'
+require 'rack/blogengine/document_parser'
 require 'rack/blogengine/document'
 require 'rack/blogengine/application'
 require 'rack/blogengine/application_router'

data/rack-blogengine.gemspec CHANGED Viewed

@@ -20,10 +20,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", ">= 2.0.0"
-  spec.add_development_dependency "test-unit"
-  spec.add_development_dependency "test-unit-notify"
-  spec.add_development_dependency "rack-test"
+  spec.add_development_dependency "cucumber"
+  spec.add_development_dependency "capybara"
   spec.add_runtime_dependency "rack"
 end

data/spec/rack/blogengine/document_spec.rb ADDED Viewed

@@ -0,0 +1,34 @@
+require 'spec_helper'
+describe Rack::Blogengine::Document do
+  before do
+    @document = Rack::Blogengine::Document.new
+    @document.title = 'testtitle'
+    @document.path = '/test'
+    @document.date = '20-20-2014'
+    @document.html = '<html><h1>Test</h1></html>'
+  end
+  describe '#new' do
+    it 'should be an instance of Document' do
+      @document.class.must_equal Rack::Blogengine::Document
+    end
+    it 'should have content when parsed in' do
+      @document.title.must_equal 'testtitle'
+      @document.path.must_equal '/test'
+      @document.date.must_equal '20-20-2014'
+      @document.html.must_equal '<html><h1>Test</h1></html>'
+    end
+  end
+  describe '#to_hash' do
+    it 'should return the right hash' do
+      hashed = @document.to_hash
+      hashed.key?(:path).must_equal true
+      hashed.key?(:html).must_equal true
+    end
+  end
+end

data/spec/spec_helper.rb ADDED Viewed

@@ -0,0 +1,53 @@
+# RSPEC spec_helper
+# =========================
+# require 'rack/blogengine'
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+# RSpec.configure do |config|
+  # config.treat_symbols_as_metadata_keys_with_true_values = true
+  # config.run_all_when_everything_filtered = true
+  # config.filter_run :focus
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  # config.order = 'random'
+# end
+# =================================
+require 'coveralls'
+Coveralls.wear!
+# Minitest
+require 'minitest/autorun'
+# Load Rack::Blogengine gem
+require 'rack/blogengine'
+#
+# Opening Kernel for testpath method
+#
+# @author [benny]
+#
+module Kernel
+  def testpath
+    "#{Rack::Blogengine.root}/testfolder"
+  end
+end
+def capture_stdout(&block)
+  original_stdout = $stdout
+  $stdout = fake = StringIO.new
+  begin
+    yield
+  ensure
+    $stdout = original_stdout
+  end
+  fake.string
+end

data/test/{application_router_test.rb → rack/blogengine/application_router_test.rb} RENAMED Viewed

@@ -5,15 +5,12 @@ require 'test_helper.rb'
 #
 # @author [benny]
 #
-class ApplicationRouterTest < Test::Unit::TestCase
-  include Rack::Test::Methods
+class ApplicationRouterTest < MiniTest::Unit::TestCase
   def setup
-    # TODO: Use Fake Data - Don't generate a whole testfolder....
-    cli = Rack::Blogengine::CommandLineInterface.new
-    capture_stdout { cli.generate(testpath) }
+    # fake document
+    documents = [{ html: '<!DOCTYPE html><body><h2>This is the Index Page</h2></body></html>',
+                   path: '/' }]
-    documents = Rack::Blogengine::DocParser.parse_in_documents(testpath)
     env_fail = { 'PATH_INFO' => '/fail' }
     env_success = { 'PATH_INFO' => '/' }
@@ -22,18 +19,18 @@ class ApplicationRouterTest < Test::Unit::TestCase
   end
   def test_map_route_general
-    assert_equal(Hash, @route_success.class, 'Route should be a hash')
+    assert_instance_of(Hash, @route_success, 'Route should be a hash')
     # Check Hash keys
-    assert_true(@route_success.key?('path'), 'Route should contain a path')
-    assert_true(@route_success.key?('response'), 'Route should contain a response')
+    assert(@route_success.key?('path'), 'Route should contain a path')
+    assert(@route_success.key?('response'), 'Route should contain a response')
     # Check path
-    assert_equal(String, @route_success['path'].class, 'Path should be a string')
+    assert_instance_of(String, @route_success['path'], 'Path should be a string')
     # Check response
-    assert_equal(Array, @route_success['response'].class, 'Response should be an Array')
-    assert_equal(Fixnum, @route_success['response'][0].class, 'Status should be a Fixnum')
+    assert_instance_of(Array, @route_success['response'], 'Response should be an Array')
+    assert_instance_of(Fixnum, @route_success['response'][0], 'Status should be a Fixnum')
   end
   def test_map_route_on_success
@@ -45,6 +42,5 @@ class ApplicationRouterTest < Test::Unit::TestCase
   end
   def teardown
-    system("rm -rf #{testpath}")
   end
 end

data/test/rack/blogengine/command_line_interface_test.rb ADDED Viewed

@@ -0,0 +1,92 @@
+require 'test_helper.rb'
+#
+# TestClass for CommandLineInterface
+#
+# @author [benny]
+#
+class CommandLineInterfaceTest < MiniTest::Unit::TestCase
+  def setup
+    @cli = Rack::Blogengine::CommandLineInterface.new
+  end
+  def test_available_methods
+    assert(@cli.respond_to?(:method_missing), 'CLI should respond to :method_missing method')
+    assert(@cli.respond_to?(:run), 'CLI should respond to :run method')
+    assert(@cli.respond_to?(:generate), 'CLI should respond to :generate method')
+    assert(@cli.respond_to?(:version?), 'CLI should respond to :version? method')
+  end
+  def test_methods_missing
+    result = capture_stdout { @cli.send(:missing_method) }
+    assert(result.include?('Command missing_method not available'), 'Not Available Method should not raise NoMethodError')
+  end
+  def test_version?
+    result = capture_stdout { @cli.send(:version?) }
+    assert(result.include?('VERSION'), ':version? should output the current VERSION')
+  end
+  def test_generate
+    capture_stdout { @cli.send(:generate, testpath) }
+    assert(Dir.exist?(testpath), 'Test Directory should exist after generate method')
+    assert(Dir.exist?("#{testpath}/assets"), 'assets Directory should exist after generate method')
+    assert(Dir.exist?("#{testpath}/assets/layout"), 'assets/layout Directory should exist after generate method')
+    assert(Dir.exist?("#{testpath}/assets/style"), 'assets/style Directory should exist after generate method')
+    assert(Dir.exist?("#{testpath}/assets/js"), 'assets/js Directory should exist after generate method')
+    assert(Dir.exist?("#{testpath}/assets/images"), 'assets/images Directory should exist after generate method')
+    assert(Dir.exist?("#{testpath}/operator"), 'operator Directory should exist after generate method')
+    assert(File.exist?("#{testpath}/operator/operator.rb"), 'operator.rb should exist after generate method')
+    assert(File.exist?("#{testpath}/config.yml"), 'config.yml should exist after generate method')
+    assert(File.exist?("#{testpath}/index.content"), 'index.content should exist after generate method')
+    assert(File.exist?("#{testpath}/assets/layout/layout.html"), 'layout.html should exist after generate method')
+    assert(File.exist?("#{testpath}/assets/style/style.css"), 'style.css should exist after generate method')
+    assert(File.exist?("#{testpath}/assets/js/script.js"), 'script.js should exist after generate method')
+    system("rm -rf #{testpath}")
+  end
+  def test_run_empty_string_argument
+    result = capture_stdout { @cli.send(:run, '') }
+    assert_equal('Specify a targetfolder!', result, 'run method should output "Specify a targetfolder!" when folderstring is empty')
+  end
+  def test_run_not_folder_string_argument
+    result = capture_stdout { @cli.send(:run, '/not_a_directory') }
+    assert_equal('/not_a_directory is not a folder!', result, 'run method should output "Target is not a folder!" when folderstring is not a directory')
+  end
+  # def test_run
+    # capture_stdout { @cli.send(:generate, testpath) }
+    # threads = []
+    # thr1 = Thread.new do
+      # capture_stdout { @cli.send(:run, testpath) }
+    # end
+    # thr2 = Thread.new do
+      # sleep 10
+      # system("rm -rf #{testpath}")
+      # exit!
+    # end
+    # threads << thr1 << thr2
+    # threads.each { |thr| thr.join }
+  # end
+  def test_get_config
+    capture_stdout { @cli.send(:generate, testpath) }
+    config = @cli.send(:get_config, testpath)
+    assert_equal(3000, config['Port'], 'Default Port should be 3000')
+    assert_equal('webrick', config['Server'], 'Default Server should be webrick')
+    assert_equal('', config['Username'], 'Default Username should not be set')
+    assert_equal('', config['Password'], 'Default Password should not be set')
+    assert_equal('no', config['Usage'], 'Default HTTP Auth Usage should be no')
+    system("rm -rf #{testpath}")
+  end
+end

data/test/rack/blogengine/document_parser_test.rb ADDED Viewed

@@ -0,0 +1,92 @@
+require 'test_helper'
+#
+# Test Class for DocumentParser
+#
+# @author [benny]
+#
+class DocumentParserTest < MiniTest::Unit::TestCase
+  # parallelize_me!
+  def setup
+    cli = Rack::Blogengine::CommandLineInterface.new
+    capture_stdout { cli.generate(testpath) }
+    @documents = Rack::Blogengine::DocumentParser.parse_in_documents(testpath)
+  end
+  # Test DocumentParser.parse_in_documents(path)
+  def test_parse_in_documents
+    @documents.each do |document|
+      # Check Hash keys
+      assert(document.key?(:html), 'Documents should contain a path')
+      assert(document.key?(:path), 'Documents should contain a response')
+    end
+  end
+  # Test DocumentParser.fill_file_contents(layout, title, content, date)
+  def test_fill_file_contents
+    layout_file = ::File.open("#{testpath}/assets/layout/layout.html", 'r')
+    layout = layout_file.read
+    title = 'testtitle'
+    content = 'testcontent'
+    date = Date.new
+    html = Rack::Blogengine::DocumentParser.fill_file_contents(layout, title, content, date)
+    assert(html.include?(title), 'Parsed and filled in HTML should contain Title')
+    assert(html.include?(content), 'Parsed and filled in HTML should contain Content')
+    assert(html.include?(date.strftime('%d.%m.%Y')), 'Parsed and filled in HTML should contain Date')
+  end
+  # Test DocumentParser.get_file_contents('file.content')
+  def test_get_file_contents
+    Rack::Blogengine::DocumentParser.title = ''
+    Rack::Blogengine::DocumentParser.content = ''
+    Rack::Blogengine::DocumentParser.date = ''
+    Rack::Blogengine::DocumentParser.get_file_contents('index.content')
+    assert_equal('INDEX', Rack::Blogengine::DocumentParser.title, 'Parsed in Title should eql Title in test .content file')
+    assert_equal('<h2>This is the Index Page</h2>', Rack::Blogengine::DocumentParser.content, 'Parsed in Content should eql Content in test .content file')
+    assert_instance_of(Date, Rack::Blogengine::DocumentParser.date, 'Parsed in Date should be of Class Date')
+  end
+  # Test DocumentParser.get_content_array(contentstring)
+  # Should split up the content for each content section (Path, Title, Date, Content)
+  def test_get_content_array
+    content = '[path]:[/path]
+               [title]:INDEX[/title]
+               [date]:2013,01,01[/date]
+               [content]:
+               <h2>This is the Index Page</h2>
+               [/content]'
+    contentarray = Rack::Blogengine::DocumentParser.get_content_array(content)
+    assert_equal(4, contentarray.length, 'The content Array should contain 4 members (Path, Title, Date, Content)')
+    assert(contentarray[0].include?('path'), 'First Entry should contain the path')
+    assert(contentarray[1].include?('title'), 'Second Entry should contain the title')
+    assert(contentarray[2].include?('date'), 'Third Entry should contain the date')
+    assert(contentarray[3].include?('content'), 'Fourth Entry should contain the content')
+  end
+  # Test DocumentParser.sort(documents)
+  def test_sort
+    documents = []
+    document1 = Rack::Blogengine::Document.new
+    document1.date = Date.new(2013, 12, 12)
+    document2 = Rack::Blogengine::Document.new
+    document2.date = Date.new(2012, 12, 12)
+    documents << document1 << document2
+    documents = Rack::Blogengine::DocumentParser.sort(documents)
+    assert_equal(Date.new(2012, 12, 12), documents[0].date, 'Documents should be sorted by date (earlier first)')
+  end
+  def teardown
+    system("rm -rf #{testpath}")
+  end
+end

data/test/rack/blogengine/document_test.rb ADDED Viewed

@@ -0,0 +1,48 @@
+require 'test_helper.rb'
+#
+# TestClass for Documents
+#
+# @author [benny]
+#
+class DocumentTest < MiniTest::Unit::TestCase
+  def setup
+    @document = Rack::Blogengine::Document.new
+    @document.title = 'testtitle'
+    @document.path = '/test'
+    @document.date = '20-20-2014'
+    @document.html = '<html><h1>Test</h1></html>'
+  end
+  def test_new_document
+    assert_instance_of(Rack::Blogengine::Document, @document, 'Document should be of class Rack::Blogengine::Document')
+  end
+  def test_document_has_content
+    assert_equal('testtitle', @document.title, 'Document should contain the testtitle')
+    assert_equal('/test', @document.path, 'Document should contain the test path')
+    assert_equal('20-20-2014', @document.date, 'Document should contain the test date')
+    assert_equal('<html><h1>Test</h1></html>', @document.html, 'Document should contain the test html')
+  end
+  def test_document_to_hash
+    hashed = @document.to_hash
+    assert(hashed.key?(:path), 'Hashed Document should contain the path')
+    assert(hashed.key?(:html), 'Hashed Document should contain parsed html')
+  end
+  def test_exec_content_operator
+    cli = Rack::Blogengine::CommandLineInterface.new
+    capture_stdout { cli.generate(testpath) }
+    document = Rack::Blogengine::Document.new
+    document.html = '{% test_operator %}'
+    document.exec_content_operator(document, 'testfolder')
+    assert_equal('test', document.html, 'Documents html should contain test_operators return value')
+    system("rm -rf #{testpath}")
+  end
+end

data/test/test_helper.rb CHANGED Viewed

@@ -1,17 +1,18 @@
+require 'coveralls'
+Coveralls.wear!
+# Previous content of test helper now starts here
 # Minitest
-# require 'minitest/autorun'
+require 'minitest/autorun'
 # require 'minitest/pride' # for colored output
-# require "test_notifier/runner/minitest"
+# require 'test_notifier/runner/minitest' # for a notifier
-# Real TestUnit
-require 'test/unit'
-require 'test/unit/notify'
-require 'rack/blogengine'
-require 'rack/test'
+# TestUnit -> MiniTest (TestUnit is only compatibility Layer)
+# require 'test/unit'
-# alternative to require_relative
-# rake install in gem dir and then
-# require 'mygem'
+# Load Rack::Blogengine gem
+require 'rack/blogengine'
 # class Hash
   # method for usage with assert_boolean
@@ -27,11 +28,11 @@ require 'rack/test'
 # end
 #
-# Opening Core Class Object for testpath method
+# Opening Kernel for testpath method
 #
 # @author [benny]
 #
-class Object
+module Kernel
   def testpath
     "#{Rack::Blogengine.root}/testfolder"
   end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-blogengine
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Benny1992
@@ -9,71 +9,53 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00 Z
+date: 2014-02-16 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: &id001 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: "1.3"
+  name: bundler
   prerelease: false
-  type: :development
   version_requirements: *id001
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: &id002 !ruby/object:Gem::Requirement
     requirements:
-    - &id004
+    - &id003
       - ">="
       - !ruby/object:Gem::Version
         version: "0"
+  name: rake
   prerelease: false
-  type: :development
   version_requirements: *id002
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+    - *id003
+  name: cucumber
   prerelease: false
+  version_requirements: *id004
   type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency
-  name: test-unit
   requirement: &id005 !ruby/object:Gem::Requirement
     requirements:
-    - *id004
+    - *id003
+  name: capybara
   prerelease: false
-  type: :development
   version_requirements: *id005
-- !ruby/object:Gem::Dependency
-  name: test-unit-notify
-  requirement: &id006 !ruby/object:Gem::Requirement
-    requirements:
-    - *id004
-  prerelease: false
   type: :development
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: &id007 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement
     requirements:
-    - *id004
-  prerelease: false
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency
+    - *id003
   name: rack
-  requirement: &id008 !ruby/object:Gem::Requirement
-    requirements:
-    - *id004
   prerelease: false
+  version_requirements: *id006
   type: :runtime
-  version_requirements: *id008
 description: Blogengine based on rack applications
 email:
 - klotz.benjamin@yahoo.de
@@ -85,7 +67,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
-- .rspec
 - .rubocop.yml
 - .travis.yml
 - Gemfile
@@ -97,18 +78,25 @@ files:
 - assets/layout.html
 - assets/operator.rb
 - bin/rack-blogengine
+- features/hello.feature
+- features/step_definitions/hello_steps.rb
+- features/support/env.rb
 - lib/rack/blogengine.rb
 - lib/rack/blogengine/application.rb
 - lib/rack/blogengine/application_router.rb
 - lib/rack/blogengine/command_line_interface.rb
-- lib/rack/blogengine/doc_parser.rb
 - lib/rack/blogengine/document.rb
+- lib/rack/blogengine/document_parser.rb
 - lib/rack/blogengine/methods.rb
 - lib/rack/blogengine/operator.rb
 - lib/rack/blogengine/version.rb
 - rack-blogengine.gemspec
-- test/application_router_test.rb
-- test/document_test.rb
+- spec/rack/blogengine/document_spec.rb
+- spec/spec_helper.rb
+- test/rack/blogengine/application_router_test.rb
+- test/rack/blogengine/command_line_interface_test.rb
+- test/rack/blogengine/document_parser_test.rb
+- test/rack/blogengine/document_test.rb
 - test/test_helper.rb
 homepage: http://www.bennyklotz.at
 licenses:
@@ -123,10 +111,10 @@ require_paths:
 - spec
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - *id004
+  - *id003
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - *id004
+  - *id003
 requirements: []
 rubyforge_project:
@@ -135,6 +123,13 @@ signing_key:
 specification_version: 4
 summary: Blogengine based on rack applications
 test_files:
-- test/application_router_test.rb
-- test/document_test.rb
+- features/hello.feature
+- features/step_definitions/hello_steps.rb
+- features/support/env.rb
+- spec/rack/blogengine/document_spec.rb
+- spec/spec_helper.rb
+- test/rack/blogengine/application_router_test.rb
+- test/rack/blogengine/command_line_interface_test.rb
+- test/rack/blogengine/document_parser_test.rb
+- test/rack/blogengine/document_test.rb
 - test/test_helper.rb

data/.rspec DELETED Viewed

	@@ -1,2 +0,0 @@
1	- --color
2	- --format documentation

data/test/document_test.rb DELETED Viewed

@@ -1,31 +0,0 @@
-require 'test_helper.rb'
-#
-# TestClass for Documents
-#
-# @author [benny]
-#
-class DocumentTest < Test::Unit::TestCase
-  def setup
-    @document = Rack::Blogengine::Document.new
-    @document.title = 'testtitle'
-    @document.path = '/test'
-    @document.date = '20-20-2014'
-    @document.html = '<html><h1>Test</h1></html>'
-  end
-  def test_document_has_content
-    assert_equal('testtitle', @document.title, 'Document should contain the testtitle')
-    assert_equal('/test', @document.path, 'Document should contain the test path')
-    assert_equal('20-20-2014', @document.date, 'Document should contain the test date')
-    assert_equal('<html><h1>Test</h1></html>', @document.html, 'Document should contain the test html')
-  end
-  def test_document_to_hash
-    hashed = @document.to_hash
-    assert_true(hashed.key?(:path), 'Hashed Document should contain the path')
-    assert_true(hashed.key?(:html), 'Hashed Document should contain parsed html')
-  end
-end