admini 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f106a63ce982fb23ce0995f971014c505943003d
-  data.tar.gz: 9be87bd739f34f6e6eda1e80914704ba3539a327
+  metadata.gz: 2951544c110448fa3e238ec1d2e06df1d3c22ca1
+  data.tar.gz: 726e830aa6a0e8b7bcf64f28fe9c78c33830f0be
 SHA512:
-  metadata.gz: 781731b8eb9442abf59b0d1f807924f6b2ba02550b202c34b184f150bf5136139775ce20c867ab0e5b962074025b06e4ebe4097be65b0eedb0103a92d9877bbd
-  data.tar.gz: 03ac9f74110c832abcf6aed47934a8e29a1c70aa7b67c272dd820d7e32f3497b69aabffa0879111c6a1f36f435fe94a33f81e14de216e813b787ef88dc9c1458
+  metadata.gz: fe48c9b92753655f75b136593ce5a38cec6b8a6026f130ebbef1f2fecb4be111511e31ecdcbb49cc606d4179dddb6038bc320a126df2a8e8a9ea1c1e166c5d9f
+  data.tar.gz: 915b6a16f2266be298a44e5d1fa3ad933bccbdb147a9f0f8e6a5e020c37ecac74fda88f36bb4fbde36d562b78cb3d4ae5a04cb7b2b28ceebb823b10db2ecb2e7

data/app/assets/stylesheets/admini/default.css

@@ -21,6 +21,17 @@ a {
   float: right;
 }
 
+.clearfix:before {
+  display: table;
+  content: '';
+}
+
+.clearfix:after {
+  clear: both;
+  display: table;
+  content: '';
+}
+
 .header {
   margin-bottom: 20px;
   padding-top: 20px;
@@ -73,9 +84,22 @@ textarea {
   padding: 8px;
   width: 50%;
   min-width: 480px;
-  border: 1px solid #eee;
+  border: 1px solid #ddd;
+  border-radius: 2px;
+  vertical-align: middle;
+}
+
+input[type=search] {
+  padding: 2px;
+  border: 1px solid #ddd;
+  border-radius: 2px;
+  vertical-align: middle;
 }
 
 textarea {
   height: 160px;
 }
+
+select {
+  vertical-align: middle;
+}

data/app/controllers/concerns/admini/resources.rb

@@ -4,10 +4,13 @@ module Admini
   module Resources
     extend ActiveSupport::Concern
 
+    include ActionView::Helpers::FormOptionsHelper
+
     included do
       before_action :load_resources, only: :index
       before_action :load_resource, only: [:edit, :update, :show, :destroy]
       before_action :build_resource, only: [:new, :create]
+      before_action :search_resources, only: :index
       before_action :authorize
 
       helper_method :resource_name,
@@ -15,6 +18,7 @@ module Admini
         :new_attributes,
         :edit_attributes,
         :show_attributes,
+        :search_attributes,
         :enum_attributes,
         :can_create?,
         :can_read?,
@@ -22,12 +26,16 @@ module Admini
         :can_delete?,
         :enable_action?,
         :render_attribute,
-        :resource_object
+        :resource_object,
+        :search_options
 
       layout 'admini/layouts/application'
     end
 
     def index
+      @resources = @resources.order(id: :desc)
+        .page(params[:page])
+        .per(paginates_per)
     end
 
     def new
@@ -71,9 +79,7 @@ module Admini
     end
 
     def resources
-      @resources ||= resource_class.order(id: :desc)
-        .page(params[:page])
-        .per(paginates_per)
+      @resources ||= resource_class.all
     end
     alias_method :load_resources, :resources
 
@@ -101,6 +107,13 @@ module Admini
       params.require(resource_name).permit(attributes)
     end
 
+    def search_resources
+      unless search_attributes.include?(params[:attribute].try(:to_sym))
+        return
+      end
+      @resources = @resources.where("#{params[:attribute]} LIKE ?", "%#{params[:value]}%")
+    end
+
     def index_attributes
       %i(id created_at updated_at)
     end
@@ -117,6 +130,10 @@ module Admini
       new_attributes
     end
 
+    def search_attributes
+      %i()
+    end
+
     def enum_attributes
       %i()
     end
@@ -188,6 +205,14 @@ module Admini
       end
     end
 
+    def search_options
+      options = []
+      search_attributes.each do |attribute|
+        options << [t("activerecord.attributes.#{resource_name}.#{attribute}"), attribute]
+      end
+      options_for_select(options)
+    end
+
     def paginates_per
       defined?(super) ? super : 25
     end

data/app/views/admini/layouts/_nav.html.erb

@@ -1,5 +1,5 @@
 <div class="nav">
-  <div class="container">
+  <div class="container clearfix">
     <%= render 'admini/shared/links/index' %>
     <%= render 'admini/shared/links/new' %>
     <% if action_name.in?(%w(show edit update)) %>
@@ -7,5 +7,8 @@
       <%= render partial: 'admini/shared/links/edit', locals: { resource: @resource } %>
       <%= render partial: 'admini/shared/links/delete', locals: { resource: @resource } %>
     <% end %>
+    <div class="right">
+      <%= render 'admini/layouts/search' %>
+    </div>
   </div>
 </div>

data/app/views/admini/layouts/_search.html.erb

@@ -0,0 +1,7 @@
+<% unless search_attributes.blank? %>
+  <%= form_tag({ action: :index }, method: :get) do %>
+    <%= search_field_tag :value %>
+    <%= select_tag :attribute, search_options %>
+    <%= submit_tag t('admini.search') %>
+  <% end %>
+<% end %>

data/config/locales/admini.en.yml

@@ -11,3 +11,4 @@ en:
       show: Show
       delete: Delete
     confirm: Are you sure?
+    search: Search

data/config/locales/admini.ja.yml

@@ -11,3 +11,4 @@ ja:
       show: 表示
       delete: 削除
     confirm: 本当によろしいですか？
+    search: 検索する

data/lib/admini/version.rb

@@ -1,3 +1,3 @@
 module Admini
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: admini
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - kami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -97,6 +97,7 @@ files:
 - app/controllers/concerns/admini/resources.rb
 - app/views/admini/layouts/_header.html.erb
 - app/views/admini/layouts/_nav.html.erb
+- app/views/admini/layouts/_search.html.erb
 - app/views/admini/layouts/application.html.erb
 - app/views/admini/resources/_form.html.erb
 - app/views/admini/resources/edit.html.erb