administrate 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 683ee0c8cf867c553a2c367063d9112cd8ff968f
-  data.tar.gz: be6336fc10bc73444eb2d42a5c95f7519252dc42
+  metadata.gz: 3f7b0d12f02edff96609479df3375a76f8416daa
+  data.tar.gz: c40ce457633bb9ae64f34313d058917986d8944e
 SHA512:
-  metadata.gz: 84a3b33e1464a4aff24661891d7333c71bd1809131994cb7af9993735230e81765fffcf0f90dc861e79fa006a06a26ca8dda37b5a045221b1e6ac13c55d0d669
-  data.tar.gz: ca89ca985db441fb3aa69bf6dfe4e5ddee6d268a1c1b034a64eac8b0a5b0b6bb27986a7f9ed359d4c48fac6c9ce0238edee87ced64bf667f89fefa783ab98c01
+  metadata.gz: dd8f1d80fa12320624e3c4c630ece69e5379a934f3ca22952648f9b42fd3f3aac5d3b99e146827a5f0732f825c6f9152e1f7a1fb7d348ffc55e690aae317232f
+  data.tar.gz: 682b91038a806ca8bfe0b0c1584eb6c9b95399bee08ee9ab35e39b864b3fa294d892bd7b38b007aeab85da2d71a32c6a01164b23f11ebef5f19ee90bacf21cb5

data/app/helpers/administrate/application_helper.rb

@@ -1,7 +1,8 @@
 module Administrate
   module ApplicationHelper
     def render_field(field, locals = {})
-      render locals: locals, object: field, partial: field.to_partial_path
+      locals.merge!(field: field)
+      render locals: locals, partial: field.to_partial_path
     end
   end
 end

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

@@ -4,7 +4,7 @@
     <h1 class="sidebar-logo-heading">Administrate</h1>
   </div>
 
-  <% DashboardManifest.new.dashboards.each do |resource| %>
+  <% DashboardManifest::DASHBOARDS.each do |resource| %>
     <li>
       <%= link_to(
         resource.to_s.titleize,

data/app/views/fields/belongs_to/_form.html.erb

@@ -0,0 +1,7 @@
+<%= f.label field.permitted_attribute %>
+<%= f.collection_select(
+  field.permitted_attribute,
+  field.candidate_records,
+  :id,
+  :to_s,
+) %>

data/app/views/fields/belongs_to/_index.html.erb

@@ -0,0 +1,3 @@
+<% if field.data %>
+  <%= link_to field.data, [Administrate::NAMESPACE, field.data] %>
+<% end %>

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

@@ -0,0 +1,3 @@
+<% if field.data %>
+  <%= link_to field.data, [Administrate::NAMESPACE, field.data] %>
+<% end %>

data/app/views/fields/email/_form.html.erb

@@ -0,0 +1,2 @@
+<%= f.label field.attribute %>
+<%= f.email_field field.attribute %>

data/app/views/fields/email/_index.html.erb

@@ -0,0 +1 @@
+<%= mail_to field.data %>

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

@@ -0,0 +1 @@
+<%= mail_to field.data %>

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

@@ -0,0 +1,11 @@
+<%= f.label field.attribute_key %>
+
+<%= f.collection_select(
+  field.attribute_key,
+  field.candidate_records,
+  :id,
+  :to_s,
+  {},
+  { multiple: true },
+)
+%>

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

@@ -0,0 +1 @@
+<%= pluralize(field.data.count, field.attribute.to_s.humanize.downcase) %>

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

@@ -0,0 +1,9 @@
+<% if field.data.any? %>
+  <%= render(
+    "table",
+    table_presenter: field.associated_table,
+    resources: field.data
+  ) %>
+<% else %>
+  <%= t("administrate.fields.has_many.none") %>
+<% end %>

data/app/views/fields/has_one/_form.html.erb

@@ -0,0 +1,7 @@
+<%= f.label field.permitted_attribute %>
+<%= f.collection_select(
+  field.permitted_attribute,
+  field.candidate_records,
+  :id,
+  :to_s,
+) %>

data/app/views/fields/has_one/_index.html.erb

@@ -0,0 +1,3 @@
+<% if field.data %>
+  <%= link_to field.data, [Administrate::NAMESPACE, field.data] %>
+<% end %>

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

@@ -0,0 +1,3 @@
+<% if field.data %>
+  <%= link_to field.data, [Administrate::NAMESPACE, field.data] %>
+<% end %>

data/app/views/fields/image/_form.html.erb

@@ -0,0 +1,2 @@
+<%= f.label field.attribute %>
+<%= f.text_field field.attribute %>

data/app/views/fields/image/_index.html.erb

@@ -0,0 +1 @@
+<%= image_tag field.data %>

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

@@ -0,0 +1 @@
+<%= image_tag field.data %>

data/app/views/fields/string/_form.html.erb

@@ -0,0 +1,2 @@
+<%= f.label field.attribute %>
+<%= f.text_field field.attribute %>

data/app/views/fields/string/_index.html.erb

@@ -0,0 +1 @@
+<%= field.data %>

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

@@ -0,0 +1 @@
+<%= field.data %>

data/lib/administrate/base_dashboard.rb

@@ -9,10 +9,26 @@ module Administrate
   class BaseDashboard
     include Administrate
 
+    def attribute_types
+      self.class::ATTRIBUTE_TYPES
+    end
+
+    def form_attributes
+      self.class::FORM_ATTRIBUTES
+    end
+
     def permitted_attributes
       form_attributes.map do |attr|
         attribute_types[attr].permitted_attribute(attr)
       end.uniq
     end
+
+    def show_page_attributes
+      self.class::SHOW_PAGE_ATTRIBUTES
+    end
+
+    def table_attributes
+      self.class::TABLE_ATTRIBUTES
+    end
   end
 end

data/lib/administrate/fields/base.rb

@@ -27,7 +27,7 @@ module Administrate
       end
 
       def to_partial_path
-        "/fields/#{page}/#{field_name}"
+        "/fields/#{field_name}/#{page}"
       end
 
       attr_reader :attribute, :data, :page

data/lib/administrate/version.rb

@@ -1,3 +1,3 @@
 module Administrate
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

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

@@ -1,53 +1,37 @@
 require "administrate/base_dashboard"
 
 class <%= class_name %>Dashboard < Administrate::BaseDashboard
-
-  # This method returns a hash
-  # that describes the type of each of the model's fields.
+  READ_ONLY_ATTRIBUTES = [
+    :id,
+    :created_at,
+    :updated_at,
+  ]
+
+  # ATTRIBUTE_TYPES
+  # a hash that describes the type of each of the model's fields.
   #
   # Each different type represents an Administrate::Field object,
   # which determines how the attribute is displayed
   # on pages throughout the dashboard.
-  def attribute_types
-    {<% attributes.each do |attr| %>
-      <%= attr %>: <%= field_type(attr) %>,<% end %>
-    }
-  end
-
-  # This method returns an array of attributes
-  # that will be displayed on the model's index page.
+  ATTRIBUTE_TYPES = {
+<% attributes.each do |attr| -%>
+    <%= attr %>: <%= field_type(attr) %>,
+<% end -%>
+  }
+
+  # TABLE_ATTRIBUTES
+  # an array of attributes that will be displayed on the model's index page.
   #
   # By default, it's limited to four items to reduce clutter on index pages.
   # Feel free to remove the limit or customize the returned array.
-  def table_attributes
-    attributes.first(<%= TABLE_ATTRIBUTE_LIMIT %>)
-  end
-
-  # This method returns an array of attributes
-  # that will be displayed on the model's show page
-  def show_page_attributes
-    attributes
-  end
-
-  # This method returns an array of attributes
-  # that will be displayed on the model's form pages (`new` and `edit`)
-  def form_attributes
-    attributes - read_only_attributes
-  end
-
-  private
+  TABLE_ATTRIBUTES = ATTRIBUTE_TYPES.keys.first(<%= TABLE_ATTRIBUTE_LIMIT %>)
 
-  def attributes
-    [<% attributes.each do |attribute| %>
-      :<%= attribute %>,<% end %>
-    ]
-  end
+  # SHOW_PAGE_ATTRIBUTES
+  # an array of attributes that will be displayed on the model's show page.
+  SHOW_PAGE_ATTRIBUTES = ATTRIBUTE_TYPES.keys
 
-  def read_only_attributes
-    [
-      :id,
-      :created_at,
-      :updated_at,
-    ]
-  end
+  # FORM_ATTRIBUTES
+  # an array of attributes that will be displayed
+  # on the model's form (`new` and `edit`) pages.
+  FORM_ATTRIBUTES = ATTRIBUTE_TYPES.keys - READ_ONLY_ATTRIBUTES
 end

data/lib/generators/administrate/install/templates/dashboard_manifest.rb.erb

@@ -1,7 +1,7 @@
 # DashboardManifest tells Administrate which dashboards to display
 class DashboardManifest
-  # `#dashboards`
-  # Returns a list of dashboards to display in the side navigation menu
+  # `DASHBOARDS`
+  # a list of dashboards to display in the side navigation menu
   #
   # These are all of the rails models that we found in your database
   # at the time you installed Administrate.
@@ -9,21 +9,17 @@ class DashboardManifest
   # To show or hide dashboards, add or remove the model name from this list.
   # Dashboards returned from this method must be Rails models for Administrate
   # to work correctly.
-  def dashboards
-    [
+  DASHBOARDS = [
 <% dashboard_resources.each do |model| -%>
-      :<%= model %>,
+    :<%= model %>,
 <% end -%>
-    ]
-  end
+  ]
 
-  # `#root_dashboard`
-  # Returns the name of the dashboard that will be displayed
+  # `ROOT_DASHBOARD`
+  # the name of the dashboard that will be displayed
   # at "http://your_site.com/admin"
   #
   # This dashboard will likely be the first page that admins see
   # when they log into the dashboard.
-  def root_dashboard
-    dashboards.first
-  end
+  ROOT_DASHBOARD = DASHBOARDS.first
 end

data/lib/generators/administrate/install/templates/routes.rb

@@ -1,7 +1,7 @@
 namespace :admin do
-    DashboardManifest.new.dashboards.each do |dashboard_resource|
+    DashboardManifest::DASHBOARDS.each do |dashboard_resource|
       resources dashboard_resource
     end
 
-    root controller: DashboardManifest.new.root_dashboard, action: :index
+    root controller: DashboardManifest::ROOT_DASHBOARD, action: :index
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Grayson Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neat
@@ -138,24 +138,24 @@ files:
 - app/views/administrate/application/index.html.erb
 - app/views/administrate/application/new.html.erb
 - app/views/administrate/application/show.html.erb
-- app/views/fields/form/_belongs_to.html.erb
-- app/views/fields/form/_email.html.erb
-- app/views/fields/form/_has_many.html.erb
-- app/views/fields/form/_has_one.html.erb
-- app/views/fields/form/_image.html.erb
-- app/views/fields/form/_string.html.erb
-- app/views/fields/index/_belongs_to.html.erb
-- app/views/fields/index/_email.html.erb
-- app/views/fields/index/_has_many.html.erb
-- app/views/fields/index/_has_one.html.erb
-- app/views/fields/index/_image.html.erb
-- app/views/fields/index/_string.html.erb
-- app/views/fields/show/_belongs_to.html.erb
-- app/views/fields/show/_email.html.erb
-- app/views/fields/show/_has_many.html.erb
-- app/views/fields/show/_has_one.html.erb
-- app/views/fields/show/_image.html.erb
-- app/views/fields/show/_string.html.erb
+- app/views/fields/belongs_to/_form.html.erb
+- app/views/fields/belongs_to/_index.html.erb
+- app/views/fields/belongs_to/_show.html.erb
+- app/views/fields/email/_form.html.erb
+- app/views/fields/email/_index.html.erb
+- app/views/fields/email/_show.html.erb
+- app/views/fields/has_many/_form.html.erb
+- app/views/fields/has_many/_index.html.erb
+- app/views/fields/has_many/_show.html.erb
+- app/views/fields/has_one/_form.html.erb
+- app/views/fields/has_one/_index.html.erb
+- app/views/fields/has_one/_show.html.erb
+- app/views/fields/image/_form.html.erb
+- app/views/fields/image/_index.html.erb
+- app/views/fields/image/_show.html.erb
+- app/views/fields/string/_form.html.erb
+- app/views/fields/string/_index.html.erb
+- app/views/fields/string/_show.html.erb
 - app/views/layouts/administrate/application.html.erb
 - config/locales/administrate.en.yml
 - config/routes.rb

data/app/views/fields/form/_belongs_to.html.erb

@@ -1,7 +0,0 @@
-<%= f.label belongs_to.permitted_attribute %>
-<%= f.collection_select(
-  belongs_to.permitted_attribute,
-  belongs_to.candidate_records,
-  :id,
-  :to_s
-) %>

data/app/views/fields/form/_email.html.erb

@@ -1,2 +0,0 @@
-<%= f.label email.attribute %>
-<%= f.email_field email.attribute %>

data/app/views/fields/form/_has_many.html.erb

@@ -1,11 +0,0 @@
-<%= f.label has_many.attribute_key %>
-
-<%= f.collection_select(
-  has_many.attribute_key,
-  has_many.candidate_records,
-  :id,
-  :to_s,
-  {},
-  { multiple: true }
-)
-%>

data/app/views/fields/form/_has_one.html.erb

@@ -1,7 +0,0 @@
-<%= f.label has_one.permitted_attribute %>
-<%= f.collection_select(
-  has_one.permitted_attribute,
-  has_one.candidate_records,
-  :id,
-  :to_s,
-) %>

data/app/views/fields/form/_image.html.erb

@@ -1,2 +0,0 @@
-<%= f.label image.attribute %>
-<%= f.text_field image.attribute %>

data/app/views/fields/form/_string.html.erb

@@ -1,2 +0,0 @@
-<%= f.label string.attribute %>
-<%= f.text_field string.attribute %>

data/app/views/fields/index/_belongs_to.html.erb

@@ -1,3 +0,0 @@
-<% if belongs_to.data %>
-  <%= link_to belongs_to.data, [Administrate::NAMESPACE, belongs_to.data] %>
-<% end %>

data/app/views/fields/index/_email.html.erb

@@ -1 +0,0 @@
-<%= mail_to email.data %>

data/app/views/fields/index/_has_many.html.erb

@@ -1 +0,0 @@
-<%= pluralize(has_many.data.count, has_many.attribute.to_s.humanize.downcase) %>

data/app/views/fields/index/_has_one.html.erb

@@ -1,3 +0,0 @@
-<% if has_one.data %>
-  <%= link_to has_one.data, [Administrate::NAMESPACE, has_one.data] %>
-<% end %>

data/app/views/fields/index/_image.html.erb

@@ -1 +0,0 @@
-<%= image_tag image.data %>

data/app/views/fields/index/_string.html.erb

@@ -1 +0,0 @@
-<%= string.data %>

data/app/views/fields/show/_belongs_to.html.erb

@@ -1,3 +0,0 @@
-<% if belongs_to.data %>
-  <%= link_to belongs_to.data, [Administrate::NAMESPACE, belongs_to.data] %>
-<% end %>

data/app/views/fields/show/_email.html.erb

@@ -1 +0,0 @@
-<%= mail_to email.data %>

data/app/views/fields/show/_has_many.html.erb

@@ -1,9 +0,0 @@
-<% if has_many.data.any? %>
-  <%= render(
-    "table",
-    table_presenter: has_many.associated_table,
-    resources: has_many.data
-  ) %>
-<% else %>
-  <%= t("administrate.fields.has_many.none") %>
-<% end %>

data/app/views/fields/show/_has_one.html.erb

@@ -1,3 +0,0 @@
-<% if has_one.data %>
-  <%= link_to has_one.data, [Administrate::NAMESPACE, has_one.data] %>
-<% end %>

data/app/views/fields/show/_image.html.erb

@@ -1 +0,0 @@
-<%= image_tag image.data %>

data/app/views/fields/show/_string.html.erb

@@ -1 +0,0 @@
-<%= string.data %>