trestle 0.8.7 → 0.8.8

data/config/locales/pl.yml

@@ -4,19 +4,6 @@ pl:
     footer: "Powered by Trestle"
     version: "Wersja"
 
-    flash:
-      success:
-        title: "Sukces!"
-        create: "%{lowercase_model_name} został pomyślnie utworzony."
-        update: "%{lowercase_model_name} został pomyślnie zaktualizowany."
-        destroy: "%{lowercase_model_name} został pomyślnie usunięty."
-
-      failure:
-        title: "Uwaga!"
-        create: "Popraw poniższe błędy."
-        update: "Popraw poniższe błędy."
-        destroy: "Nie można usunąć %{lowercase_model_name}."
-
     helpers:
       page_entries_info:
         one_page:
@@ -35,6 +22,15 @@ pl:
       no_template: "Aby dostosować ten szablon, utwórz <code>%{path}</code>."
       no_form: "Proszę zdefiniować blok formularza lub utworzyć podszablon <code>_form.html</code>."
 
+    ui:
+      toggle_navigation: "Przełącz nawigację"
+      toggle_sidebar: "Przełącz pasek boczny"
+
+    confirmation:
+      title: "Jesteś pewny?"
+      delete: "Usuń"
+      cancel: "Anuluj"
+
   admin:
     titles:
       index: "Lista %{pluralized_model_name}"
@@ -49,6 +45,34 @@ pl:
     breadcrumbs:
       home: "Start"
 
+    flash:
+      create:
+        success:
+          title: "Sukces!"
+          message: "%{lowercase_model_name} został pomyślnie utworzony."
+
+        failure:
+          title: "Uwaga!"
+          message: "Popraw poniższe błędy."
+
+      update:
+        success:
+          title: "Sukces!"
+          message: "%{lowercase_model_name} został pomyślnie zaktualizowany."
+
+        failure:
+          title: "Uwaga!"
+          message: "Popraw poniższe błędy."
+
+      destroy:
+        success:
+          title: "Sukces!"
+          message: "%{lowercase_model_name} został pomyślnie usunięty."
+
+        failure:
+          title: "Uwaga!"
+          message: "Nie można usunąć %{lowercase_model_name}."
+
     table:
       headers:
         id: "ID"
@@ -57,14 +81,5 @@ pl:
       select:
         prompt: "- Wybierz %{attribute_name} -"
 
-    confirmation:
-      title: "Jesteś pewny?"
-      delete: "Usuń"
-      cancel: "Anuluj"
-
-    ui:
-      toggle_navigation: "Przełącz nawigację"
-      toggle_sidebar: "Przełącz pasek boczny"
-
     format:
       blank: "Żaden"

data/config/locales/pt-BR.yml

@@ -4,19 +4,6 @@ pt-BR:
     footer: "Powered by Trestle"
     version: "Versão"
 
-    flash:
-      success:
-        title: "Sucesso!"
-        create: "O %{model_name} foi criado com sucesso."
-        update: "O %{model_name} foi atualizado com sucesso."
-        destroy: "O %{model_name} foi deletado com sucesso."
-
-      failure:
-        title: "Atenção!"
-        create: "Por favor corrija os erros abaixo."
-        update: "Por favor corrija os erros abaixo."
-        destroy: "Falha ao excluir %{model_name}."
-
     helpers:
       page_entries_info:
         one_page:
@@ -34,6 +21,15 @@ pt-BR:
       no_template: "Para personalizar este template, crie <code>%{path}</code>."
       no_form: "Defina um bloco de formulário ou crie um <code>_form.html</code> parcial."
 
+    ui:
+      toggle_navigation: "Alternar naveção"
+      toggle_sidebar: "Alternar barra lateral"
+
+    confirmation:
+      title: "Você tem certeza?"
+      delete: "Excluir"
+      cancel: "Cancelar"
+
   admin:
     titles:
       index: "Listando %{pluralized_model_name}"
@@ -48,6 +44,34 @@ pt-BR:
     breadcrumbs:
       home: "Home"
 
+    flash:
+      create:
+        success:
+          title: "Sucesso!"
+          message: "O %{model_name} foi criado com sucesso."
+
+        failure:
+          title: "Atenção!"
+          message: "Por favor corrija os erros abaixo."
+
+      update:
+        success:
+          title: "Sucesso!"
+          message: "O %{model_name} foi atualizado com sucesso."
+
+        failure:
+          title: "Atenção!"
+          message: "Por favor corrija os erros abaixo."
+
+      destroy:
+        success:
+          title: "Sucesso!"
+          message: "O %{model_name} foi deletado com sucesso."
+
+        failure:
+          title: "Atenção!"
+          message: "Falha ao excluir %{model_name}."
+
     table:
       headers:
         id: "ID"
@@ -56,14 +80,5 @@ pt-BR:
       select:
         prompt: "- Selecione %{attribute_name} -"
 
-    confirmation:
-      title: "Você tem certeza?"
-      delete: "Excluir"
-      cancel: "Cancelar"
-
-    ui:
-      toggle_navigation: "Alternar naveção"
-      toggle_sidebar: "Alternar barra lateral"
-
     format:
       blank: "Nenhum"

data/config/locales/zh-CN.rb

@@ -0,0 +1,18 @@
+{
+  'zh-CN' => {
+    date: {
+      formats: {
+        trestle_date: proc { |date| "%Y年%-m月%-d日" },
+        trestle_calendar: "%Y年%-m月%-d日"
+      }
+    },
+
+    time: {
+      formats: {
+        trestle_date: proc { |time| "%Y年%-m月%-d日" },
+        trestle_time: "%H:%M",
+        trestle_time_with_seconds: "%H:%M:%S"
+      }
+    }
+  }
+}

data/config/locales/zh-CN.yml

@@ -0,0 +1,94 @@
+zh-CN:
+  trestle:
+    title: "Trestle Admin"
+    footer: "由 Trestle 强力驱动"
+    version: "版本"
+
+    helpers:
+      page_entries_info:
+        one_page:
+          display_entries:
+            zero: "没找到%{entry_name}"
+            one: "已显示 <strong>1</strong> 条%{entry_name}记录"
+            other: "已显示<strong>全部 %{count}</strong> 条%{entry_name}记录"
+
+        more_pages:
+          display_entries: "显示 %{entry_name} <strong>%{first}&nbsp;-&nbsp;%{last}</strong>，总共 <b>%{total} 条记录</b>"
+
+    onboarding:
+      welcome: "欢迎使用 Trestle"
+      no_admins: "要开始使用，请在 <code>app/admin</code> 里创建管理资源。"
+      no_template: "要自定义此模板，请创建 <code>%{path}</code>。"
+      no_form: "请定义一个表单块或者创建一个 <code>_form.html</code> 文件。"
+
+    ui:
+      toggle_navigation: "打开/隐藏导航"
+      toggle_sidebar: "打开/隐藏侧边栏"
+
+    dialog:
+      error: 无法完成该请求。
+
+    confirmation:
+      title: 真的要删除吗？
+      delete: 删除
+      cancel: 取消
+
+  admin:
+    titles:
+      index: "%{pluralized_model_name}列表"
+      new: "新建%{model_name}"
+      edit: "编辑%{model_name}"
+
+    buttons:
+      new: "新建%{model_name}"
+      save: "保存%{model_name}"
+      delete: "删除%{model_name}"
+      ok: "确定"
+
+    breadcrumbs:
+      home: "首页"
+
+    flash:
+      create:
+        success:
+          title: "成功！"
+          message: "%{lowercase_model_name}创建成功。"
+
+        failure:
+          title: "警告!"
+          message: "请修正以下错误。"
+
+      update:
+        success:
+          title: "成功！"
+          message: "%{lowercase_model_name}更新成功。"
+
+        failure:
+          title: "警告!"
+          message: "请修正以下错误。"
+
+      destroy:
+        success:
+          title: "成功！"
+          message: "%{lowercase_model_name}删除成功。"
+
+        failure:
+          title: "警告!"
+          message: "不能删除%{lowercase_model_name}。"
+
+    table:
+      headers:
+        id: "ID"
+
+    form:
+      select:
+        prompt: "- 选择%{attribute_name} -"
+
+    format:
+      blank: "无"
+
+    datepicker:
+      formats:
+        date: "Y年m月d日"
+        datetime: "Y年m月d日 H:i"
+        time: "H:i"

data/gemfiles/rails-5.2.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem 'coveralls', require: false
+  gem 'simplecov', require: false
+
+  gem 'capybara'
+  gem 'capybara-selenium'
+  gem 'selenium-webdriver'
+end
+
+gem 'rails', '~> 5.2.0'
+
+gemspec :path => "../"

data/lib/trestle/adapters/adapter.rb

@@ -133,10 +133,10 @@ module Trestle
       #
       # Returns a Kaminari-compatible scope corresponding to a single page.
       def paginate(collection, params)
-        collection = Kaminari.paginate_array(collection.to_a) unless collection.respond_to?(:page)
+        collection = Kaminari.paginate_array(collection.to_a) unless collection.respond_to?(Kaminari.config.page_method_name)
         per_page = admin.pagination_options[:per]
 
-        collection.page(params[:page]).per(per_page)
+        collection.public_send(Kaminari.config.page_method_name, params[:page]).per(per_page)
       end
 
       # Filters the submitted form parameters and returns a whitelisted attributes 'hash'
@@ -149,7 +149,7 @@ module Trestle
       #
       # Returns the permitted set of parameters as a ActionController::Parameters object.
       def permitted_params(params)
-        params.require(admin.admin_name.singularize).permit!
+        params.require(admin.parameter_name).permit!
       end
 
       # Produces a human-readable name for a given attribute, applying I18n where appropriate.

data/lib/trestle/admin.rb

@@ -46,13 +46,33 @@ module Trestle
       end
 
       def default_breadcrumb
-        Breadcrumb.new(I18n.t("admin.breadcrumbs.#{admin_name}", default: admin_name.titleize), path)
+        Breadcrumb.new(human_admin_name, path)
       end
 
       def admin_name
         name.underscore.sub(/_admin$/, '')
       end
 
+      def i18n_key
+        admin_name
+      end
+
+      def human_admin_name
+        I18n.t("admin.breadcrumbs.#{i18n_key}", default: name.demodulize.underscore.sub(/_admin$/, '').titleize)
+      end
+
+      def translate(key, options={})
+        defaults = [:"admin.#{i18n_key}.#{key}", :"admin.#{key}"]
+        defaults << options[:default] if options[:default]
+
+        I18n.t(defaults.shift, options.merge(default: defaults))
+      end
+      alias t translate
+
+      def parameter_name
+        admin_name.singularize
+      end
+
       def route_name
         "#{admin_name.tr('/', '_')}_admin"
       end
@@ -65,7 +85,7 @@ module Trestle
         "#{name.underscore}/admin"
       end
 
-      def path(action=:index, options={})
+      def path(action=root_action, options={})
         Engine.routes.url_for(options.merge(controller: controller_namespace, action: action, only_path: true))
       end
 
@@ -73,6 +93,10 @@ module Trestle
         [:index]
       end
 
+      def root_action
+        :index
+      end
+
       def routes
         admin = self
 
@@ -92,6 +116,10 @@ module Trestle
       def build(&block)
         Admin::Builder.build(self, &block)
       end
+
+      def validate!
+        # No validations by default. This can be overridden in subclasses.
+      end
     end
   end
 end

data/lib/trestle/admin/builder.rb

@@ -34,6 +34,9 @@ module Trestle
         controller.instance_variable_set("@admin", admin)
 
         admin.build(&block)
+        admin.validate!
+
+        admin
       end
 
       def menu(*args, &block)
@@ -45,12 +48,7 @@ module Trestle
       end
 
       def table(name_or_options={}, options={}, &block)
-        if name_or_options.is_a?(Hash)
-          name, options = :index, name_or_options.reverse_merge(admin: admin, sortable: true)
-        else
-          name = name_or_options
-        end
-
+        name, options = normalize_table_options(name_or_options, options)
         admin.tables[name] = Table::Builder.build(options, &block)
       end
 
@@ -75,10 +73,22 @@ module Trestle
       def breadcrumb(label=nil, path=nil, &block)
         if block_given?
           @admin.breadcrumb = block
-        else
+        elsif label
           @admin.breadcrumb = -> { Breadcrumb.new(label, path) }
+        else
+          @admin.breadcrumb = -> { false }
         end
       end
+
+    protected
+      def normalize_table_options(name, options)
+        if name.is_a?(Hash)
+          # Default index table
+          name, options = :index, name
+        end
+
+        [name, options]
+      end
     end
   end
 end

data/lib/trestle/breadcrumb.rb

@@ -18,6 +18,8 @@ module Trestle
         new(obj)
       when Array
         new(*obj)
+      when NilClass, false
+        nil
       else
         raise ArgumentError, "Unable to cast #{obj.inspect} to Breadcrumb"
       end
@@ -27,7 +29,7 @@ module Trestle
       include Enumerable
 
       def initialize(breadcrumbs=[])
-        @breadcrumbs = Array(breadcrumbs)
+        @breadcrumbs = Array(breadcrumbs).compact
       end
 
       def ==(other)