ciridiri 0.8.1 → 0.8.2

data/Rakefile

@@ -1,33 +1,8 @@
 require 'rubygems'
 require 'rake/testtask'
-require 'rake/gempackagetask'
 
 task :default => :test
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "ciridiri"
-    gemspec.version = "0.8.1"
-    gemspec.summary = gemspec.description = "Dead simple wiki engine"
-    gemspec.email = "vasily@polovnyov.ru"
-    gemspec.homepage = "http://vast.github.com/ciridiri.rb"
-    gemspec.authors = ["Vasily Polovnyov"]
-
-    gemspec.add_dependency 'sinatra', '>=0.9.1'
-
-    gemspec.add_development_dependency 'rack-test', '>=0.3.0'
-    gemspec.add_development_dependency 'contest', '>=0.1.0'
-
-    gemspec.test_files = Dir.glob('test/*')
-    gemspec.files = ["LICENSE", "README.md", "Rakefile", "config.ru"] + Dir.glob('lib/**/*') + gemspec.test_files +
-                    Dir.glob('public/**/*') + Dir.glob('views/*')
-
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
-end
-
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/*_test.rb']

data/lib/ciridiri/page.rb

@@ -1,5 +1,6 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__)) unless $LOAD_PATH.include?(File.dirname(__FILE__))
-%w[fileutils finders paths extensions].each {|r| require r}
+require 'fileutils'
+dir = File.dirname(__FILE__)
+%w[finders paths extensions].each {|r| require File.join(dir, r)}
 
 module Ciridiri
   class Page
@@ -9,7 +10,7 @@ module Ciridiri
     # A regular expression for markdown like headers (`#`, `##`, `###`, `=====`, `----`)
     MD_TITLE = Regexp.new("(^\#{1,3}\\s*?([^#].*?)#*$)|(^ {0,3}(\\S.*?)\\n(?:=|-)+(?=\\n+|\\Z))", Regexp::MULTILINE)
     # HTML headers (`<h1-3>`)
-    HTML_TITLE = Regexp.new("^<h[1-3](.*)?>(.*)+</h[1-3]>")
+    HTML_TITLE = Regexp.new("^<h[1-3](.*)?>((.*)+)</h[1-3]>")
 
     # File extensions
     SOURCE_FILE_EXT = ".text".freeze
@@ -111,7 +112,12 @@ module Ciridiri
     # Tiny `attr_writer` for `@@content_dir` which creates the content directory if it doesn't exist
     def self.content_dir=(dir)
       @@content_dir = dir
-      FileUtils.mkdir_p(@@content_dir) if !File.exists?(@@content_dir)
+      begin
+        FileUtils.mkdir_p(@@content_dir) if !File.exists?(@@content_dir)
+      rescue Errno::EACCES
+        # Can't create content dir, using current working dir
+        @@content_dir = "."
+      end
     end
 
     ###Protected methods
@@ -120,9 +126,9 @@ module Ciridiri
     # Find the title in contents (html or markdown variant).
     # Return `""` if nothing found.
     def self.find_title(contents="")
-      if contents.detect {|s| s.match(MD_TITLE)}
+      if contents.match(MD_TITLE)
         $2.strip || $4.strip
-      elsif contents.detect {|s| s.match(HTML_TITLE)}
+      elsif contents.match(HTML_TITLE)
         $2.strip
       else
         ""

data/test/ciridiri_test.rb

@@ -75,7 +75,7 @@ class CiridiriTest < Test::Unit::TestCase
     protected
     def assert_redirect(uri)
       assert last_response.redirect?
-      assert_equal last_response.headers['Location'], uri
+      assert last_response.headers['Location'] =~ Regexp.new(uri + '$')
     end
   end
 end

data/test/test_helper.rb

@@ -1,7 +1,8 @@
+gem 'minitest'
 require 'rubygems'
 require 'test/unit'
 require 'contest'
-require 'lib/ciridiri'
+require './lib/ciridiri'
 begin; require 'turn'; rescue LoadError; end
 
 Ciridiri::Page.content_dir = File.join(File.dirname(__FILE__), 'pages')

metadata

@@ -1,80 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ciridiri
-version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: false
-  segments: 
-  - 0
-  - 8
-  - 1
-  version: 0.8.1
+version: !ruby/object:Gem::Version
+  version: 0.8.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Vasily Polovnyov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-01 00:00:00 +04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157070940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 9
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2157070940
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &2157070460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: contest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2157070460
+- !ruby/object:Gem::Dependency
+  name: contest
+  requirement: &2157069980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.0
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2157069980
 description: Dead simple wiki engine
 email: vasily@polovnyov.ru
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - README.md
 - Rakefile
 - config.ru
@@ -92,41 +68,32 @@ files:
 - views/edit.erb
 - views/layout.erb
 - views/show.erb
-has_rdoc: true
 homepage: http://vast.github.com/ciridiri.rb
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Dead simple wiki engine
-test_files: 
+test_files:
 - test/test_helper.rb
 - test/ciridiri_test.rb
 - test/page_test.rb