1
1
"" "
2
- jekyll-multisite Sumit Khanna - http://penguindreams.org
2
+ jekyll-multisite Sumit Khanna - http://penguindreams.org
3
3
4
4
---
5
5
@@ -29,7 +29,7 @@ module Jekyll
29
29
30
30
class << self
31
31
def sanitized_path ( base_directory , questionable_path )
32
-
32
+
33
33
if base_directory . eql? ( questionable_path )
34
34
base_directory
35
35
elsif questionable_path . start_with? ( base_directory )
@@ -41,7 +41,7 @@ def sanitized_path(base_directory, questionable_path)
41
41
else
42
42
File . join ( base_directory , questionable_path )
43
43
end
44
-
44
+
45
45
end
46
46
end
47
47
@@ -57,47 +57,47 @@ def parent_dirs(file)
57
57
end
58
58
end
59
59
end
60
-
60
+
61
61
# Shared source reader
62
62
63
63
class Reader
64
64
65
65
def read
66
66
@site . layouts = LayoutReader . new ( site ) . read
67
67
read_directories
68
-
68
+
69
69
if @site . config [ 'shared_dir' ]
70
70
read_directories File . join ( '..' , @site . config [ 'shared_dir' ] )
71
71
end
72
-
72
+
73
73
sort_files!
74
74
@site . data = DataReader . new ( site ) . read ( site . config [ 'data_dir' ] )
75
75
CollectionReader . new ( site ) . read
76
76
end
77
-
77
+
78
78
end
79
79
80
80
81
81
# Move the _shared directories to the correct location
82
- # (very hacky - we move all the files to the correct
82
+ # (very hacky - we move all the files to the correct
83
83
# location with a hook after the site is written/rendered)
84
84
85
85
def self . sync_dir ( cur , base , dest )
86
86
Dir . glob ( File . join ( cur , '*' ) , File ::FNM_DOTMATCH ) . each do |f |
87
-
87
+
88
88
rel = Pathname . new ( f ) . relative_path_from ( base )
89
89
dest_dir = File . join ( dest , rel )
90
-
90
+
91
91
if File . basename ( f ) == '.' or File . basename ( f ) == '..'
92
- next
92
+ next
93
93
elsif File . directory? ( f )
94
- if not File . exists? ( dest_dir )
95
- Dir . mkdir ( dest_dir )
96
- end
94
+ if not File . exists? ( dest_dir )
95
+ Dir . mkdir ( dest_dir )
96
+ end
97
97
sync_dir ( f , base , dest )
98
- Dir . rmdir ( f )
98
+ Dir . rmdir ( f )
99
99
else
100
- FileUtils . mv ( f , dest_dir )
100
+ FileUtils . mv ( f , dest_dir )
101
101
end
102
102
end
103
103
end
@@ -110,10 +110,10 @@ def self.sync_dir(cur, base, dest)
110
110
base_shared = File . basename ( site . config [ 'shared_dir' ] )
111
111
shared_dir = File . join ( site . dest , base_shared )
112
112
static_shared_dir = File . join ( Configuration ::DEFAULTS [ 'destination' ] , base_shared )
113
-
113
+
114
114
sync_dir ( shared_dir , Pathname . new ( shared_dir ) , site . dest )
115
115
sync_dir ( static_shared_dir , Pathname . new ( static_shared_dir ) , site . dest )
116
-
116
+
117
117
Dir . rmdir ( shared_dir )
118
118
Dir . rmdir ( static_shared_dir )
119
119
end
@@ -140,15 +140,15 @@ def relative_to_source(entry)
140
140
141
141
begin
142
142
require "jekyll-paginate"
143
-
143
+
144
144
module Paginate
145
145
146
146
class Pager
147
147
def self . pagination_candidate? ( config , page )
148
148
page . name == 'index.html'
149
149
end
150
150
end
151
-
151
+
152
152
class Pagination < Generator
153
153
def paginate ( site , page )
154
154
all_posts = site . site_payload [ 'site' ] [ 'posts' ]
@@ -159,14 +159,14 @@ def paginate(site, page)
159
159
if num_page > 1
160
160
161
161
# Here is our monkey patch
162
- if File . basename ( page . dir ) == site . config [ 'shared_dir' ]
163
- base = File . expand_path ( File . join ( site . source , '..' ) )
162
+ if File . basename ( page . dir ) == site . config [ 'shared_dir' ]
163
+ base = File . expand_path ( File . join ( site . source , '..' ) )
164
164
newpage = Page . new ( site , base , page . dir , page . name )
165
165
else
166
- newpage = Page . new ( site , site . source , page . dir , page . name )
167
- end
166
+ newpage = Page . new ( site , site . source , page . dir , page . name )
167
+ end
168
168
169
- newpage . pager = pager
169
+ newpage . pager = pager
170
170
newpage . dir = Pager . paginate_path ( site , num_page )
171
171
site . pages << newpage
172
172
else
0 commit comments