uzuuzu-cms 0.0.1 → 0.0.2

data/lib/uzuuzu-cms/model/page_meta.rb

@@ -0,0 +1,20 @@
+# coding: utf-8
+
+module UzuUzu
+  #
+  #
+  #
+  class PageMeta
+    include DataMapper::Resource
+
+    property :id, Serial
+    property :name, String,
+              :length => 255,
+              :required => true
+    property :content, String,
+              :length => 255,
+              :required => true
+
+    has n, :pages, :through => Resource
+  end # PageMeta
+end # UzuUzu

data/lib/uzuuzu-cms/model/user.rb

@@ -18,6 +18,8 @@ module UzuUzu
     property :email, String,
               :length => 255
     property :web, Text
+    property :admin, Boolean,
+              :default => false
     timestamps :at
     
   end #User

data/lib/uzuuzu-cms/wrapper/application.rb

@@ -0,0 +1,6 @@
+# coding: utf-8
+
+module UzuUzu
+  class Application
+  end # Application
+end # UzuUzu

data/lib/uzuuzu-cms/wrapper/controller.rb

@@ -2,9 +2,9 @@
 
 module UzuUzu
   module Controller
-    autoload(:Admin, 'uzuuzu-cms/controller/admin')
     autoload(:Contents, 'uzuuzu-cms/controller/contents')
     autoload(:Crud, 'uzuuzu-cms/controller/crud')
+    autoload(:Error, 'uzuuzu-cms/controller/error')
     autoload(:Index, 'uzuuzu-cms/controller/index')
     autoload(:Initialize, 'uzuuzu-cms/controller/initialize')
     autoload(:Oauth, 'uzuuzu-cms/controller/oauth')
@@ -12,5 +12,21 @@ module UzuUzu
     autoload(:Page, 'uzuuzu-cms/controller/page')
     autoload(:Plugin, 'uzuuzu-cms/controller/plugin')
     autoload(:User, 'uzuuzu-cms/controller/user')
+    module Admin
+      autoload(:Index, 'uzuuzu-cms/controller/admin/index')
+    end
+    module Blog
+      autoload(:Index, 'uzuuzu-cms/controller/admin/index')
+    end
+    module Ec
+      autoload(:Index, 'uzuuzu-cms/controller/admin/index')
+    end
+    module Wiki
+      autoload(:Index, 'uzuuzu-cms/controller/admin/index')
+    end
+    
+    def info
+      @_info ||= ::UzuUzu::Info.uniq
+    end
   end
 end

data/lib/uzuuzu-cms/wrapper/helper.rb

@@ -0,0 +1,6 @@
+# coding: utf-8
+
+require 'uzuuzu-cms/helper/page'
+
+::UzuUzu::Application.dicons << ::UzuUzu::Helper::Page
+::UzuUzu::Application.helpers << ::UzuUzu::Helper::Page

data/lib/uzuuzu-cms/wrapper/lang/ja.yaml

@@ -7,27 +7,18 @@ update: 更新
 delete: 削除
 
 login: ログイン
+to_admin_page: 管理画面へ
+to_top_page: トップページへ
 
 # error
 not_found: お探しのページが見つかりません。
 server_error: エラーが発生しました。
 
 # openid
-openid_messege: ログイン方法を選択してください
+openid_message: 以下よりログインするOpenIDサービスを選択してください
 openid_url: その他OpenId
 
-# user entry
-user_entry: ユーザー情報を登録してください
-user_entry_name: 表示するユーザー名
-user_entry_email: メールアドレス
-user_entry_web: ホームページアドレス
-
-# user entry error
-user_name_empty: ユーザー名の入力は必須です。
-
 # initialize
 initialize_title: 初期設定
-step1: 管理者を登録します。下記よりログインしてください。
-step2: 管理者情報を入力してください。
-step3: サイト情報を入力してください。
-
+step1: 管理者を設定します。
+step2: 初期設定が完了しました。管理画面にて構築を行ってください。

data/lib/uzuuzu-cms/wrapper/model.rb

@@ -13,7 +13,7 @@ module UzuUzu
   autoload(:Info, 'uzuuzu-cms/model/info')
   autoload(:Layout, 'uzuuzu-cms/model/layout')
   autoload(:Movie, 'uzuuzu-cms/model/movie')
-  autoload(:PageBody, 'uzuuzu-cms/model/page_body')
+  autoload(:PageMeta, 'uzuuzu-cms/model/page')
   autoload(:Page, 'uzuuzu-cms/model/page')
   autoload(:Javascript, 'uzuuzu-cms/model/javascript')
   autoload(:User, 'uzuuzu-cms/model/user')

data/lib/uzuuzu-cms/wrapper/uzuuzu.rb

@@ -0,0 +1,10 @@
+# coding: utf-8
+
+module UzuUzu
+  #
+  #
+  #
+  def self.info
+    UzuUzu::Controller.current.info
+  end # info
+end # UzuUzu

data/uzuuzu-cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uzuuzu-cms}
-  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 = ["Takuya Kondo"]
-  s.date = %q{2011-08-23}
+  s.date = %q{2011-09-08}
   s.description = %q{cms on uzuuzu}
   s.email = %q{takuya.v3v@gmail.com}
   s.extra_rdoc_files = [
@@ -28,18 +28,18 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/uzuuzu-cms.rb",
     "lib/uzuuzu-cms/controller/admin/index.rb",
+    "lib/uzuuzu-cms/controller/admin/view/index.rhtml",
     "lib/uzuuzu-cms/controller/blog/index.rb",
     "lib/uzuuzu-cms/controller/contents.rb",
     "lib/uzuuzu-cms/controller/crud.rb",
     "lib/uzuuzu-cms/controller/ec/index.rb",
+    "lib/uzuuzu-cms/controller/error.rb",
     "lib/uzuuzu-cms/controller/index.rb",
     "lib/uzuuzu-cms/controller/initialize.rb",
     "lib/uzuuzu-cms/controller/oauth.rb",
     "lib/uzuuzu-cms/controller/openid.rb",
     "lib/uzuuzu-cms/controller/page.rb",
-    "lib/uzuuzu-cms/controller/plugin.rb",
     "lib/uzuuzu-cms/controller/user.rb",
-    "lib/uzuuzu-cms/controller/view/admin/index.rhtml",
     "lib/uzuuzu-cms/controller/view/crud/destroy.rhtml",
     "lib/uzuuzu-cms/controller/view/crud/edit.rhtml",
     "lib/uzuuzu-cms/controller/view/crud/index.rhtml",
@@ -49,11 +49,12 @@ Gem::Specification.new do |s|
     "lib/uzuuzu-cms/controller/view/error/500.rhtml",
     "lib/uzuuzu-cms/controller/view/initialize/step1.rhtml",
     "lib/uzuuzu-cms/controller/view/initialize/step2.rhtml",
-    "lib/uzuuzu-cms/controller/view/initialize/step3.rhtml",
-    "lib/uzuuzu-cms/controller/view/layout.rhtml",
     "lib/uzuuzu-cms/controller/view/openid/index.rhtml",
     "lib/uzuuzu-cms/controller/view/user/entry.rhtml",
     "lib/uzuuzu-cms/controller/wiki/index.rb",
+    "lib/uzuuzu-cms/helper/page.rb",
+    "lib/uzuuzu-cms/model/authority.rb",
+    "lib/uzuuzu-cms/model/authority_group.rb",
     "lib/uzuuzu-cms/model/blog.rb",
     "lib/uzuuzu-cms/model/blog_category.rb",
     "lib/uzuuzu-cms/model/blog_comment.rb",
@@ -67,17 +68,20 @@ Gem::Specification.new do |s|
     "lib/uzuuzu-cms/model/layout.rb",
     "lib/uzuuzu-cms/model/movie.rb",
     "lib/uzuuzu-cms/model/page.rb",
-    "lib/uzuuzu-cms/model/page_body.rb",
+    "lib/uzuuzu-cms/model/page_meta.rb",
     "lib/uzuuzu-cms/model/user.rb",
     "lib/uzuuzu-cms/model/wiki.rb",
     "lib/uzuuzu-cms/model/wiki_attache.rb",
     "lib/uzuuzu-cms/model/wiki_entry.rb",
     "lib/uzuuzu-cms/model/wiki_layout.rb",
+    "lib/uzuuzu-cms/wrapper/application.rb",
     "lib/uzuuzu-cms/wrapper/controller.rb",
     "lib/uzuuzu-cms/wrapper/environments.rb",
+    "lib/uzuuzu-cms/wrapper/helper.rb",
     "lib/uzuuzu-cms/wrapper/lang/en.yaml",
     "lib/uzuuzu-cms/wrapper/lang/ja.yaml",
     "lib/uzuuzu-cms/wrapper/model.rb",
+    "lib/uzuuzu-cms/wrapper/uzuuzu.rb",
     "spec/spec_helper.rb",
     "spec/uzuuzu-cms_spec.rb",
     "template/app.rb",

metadata

@@ -2,7 +2,7 @@
 name: uzuuzu-cms
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Takuya Kondo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 +09:00
+date: 2011-09-08 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,18 +89,18 @@ files:
 - VERSION
 - lib/uzuuzu-cms.rb
 - lib/uzuuzu-cms/controller/admin/index.rb
+- lib/uzuuzu-cms/controller/admin/view/index.rhtml
 - lib/uzuuzu-cms/controller/blog/index.rb
 - lib/uzuuzu-cms/controller/contents.rb
 - lib/uzuuzu-cms/controller/crud.rb
 - lib/uzuuzu-cms/controller/ec/index.rb
+- lib/uzuuzu-cms/controller/error.rb
 - lib/uzuuzu-cms/controller/index.rb
 - lib/uzuuzu-cms/controller/initialize.rb
 - lib/uzuuzu-cms/controller/oauth.rb
 - lib/uzuuzu-cms/controller/openid.rb
 - lib/uzuuzu-cms/controller/page.rb
-- lib/uzuuzu-cms/controller/plugin.rb
 - lib/uzuuzu-cms/controller/user.rb
-- lib/uzuuzu-cms/controller/view/admin/index.rhtml
 - lib/uzuuzu-cms/controller/view/crud/destroy.rhtml
 - lib/uzuuzu-cms/controller/view/crud/edit.rhtml
 - lib/uzuuzu-cms/controller/view/crud/index.rhtml
@@ -110,11 +110,12 @@ files:
 - lib/uzuuzu-cms/controller/view/error/500.rhtml
 - lib/uzuuzu-cms/controller/view/initialize/step1.rhtml
 - lib/uzuuzu-cms/controller/view/initialize/step2.rhtml
-- lib/uzuuzu-cms/controller/view/initialize/step3.rhtml
-- lib/uzuuzu-cms/controller/view/layout.rhtml
 - lib/uzuuzu-cms/controller/view/openid/index.rhtml
 - lib/uzuuzu-cms/controller/view/user/entry.rhtml
 - lib/uzuuzu-cms/controller/wiki/index.rb
+- lib/uzuuzu-cms/helper/page.rb
+- lib/uzuuzu-cms/model/authority.rb
+- lib/uzuuzu-cms/model/authority_group.rb
 - lib/uzuuzu-cms/model/blog.rb
 - lib/uzuuzu-cms/model/blog_category.rb
 - lib/uzuuzu-cms/model/blog_comment.rb
@@ -128,17 +129,20 @@ files:
 - lib/uzuuzu-cms/model/layout.rb
 - lib/uzuuzu-cms/model/movie.rb
 - lib/uzuuzu-cms/model/page.rb
-- lib/uzuuzu-cms/model/page_body.rb
+- lib/uzuuzu-cms/model/page_meta.rb
 - lib/uzuuzu-cms/model/user.rb
 - lib/uzuuzu-cms/model/wiki.rb
 - lib/uzuuzu-cms/model/wiki_attache.rb
 - lib/uzuuzu-cms/model/wiki_entry.rb
 - lib/uzuuzu-cms/model/wiki_layout.rb
+- lib/uzuuzu-cms/wrapper/application.rb
 - lib/uzuuzu-cms/wrapper/controller.rb
 - lib/uzuuzu-cms/wrapper/environments.rb
+- lib/uzuuzu-cms/wrapper/helper.rb
 - lib/uzuuzu-cms/wrapper/lang/en.yaml
 - lib/uzuuzu-cms/wrapper/lang/ja.yaml
 - lib/uzuuzu-cms/wrapper/model.rb
+- lib/uzuuzu-cms/wrapper/uzuuzu.rb
 - spec/spec_helper.rb
 - spec/uzuuzu-cms_spec.rb
 - template/app.rb
@@ -201,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 880284361759703514
+      hash: -1973875796380053779
       segments: 
       - 0
       version: "0"

data/lib/uzuuzu-cms/controller/plugin.rb

@@ -1,16 +0,0 @@
-# coding: utf-8
-
-module UzuUzu
-  module Controller
-    class Plugin
-      
-      def before
-        redirect(rf(Initialize)) unless info.initialize?
-      end
-      
-      def index
-        ''
-      end
-    end # Plugin
-  end # Controller
-end # UzuUzu

data/lib/uzuuzu-cms/controller/view/initialize/step3.rhtml

@@ -1,24 +0,0 @@
-
-<div id="step3">
-	<p>
-		<%= fix_localize(:step3) %>
-	</p>
-	<form method="post">
-		<p class='error_detail'><%= @error %></p>
-		<p>
-			<%= fix_localize(:info_title) %>：
-			<input type="text" name="title" />
-		</p>
-		<p>
-			<%= fix_localize(:user_entry_email) %>：
-			<input type="text" name="email" />
-		</p>
-		<p>
-			<%= fix_localize(:user_entry_web) %>：
-			<input type="text" name="web" />
-		</p>
-		<p>
-			<input type="submit" value="<%= fix_localize(:entry) %>"/>
-		</p>
-	</form>
-</div>

data/lib/uzuuzu-cms/controller/view/layout.rhtml

@@ -1,25 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Script-Type" content="text/javascript" />
-		<meta http-equiv="Content-Style-Type" content="text/css" />
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta http-equiv="expires" content="-1" />
-		<link rel="apple-touch-icon" href="/favicon.png">
-		<% unless @meta.blank?
-		     @meta.each do |meta|
-		%>
-		<meta name="<%= h key %>" content="<%= h value %>">
-		<%   end
-		   end
-		%>
-		<title><%= h "#{@title} - " unless @title.blank? %><%= h info.title if info %></title>
-		<%= css_for @css unless @css.blank? %>
-		<%= js_for @js unless @js.blank? %>
-	</head>
-	<body >
-		<%= @contents %>
-	</body>
-</html>

data/lib/uzuuzu-cms/model/page_body.rb

@@ -1,37 +0,0 @@
-# coding: utf-8
-require 'uzuuzu-cms/model/contents'
-
-module UzuUzu
-  
-  class ContentsPageBody
-    include DataMapper::Resource
-    
-    belongs_to :page_body, :key => true
-    belongs_to :contents, 'UzuUzu::Contents', :key => true
-  end
-  
-  class Contents
-    has n, :page_bodies, :through => Resource, :via => :page_body
-  end
-  
-  class PageBody
-    include DataMapper::Resource
-
-    property :id, Serial
-    
-    has n, :contents, 'UzuUzu::Contents', :through => Resource, :via => :contents
-    
-    def render(instance=nil, options={})
-      self.contents.map do |c|
-        c.render(instance=nil, options={})
-      end.join('\n')
-    end
-  end # PageBody
-  
-  if auto_upgrade?
-    repository do
-      PageBody.auto_upgrade!
-      ContentsPageBody.auto_upgrade!
-    end
-  end
-end # UzuUzu