administrate 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edc61eafe7e1c58cccdf49d53f0b5c279e343deb
-  data.tar.gz: 2410bd7f50fe33e8341d1c662db4c6ddc343d408
+  metadata.gz: f6a8554f3a353107a488efb3fec4ef4b30f8c936
+  data.tar.gz: 7d0941da63a83224d077819a1d7976ded1d40288
 SHA512:
-  metadata.gz: 9402b5353adf25c3a1a06f6e33ad963bca6e6aeb3d1806e47941581f1b95d08e737d61bfd42af7a8c495cb24962ab63cb7ca11f7eec5b9b3ad2581185bfd47e2
-  data.tar.gz: f51fab8de37a22371755543ad6ac29437d0b81c95edfbda7e8f1e93b0a53ac7e8a6f9722c9874176e800f190e29757dcd3ca6605ca81bfb343c7748551716145
+  metadata.gz: f0b5072a78e97d7d320ae833c63e5f3d17294c2344a7597e392c1c8ca2eea89445bfbb23cb7943b09392457842b448589be7244c29df8a7306ba7bc7d89df9a7
+  data.tar.gz: e67b6690e0ba8d3fbbe579d780f4780998e49bc27d67585cafae7f1741b7fd63e3028c477e95433f23083733dbd07b1e3b9bc3888d67ec4a9f16de52e89bd894

data/app/assets/stylesheets/administrate/components/_table.scss

@@ -21,3 +21,11 @@
 .table__action--destroy {
   color: $light-red;
 }
+
+.table__link-plain {
+  color: inherit;
+
+  &:hover {
+    color: inherit;
+  }
+}

data/app/controllers/administrate/application_controller.rb

@@ -13,6 +13,7 @@ module Administrate
         resources: resources,
         search_term: search_term,
         page: page,
+        show_search_bar: show_search_bar?
       }
     end
 
@@ -122,5 +123,11 @@ module Administrate
         resource: resource_resolver.resource_title,
       )
     end
+
+    def show_search_bar?
+      dashboard.attribute_types_for(
+        dashboard.collection_attributes
+      ).any? { |_name, attribute| attribute.searchable? }
+    end
   end
 end

data/app/views/administrate/application/_collection.html.erb

@@ -60,7 +60,11 @@ to display a collection of resources in an HTML table.
           >
         <% collection_presenter.attributes_for(resource).each do |attribute| %>
           <td class="cell-data cell-data--<%= attribute.html_class %>">
-            <%= render_field attribute %>
+            <a href="<%= polymorphic_path([namespace, resource]) -%>"
+               class="action-show table__link-plain"
+               >
+              <%= render_field attribute %>
+            </a>
           </td>
         <% end %>
 

data/app/views/administrate/application/index.html.erb

@@ -17,6 +17,8 @@ It renders the `_table` partial to display details about the resources.
   By default, these resources are passed to the table partial to be displayed.
 - `search_term`:
   A string containing the term the user has searched for, if any.
+- `show_search_bar`:
+  A boolean that determines if the search bar should be shown.
 
 [1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Collection
 %>
@@ -26,7 +28,9 @@ It renders the `_table` partial to display details about the resources.
 <% end %>
 
 <% content_for(:search) do %>
-  <%= render "search", search_term: search_term %>
+  <% if show_search_bar %>
+    <%= render "search", search_term: search_term %>
+  <% end %>
 <% end %>
 
 <header class="header">

data/app/views/fields/has_many/_show.html.erb

@@ -30,7 +30,7 @@ from the associated resource class's dashboard.
       <%= t(
         'administrate.fields.has_many.more',
         count: field.limit,
-        total_count: field.data.count,
+        total_count: field.data.count(:all),
       ) %>
     </span>
   <% end %>

data/app/views/layouts/docs.html.erb

@@ -25,6 +25,7 @@
         <li><a href="/customizing_attribute_partials">Customizing Attribute Partials</a></li>
         <li><a href="/adding_custom_field_types">Adding Custom Field Types</a></li>
         <li><a href="/customizing_controller_actions">Customizing Controller Actions</a></li>
+        <li><a href="/authentication">Authentication</a></li>
       </ul>
     </div>
 

data/config/locales/administrate.ja.yml

@@ -0,0 +1,23 @@
+---
+ja:
+  administrate:
+    actions:
+      confirm: 本当によろしいですか？
+      destroy: 削除
+      edit: 編集
+      show: 参照
+    controller:
+      create:
+        success: "%{resource}を作成しました。"
+      destroy:
+        success: "%{resource}を削除しました。"
+      update:
+        success: "%{resource}を更新しました。"
+    fields:
+      has_many:
+        more: "%{total_count} 件中 %{count} 件表示"
+        none: データがありません
+      polymorphic:
+        not_supported: フォームでは「多：多」の関連をサポートしていません。
+      has_one:
+        not_supported: フォームでは「１：１」の関連をサポートしていません。

data/config/locales/administrate.pt-BR.yml

@@ -19,6 +19,6 @@ pt-BR:
         more: "Exibindo %{count} de %{total_count}"
         none: Nenhum
       polymorphic:
-        not_supported: Relações polimórmficas nos formulários não são suportadas.
+        not_supported: Relações polimórficas nos formulários não são suportadas.
       has_one:
         not_supported: Relações um para muitos nos formulários não são suportadas.

data/config/secrets.yml

@@ -0,0 +1,14 @@
+default: &default
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
+
+development:
+  <<: *default
+
+test:
+  <<: *default
+
+staging:
+  <<: *default
+
+production:
+  <<: *default

data/lib/administrate/engine.rb

@@ -1,3 +1,4 @@
+require "bourbon"
 require "datetime_picker_rails"
 require "jquery-rails"
 require "kaminari"

data/lib/administrate/field/associative.rb

@@ -20,6 +20,10 @@ module Administrate
       def associated_class_name
         options.fetch(:class_name, attribute.to_s.singularize.camelcase)
       end
+
+      def primary_key
+        options.fetch(:primary_key, :id)
+      end
     end
   end
 end

data/lib/administrate/field/belongs_to.rb

@@ -13,12 +13,12 @@ module Administrate
 
       def associated_resource_options
         [nil] + candidate_resources.map do |resource|
-          [display_candidate_resource(resource), resource.id]
+          [display_candidate_resource(resource), resource.send(primary_key)]
         end
       end
 
       def selected_option
-        data && data.id
+        data && data.send(primary_key)
       end
 
       private

data/lib/administrate/field/has_many.rb

@@ -20,12 +20,12 @@ module Administrate
 
       def associated_resource_options
         candidate_resources.map do |resource|
-          [display_candidate_resource(resource), resource.id]
+          [display_candidate_resource(resource), resource.send(primary_key)]
         end
       end
 
       def selected_options
-        data && data.map(&:id)
+        data && data.map { |object| object.send(primary_key) }
       end
 
       def limit
@@ -41,7 +41,7 @@ module Administrate
       end
 
       def more_than_limit?
-        data.count > limit
+        data.count(:all) > limit
       end
 
       private

data/lib/administrate/version.rb

@@ -1,3 +1,3 @@
 module Administrate
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

data/lib/administrate/view_generator.rb

@@ -24,7 +24,13 @@ module Administrate
     end
 
     def resource_path
-      args.first.try(:underscore).try(:pluralize) || "application"
+      args.first.try(:underscore).try(:pluralize) || BaseResourcePath.new
+    end
+
+    class BaseResourcePath
+      def to_s
+        "application"
+      end
     end
   end
 end

data/lib/generators/administrate/dashboard/templates/controller.rb.erb

@@ -5,7 +5,9 @@ module Admin
     #
     # def index
     #   super
-    #   @resources = <%= class_name %>.all.paginate(10, params[:page])
+    #   @resources = <%= class_name %>.
+    #     page(params[:page]).
+    #     per(10)
     # end
 
     # Define a custom finder by overriding the `find_resource` method:
@@ -13,7 +15,7 @@ module Admin
     #   <%= class_name %>.find_by!(slug: param)
     # end
 
-    # See https://administrate-docs.herokuapp.com/customizing_controller_actions
+    # See https://administrate-prototype.herokuapp.com/customizing_controller_actions
     # for more information
   end
 end

data/lib/generators/administrate/routes/routes_generator.rb

@@ -8,7 +8,7 @@ module Administrate
       source_root File.expand_path("../templates", __FILE__)
 
       def insert_dashboard_routes
-        unless File.read(rails_routes_file_path).include?(dashboard_routes)
+        if should_route_dashboard?
           route(dashboard_routes)
         end
       end
@@ -66,6 +66,10 @@ module Administrate
         ERB.new(File.read(routes_file_path)).result(binding)
       end
 
+      def routes_includes_resources?
+        File.read(rails_routes_file_path).include?(dashboard_routes)
+      end
+
       def rails_routes_file_path
         Rails.root.join("config/routes.rb")
       end
@@ -73,6 +77,10 @@ module Administrate
       def routes_file_path
         File.expand_path(find_in_source_paths("routes.rb.erb"))
       end
+
+      def should_route_dashboard?
+        routes_includes_resources? || valid_dashboard_models.any?
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Grayson Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
@@ -278,6 +278,7 @@ files:
 - config/locales/administrate.es.yml
 - config/locales/administrate.fr.yml
 - config/locales/administrate.it.yml
+- config/locales/administrate.ja.yml
 - config/locales/administrate.nl.yml
 - config/locales/administrate.pl.yml
 - config/locales/administrate.pt-BR.yml
@@ -288,6 +289,7 @@ files:
 - config/locales/administrate.zh-CN.yml
 - config/locales/administrate.zh-TW.yml
 - config/routes.rb
+- config/secrets.yml
 - config/unicorn.rb
 - lib/administrate.rb
 - lib/administrate/base_dashboard.rb
@@ -345,7 +347,7 @@ files:
 - lib/generators/administrate/views/sidebar_generator.rb
 - lib/generators/administrate/views/views_generator.rb
 - lib/tasks/administrate_tasks.rake
-homepage: https://administrate-docs.herokuapp.com/
+homepage: https://administrate-prototype.herokuapp.com/
 licenses:
 - MIT
 metadata: {}
@@ -365,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A Rails engine for creating super-flexible admin dashboards