pipin 0.3.0 → 0.3.1

data/lib/pipin/build_tasks.rb

@@ -7,8 +7,8 @@ end
 
 setup_environment
 
-SRCDIR = Pipin::Post.posts_dir
-DSTDIR = 'public'
+SRCDIR = config[:dir][:posts]
+DSTDIR = config[:dir][:dist]
 SRC_EXTNAMES = %w(html txt)
 EXTS = SRC_EXTNAMES.join(',')
 
@@ -27,7 +27,7 @@ end
 
 # posts
 SRC_EXTNAMES.each do |extname|
-  rule /public\/\w+\.html/ => "#{SRCDIR}/%n.#{extname}" do |t|
+  rule /#{Regexp.escape DSTDIR}\/\w+\.html/ => "#{SRCDIR}/%n.#{extname}" do |t|
     Pipin::Exec.new('post', File.basename(t.name, '.html')).build
   end
 end

data/lib/pipin/templates/pipinrc

@@ -11,9 +11,10 @@ def config
     :title => 'Thie Pipin Diary',
     #:description => 'Please set config[:description] in pipinrc',
     :dir => {
-      #:posts => '/Users/dan/w/piping/datasample',
-      #:views => '/Users/dan/w/piping/views',
-      #:plugins => "#{root_path}/config/plugins",
+      :dist => './public',
+      :posts => './data',
+      #:views => "#{pipin_root}/pipin/templates/plugins",
+      #:plugins => "#{pipin_root}/pipin/templates/plugins",
     },
     :limit => 5,
     # 複数のcssを使用する場合は配列で指定してください
@@ -53,7 +54,6 @@ def setup_environment
     $KCODE = 'UTF-8' # 1.8
   end
   add_compilers
-  Pipin::Post.posts_dir = config[:dir][:posts] || './data'
   load_plugins config[:dir][:plugins] || './plugins'
 end
 

data/lib/pipin/version.rb

@@ -1,3 +1,3 @@
 module Pipin
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/pipin.rb

@@ -26,7 +26,7 @@ module Pipin
 
     def build
       page_name, *opts = @args
-      Builder.new('public').__send__('render_' + page_name, *opts)
+      Builder.new(config[:dir][:dist]).__send__('render_' + page_name, *opts)
     end
   end
 
@@ -87,15 +87,12 @@ module Pipin
   end
 
   class Post
-    def self.posts_dir=(dir) @@posts_dir = dir end
-    def self.posts_dir() @@posts_dir end
-
     def self.find(pattern, options = {})
       self.find_srcs(pattern, options).map {|e| Post.new(e) }
     end
 
     def self.find_srcs(pattern, options = {})
-      files = Dir.chdir(@@posts_dir) { Dir.glob(pattern + '.{txt,html}') }.sort.reverse
+      files = Dir.chdir(config[:dir][:posts]) { Dir.glob(pattern + '.{txt,html}') }.sort.reverse
       options[:limit] ? files[0, options[:limit]] : files 
     end
 
@@ -118,7 +115,7 @@ module Pipin
     attr_reader :filename, :header, :body
     def initialize(filename)
       @filename = filename
-      @header, @body = Dir.chdir(@@posts_dir) { File.read(@filename) }.split(/^__$/, 2)
+      @header, @body = Dir.chdir(config[:dir][:posts]) { File.read(@filename) }.split(/^__$/, 2)
       @header, @body = nil, @header unless @body
       @header and p(@header)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pipin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -26,7 +26,6 @@ files:
 - lib/misc/mixistyle.rb
 - lib/pipin.rb
 - lib/pipin/build_tasks.rb
-- lib/pipin/templates/.htaccess
 - lib/pipin/templates/Rakefile
 - lib/pipin/templates/data/20110620.txt
 - lib/pipin/templates/data/20110622.txt
@@ -36,6 +35,7 @@ files:
 - lib/pipin/templates/plugins/amazon.rb
 - lib/pipin/templates/plugins/genarate_rss.rb
 - lib/pipin/templates/plugins/use_hiki_plugin.rb
+- lib/pipin/templates/public/dot.htaccess
 - lib/pipin/templates/public/stylesheets/pipin.css
 - lib/pipin/version.rb
 - lib/pipin/views/archives.haml