admin_view 0.3.0 → 0.4.0

data/README.md

@@ -33,6 +33,10 @@ Yes! Feel free to fork the repo, make your changes in a topic branch and send us
 
 If you're having a problem or found a bug, please open an issue in the GitHub [issue tracker](https://github.com/renderedtext/admin_view/issues).
 
+## Credits
+
+Big thank you to all [the contributors](https://github.com/renderedtext/admin_view/graphs/contributors)!
+
 ## License
 
 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/lib/admin_view/version.rb

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

data/lib/generators/admin_view_generator.rb

@@ -26,6 +26,7 @@ class AdminViewGenerator < Rails::Generators::NamedBase
   end
 
   def create_controller
+    @attributes_symbols = get_model_columns.dup.delete_if {|attribute| ['id', 'created_at', 'updated_at'].include? attribute.name }.collect {|attribute| ":#{attribute.name}" }
     template "controller.rb", File.join("app/controllers/admin", "#{controller_file_name}_controller.rb")
   end
 

data/lib/generators/templates/base_controller_spec.rb

@@ -8,8 +8,10 @@ describe Admin::BaseController do
 
       it "renders index page" do
         controller.stub_chain(:current_user, :admin?).and_return(true)
+
         get :index
-        response.should render_template('index')
+
+        expect(response).to render_template('index')
       end
 
     end
@@ -18,9 +20,11 @@ describe Admin::BaseController do
 
       it "renders 404" do
         controller.stub_chain(:current_user, :admin?).and_return(false)
+
         get :index
-        response.should render_template('404.html')
-        response.response_code.should eql(404)
+
+        expect(response).to render_template('404.html')
+        expect(response.response_code).to eql(404)
       end
 
     end
@@ -28,10 +32,12 @@ describe Admin::BaseController do
     context "not logged in" do
 
       it "renders 404" do
-        controller.stub(:current_user).and_return(nil)
+        allow(controller).to receive(:current_user).and_return(nil)
+
         get :index
-        response.should render_template('404.html')
-        response.response_code.should eql(404)
+
+        expect(response).to render_template('404.html')
+        expect(response.response_code).to eql(404)
       end
 
     end

data/lib/generators/templates/controller.rb

@@ -15,7 +15,7 @@ class Admin::<%= controller_class_name %>Controller < Admin::BaseController
   end
 
   def create
-    @<%= singular_table_name %> = <%= class_name %>.new(params[:<%= singular_table_name %>])
+    @<%= singular_table_name %> = <%= class_name %>.new(<%= singular_table_name %>_params)
     if @<%= singular_table_name %>.save
       redirect_to admin_<%= plural_table_name %>_path, :notice => "Successfully created <%= human_name.downcase %>."
     else
@@ -32,7 +32,7 @@ class Admin::<%= controller_class_name %>Controller < Admin::BaseController
   end
 
   def update
-    if @<%= singular_table_name %>.update_attributes(params[:<%= singular_table_name %>])
+    if @<%= singular_table_name %>.update_attributes(<%= singular_table_name %>_params)
       redirect_to admin_<%= plural_table_name %>_path, :notice => "Successfully updated <%= human_name.downcase %>."
     else
       render :edit
@@ -64,4 +64,13 @@ class Admin::<%= controller_class_name %>Controller < Admin::BaseController
     %w[asc desc].include?(params[:direction]) ? params[:direction] : "desc"
   end
 
+<% unless options[:read_only] -%>
+  private
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def <%= singular_table_name %>_params
+    params.require(:<%= singular_table_name %>).permit(<%= @attributes_symbols.join(",") %>)
+  end
+<% end -%>
+
 end

data/lib/generators/templates/controller_spec.rb

@@ -4,34 +4,36 @@ describe Admin::<%= controller_class_name %>Controller do
 
   def mock_<%= singular_table_name %>(stubs={})
     (@mock_<%= singular_table_name %> ||= mock_model(<%= class_name %>).as_null_object).tap do |<%= singular_table_name %>|
-      <%= singular_table_name %>.stub(stubs) unless stubs.empty?
+      stubs.each_key do |method_name|
+        allow(<%= singular_table_name %>).to receive(method_name).and_return(stubs[method_name])
+      end
     end
   end
 
-  before { controller.stub(:require_admin) }
+  before { allow(controller).to receive(:require_admin) }
 
   describe "GET index" do
     it "assigns all <%= plural_table_name %> as @<%= plural_table_name %>" do
-      controller.stub(:find_<%= plural_table_name %>).and_return([mock_<%= singular_table_name %>])
+      allow(controller).to receive(:find_<%= plural_table_name %>).and_return([mock_<%= singular_table_name %>])
       get :index
-      assigns(:<%= plural_table_name %>).should eq([mock_<%= singular_table_name %>])
+      expect(assigns(:<%= plural_table_name %>)).to eq([mock_<%= singular_table_name %>])
     end
   end
 
   describe "GET show" do
     it "assigns the requested <%= singular_table_name %> as @<%=singular_table_name %>" do
-      <%= class_name %>.stub(:find).with("37") { mock_<%= singular_table_name %> }
+      allow(<%= class_name %>).to receive(:find).with("37") { mock_<%= singular_table_name %> }
       get :show, :id => "37"
-      assigns(:<%= singular_table_name %>).should be(mock_<%= singular_table_name %>)
+      expect(assigns(:<%= singular_table_name %>)).to be(mock_<%= singular_table_name %>)
     end
   end
 
   <% unless options[:no_create] or options[:read_only] %>
   describe "GET new" do
     it "assigns a new <%= singular_table_name %> as @<%= singular_table_name %>" do
-      <%= class_name %>.stub(:new) { mock_<%= singular_table_name %> }
+      allow(<%= class_name %>).to receive(:new) { mock_<%= singular_table_name %> }
       get :new
-      assigns(:<%= singular_table_name %>).should be(mock_<%= singular_table_name %>)
+      expect(assigns(:<%= singular_table_name %>)).to be(mock_<%= singular_table_name %>)
     end
   end
 
@@ -39,29 +41,29 @@ describe Admin::<%= controller_class_name %>Controller do
 
     describe "with valid params" do
       it "assigns a newly created <%= singular_table_name %> as @<%= singular_table_name %>" do
-        <%= class_name %>.stub(:new).with({'these' => 'params'}) { mock_<%= singular_table_name %>(:save => true) }
+        allow(<%= class_name %>).to receive(:new).with({'these' => 'params'}) { mock_<%= singular_table_name %>(:save => true) }
         post :create, :<%= singular_table_name %> => {'these' => 'params'}
-        assigns(:<%= singular_table_name %>).should be(mock_<%= singular_table_name %>)
+        expect(assigns(:<%= singular_table_name %>)).to be(mock_<%= singular_table_name %>)
       end
 
       it "redirects to the created <%= singular_table_name %>" do
-        <%= class_name %>.stub(:new) { mock_<%= singular_table_name %>(:save => true) }
+        allow(<%= class_name %>).to receive(:new) { mock_<%= singular_table_name %>(:save => true) }
         post :create, :<%= singular_table_name %> => {}
-        response.should redirect_to(admin_<%= plural_table_name %>_url)
+        expect(response).to redirect_to(admin_<%= plural_table_name %>_url)
       end
     end
 
     describe "with invalid params" do
       it "assigns a newly created but unsaved <%= singular_table_name %> as @<%= singular_table_name %>" do
-        <%= class_name %>.stub(:new).with({'these' => 'params'}) { mock_<%= singular_table_name %>(:save => false) }
+        allow(<%= class_name %>).to receive(:new).with({'these' => 'params'}) { mock_<%= singular_table_name %>(:save => false) }
         post :create, :<%= singular_table_name %> => {'these' => 'params'}
-        assigns(:<%= singular_table_name %>).should be(mock_<%= singular_table_name %>)
+        expect(assigns(:<%= singular_table_name %>)).to be(mock_<%= singular_table_name %>)
       end
 
       it "re-renders the 'new' template" do
-        <%= class_name %>.stub(:new) { mock_<%= singular_table_name %>(:save => false) }
+        allow(<%= class_name %>).to receive(:new) { mock_<%= singular_table_name %>(:save => false) }
         post :create, :<%= singular_table_name %> => {}
-        response.should render_template("new")
+        expect(response).to render_template("new")
       end
     end
 
@@ -71,9 +73,9 @@ describe Admin::<%= controller_class_name %>Controller do
   <% unless options[:read_only] %>
   describe "GET edit" do
     it "assigns the requested <%= singular_table_name %> as @<%= singular_table_name %>" do
-      <%= class_name %>.stub(:find).with("37") { mock_<%= singular_table_name %> }
+      allow(<%= class_name %>).to receive(:find).with("37") { mock_<%= singular_table_name %> }
       get :edit, :id => "37"
-      assigns(:<%= singular_table_name %>).should be(mock_<%= singular_table_name %>)
+      expect(assigns(:<%= singular_table_name %>)).to be(mock_<%= singular_table_name %>)
     end
   end
 
@@ -81,35 +83,35 @@ describe Admin::<%= controller_class_name %>Controller do
 
     describe "with valid params" do
       it "updates the requested <%= singular_table_name %>" do
-        <%= class_name %>.should_receive(:find).with("37") { mock_<%= singular_table_name %> }
-        mock_<%= singular_table_name %>.should_receive(:update_attributes).with({'these' => 'params'})
+        expect(<%= class_name %>).to receive(:find).with("37") { mock_<%= singular_table_name %> }
+        expect(mock_<%= singular_table_name %>).to receive(:update_attributes).with({'these' => 'params'})
         put :update, :id => "37", :<%= singular_table_name %> => {'these' => 'params'}
       end
 
       it "assigns the requested <%= singular_table_name %> as @<%= singular_table_name %>" do
-        <%= class_name %>.stub(:find) { mock_<%= singular_table_name %>(:update_attributes => true) }
+        allow(<%= class_name %>).to receive(:find) { mock_<%= singular_table_name %>(:update_attributes => true) }
         put :update, :id => "1"
-        assigns(:<%= singular_table_name %>).should be(mock_<%= singular_table_name %>)
+        expect(assigns(:<%= singular_table_name %>)).to be(mock_<%= singular_table_name %>)
       end
 
       it "redirects to the <%= singular_table_name %>" do
-        <%= class_name %>.stub(:find) { mock_<%= singular_table_name %>(:update_attributes => true) }
+        allow(<%= class_name %>).to receive(:find) { mock_<%= singular_table_name %>(:update_attributes => true) }
         put :update, :id => "1"
-        response.should redirect_to(admin_<%= plural_table_name %>_url)
+        expect(response).to redirect_to(admin_<%= plural_table_name %>_url)
       end
     end
 
     describe "with invalid params" do
       it "assigns the <%= singular_table_name %> as @<%= singular_table_name %>" do
-        <%= class_name %>.stub(:find) { mock_<%= singular_table_name %>(:update_attributes => false) }
+        allow(<%= class_name %>).to receive(:find) { mock_<%= singular_table_name %>(:update_attributes => false) }
         put :update, :id => "1"
-        assigns(:<%= singular_table_name %>).should be(mock_<%= singular_table_name %>)
+        expect(assigns(:<%= singular_table_name %>)).to be(mock_<%= singular_table_name %>)
       end
 
       it "re-renders the 'edit' template" do
-        <%= class_name %>.stub(:find) { mock_<%= singular_table_name %>(:update_attributes => false) }
+        allow(<%= class_name %>).to receive(:find) { mock_<%= singular_table_name %>(:update_attributes => false) }
         put :update, :id => "1"
-        response.should render_template("edit")
+        expect(response).to render_template("edit")
       end
     end
 
@@ -118,15 +120,15 @@ describe Admin::<%= controller_class_name %>Controller do
 
   describe "DELETE destroy" do
     it "destroys the requested <%= singular_table_name %>" do
-      <%= class_name %>.should_receive(:find).with("37") { mock_<%= singular_table_name %> }
-      mock_<%= singular_table_name %>.should_receive(:destroy)
+      expect(<%= class_name %>).to receive(:find).with("37") { mock_<%= singular_table_name %> }
+      expect(mock_<%= singular_table_name %>).to receive(:destroy)
       delete :destroy, :id => "37"
     end
 
     it "redirects to the <%= plural_table_name %> list" do
-      <%= class_name %>.stub(:find) { mock_<%= singular_table_name %> }
+      allow(<%= class_name %>).to receive(:find) { mock_<%= singular_table_name %> }
       delete :destroy, :id => "1"
-      response.should redirect_to(admin_<%= plural_table_name %>_url)
+      expect(response).to redirect_to(admin_<%= plural_table_name %>_url)
     end
   end
 

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

@@ -24,8 +24,8 @@
 <% end -%>
 <% unless options[:read_only] -%>
       <th>Edit</th>
-<% end -%>
       <th>Delete</th>
+<% end -%>
     </tr>
   </thead>
   <tbody>
@@ -38,8 +38,8 @@
 <% end -%>
 <% 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>
+<% end -%>
       </tr>
     <%% end %>
   </tbody>

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

@@ -11,14 +11,14 @@
     <td><%%= @<%= singular_table_name %>.<%= attribute.name %> %></td>
   </tr>
 <% end -%>
+
+<% unless options[:read_only] -%>
   <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") %>
+      <%%= link_to("Delete", admin_<%= singular_table_name %>_path(@<%= singular_table_name %>), :data => { :confirm => "Are you sure?" }, :method => :delete, :class => "btn btn-danger") %>
     </td>
   </tr>
+<% end -%>
 </table>
-

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: admin_view
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Marko Anastasov
@@ -9,62 +10,70 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.15'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
 description: Code generator of admin views and controllers for ActiveRecord models.
@@ -74,7 +83,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -97,25 +106,26 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/renderedtext/admin_view
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: admin_view
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Admin view code generator for Rails.
 test_files: []

checksums.yaml

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