yhara-lifelog 0.0.3 → 0.1.1

data/Rakefile

@@ -11,7 +11,8 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.homepage = "http://github.com/yhara/lifelog"
   gemspec.description = gemspec.summary
   gemspec.authors = ["Yutaka HARA"]
-  gemspec.add_dependency('ramaze', '= 2009.05')
+  gemspec.add_dependency('ramaze', '= 2009.06.12')
+  gemspec.add_dependency('haml')
   gemspec.add_dependency('dm-core')
   gemspec.add_dependency('do_sqlite3')
 end
@@ -20,3 +21,14 @@ desc "install current source as gem"
 task :dogfood => [:gemspec, :build] do
   sh "sudo gem install pkg/lifelog-#{File.read("VERSION").chomp}.gem"
 end
+
+desc "uninstall temporary gem and install from github"
+task :nodogfood do
+  sh "sudo gem uninstall lifelog"
+  sh "sudo gem install yhara-lifelog"
+end
+
+desc "check for gem to be built"
+task :stalk do
+  sh "gemstalk yhara lifelog"
+end

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.1

data/controller/init.rb

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

data/controller/main.rb

@@ -9,6 +9,8 @@ class Main < Controller
   end
 
   def say
+    redirect_referer unless request.post?
+
     post = Post.create({
       :posted_at => Time.now,
       :message => request.params["message"],

data/layout/default.haml

@@ -0,0 +1,12 @@
+!!! XML
+!!! Strict
+ 
+%html
+  %head
+    %title LifeLog
+    %meta{:"http-equiv"=>"Content-Type", :content=>"text/html", :charset=>"utf-8"}
+  %body
+    %h1 LifeLog
+    != @content
+
+-#    %link{:rel=>"stylesheet", :type=>"text/css", :href=>"/screen.css"}

data/main.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+require 'optparse'
+require 'rubygems'
+require 'ruby-station'; RubyStation.parse_argv
+require 'ramaze'
+
+$LOAD_PATH.unshift __DIR__("./")
+require 'controller/init.rb'
+require 'model/init.rb'
+
+#module LifeLog
+#  VERSION = File.read(__DIR__("./VERSION"))
+#end
+
+Ramaze.start :port => RubyStation.port,
+             :root => __DIR__('./')

data/model/init.rb

@@ -1,6 +1,8 @@
 require 'dm-core'
 require 'dm-validations'
-DataMapper.setup(:default, "sqlite3://#{LifeLog.options[:db]}")
+require 'dm-aggregates' # needed for #count in spec
+db_path = RubyStation.data_path("lifelog.db")
+DataMapper.setup(:default, "sqlite3://#{db_path}")
 
 require __DIR__('./post.rb')
 require __DIR__('./tag.rb')

data/spec/helper.rb

@@ -0,0 +1 @@
+require 'ramaze/spec/bacon'

data/spec/main.rb

@@ -0,0 +1,41 @@
+require 'spec/helper.rb'
+ARGV.concat ["--db", "test.db"]
+load 'bin/lifelog'
+
+describe Main do
+  behaves_like :rack_test
+
+  # index
+
+  it 'shows start page' do
+    get('/').status.should == 200
+    #last_response.should =~ /<h1>Welcome to Ramaze!<\/h1>/
+  end
+
+  # posting
+
+  it 'accepts a post' do
+    post('/say', :message => "This is test").status.should == 302
+    follow_redirect!
+    last_response.should =~ /This is test/
+  end
+
+  it 'should not create a post via GET method' do
+    lambda{
+      get('/say?message=test')
+    }.should.not.change{ Post.count }
+  end
+
+  # searching by tags
+
+  it 'searches tagged posts' do
+    post('/say', :message => "#foo test1")
+    post('/say', :message => "#foo test2")
+    post('/say', :message => "#bar test3")
+
+    get('/search/tag/foo')
+    last_response.should =~ /test1/
+    last_response.should =~ /test2/
+    last_response.should.not =~ /test3/
+  end
+end

data/spec/models.rb

@@ -0,0 +1,48 @@
+require 'spec/helper.rb'
+module LifeLog
+  include Innate::Optioned
+
+  options.dsl do
+    o "Path of database file (for test)",
+      :db, "test.db"
+  end
+end
+require 'model/init.rb'
+
+describe Post do
+  # init
+ 
+  it 'does not exist at first' do
+    Post.all.should == []
+  end
+
+  # instantiation
+
+  it 'should create instance for valid data' do
+    lambda{
+      Post.create({
+        :posted_at => Time.now,
+        :message => "test",
+      })
+    }.should.change{ Post.count }
+  end
+
+  it 'should make tags for tagged message' do
+    post = Post.create({
+      :posted_at => Time.now,
+      :message => "#foo #bar test",
+    })
+    foo = Tag.first(:name => "foo")
+    bar = Tag.first(:name => "bar")
+
+    [foo, bar].each{|tag| tag.should.not == nil}
+    post.tags.should == [foo, bar]
+  end
+end
+
+describe Tag do
+  it 'should check uniqueness' do
+    Tag.create(:name => "foo")
+    Tag.create(:name => "foo").id.should == nil
+  end
+end

data/view/index.haml

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yhara-lifelog
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.1.1
 platform: ruby
 authors: 
 - Yutaka HARA
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-26 00:00:00 -07:00
-default_executable: lifelog
+date: 2009-07-18 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ramaze
@@ -20,7 +20,17 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: "2009.05"
+        version: 2009.06.12
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: haml
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
@@ -44,8 +54,8 @@ dependencies:
     version: 
 description: A lifelogging tool written in Ramaze
 email: yutaka.hara/at/gmail.com
-executables: 
-- lifelog
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -54,16 +64,18 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- bin/lifelog
 - controller/init.rb
 - controller/main.rb
-- layout/default.ges
-- lifelog.gemspec
+- layout/default.haml
+- main.rb
 - model/init.rb
 - model/migrations.rb
 - model/post.rb
 - model/tag.rb
-- view/index.ges
+- spec/helper.rb
+- spec/main.rb
+- spec/models.rb
+- view/index.haml
 has_rdoc: true
 homepage: http://github.com/yhara/lifelog
 post_install_message: 
@@ -90,5 +102,7 @@ rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: A lifelogging tool written in Ramaze
-test_files: []
-
+test_files: 
+- spec/helper.rb
+- spec/main.rb
+- spec/models.rb

data/bin/lifelog

@@ -1,66 +0,0 @@
-#!/usr/bin/env ruby
-require 'optparse'
-require 'rubygems'
-require 'ramaze'
-require 'controller/init.rb'
-
-module LifeLog
-  include Innate::Optioned
-  VERSION = File.read(__DIR__("../VERSION"))
-
-  options.dsl do
-    o "Path of config file", 
-      :config, File.expand_path("~/.lifelog.rb") 
-    o "Path of database file",
-      :db, File.expand_path("~/.lifelog.db")
-    o "Port number", 
-      :port, 7012
-    o "Whether to skip creating table :posts",
-      :no_create_post_table, false
-  end
-
-  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
-
-LifeLog.parse_argv!
-
-LifeLog.load_conf(LifeLog.options[:config])
-LifeLog.load_models(LifeLog.options[:db])
-LifeLog.start(LifeLog.options[:port])

data/layout/default.ges

@@ -1,15 +0,0 @@
-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

@@ -1,57 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{lifelog}
-  s.version = "0.0.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Yutaka HARA"]
-  s.date = %q{2009-05-26}
-  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 = [
-    "README.md",
-     "Rakefile",
-     "VERSION",
-     "bin/lifelog",
-     "controller/init.rb",
-     "controller/main.rb",
-     "layout/default.ges",
-     "lifelog.gemspec",
-     "model/init.rb",
-     "model/migrations.rb",
-     "model/post.rb",
-     "model/tag.rb",
-     "view/index.ges"
-  ]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/yhara/lifelog}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.2}
-  s.summary = %q{A lifelogging tool written in Ramaze}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ramaze>, ["= 2009.05"])
-      s.add_runtime_dependency(%q<dm-core>, [">= 0"])
-      s.add_runtime_dependency(%q<do_sqlite3>, [">= 0"])
-    else
-      s.add_dependency(%q<ramaze>, ["= 2009.05"])
-      s.add_dependency(%q<dm-core>, [">= 0"])
-      s.add_dependency(%q<do_sqlite3>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<ramaze>, ["= 2009.05"])
-    s.add_dependency(%q<dm-core>, [">= 0"])
-    s.add_dependency(%q<do_sqlite3>, [">= 0"])
-  end
-end

data/view/index.ges

@@ -1,25 +0,0 @@
-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"){
-        format_message(h post.message)
-      }
-    end
-  end
-
-end
-
-div(:class => "pager") { @pager.navigation if @pager.needed? }