yhara-lifelog 0.0.1 → 0.0.2

data/README.md

@@ -0,0 +1,36 @@
+LifeLog
+=======
+
+Install
+-------
+
+    $ sudo gem install ramaze datamapper do_sqlite3
+    $ sudo gem install yhara-lifelog
+
+How to use
+----------
+    $ lifelog \[options]
+
+options:
+
+* --config PATH : from where configuration is loaded
+  (default: ~/.lifelog.rb)
+* --db PATH : where sqlite3 database is put
+* --port N : port of server
+* --version : show version
+* --help : show information of options
+* --from-001 : if you are using VERSION=0.0.1,
+  use this option for first time
+
+then open [http://localhost:7012/](http://localhost:7012/)
+in your browser.
+
+Config file
+-----------
+
+Config file is put in ~/.lifelog.rb by default
+(you can specify its path by --config option).
+
+It's just a Ruby script file, so you can write
+any code to change behavior of application.
+

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/lifelog

@@ -2,26 +2,11 @@
 require 'optparse'
 require 'rubygems'
 require 'ramaze'
+require 'controller/init.rb'
 
-class MainController < Ramaze::Controller
-  map '/'
-  engine :Haml
-
-  def index
-    @posts = Post.all(:order => [:posted_at.desc])
-  end
-
-  def say
-    Post.create({
-      :posted_at => Time.now,
-      :message => request.params["message"],
-    })
-
-    redirect '/'
-  end
-end
 module LifeLog
   include Innate::Optioned
+  VERSION = File.read(__DIR__("../VERSION"))
 
   options.dsl do
     o "Path of config file", 
@@ -30,33 +15,52 @@ module LifeLog
       :db, File.expand_path("~/.lifelog.db")
     o "Port number", 
       :port, 7012
+    o "Whether to skip creating table :posts",
+      :no_create_post_table, false
   end
-end
 
-OptionParser.new{|o|
-  o.on("--config PATH"){|path|
-    LifeLog.options[:config] = path
-  }
-  o.on("--db DB_PATH"){|path| 
-    LifeLog.options[:db] = File.expand_path(path, Dir.pwd)
-  }
-  o.on("--port N"){|port|
-    LifeLog.options[:port] = port
-  }
-  o.on("--help"){ puts o.to_s; exit }
-}.parse!(ARGV)
-
-conf = LifeLog.options[:config]
-if File.exist?(conf)
-  Ramaze::Log.info("Loading config file: #{conf}")
-  require conf
-else
-  Ramaze::Log.warn("Config file not found: #{conf}")
+  def self.parse_argv!
+    OptionParser.new{|o|
+      o.on("--config PATH"){|path|
+        LifeLog.options[:config] = path
+      }
+      o.on("--db DB_PATH"){|path| 
+        LifeLog.options[:db] = File.expand_path(path, Dir.pwd)
+      }
+      o.on("--from-001"){
+        LifeLog.options[:no_create_post_table] = true
+      }
+      o.on("--port N"){|port|
+        LifeLog.options[:port] = port
+      }
+      o.on("--version"){ puts VERSION; exit }
+      o.on("--help"){ puts o.to_s; exit }
+    }.parse!(ARGV)
+  end
+
+  def self.load_conf(conf)
+    if File.exist?(conf)
+      Ramaze::Log.info("Loading config file: #{conf}")
+      require conf
+    else
+      Ramaze::Log.warn("Config file not found: #{conf}")
+    end
+  end
+
+  def self.load_models(db)
+    Ramaze::Log.info("Loading database: #{db}")
+    require __DIR__('../model/init.rb')
+  end
+
+  def self.start(port)
+    Ramaze::Log.info("Starting server with port #{port}")
+    Ramaze.start :port => port,
+                 :root => __DIR__('../')
+  end
 end
 
-Ramaze::Log.info("Loading database: #{LifeLog.options[:db]}")
-require __DIR__('../models.rb')
+LifeLog.parse_argv!
 
-Ramaze::Log.info("Starting server with port #{LifeLog.options[:port]}")
-Ramaze.start :port => LifeLog.options[:port], 
-             :root => __DIR__('../')
+LifeLog.load_conf(LifeLog.options[:config])
+LifeLog.load_models(LifeLog.options[:db])
+LifeLog.start(LifeLog.options[:port])

data/controller/init.rb

@@ -0,0 +1,7 @@
+class Controller < Ramaze::Controller
+  layout 'default'
+  engine :Gestalt
+  helper :gestalt
+end
+
+require 'controller/main.rb'

data/controller/main.rb

@@ -0,0 +1,19 @@
+class Main < Controller
+  map '/'
+  helper :paginate
+
+  trait :paginate => { :limit => 100, :var => "page" }
+
+  def index
+    @pager = paginate(Post.all(:order => [:posted_at.desc]))
+  end
+
+  def say
+    Post.create({
+      :posted_at => Time.now,
+      :message => request.params["message"],
+    })
+
+    redirect '/'
+  end
+end

data/layout/default.ges

@@ -0,0 +1,15 @@
+html do
+  head do
+    meta({:"http-equiv" => "Content-Type",
+          :content => "text/html; charset=utf-8"})
+    title "LifeLog"
+  end
+  body do
+    h1 {
+      a(:href => Main.r(:index)){ h "LifeLog" }
+    }
+    div {
+      @content
+    }
+  end
+end

data/lifelog.gemspec

@@ -2,22 +2,31 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lifelog}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yutaka HARA"]
-  s.date = %q{2009-05-23}
+  s.date = %q{2009-05-24}
   s.default_executable = %q{lifelog}
   s.description = %q{A lifelogging tool written in Ramaze}
   s.email = %q{yutaka.hara/at/gmail.com}
   s.executables = ["lifelog"]
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
   s.files = [
-    "Rakefile",
+    "README.md",
+     "Rakefile",
      "VERSION",
      "bin/lifelog",
+     "controller/init.rb",
+     "controller/main.rb",
+     "layout/default.ges",
      "lifelog.gemspec",
-     "models.rb",
-     "view/index.haml"
+     "model/init.rb",
+     "model/migrations.rb",
+     "model/models.rb",
+     "view/index.ges"
   ]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/yhara/lifelog}
@@ -45,4 +54,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<do_sqlite3>, [">= 0"])
   end
 end
-

data/model/init.rb

@@ -0,0 +1,27 @@
+require 'dm-core'
+DataMapper.setup(:default, "sqlite3://#{LifeLog.options[:db]}")
+
+require __DIR__('./migrations.rb')
+require __DIR__('./models.rb')
+
+# 
+# ramaze paginate for datamapper
+#
+require 'ramaze/helper/paginate'
+class DataMapper::Collection
+  def paginate(page, limit)
+    DMCollectionPager.new(self, page, limit)
+  end
+
+  class DMCollectionPager < Ramaze::Helper::Paginate::Paginator::ArrayPager
+    def each(&block)
+      from = ((@page - 1) * @limit)
+      from = 0 if from < 0
+      to = from + @limit
+
+      a = @array[from...to] || []
+      a.each(&block)
+    end
+
+  end
+end

data/model/migrations.rb

@@ -0,0 +1,23 @@
+require 'migration_runner'
+
+if LifeLog.options[:no_create_post_table]
+  migration 1, :create_posts do
+    up {}
+    down {}
+  end
+else
+  migration 1, :create_posts do
+    up do
+      create_table :posts do
+        column :id, Integer, :serial => true
+        column :posted_at, DateTime
+        column :message, String
+      end
+    end
+    down do
+      drop_table :posts
+    end
+  end
+end
+
+migrate_up!

data/{models.rb → model/models.rb}

@@ -1,7 +1,4 @@
-require 'rubygems'
-require 'dm-core'
-
-DataMapper.setup(:default, "sqlite3://#{LifeLog.options[:db]}")
+#require 'dm-timestamps'
 
 class Post
   include DataMapper::Resource
@@ -13,4 +10,3 @@ class Post
     self.posted_at.strftime("%Y-%m-%d %H:%M:%S")
   end
 end
-Post.auto_upgrade!

data/view/index.ges

@@ -0,0 +1,25 @@
+table do
+  tr do
+    td {}
+    td {
+      form(:action => "/say", :method => "POST") do
+        input(:type => "text", :name => "message", :size => 120)
+        input(:type => "submit", :value => "add")
+      end
+    }
+  end
+
+  @pager.each do |post|
+    tr do
+      td(:class => "time"){
+        h post.time_str
+      }
+      td(:class => "message"){
+        h post.message
+      }
+    end
+  end
+
+end
+
+div(:class => "pager") { @pager.navigation if @pager.needed? }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yhara-lifelog
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Yutaka HARA
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-23 00:00:00 -07:00
+date: 2009-05-24 00:00:00 -07:00
 default_executable: lifelog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,15 +48,21 @@ executables:
 - lifelog
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.md
 files: 
+- README.md
 - Rakefile
 - VERSION
 - bin/lifelog
+- controller/init.rb
+- controller/main.rb
+- layout/default.ges
 - lifelog.gemspec
-- models.rb
-- view/index.haml
+- model/init.rb
+- model/migrations.rb
+- model/models.rb
+- view/index.ges
 has_rdoc: true
 homepage: http://github.com/yhara/lifelog
 post_install_message: 

data/view/index.haml

@@ -1,19 +0,0 @@
-%html
-  %head
-    %meta{:"http-equiv"=>"Content-Type", :content=>"text/html", :charset=>"utf-8" }
-    %title LifeLogger
-  %body
-    %h1 LifeLog
-
-    %table.log
-      %tr
-        %td
-        %td
-          %form{:action => "/say", :method => "POST"}
-            %input{:type => "text", :size => 120, :name => "message"}
-            %input{:type => "submit", :value => "add"}
-
-      - @posts.each do |post|
-        %tr.post
-          %td.time= h post.time_str
-          %td.message= post.message