typus 3.1.0.rc11 → 3.1.0.rc12

data/lib/typus/controller/filters.rb

@@ -1,3 +1,25 @@
+##
+# How predefined filters work?
+#
+# On your controllers ...
+#
+#     def index
+#       # Added predefined filter takes any argumes, but in the views we
+#       # expected the following:
+#       #
+#       #     add_predefined_filter(filter_name, action, scope)
+#       #
+#       ...
+#       add_predefined_filter("Trash", "trash", "deleted")
+#       ...
+#     end
+#
+# On your views ...
+#
+#     <% predefined_filters.each do |filter_name, action, scope| %>
+#       ...
+#     <% end %>
+#
 module Typus
   module Controller
     module Filters

data/lib/typus/i18n.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 module Typus
   module I18n
 
@@ -26,6 +28,21 @@ module Typus
         :en
       end
 
+      def available_locales
+        { "Brazilian Portuguese" => "pt-BR",
+          "Català" => "ca",
+          "German" => "de",
+          "Greek"  => "el",
+          "Italiano" => "it",
+          "English" => "en",
+          "Español" => "es",
+          "Français" => "fr",
+          "Magyar" => "hu",
+          "Portuguese" => "pt-PT",
+          "Russian" => "ru",
+          "中文" => "zh-CN" }
+      end
+
     end
 
   end

data/lib/typus/orm/active_record/user/class_methods.rb

@@ -19,7 +19,7 @@ module Typus
           end
 
           def locale
-            Typus.locales
+            Typus::I18n.available_locales
           end
 
         end

data/lib/typus/orm/base.rb

@@ -58,7 +58,7 @@ module Typus
       # With Typus::Resources we some application defaults.
       #
       #     Typus::Resources.setup do |config|
-      #       config.per_page = 15
+      #       config.per_page = 25
       #     end
       #
       # If for any reason we need a better default for an specific resource we
@@ -67,7 +67,7 @@ module Typus
       #     Post:
       #       ...
       #       options:
-      #         per_page: 15
+      #         per_page: 25
       #++
       def typus_options_for(filter)
         options = read_model_config['options']

data/lib/typus/resources.rb

@@ -28,7 +28,7 @@ module Typus
     @@only_user_items = false
 
     mattr_accessor :per_page
-    @@per_page = 15
+    @@per_page = 25
 
     mattr_accessor :sortable
     @@sortable = true

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.0.rc11"
+  VERSION = "3.1.0.rc12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typus
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc11
+  version: 3.1.0.rc12
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-27 00:00:00.000000000Z
+date: 2011-07-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
-  requirement: &2161117880 !ruby/object:Gem::Requirement
+  requirement: &2152822480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2161117880
+  version_requirements: *2152822480
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2161117460 !ruby/object:Gem::Requirement
+  requirement: &2152821960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161117460
+  version_requirements: *2152821960
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2161117000 !ruby/object:Gem::Requirement
+  requirement: &2152821460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161117000
+  version_requirements: *2152821460
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &2161116580 !ruby/object:Gem::Requirement
+  requirement: &2152821020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161116580
+  version_requirements: *2152821020
 - !ruby/object:Gem::Dependency
   name: rails-trash
-  requirement: &2161116080 !ruby/object:Gem::Requirement
+  requirement: &2152820440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *2161116080
+  version_requirements: *2152820440
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2161115440 !ruby/object:Gem::Requirement
+  requirement: &2152819720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161115440
+  version_requirements: *2152819720
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2161114760 !ruby/object:Gem::Requirement
+  requirement: &2152818880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161114760
+  version_requirements: *2152818880
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2161114000 !ruby/object:Gem::Requirement
+  requirement: &2152817080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 3.1.0.rc4
   type: :runtime
   prerelease: false
-  version_requirements: *2161114000
+  version_requirements: *2152817080
 description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured
   content.
 email:
@@ -109,8 +109,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .gitmodules
-- .yardopts
-- Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -164,6 +162,7 @@ files:
 - app/themes/default/views/admin/mailer/reset_password_link.text.erb
 - app/themes/default/views/admin/resources/_edit.html.erb
 - app/themes/default/views/admin/resources/_form.html.erb
+- app/themes/default/views/admin/resources/_form_javascripts.html.erb
 - app/themes/default/views/admin/resources/_index.html.erb
 - app/themes/default/views/admin/resources/_new.html.erb
 - app/themes/default/views/admin/resources/_show.html.erb
@@ -173,6 +172,7 @@ files:
 - app/themes/default/views/admin/resources/show.html.erb
 - app/themes/default/views/admin/session/new.html.erb
 - app/themes/default/views/admin/shared/_head.html.erb
+- app/themes/default/views/admin/templates/README.md
 - app/themes/default/views/admin/templates/_belongs_to.html.erb
 - app/themes/default/views/admin/templates/_belongs_to_with_autocomplete.html.erb
 - app/themes/default/views/admin/templates/_boolean.html.erb
@@ -185,6 +185,7 @@ files:
 - app/themes/default/views/admin/templates/_paperclip.html.erb
 - app/themes/default/views/admin/templates/_paperclip_preview.html.erb
 - app/themes/default/views/admin/templates/_password.html.erb
+- app/themes/default/views/admin/templates/_position.html.erb
 - app/themes/default/views/admin/templates/_profile_sidebar.html.erb
 - app/themes/default/views/admin/templates/_selector.html.erb
 - app/themes/default/views/admin/templates/_string.html.erb
@@ -233,12 +234,6 @@ files:
 - config/locales/typus.zh-CN.models.yml
 - config/locales/typus.zh-CN.yml
 - config/routes.rb
-- doc/yard/handlers/configurable_attr_handler.rb
-- doc/yard/setup.rb
-- doc/yard/templates/default/fulldoc/html/css/common.css
-- doc/yard/templates/default/layout/html/layout.erb
-- doc/yard/templates/default/module/html/configuration_summary.erb
-- doc/yard/templates/default/module/setup.rb
 - lib/generators/templates/config/initializers/typus.rb
 - lib/generators/templates/config/initializers/typus_authentication.rb
 - lib/generators/templates/config/initializers/typus_resources.rb

data/.yardopts

@@ -1,6 +0,0 @@
---main doc/wiki/home.md
---output doc/site
--e ./doc/yard/setup.rb
--
-README.md
-doc/wiki/*

data/Gemfile

@@ -1,60 +0,0 @@
-source 'http://rubygems.org'
-
-# Specify your gem's dependencies in typus.gemspec
-gemspec
-
-gem "sqlite3"
-gem "jquery-rails"
-gem "ckeditor-rails", "0.0.2"
-
-# And this stuff needed for the demo application.
-gem "acts_as_list"
-gem "acts_as_tree"
-gem "factory_girl"
-gem "rails-trash", "~> 1.1.1"
-
-# Asset Management
-gem "dragonfly", "~> 0.9"
-gem "rack-cache", :require => "rack/cache"
-gem "paperclip"
-
-group :test do
-  gem "shoulda-context"
-  gem "mocha" # Make sure mocha is loaded at the end ...
-end
-
-group :development, :test do
-
-  platforms :jruby do
-    gem "activerecord-jdbc-adapter", :require => false
-
-    gem "jdbc-mysql"
-    gem "jdbc-postgres"
-    gem "jdbc-sqlite3"
-
-    gem "jruby-openssl" # JRuby limited openssl loaded. http://jruby.org/openssl
-  end
-
-  platforms :ruby do
-    gem "mysql2"
-    gem "pg"
-    gem "sqlite3"
-  end
-
-end
-
-group :production do
-
-  # gem "mongoid"
-
-  platforms :jruby do
-    gem "activerecord-jdbc-adapter"
-    gem "jdbc-sqlite3"
-  end
-
-  platforms :ruby do
-    # gem "bson_ext"
-    gem "sqlite3"
-  end
-
-end

data/doc/yard/handlers/configurable_attr_handler.rb

@@ -1,38 +0,0 @@
-class ConfigurableAttrHandler < YARD::Handlers::Ruby::Legacy::Base
-  handles(/^\s*configurable_attr/)
-
-  def process
-    namespace[:configurable_attributes] ||= []
-    
-    attribute = token_to_object(statement.tokens[2])
-    comments = statement.comments.join(' ') if statement.comments
-    
-    if statement.block
-    # e.g. configurable_attr :datastore do FileDataStore.new end
-      lazy_default_value = statement.block.to_s
-    else
-    # e.g. configurable_attr :fallback_mime_type, 'application/octet-stream'    
-      default_value = token_to_object(statement.tokens[5..-1])
-    end
-    namespace[:configurable_attributes] << {
-      :attribute => attribute,
-      :default_value => default_value,
-      :lazy_default_value => lazy_default_value,
-      :comments => comments
-    }
-  end
-
-  private
-
-  def token_to_object(token)
-    if token
-      if token.is_a?(YARD::Parser::Ruby::Legacy::TokenList)
-        eval(token.to_s)
-      else # is a single token
-        eval(token.text)
-      end
-    end
-  end
-
-end
-

data/doc/yard/setup.rb

@@ -1,9 +0,0 @@
-this_dir = File.dirname(__FILE__)
-
-YARD::Templates::Engine.register_template_path(this_dir + '/templates')
-Dir[this_dir + '/handlers/*.rb'].each do |file|
-  require File.expand_path(file)
-end
-YARD::Parser::SourceParser.parser_type = :ruby18
-
-DRAGONFLY_VERSION = "0.0.0"

data/doc/yard/templates/default/fulldoc/html/css/common.css

@@ -1,109 +0,0 @@
-/* Overrides for yard documentation */
-
-/* Clearfix */
-.clearfix:after {
-	content: ".";
-	display: block;
-	clear: both;
-	visibility: hidden;
-	line-height: 0;
-	height: 0;
-}
- 
-.clearfix {
-	display: inline-block;
-}
- 
-html[xmlns] .clearfix {
-	display: block;
-}
- 
-* html .clearfix {
-	height: 1%;
-}
- /************/
-
-body {
-  font-family: "PT Sans",Verdana,Arial,sans-serif;
-  font-size: 14px;
-}
-
-pre, code, .code,
-#filecontents pre.code,
-.docstring pre.code,
-.source_code pre {
-  font-family: Inconsolata,Monaco,"Courier New","DejaVu Sans Mono","Bitstream Vera Sans Mono",monospace;
-}
-
-pre.code, code {
-  background:#F5F5FF;
-  overflow-x: auto;
-}
-#filecontents pre.code {
-  margin:10px 0;
-  padding:5px 12px;
-  border-radius:5px;
-  -webkit-border-radius:5px;
-  -moz-border-radius:5px;
-  border: 1px dotted #CCC;
-}
-
-code .val {
-  color:#036A07;
-}
-code .kw {
-  color:#0000FF;
-}
-code .symbol {
-  color:#C5060B;
-}
-
-ul.main_files {
-  list-style-type:none;
-  margin:0;
-  padding:0;
-  font-size:14px;
-}
-ul.main_files li {
-  margin:0;
-  padding:0;
-}
-
-ul.main_files li a {
-  margin: 0;
-  padding:3px 12px;
-  display:block;
-  cursor:pointer;
-}
-#content ul.main_files li a:hover {
-  background-color:#F4F9E4;
-}
-/* Layout */
-#header,
-#content,
-#footer {
-  margin:0 auto;
-  width:1000px;
-}
-#header #logo {
-  float:left;
-  width:50%;
-  font-size: 32px;
-  letter-spacing: -1px;
-  margin-top: 20px;
-}
-#header #search {
-  position:static;
-  float:right;
-}
-#content .col1 {
-  float:left;
-  width: 750px;
-}
-#content .col2 {
-  float:left;
-  margin: 0 0 0 20px;
-  padding: 0 0 0 20px;
-  width: 200px;
-  border-left: 1px dotted #D5D5D5;
-}