css 変更

.bundle/config

@@ -1,4 +1,4 @@
 --- 
 BUNDLE_DISABLE_SHARED_GEMS: "1"
-BUNDLE_WITHOUT: production
+BUNDLE_WITHOUT: production:test
 BUNDLE_PATH: bundle

Gemfile

@@ -5,6 +5,7 @@ gem 'i18n', '0.4.1'
 gem 'sinatra', '1.0.0'
 gem 'sinatra-r18n', '0.4.7.1'
 gem 'sinatra-logger', '0.1.0'
+gem 'sinatra-content-for'
 gem 'dm-migrations', '1.0.0'
 gem 'dm-timestamps', '1.0.0'
 gem 'dm-validations', '1.0.0'
@@ -14,25 +15,24 @@ gem 'dm-pager', '1.1.0'
 gem 'dm-tags', '1.0.0'
 gem 'builder', '2.1.2'
 gem 'haml', '3.0.17'
-gem 'fastercsv'
-gem 'rake'
-gem 'shotgun'
-gem 'exceptional'
-gem 'thin'
+gem 'rake', '0.8.7'
+gem 'shotgun', '0.8'
+gem 'exceptional', '2.0.25'
+gem 'erubis', '2.6.6'
+gem 'activesupport', '3.0.0'
 
 group :production do
   gem 'dm-postgres-adapter', '1.0.0'
 end
 
 group :development do
-  gem 'dm-sqlite-adapter'
+  gem 'dm-sqlite-adapter', '1.0.2'
 end
 
 group :test do
   gem 'shoulda', '2.11.3'
-  gem 'rack-test', :require => 'rack/test'
-  gem 'dm-sqlite-adapter'
-  gem 'autotest'
-  gem 'autotest-growl', :require => 'autotest/growl'
-  gem 'rcov'
+  gem 'rack-test', '0.5.4', :require => 'rack/test'
+  gem 'dm-sqlite-adapter', '1.0.2'
+  gem 'autotest', '4.3.2'
+  gem 'autotest-growl', '0.2.5', :require => 'autotest/growl'
 end

Gemfile.lock

@@ -1,22 +1,22 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    abstract (1.0.0)
+    activesupport (3.0.0)
     addressable (2.2.0)
     autotest (4.3.2)
-    autotest-growl (0.2.4)
-      autotest (>= 4.2.4)
+    autotest-growl (0.2.5)
     builder (2.1.2)
-    daemons (1.1.0)
     data_objects (0.10.2)
       addressable (~> 2.1)
-    dm-aggregates (1.0.0)
-      dm-core (~> 1.0.0)
-    dm-core (1.0.0)
-      addressable (~> 2.1)
+    dm-aggregates (1.0.2)
+      dm-core (~> 1.0.2)
+    dm-core (1.0.2)
+      addressable (~> 2.2)
       extlib (~> 0.9.15)
-    dm-do-adapter (1.0.0)
-      data_objects (~> 0.10.1)
-      dm-core (~> 1.0.0)
+    dm-do-adapter (1.0.2)
+      data_objects (~> 0.10.2)
+      dm-core (~> 1.0.2)
     dm-is-tree (1.0.0)
       dm-core (~> 1.0.0)
     dm-migrations (1.0.0)
@@ -27,8 +27,8 @@ GEM
     dm-postgres-adapter (1.0.0)
       dm-do-adapter (~> 1.0.0)
       do_postgres (~> 0.10.2)
-    dm-sqlite-adapter (1.0.0)
-      dm-do-adapter (~> 1.0.0)
+    dm-sqlite-adapter (1.0.2)
+      dm-do-adapter (~> 1.0.2)
       do_sqlite3 (~> 0.10.2)
     dm-tags (1.0.0)
       dm-core (~> 1.0.0)
@@ -46,7 +46,8 @@ GEM
       data_objects (= 0.10.2)
     do_sqlite3 (0.10.2)
       data_objects (= 0.10.2)
-    eventmachine (0.12.10)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     exceptional (2.0.25)
     extlib (0.9.15)
     fastercsv (1.5.3)
@@ -60,50 +61,47 @@ GEM
     rack-test (0.5.4)
       rack (>= 1.0)
     rake (0.8.7)
-    rcov (0.9.8)
     shotgun (0.8)
       rack (>= 1.0)
     shoulda (2.11.3)
     sinatra (1.0)
       rack (>= 1.0)
+    sinatra-content-for (0.2)
+      sinatra
     sinatra-logger (0.1.0)
       sinatra (>= 0.10.1)
     sinatra-r18n (0.4.7.1)
       r18n-core (= 0.4.7.1)
     stringex (1.1.0)
-    thin (1.2.7)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
     uuidtools (2.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  autotest
-  autotest-growl
+  activesupport (= 3.0.0)
+  autotest (= 4.3.2)
+  autotest-growl (= 0.2.5)
   builder (= 2.1.2)
   dm-is-tree (= 1.0.0)
   dm-migrations (= 1.0.0)
   dm-pager (= 1.1.0)
   dm-postgres-adapter (= 1.0.0)
-  dm-sqlite-adapter
+  dm-sqlite-adapter (= 1.0.2)
   dm-tags (= 1.0.0)
   dm-timestamps (= 1.0.0)
   dm-types (= 1.0.0)
   dm-validations (= 1.0.0)
-  exceptional
-  fastercsv
+  erubis (= 2.6.6)
+  exceptional (= 2.0.25)
   haml (= 3.0.17)
   i18n (= 0.4.1)
   rack-flash (= 0.1.1)
-  rack-test
-  rake
-  rcov
-  shotgun
+  rack-test (= 0.5.4)
+  rake (= 0.8.7)
+  shotgun (= 0.8)
   shoulda (= 2.11.3)
   sinatra (= 1.0.0)
+  sinatra-content-for
   sinatra-logger (= 0.1.0)
   sinatra-r18n (= 0.4.7.1)
-  thin

README.ja.rdoc

@@ -15,8 +15,8 @@ Rubyで書かれたクラウドの為のCMS。
   $ gem install bundler
   $ git clone git://github.com/komagata/pyha.git
   $ cd pyha
-  $ rake install
-  $ rackup
+  $ bundle exec rake install
+  $ bundle exec rackup
 
 http://localhost:9292/ を見る。
 

README.rdoc

@@ -15,8 +15,8 @@ CMS written in Ruby for cloud computing.
   $ gem install bundler
   $ git clone git://github.com/komagata/pyha.git
   $ cd pyha
-  $ rake install
-  $ rackup
+  $ bundle exec rake install
+  $ bundle exec rackup
 
 View at: http://localhost:9292/
 

Rakefile

@@ -105,12 +105,12 @@ task 'db:reset' => %w(db:migrate db:seed)
 
 desc 'Bundler'
 task :bundle do
-  `bundle install --without production`
+  `bundle install bundle --without production test`
 end
 
 desc 'Rebundler'
 task :rebundle do
-  `bundle install --without production`
+  `bundle install bundle --without production test`
 end
 
 desc 'Install'

config.yml

@@ -0,0 +1,4 @@
+production:
+  dsn: sqlite3://<%= root %>/production.sqlite3
+development:
+  dsn: sqlite3://<%= root %>/development.sqlite3

i18n/en.yml

@@ -0,0 +1,111 @@
+error: Error
+profile: Profile
+next: Next
+previous: Previous
+older_post: Older Post
+newer_post: Newer Post
+older: Older
+newer: Newer
+admin: Admin
+admin_page: Admin page
+dashboard: Dashboard
+login: Login
+logout: Logout
+signup: Signup
+users: Users
+categories: Categories
+posts: Posts
+pages: Pages
+comments: Comments
+themes: Themes
+plugins: Plugins
+settings: Settings
+site: Site
+list: List
+new: New
+edit: Edit
+delete: Delete
+about: About this site
+recent_entries:  Recent Entries
+tags: Tags
+archives: Archives
+search: Search
+others: Others
+feed: Feed
+listing_posts: Listing Posts
+listing_pages: Listing Pages
+listing_categories: Listing Categories
+listing_tags: Listing Tags
+listing_comments: Listing Comments
+listing_users: Listing Users
+listing_themes: Listing Themes
+listing_plugins: Listing Plugins
+new_post: New Post
+new_page: New Page
+new_category: New Category
+new_user: New User
+new_comment: New Comment
+edit_post: Edit Post
+edit_page: Edit Page
+edit_category: Edit Category
+edit_comment: Edit Comment
+edit_user:  Edit User
+edit_site: Edit Site
+are_you_sure: Are you sure?
+not_select: Not Select
+no_category: No Cateogry
+no_tag: No Tag
+no_post: No Post
+no_page: No Page
+no_user: No User
+no_comment: No Comment
+no_plugin: No Plugin
+page:
+  id: ID
+  slug: Slug
+  title: Title
+  body: Body
+  user: Author
+  category: Category
+  tags: Tags
+  created_at: Created at
+  updated_at: Updated at
+post:
+  id: ID
+  slug: Slug
+  title: Title
+  body: Body
+  user: Author
+  category: Category
+  tags: Tags
+  created_at: Created at
+  updated_at: Updated at
+category:
+  id: ID
+  slug: Slug
+  title: Title
+  description: Description
+  created_at: Created at
+  updated_at: Updated at
+user:
+  id: ID
+  name: Name
+  email: Email
+  password: Password
+  password_confirmation: Password Confirmation
+  created_at: Created at
+  updated_at: Updated at
+site:
+  id: ID
+  title: Title
+  description: Description
+  theme: Theme
+  created_at: Created at
+  updated_at: Updated at
+comment:
+  id: ID
+  name: Name
+  body: Body
+  homepage: Homepage
+  created_at: Created at
+  updated_at: Updated at

i18n/ja.yml

@@ -37,7 +37,7 @@ listing_pages: ページ一覧
 listing_categories: カテゴリー一覧
 listing_tags: タグ一覧
 listing_comments: コメント一覧
-listing_users: タグ一覧
+listing_users: ユーザー一覧
 listing_themes: テーマ一覧
 listing_plugins: プラグイン一覧
 new_post: 投稿登録
@@ -59,12 +59,13 @@ no_post: 投稿がありません
 no_page: ページがありません
 no_user: ユーザーがいません
 no_comment: コメントがありません
-no_plugin: プラグインがいません
+no_plugin: プラグインがありません
 page:
   id: ID
   slug: スラッグ
   title: タイトル
   body: 本文
+  user: 作成者
   category: カテゴリー
   tags: タグ
   created_at: 作成日時
@@ -74,6 +75,7 @@ post:
   slug: スラッグ
   title: タイトル
   body: 本文
+  user: 作成者
   category: カテゴリー
   tags: タグ
   created_at: 作成日時

init.rb

@@ -1,4 +1,5 @@
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'plugin', 'hello', 'lib'))
 
 require 'rubygems'
 require 'bundler'

install.rb

@@ -1,9 +1,16 @@
+#!/usr/bin/env ruby
+
 def _run(cmd)
   puts cmd
   system cmd
 end
 
 Dir.chdir(File.dirname(__FILE__))
 
-_run 'gem install bundler --pre'
-_run 'bundle install bundle --without production'
+_run 'gem update --system'
+_run 'gem install bundler --no-rdoc --no-ri --version "1.0.0"'
+_run 'bundle install bundle --without production test'
+_run 'bundle exec rake db:reset'
+puts '--- Installation complete ---'
+puts 'Press Enter.'
+STDIN.getc

lib/pyha.rb

@@ -8,6 +8,7 @@
 require 'sinatra/base'
 require 'sinatra/r18n'
 require 'sinatra/logger'
+require 'sinatra/content_for'
 require 'dm-core'
 require 'dm-timestamps'
 require 'dm-migrations'
@@ -30,8 +31,12 @@
 require 'pyha/bread_crumb'
 require 'pyha/before'
 require 'pyha/helpers'
+
+require 'pyha/hello'
+
 require 'pyha/app'
 
+
 module Pyha
   class NoTemplateError < StandardError; end
 end