admin_view 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 75c33648b3776e0a936f358a9927a43dff397524
+  data.tar.gz: e12dee840643c2bfbcf07e3fa7faedcb9d1b263c
+SHA512:
+  metadata.gz: 2f5ad171e3c5d6e60d543d6f02cfd4fefde17abecaba6a8ac6e677c496ae51f456a9ce272232f2df8b679fe5a2679d419b2d723a4b6f64796d3c843604487d39
+  data.tar.gz: b02916d24b92c1dfcb5b16a38b81ca127313bbb1a318512508236f82a777b42a8770a450458546f2509e8984cc6027af10f9940beed9e3637321bd3bab8972ef

data/README.md

@@ -1,12 +1,14 @@
 # admin_view
 
-Rails 3 generator of CRUD admin controllers, views and specs for existing ActiveRecord models.
+Code generator of CRUD admin controllers, views and specs for existing ActiveRecord models. It helps you get the data on screen immediately, so you can customize the specifics to your liking.
 
-It uses [meta_search](https://github.com/ernie/meta_search) for search and [kaminari](https://github.com/amatsuda/kaminari) for pagination. It also assumes that you have [dynamic_form](https://github.com/joelmoss/dynamic_form) plugin installed.
+It works with Rails 4 and uses [ransack](https://github.com/activerecord-hackery/ransack) for search and [kaminari](https://github.com/amatsuda/kaminari) for pagination.
+
+The produced markup in views is compatible with [Bootstrap 3](http://getbootstrap.com).
 
 Screenshot:
 
-![admin_view example screenshot](http://renderedtext.com/images/blog/admin_view.png)
+![admin_view example screenshot](http://cl.ly/image/1o3n1P153V0O/Screen%20Shot%202014-05-16%20at%2014.57.29%20.png)
 
 ## Usage
 
@@ -18,7 +20,7 @@ Run the generator:
 
 	$ bundle exec rails g admin_view User --search_by name_or_email
 
-The `--search_by` option is not required - if you don't pass it, the form template will come out commented out. However, it's useful most of the time, and you can use any meta_search-compatible expression to search in string or text fields.
+The `--search_by` option is not required. However, it's useful most of the time, and you can use any ransack-compatible expression to search in string or text fields.
 
 Other options available are:
 
@@ -33,4 +35,4 @@ If you're having a problem or found a bug, please open an issue in the GitHub [i
 
 ## License
 
-Copyright © 2011 [Rendered Text](http://renderedtext.com). admin_view is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.
+Copyright © 2011-2014 [Rendered Text](http://renderedtext.com). admin_view is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.

data/admin_view.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Marko Anastasov", "Darko Fabijan"]
   s.email       = ["devs@renderedtext.com"]
   s.homepage    = "http://github.com/renderedtext/admin_view"
-  s.summary     = %q{Rails 3 generator of admin views and controllers for existing models.}
-  s.description = %q{Rails 3 generator of admin views and controllers for existing models.}
+  s.summary     = %q{Admin view code generator for Rails.}
+  s.description = %q{Code generator of admin views and controllers for ActiveRecord models.}
 
   s.rubyforge_project = "admin_view"
 
@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("rails", ">= 3.0")
-  s.add_dependency("meta_search", ">= 1.0")
-  s.add_dependency("kaminari", ">= 0.12")
-  s.add_development_dependency("rspec-rails", ">= 2.4.0")
+  s.add_dependency("rails", "~> 4.0")
+  s.add_dependency("ransack", "~> 1.2")
+  s.add_dependency("kaminari", "~> 0.15")
+  s.add_development_dependency("rspec-rails", "~> 2.4")
 end

data/lib/admin_view/version.rb

@@ -1,3 +1,3 @@
 module AdminView
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/generators/templates/controller.rb

@@ -1,15 +1,15 @@
 class Admin::<%= controller_class_name %>Controller < Admin::BaseController
 
-  helper_method :sort_column, :sort_direction, :search_params
+  helper_method :sort_column, :sort_direction
 
   before_filter :find_<%= singular_table_name %>, :only => [<% unless options[:read_only] %>:edit, :update,<% end %> :show, :destroy]
 
   def index
-    @search = <%= class_name %>.search(params[:search])
+    @q = <%= class_name %>.search(params[:q])
     @<%= plural_table_name %> = find_<%= plural_table_name %>
   end
 
-  <% unless options[:no_create] or options[:read_only] %>
+<% unless options[:no_create] || options[:read_only] %>
   def new
     @<%= singular_table_name %> = <%= class_name %>.new
   end
@@ -22,12 +22,12 @@ class Admin::<%= controller_class_name %>Controller < Admin::BaseController
       render :new
     end
   end
-  <% end -%>
+<% end -%>
 
   def show
   end
 
-  <% unless options[:read_only] %>
+<% unless options[:read_only] -%>
   def edit
   end
 
@@ -38,11 +38,11 @@ class Admin::<%= controller_class_name %>Controller < Admin::BaseController
       render :edit
     end
   end
-  <% end -%>
+<% end -%>
 
   def destroy
     @<%= singular_table_name %>.destroy
-    redirect_to admin_<%= plural_table_name %>_path, :notice => "<%= human_name %> has been deleted."
+    redirect_to admin_<%= plural_table_name %>_path, :notice => "<%= human_name %> deleted."
   end
 
   protected
@@ -52,8 +52,8 @@ class Admin::<%= controller_class_name %>Controller < Admin::BaseController
   end
 
   def find_<%= plural_table_name %>
-    search_relation = @search.relation
-    search_relation.order(sort_column + " " + sort_direction).page params[:page]
+    search_relation = @q.result
+    @<%= plural_table_name %> = search_relation.order(sort_column + " " + sort_direction).references(:<%= singular_table_name %>).page params[:page]
   end
 
   def sort_column
@@ -64,8 +64,4 @@ class Admin::<%= controller_class_name %>Controller < Admin::BaseController
     %w[asc desc].include?(params[:direction]) ? params[:direction] : "desc"
   end
 
-  def search_params
-    {:search => params[:search]}
-  end
-
 end

data/lib/generators/templates/views/_form.html.erb

@@ -1,12 +1,24 @@
-<%%= f.error_messages %>
+<%% if @<%= singular_table_name %>.errors.any? -%>
+  <ul class="errors">
+  <%% @<%= singular_table_name %>.errors.full_messages.each do |msg| %>
+    <li><%%= msg %></li>
+  <%% end %>
+  </ul>
+<%% end %>
 
 <% @attributes.each do |attribute| -%>
   <% next if ["id", "created_at", "updated_at"].include?(attribute.name) -%>
-  <p>
-    <%%= f.label :<%= attribute.name %> %><br />
-    <%%= f.text_field :<%= attribute.name %> %>
-  </p>
+  <div class="form-group">
+    <%%= f.label :<%= attribute.name %>, :class => "col-sm-2 control-label" %>
+    <div class="col-sm-4">
+      <%%= f.text_field :<%= attribute.name %>, :class => "form-control", :placeholder => "<%= attribute.name.capitalize %>" %>
+    </div>
+  </div>
 <% end -%>
 
 <%% label = @<%= singular_table_name %>.new_record? ? "Create" : "Update" -%>
-<%%= f.submit label %>
+<div class="form-group">
+  <div class="col-sm-offset-2 col-sm-4">
+    <button type="submit" class="btn btn-default"><%%= label %></button>
+  </div>
+</div>

data/lib/generators/templates/views/edit.html.erb

@@ -1,5 +1,7 @@
-<h1>Editing <%= human_name.downcase %></h1>
+<div class="page-header">
+  <h1>Editing <%%= link_to "<%= human_name.downcase %> #{@<%= singular_table_name %>.id}", admin_<%= singular_table_name %>_path(@<%= singular_table_name %>) %></h1>
+</div>
 
-<%%= form_for [:admin, @<%= singular_table_name %>] do |f| -%>
+<%%= form_for [:admin, @<%= singular_table_name %>], :html => { :class => "form-horizontal", :role => "form" } do |f| -%>
   <%%= render "form", { :f => f } %>
 <%% end -%>

data/lib/generators/templates/views/index.html.erb

@@ -1,29 +1,28 @@
-<h2><%= human_name.pluralize %></h2>
+<div class="page-header">
+  <h1><%= human_name.pluralize %></h1>
+</div>
 
-<%%= form_for @search, :url => admin_<%= plural_table_name %>_path, :html => {:method => :get} do |f| %>
-  <% if options[:search_by].blank? -%>
-  <!--
-  <% end %>
-  <!-- feel free to add further search options, eg foo_or_bar_contains -->
-  <%%= f.label :<%= options[:search_by] %>_contains, "Search by <%= options[:search_by] %>" %>
-  <%%= f.text_field :<%= options[:search_by] %>_contains %>
-  <%%= f.submit %>
-  <% if options[:search_by].blank? -%>
-  --><p>Set up your search form or delete.</p>
-  <% end %>
+<% if options[:search_by].present? -%>
+<%%= search_form_for @q, :url => admin_<%= plural_table_name %>_path, :html => { :method => :get, :class => "well form-inline" } do |f| %>
+  <div class="form-group">
+    <%%= f.text_field :<%= options[:search_by] %>_cont, :type => "search", :class => "form-control", :placeholder => "Search by <%= options[:search_by] %>" %>
+  </div>
+
+  <%%= f.submit "Search", :class => "btn btn-default" %>
 <%% end %>
+<% end -%>
 
-<% unless options[:no_create] or options[:read_only] %>
+<% unless options[:no_create] || options[:read_only] %>
 <p><%%= link_to("Create a new <%= human_name %>", new_admin_<%= singular_table_name %>_path) %></p>
 <% end -%>
 
-<table class="sortable">
+<table class="sortable table table-striped table-bordered table-condensed">
   <thead>
     <tr>
 <% @attributes.each do |attribute| -%>
       <th><%%= sortable "<%= attribute.name %>" %></th>
 <% end -%>
-<% unless options[:read_only] %>
+<% unless options[:read_only] -%>
       <th>Edit</th>
 <% end -%>
       <th>Delete</th>
@@ -31,13 +30,13 @@
   </thead>
   <tbody>
     <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
-      <tr>
+      <tr class="<%= singular_table_name %>">
         <td><%%= link_to(<%= singular_table_name %>.id, admin_<%= singular_table_name %>_path(<%= singular_table_name %>)) %></td>
 <% @attributes.each do |attribute| -%>
 <% next if attribute.name == "id" -%>
         <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
 <% end -%>
-<% unless options[:read_only] %>
+<% unless options[:read_only] -%>
         <td><%%= link_to('Edit', edit_admin_<%= singular_table_name %>_path(<%= singular_table_name %>)) %></td>
 <% end -%>
         <td><%%= link_to('Delete', admin_<%= singular_table_name %>_path(<%= singular_table_name %>), :confirm => "Are you sure?", :method => :delete) %></td>

data/lib/generators/templates/views/new.html.erb

@@ -1,5 +1,7 @@
-<h1>Create new <%= human_name.downcase %></h1>
+<div class="page-header">
+  <h1>Create new <%= human_name.downcase %></h1>
+</div>
 
-<%%= form_for [:admin, @<%= singular_table_name %>] do |f| -%>
+<%%= form_for [:admin, @<%= singular_table_name %>], :html => { :class => "form-horizontal", :role => "form" } do |f| -%>
   <%%= render "form", { :f => f } %>
 <%% end -%>

data/lib/generators/templates/views/show.html.erb

@@ -1,11 +1,24 @@
-<h1><%= human_name.capitalize %> <%%= @<%= singular_table_name %>.id %></h1>
+<div class="page-header">
+  <h1>
+    <%= human_name.capitalize %> <%%= @<%= singular_table_name %>.id %>
+  </h1>
+</div>
 
+<table class="table table-bordered">
 <% @attributes.each do |attribute| -%>
-<p>
-  <strong><%= attribute.human_name %>:</strong>
-  <%%= @<%= singular_table_name %>.<%= attribute.name %> %>
-</p>
+  <tr>
+    <td><%= attribute.human_name %>:</td>
+    <td><%%= @<%= singular_table_name %>.<%= attribute.name %> %></td>
+  </tr>
 <% end -%>
+  <tr>
+    <td>Actions</td>
+    <td>
+<% unless options[:read_only] -%>
+      <%%= link_to "Edit", edit_admin_<%= singular_table_name %>_path(@<%= singular_table_name %>), :class => "btn btn-default" %>
+<% end -%>
+      <%%= link_to("Delete", admin_user_path(@user), :data => { :confirm => "Are you sure?" }, :method => :delete, :class => "btn btn-danger btn-xs") %>
+    </td>
+  </tr>
+</table>
 
-<%%= link_to "Edit", edit_admin_<%= singular_table_name %>_path(@<%= singular_table_name %>) %> |
-<%%= link_to "Back", admin_<%= plural_table_name %>_path %>

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'active_support/test_case'
 require 'rails/all'
 require 'rails/generators'

metadata

@@ -1,87 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: admin_view
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Marko Anastasov
 - Darko Fabijan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-14 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-05-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: meta_search
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: ransack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: kaminari
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        version: "0.12"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 0
-        version: 2.4.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :development
-  version_requirements: *id004
-description: Rails 3 generator of admin views and controllers for existing models.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+description: Code generator of admin views and controllers for ActiveRecord models.
+email:
 - devs@renderedtext.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -102,36 +95,27 @@ files:
 - lib/generators/templates/views/show.html.erb
 - test/admin_view_generator_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/renderedtext/admin_view
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: admin_view
-rubygems_version: 1.3.6
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: Rails 3 generator of admin views and controllers for existing models.
-test_files: 
-- test/admin_view_generator_test.rb
-- test/test_helper.rb
+specification_version: 4
+summary: Admin view code generator for Rails.
+test_files: []