ciridiri 0.8.2 → 0.8.3

data/lib/ciridiri/finders.rb

@@ -15,7 +15,8 @@ module Ciridiri
     # Return an array of all `Page`s excluding backups
     def all
       Dir.chdir(content_dir) do
-        files = Dir.glob(File.join("**", "*#{SOURCE_FILE_EXT}")).delete_if {|p| p =~ Regexp.new("\\.[0-9]+\\#{SOURCE_FILE_EXT}$")}
+        files = Dir.glob(File.join("**", "*#{Ciridiri::SOURCE_FILE_EXT}")).
+                    delete_if {|p| p =~ Regexp.new("\\.[0-9]+\\#{Ciridiri::SOURCE_FILE_EXT}$")}
         files.collect {|f| Page.new(uri_from_path(f), File.open(f, 'r') {|b| b.read})}
       end
     end

data/lib/ciridiri/page.rb

@@ -1,11 +1,9 @@
 require 'fileutils'
 dir = File.dirname(__FILE__)
-%w[finders paths extensions].each {|r| require File.join(dir, r)}
+%w[extensions paths finders].each {|r| require File.join(dir, r)}
 
 module Ciridiri
-  class Page
-    extend Ciridiri::Finders, Ciridiri::Paths
-    ###Constants block
+    ### Constants
 
     # A regular expression for markdown like headers (`#`, `##`, `###`, `=====`, `----`)
     MD_TITLE = Regexp.new("(^\#{1,3}\\s*?([^#].*?)#*$)|(^ {0,3}(\\S.*?)\\n(?:=|-)+(?=\\n+|\\Z))", Regexp::MULTILINE)
@@ -16,7 +14,10 @@ module Ciridiri
     SOURCE_FILE_EXT = ".text".freeze
     CACHED_FILE_EXT = ".html".freeze
 
-    ###Default values for all options
+  class Page
+    include Ciridiri
+    extend Ciridiri::Finders, Ciridiri::Paths
+    ### Default values for all options
 
     # Where pages should be stored on a file system
     @@content_dir = '.'

data/lib/ciridiri/paths.rb

@@ -1,11 +1,24 @@
+require 'pathname'
+
 module Ciridiri
   module Paths
     # Convert `uri` to `path` in a file system including `content_dir` and a source file extension
     # `/team/pro/chuck-norris` -> `content_dir/team/pro/chuck-norris.text`
     def path_from_uri(uri)
-      path = uri.split("/")
+      path = uri.split('/')
       filename = path.pop
-      File.join(content_dir, path, "#{filename}#{Page::SOURCE_FILE_EXT}")
+      File.join(content_dir, path, "#{filename}#{Ciridiri::SOURCE_FILE_EXT}")
+    end
+
+    # Convert `path` to `uri`
+    # `content_dir/team/pro/chuck-norris.text` -> `/team/pro/chuck-norris`
+    def uri_from_path(path)
+      path = File.absolute_path(path)
+      relative_path = Pathname.new(path).relative_path_from(Pathname(content_dir)).to_s
+      relative_uri = relative_path.gsub(File::Separator, '/').
+                                   gsub(Regexp.new("#{Ciridiri::SOURCE_FILE_EXT}$"), '')
+
+      "/#{relative_uri}"
     end
 
   end

data/test/page_test.rb

@@ -49,6 +49,16 @@ class PageTest < Test::Unit::TestCase
       assert_not_nil Page.find_by_uri_or_empty('nonexistent-uri')
     end
 
+    should "return all pages" do
+      page_1, page_2 = page_stub('/page_1'), page_stub('/page_2')
+      page_1.save
+      page_2.save
+
+      assert_equal 2, Page.all.length
+      assert_not_nil Page.all.detect {|p| p.uri == page_1.uri}
+      assert_not_nil Page.all.detect {|p| p.uri == page_2.uri}
+    end
+
     should "respect uri hierarchy" do
       @page = page_stub('about/team/boris')
       @page.save

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ciridiri
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2157070940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157070940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2157070460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *2157070460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: contest
-  requirement: &2157069980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *2157069980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: Dead simple wiki engine
 email: vasily@polovnyov.ru
 executables: []
@@ -89,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Dead simple wiki engine