uzuuzu-cms 0.0.0 → 0.0.1

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/lib/uzuuzu-cms/controller/admin/index.rb

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

data/lib/uzuuzu-cms/controller/blog/index.rb

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

data/lib/uzuuzu-cms/controller/ec/index.rb

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

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

@@ -4,49 +4,108 @@ module UzuUzu
   module Controller
     class Initialize
       def index
-        UzuUzu.repository do
-          @info = Info.uniq
+        if Info.first.nil?
+          # fixture load
+          logger.debug 'fixture load start'
+          Dir.glob('./fixture/**/*.*').each do |path|
+            logger.debug "fixture file : #{path}"
+            paths = path.split('/')
+            model_name = ::File.basename(paths.pop, '.*')
+            while !paths.blank? && paths[-1] != 'fixture'
+              model_name = "#{paths.pop.camel_case}::#{model_name.camel_case}"
+            end
+            begin
+              logger.debug "fixture model name : #{model_name}"
+              model = eval("::#{model_name}")
+              ::UzuUzu::DataStore::Fixture.import_file(model, path, true)
+            rescue NameError => e
+              logger.error(e.to_s)
+            end
+          end
+          logger.debug 'fixture load end'
         end
-        if request.post? and @info.step < 4
-          self.send("step#{@info.step}", [])
+        if info.initialize?
+          redirect rf(UzuUzu::Controller::Index)
         end
-        case(@info.step)
+        self.send("step#{info.step}")
+        case(info.step)
         when 1
-          respond(render_file(__DIR__('view/initialize/step1.rhtml'),
-          :layout => __DIR__('view/layout.rhtml')))
+          respond(info.render(self, render_file(__DIR__('view/initialize/step1.rhtml'))))
         when 2
-          respond(render_file(__DIR__('view/initialize/step2.rhtml'),
-          :layout => __DIR__('view/layout.rhtml')))
+          respond(info.render(self, render_file(__DIR__('view/initialize/step2.rhtml'))))
         when 3
-          respond(render_file(__DIR__('view/initialize/step3.rhtml'),
-          :layout => __DIR__('view/layout.rhtml')))
+          respond(info.render(self, render_file(__DIR__('view/initialize/step3.rhtml'))))
         when 4
-          redirect rf(Index)
+          redirect rf(UzuUzu::Controller::Index)
         end
       end
 
       private
 
-      def setp1
+      def step1
         unless session[:openid_identity].nil?
           UzuUzu.transaction do |tr|
             tr.begin
-            @user = UzuUzu::User.new
-            @user.user_id = session[:openid_identity]
-            @info.step = 2
-            @info.admin = @user
-            @info.save if @user.save
+            info.step = 2
+            info.save
             tr.commit
           end
         end
       end
 
       def step2
-
+        if session[:openid_identity].nil?
+          UzuUzu.transaction do |tr|
+            tr.begin
+            info.step = 1
+            info.save
+            tr.commit
+          end
+          return
+        end
+        if request.post?
+          if request.params['name'].blank?
+            @error = fix_localize(:user_name_empty)
+            return
+          end
+          UzuUzu.transaction do |tr|
+            tr.begin
+            user = UzuUzu::User.new
+            user.user_id = session[:openid_identity]
+            user.domain = session[:openid_domain]
+            user.name = request.params['name']
+            user.email = request.params['email']
+            user.web = request.params['web']
+            info.step = 3
+            info.admin = user
+            if info.save
+              tr.commit
+            else
+              tr.roolback
+            end
+          end
+        end
       end
 
       def step3
-
+        if session[:openid_identity].nil?
+          UzuUzu.transaction do |tr|
+            tr.begin
+            info.step = 1
+            info.save
+            tr.commit
+          end
+          return
+        end
+        if request.post?
+           UzuUzu.transaction do |tr|
+            tr.begin
+            info.step = 4
+            info.title = request.params['title']
+            info.save
+            tr.commit
+          end
+        end
       end
     end # Initialize
   end # Controller

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

@@ -8,35 +8,34 @@ require 'openid/store/memcache'
 
 module UzuUzu
   module Controller
+    #
+    #
+    #
     class Openid
-      
+      #
+      #
+      #
       def index
-        
-        p request.domain
-        if session[:openid] and session[:openid][:identity]
+        if session[:openid_identity]
           referer = session[:referer]
           session.delete(:referer)
-          login_remote_user
           redirect referer || rf(Index)
         end
         session[:referer] = request.referrer
-        if info.initialize?
-          
-        else
-          respond(info.render(render_file(__DIR__('view/openid/index.rhtml')),
-           :layout => __DIR__('view/layout.rhtml')))
-        end
+        respond(info.render(render_file(__DIR__('view/openid/index.rhtml'))))
       end
 
       def logout
-        session.delete(:openid)
+        session.delete(:openid_identity)
+        session.delete(:openid_sreg)
+        session.delete(:openid_domain)
       end
       
       def openid_begin
-        url = request['url']
+        url = request.params['url']
         redirect_referrer if url.to_s.empty?
-        session[:openid] ||= {}
-        session[:openid][:entry] = request.referrer
+        session[:openid_domain] = url
+        session[:openid_entry] = request.referrer
 
         openid_request = openid_consumer.begin(url)
 
@@ -52,9 +51,8 @@ module UzuUzu
         openid_request.add_extension(sregreq)
         openid_request.return_to_args['did_pape'] = 'y'
 
-        root      = request.domain
-        p request.domain
-        return_to = request.domain(r(:openid_complete))
+        root      = root_uri
+        return_to = "#{root_uri}#{r(:openid_complete)}"
         immediate = false
 
         if openid_request.send_redirect?(root, return_to, immediate)
@@ -64,10 +62,8 @@ module UzuUzu
         else
           # what the hell is @form_text ?
         end
-
       rescue OpenID::OpenIDError => ex
-        flash[:error] = "Discovery failed for #{url}: #{ex}"
-        redirect r
+        server_error
       end
       
       def openid_complete
@@ -77,24 +73,17 @@ module UzuUzu
         when OpenID::Consumer::FAILURE
         when OpenID::Consumer::SUCCESS
           # Backwards compatibility
-          session[:openid][:identity] = openid_response.identity_url
-          session[:openid][:sreg] = OpenID::SReg::Response.from_success_response(openid_response)
+          session[:openid_identity] = openid_response.identity_url
+          session[:openid_sreg] = OpenID::SReg::Response.from_success_response(openid_response)
         end
-        redirect session[:openid][:entry]
+        openid_entry = session[:openid_entry]
+        session.delete(:openid_entry)
+        redirect openid_entry
       end
 
 
       private
 
-      #logined
-      def login_remote_user
-        remote_user = User.first(:user_id => session[:openid][:identity])
-        if remote_user.nil?
-          #remote_user = User.new(:user_id => session[:openid_identity])
-          #remote_user.save!
-        end
-      end
-
       # use memcache
       def openid_consumer
         memcache = OpenID::Store::Memcache.new(UzuUzu.memcache)

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

@@ -1,7 +1,7 @@
 
-<div id="openid_index">
+<div id="step1">
 	<p>
-		<%= fix_localize(:openid_message) %>
+		<%= fix_localize(:step1) %>
 	</p>
 	<form method="post" action="<%= rf(UzuUzu::Controller::Openid, :openid_begin) %>">
 		<p>

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

@@ -1 +1,24 @@
 
+<div id="step2">
+	<p>
+		<%= fix_localize(:step2) %>
+	</p>
+	<form method="post">
+		<p class='error_detail'><%= @error %></p>
+		<p>
+			<%= fix_localize(:user_entry_name) %>：
+			<input type="text" name="name" />
+		</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/initialize/step3.rhtml

@@ -0,0 +1,24 @@
+
+<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/wiki/index.rb

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

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

@@ -1,8 +1,8 @@
 # coding: utf-8
-require 'uzuuzu/adapter/datamapper/model/user'
-require 'uzuuzu/adapter/datamapper/model/blog_category'
-require 'uzuuzu/adapter/datamapper/model/blog_comment'
-require 'uzuuzu/adapter/datamapper/model/blog_entry'
+require 'uzuuzu-cms/model/user'
+require 'uzuuzu-cms/model/blog_category'
+require 'uzuuzu-cms/model/blog_comment'
+require 'uzuuzu-cms/model/blog_entry'
 
 module UzuUzu
   class User

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

@@ -1,6 +1,6 @@
 # coding: utf-8
-require 'uzuuzu/adapter/datamapper/model/css'
-require 'uzuuzu/adapter/datamapper/model/javascript'
+require 'uzuuzu-cms/model/css'
+require 'uzuuzu-cms/model/javascript'
 
 module UzuUzu
   class Css
@@ -28,8 +28,8 @@ module UzuUzu
     has n, :csses, :through => Resource
     has n, :javascripts, :through => Resource
     
-    def render
-      UzuUzu.render_engine(nil, self.body, self.format, options, locals)
+    def render(instance=nil, options={}, locals={})
+      UzuUzu.render_engine(instance, self.body, self.format, options, locals)
     end
   end # Contents
 

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

@@ -1,5 +1,5 @@
 # coding: utf-8
-require 'uzuuzu/adapter/datamapper/model/user'
+require 'uzuuzu-cms/model/user'
 
 module UzuUzu
   class User

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

@@ -1,5 +1,5 @@
 # coding: utf-8
-require 'uzuuzu/adapter/datamapper/model/user'
+require 'uzuuzu-cms/model/user'
 
 module UzuUzu
   class User

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

@@ -1,10 +1,10 @@
 # coding: utf-8
-require 'uzuuzu/adapter/datamapper/model/user'
-require 'uzuuzu/adapter/datamapper/model/css'
-require 'uzuuzu/adapter/datamapper/model/javascript'
-require 'uzuuzu/adapter/datamapper/model/layout'
-require 'uzuuzu/adapter/datamapper/model/page_body'
-require 'uzuuzu/adapter/datamapper/model/page'
+require 'uzuuzu-cms/model/user'
+require 'uzuuzu-cms/model/css'
+require 'uzuuzu-cms/model/javascript'
+require 'uzuuzu-cms/model/layout'
+require 'uzuuzu-cms/model/page_body'
+require 'uzuuzu-cms/model/page'
 
 module UzuUzu
   class User
@@ -49,7 +49,7 @@ module UzuUzu
              :default => false
     
     belongs_to :top_page, 'UzuUzu::Page', :required => false
-    belongs_to :layout, :required => false
+    belongs_to :layout
     belongs_to :admin, 'UzuUzu::User', :required => false
     belongs_to :header, 'UzuUzu::PageBody'
     belongs_to :footer, 'UzuUzu::PageBody'
@@ -59,7 +59,7 @@ module UzuUzu
 
     has n, :csses, 'UzuUzu::Css', :through => Resource
     has n, :javascripts, 'UzuUzu::Javascript', :through => Resource
-    
+        
     def self.uniq
       ret = nil
       UzuUzu.transaction do |tr|
@@ -68,6 +68,7 @@ module UzuUzu
         if ary.empty?
           ret = self.new
           ret.title = "UzuUzu"
+          ret.layout = ::UzuUzu::Layout.first
           ret.header = ::UzuUzu::PageBody.new
           ret.footer = ::UzuUzu::PageBody.new
           ret.navigator = ::UzuUzu::PageBody.new
@@ -100,21 +101,56 @@ module UzuUzu
       info.initialize?
     end
     
-    def render(contents=nil, instance=nil, options={})
+    def render(instance=nil, contents=nil, options={})
         locals = {
           :@header => self.header.render(instance, options),
           :@footer => self.footer.render(instance, options),
           :@left => self.left.render(instance, options),
           :@right => self.right.render(instance, options),
-          :@css => self.csses,
-          :@js => self.javascripts
+          :@css => self.csses.to_a.map{|css|css.url},
+          :@js => self.javascripts.to_a.map{|js|js.url}
         }
         locals[:@navigator] = self.navigator.render(instance, options) if self.use_navigator
         locals[:@contents] = contents
         locals[:@contents] ||= yield if block_given?
         locals[:@contents] ||= ""
-        UzuUzu.render_engine(instance, self.layout.body, self.layout.engine, options, locals)
+        UzuUzu.render_engine(instance, self.layout.body, self.layout.format, options, locals)
     end # render
+    
+    def header
+      page_body_property(super, :header)
+    end # header
+
+    def footer
+      page_body_property(super, :footer)
+    end # footer
+    
+    def left
+      page_body_property(super, :left)
+    end # left
+    
+    def right
+      page_body_property(super, :right)
+    end # right
+    
+    def navigator
+      page_body_property(super, :navigator)
+    end # navigator
+    
+    private
+    def page_body_property(value, property_name)
+      if value.nil?
+        UzuUzu.transaction do |tr|
+          tr.commit do
+            value = ::UzuUzu::PageBody.new
+            self.send("#{property_name}=", value)
+            self.save
+          end
+        end
+      end
+      value
+    end 
+
   end #Info
   
   if auto_upgrade?

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

@@ -6,10 +6,10 @@ module UzuUzu
 
     property :id, Serial
     property :name, String,
-              :length => 255
-    property :format, String,
               :required => true,
-              :length => 10
+              :length => 255
+    property :format, Enum[:none, :erb, :markdown],
+              :required => true
     property :body, Text,
               :required => true
   end #Page

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

@@ -1,5 +1,5 @@
 # coding: utf-8
-require 'uzuuzu/adapter/datamapper/model/user'
+require 'uzuuzu-cms/model/user'
 
 module UzuUzu
   class Movie