zen 0.2.3 → 0.2.4

data/proto/package/lib/package/controller/controllers.rb

@@ -8,12 +8,12 @@ module EXTENSION
     class CONTROLLER < Zen::Controllers::AdminController
       include ::EXTENSION::Models
 
-      map "/admin/module"
+      map   "/admin/module"
       trait :extension_identifier => ''
       
       before_all do
         csrf_protection :save, :delete do
-          respond(@zen_general_lang.errors[:csrf], 401)
+          respond(lang('zen_general.errors.csrf'), 401)
         end
       end
       
@@ -25,16 +25,12 @@ module EXTENSION
       def initialize
         super
         
-        @form_save_url = ''
-        @lang = Zen::Language.load ''
+        Zen::Language.load 'language'
         
         # Set the page title
         if !action.method.nil?
-          method = action.method.to_sym
-        
-          if @lang.titles.key? method 
-            @page_title = @lang.titles[method]
-          end
+          method      = action.method.to_sym
+          @page_title = lang("language.titles.#{method}") rescue nil
         end
       end
       

data/proto/package/lib/package/language/en/languages.yml

@@ -0,0 +1,4 @@
+titles:
+  index :''
+  edit  : ''
+  new   : ''

metadata

@@ -2,7 +2,7 @@
 name: zen
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Yorick Peterse
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-20 00:00:00 +01:00
+date: 2011-03-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.1.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.2.2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -65,7 +65,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.5.1
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -76,7 +76,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.14.6
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -87,7 +87,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.1
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -98,7 +98,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.0.6
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -109,7 +109,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "1.0"
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -120,42 +120,75 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.6.8
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: redcloth
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "2.0"
+        version: 4.2.7
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rspec
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.5.0
   type: :development
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: capybara
+  name: yard
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.6.5
   type: :development
   version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.4.1.2
+  type: :development
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id016
 description: Zen is a fully modular CMS written using Ramaze. Unlike traditional Content Management Systems you are completely free to build whatever you want.
 email: info@yorickpeterse.com
 executables: 
@@ -171,28 +204,30 @@ files:
 - ROADMAP.md
 - Thorfile
 - bin/zen
-- lib/zen/base/database.rb
-- lib/zen/base/language.rb
-- lib/zen/base/logger.rb
-- lib/zen/base/package.rb
-- lib/zen/base/version.rb
-- lib/zen/bin/zen_binary.rb
+- lib/zen/bin/base.rb
 - lib/zen/controller/admin_controller.rb
 - lib/zen/controller/base_controller.rb
 - lib/zen/controller/frontend_controller.rb
 - lib/zen/controller/main_controller.rb
+- lib/zen/database.rb
+- lib/zen/error/language_error.rb
+- lib/zen/error/package_error.rb
+- lib/zen/error/plugin_error.rb
+- lib/zen/error/theme_error.rb
 - lib/zen/helper/acl.rb
 - lib/zen/helper/asset.rb
 - lib/zen/helper/breadcrumb.rb
 - lib/zen/helper/common.rb
 - lib/zen/language/en/zen_general.yml
 - lib/zen/language/en/zen_models.yml
+- lib/zen/language.rb
 - lib/zen/layout/admin.xhtml
 - lib/zen/layout/login.xhtml
 - lib/zen/liquid/controller_behavior.rb
 - lib/zen/liquid/general.rb
 - lib/zen/liquid/redirect.rb
 - lib/zen/liquid/strip.rb
+- lib/zen/logger.rb
 - lib/zen/model/methods.rb
 - lib/zen/model/settings.rb
 - lib/zen/package/all.rb
@@ -319,6 +354,9 @@ files:
 - lib/zen/package/users/lib/users.rb
 - lib/zen/package/users/migrations/.gitkeep
 - lib/zen/package/users/migrations/1295281013_create_schema.rb
+- lib/zen/package.rb
+- lib/zen/plugin/markup.rb
+- lib/zen/plugin.rb
 - lib/zen/public/admin/css/boilerplate.css
 - lib/zen/public/admin/css/buttons.css
 - lib/zen/public/admin/css/datepicker.css
@@ -368,11 +406,15 @@ files:
 - lib/zen/public/admin/js/zen/modal.js
 - lib/zen/public/admin/js/zen/notification.js
 - lib/zen/public/admin/js/zen/tabs.js
+- lib/zen/strict_struct.rb
 - lib/zen/task/build.rb
 - lib/zen/task/clean.rb
 - lib/zen/task/db.rb
 - lib/zen/task/package.rb
 - lib/zen/task/proto.rb
+- lib/zen/task/theme.rb
+- lib/zen/theme.rb
+- lib/zen/version.rb
 - lib/zen.rb
 - license.txt
 - proto/app/Thorfile
@@ -382,16 +424,14 @@ files:
 - proto/app/config/middlewares.rb
 - proto/app/config/requires.rb
 - proto/app/config.ru
-- proto/app/logs/.gitkeep
+- proto/app/log/.gitkeep
 - proto/app/public/.gitkeep
 - proto/app/start.rb
 - proto/app/vendor/.gitkeep
 - proto/app/vendor/themes/.gitkeep
 - proto/migration.rb
-- proto/package/LICENSE
-- proto/package/README.textile
 - proto/package/lib/package/controller/controllers.rb
-- proto/package/lib/package/language/en/languages.rb
+- proto/package/lib/package/language/en/languages.yml
 - proto/package/lib/package/model/model.rb
 - proto/package/lib/package/view/admin/package/edit.xhtml
 - proto/package/lib/package/view/admin/package/form.xhtml

data/proto/package/lib/package/language/en/languages.rb

@@ -1,3 +0,0 @@
-Zen::Language.translation 'language package name' do |item|
-  
-end