sharp_admin 1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52114ce6b82a6330e94300dfc8fab7bf8707a5b8
-  data.tar.gz: 57c9ebb861063a136aa8b51db83d7fe64d429a69
+  metadata.gz: c4e3c8abbc1860c7c5a8c17d42ababd5b35631a4
+  data.tar.gz: 9c3910137ff18ac23708abe83565074b25a3b38e
 SHA512:
-  metadata.gz: 2c636e4fd03e66813c45eda0ad2cda6fbaa212a595338a5edf915c479fb5e75f5d591757f893179de35bac892cc25044ed106f6e0ec03697adc5aee5e5504164
-  data.tar.gz: a28773397d3fb624ce5b175d5c614c8febf5bb8e95f9f65e48b8f748ca2e49030861cf621943c703d010f71e9f2e875941e3b0c6101c893cfa6b22d0fc23e25a
+  metadata.gz: 1ab66a9dbee912cfb78512faa0105a11741ec1032a7f2a9276113e780bdd818ffb5c225dbe2912d9719e3c3c018ecbe8210ca74e3e46d990ba7af83abda23cd2
+  data.tar.gz: 6671f557b12d5fbea3847bb247b9e3c193e98c2da051f1770959e59b9aedacba39dc0dcaf5f6f65f58b4d57ea4c8969450db34f4efb05811d5e97f56555abe73

data/lib/sharp_admin/sharp_admin_generator.rb

@@ -31,10 +31,6 @@ class SharpAdminGenerator < Rails::Generators::NamedBase
     template "controller.rb", File.join("app/controllers/#{options[:ns]}", "#{controller_file_name}_controller.rb")
   end
 
-  def create_controller_rspec
-    template "controller_spec.rb", File.join("spec/controllers/#{options[:ns]}", "#{controller_file_name}_controller_spec.rb")
-  end
-
   def create_helper
     empty_directory "app/helpers/#{options[:ns]}"
     template "base_helper.rb", File.join("app/helpers/#{options[:ns]}", "base_helper.rb")

data/lib/sharp_admin/templates/controller.rb

@@ -17,7 +17,7 @@ class <%= options[:ns].classify %>::<%= controller_class_name %>Controller < <%=
   def create
     @<%= 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 %>."
+      redirect_to <%= options[:ns] %>_<%= plural_table_name %>_path, :notice => "Successfully created <%= human_name.downcase %>."
     else
       render :new
     end
@@ -33,7 +33,7 @@ class <%= options[:ns].classify %>::<%= controller_class_name %>Controller < <%=
 
   def update
     if @<%= singular_table_name %>.update_attributes(<%= singular_table_name %>_params)
-      redirect_to admin_<%= plural_table_name %>_path, :notice => "Successfully updated <%= human_name.downcase %>."
+      redirect_to <%= options[:ns] %>_<%= plural_table_name %>_path, :notice => "Successfully updated <%= human_name.downcase %>."
     else
       render :edit
     end
@@ -42,7 +42,7 @@ class <%= options[:ns].classify %>::<%= controller_class_name %>Controller < <%=
 
   def destroy
     @<%= singular_table_name %>.destroy
-    redirect_to admin_<%= plural_table_name %>_path, :notice => "<%= human_name %> deleted."
+    redirect_to <%= options[:ns] %>_<%= plural_table_name %>_path, :notice => "<%= human_name %> deleted."
   end
 
   protected

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

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

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

@@ -1,7 +1,7 @@
 .page-header
   %h3
     Editing
-    = link_to "<%= human_name.downcase %> #{@<%= singular_table_name %>.id}", admin_<%= singular_table_name %>_path(@<%= singular_table_name %>) %>
+    = link_to "<%= human_name.downcase %> #{@<%= singular_table_name %>.id}", <%= options[:ns] %>_<%= singular_table_name %>_path(@<%= singular_table_name %>)
 
-= form_for [<%= options[:ns] %>, @<%= singular_table_name %>], :html => { :class => "form-horizontal", :role => "form" } do |f|
+= simple_form_for [:<%= options[:ns] %>, @<%= singular_table_name %>], :html => { :class => "form-horizontal", :role => "form" } do |f|
   = render "form", { :f => f }

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

@@ -1,7 +1,7 @@
 %h3
   <%= human_name.pluralize %>
 
-<% if options[:search_by].present? -%>
+<%- if options[:search_by].present? -%>
 = search_form_for @q, :url => <%= options[:ns] %>_<%= plural_table_name %>_path, :html => { :method => :get, :class => "well form-inline" } do |f|
   .class.form-group
     = f.text_field :<%= options[:search_by] %>_cont, :type => "search", :class => "form-control", :placeholder => "Search by <%= options[:search_by] %>"
@@ -9,12 +9,12 @@
   = f.submit "Search", :class => "btn btn-default"
 <% end %>
 
-<% unless options[:no_create] || options[:read_only] %>
+<%- unless options[:no_create] || options[:read_only] %>
 %p
   = link_to("Create a new <%= human_name %>", new_<%= options[:ns] %>_<%= singular_table_name %>_path)
 <% end -%>
 
-%table.sortable.table.table-striped.table-bordered.table-condensed
+%table.sortable.table
   %thead
     %tr
 <% @attributes.each do |attribute| -%>

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

@@ -2,5 +2,5 @@
   %h3
     Create new <%= human_name.downcase %>
 
-= form_for [<%= options[:ns] %>, @<%= singular_table_name %>], :html => { :class => "form-horizontal", :role => "form" } do |f|
+= simple_form_for [:<%= options[:ns] %>, @<%= singular_table_name %>], :html => { :class => "form-horizontal", :role => "form" } do |f|
   = render "form", { :f => f }

data/lib/sharp_admin/version.rb

@@ -1,3 +1,3 @@
 module EasyAdmin
-  VERSION = "1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sharp_admin
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: 1.1.2
 platform: ruby
 authors:
 - sharp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,7 +67,6 @@ files:
 - lib/sharp_admin/templates/base_controller_spec.rb
 - lib/sharp_admin/templates/base_helper.rb
 - lib/sharp_admin/templates/controller.rb
-- lib/sharp_admin/templates/controller_spec.rb
 - lib/sharp_admin/templates/views/_form.html.erb
 - lib/sharp_admin/templates/views/edit.html.erb
 - lib/sharp_admin/templates/views/index.html.erb

data/lib/sharp_admin/templates/controller_spec.rb

@@ -1,136 +0,0 @@
-require 'spec_helper'
-
-describe <%= options[:ns].classify %>::<%= 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 %>|
-      stubs.each_key do |method_name|
-        allow(<%= singular_table_name %>).to receive(method_name).and_return(stubs[method_name])
-      end
-    end
-  end
-
-  before { allow(controller).to receive(:require_admin) }
-
-  describe "GET index" do
-    it "assigns all <%= plural_table_name %> as @<%= plural_table_name %>" do
-      allow(controller).to receive(:find_<%= plural_table_name %>).and_return([mock_<%= singular_table_name %>])
-      get :index
-      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
-      allow(<%= class_name %>).to receive(:find).with("37") { mock_<%= singular_table_name %> }
-      get :show, :id => "37"
-      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
-      allow(<%= class_name %>).to receive(:new) { mock_<%= singular_table_name %> }
-      get :new
-      expect(assigns(:<%= singular_table_name %>)).to be(mock_<%= singular_table_name %>)
-    end
-  end
-
-  describe "POST create" do
-
-    describe "with valid params" do
-      it "assigns a newly created <%= singular_table_name %> as @<%= singular_table_name %>" do
-        allow(<%= class_name %>).to receive(:new).with({'these' => 'params'}) { mock_<%= singular_table_name %>(:save => true) }
-        post :create, :<%= singular_table_name %> => {'these' => 'params'}
-        expect(assigns(:<%= singular_table_name %>)).to be(mock_<%= singular_table_name %>)
-      end
-
-      it "redirects to the created <%= singular_table_name %>" do
-        allow(<%= class_name %>).to receive(:new) { mock_<%= singular_table_name %>(:save => true) }
-        post :create, :<%= singular_table_name %> => {}
-        expect(response).to redirect_to(<%= options[:ns] %>_<%= 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
-        allow(<%= class_name %>).to receive(:new).with({'these' => 'params'}) { mock_<%= singular_table_name %>(:save => false) }
-        post :create, :<%= singular_table_name %> => {'these' => 'params'}
-        expect(assigns(:<%= singular_table_name %>)).to be(mock_<%= singular_table_name %>)
-      end
-
-      it "re-renders the 'new' template" do
-        allow(<%= class_name %>).to receive(:new) { mock_<%= singular_table_name %>(:save => false) }
-        post :create, :<%= singular_table_name %> => {}
-        expect(response).to render_template("new")
-      end
-    end
-
-  end
-  <% end -%>
-
-  <% unless options[:read_only] %>
-  describe "GET edit" do
-    it "assigns the requested <%= singular_table_name %> as @<%= singular_table_name %>" do
-      allow(<%= class_name %>).to receive(:find).with("37") { mock_<%= singular_table_name %> }
-      get :edit, :id => "37"
-      expect(assigns(:<%= singular_table_name %>)).to be(mock_<%= singular_table_name %>)
-    end
-  end
-
-  describe "PUT update" do
-
-    describe "with valid params" do
-      it "updates the requested <%= singular_table_name %>" do
-        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
-        allow(<%= class_name %>).to receive(:find) { mock_<%= singular_table_name %>(:update_attributes => true) }
-        put :update, :id => "1"
-        expect(assigns(:<%= singular_table_name %>)).to be(mock_<%= singular_table_name %>)
-      end
-
-      it "redirects to the <%= singular_table_name %>" do
-        allow(<%= class_name %>).to receive(:find) { mock_<%= singular_table_name %>(:update_attributes => true) }
-        put :update, :id => "1"
-        expect(response).to redirect_to(<%= options[:ns] %>_<%= plural_table_name %>_url)
-      end
-    end
-
-    describe "with invalid params" do
-      it "assigns the <%= singular_table_name %> as @<%= singular_table_name %>" do
-        allow(<%= class_name %>).to receive(:find) { mock_<%= singular_table_name %>(:update_attributes => false) }
-        put :update, :id => "1"
-        expect(assigns(:<%= singular_table_name %>)).to be(mock_<%= singular_table_name %>)
-      end
-
-      it "re-renders the 'edit' template" do
-        allow(<%= class_name %>).to receive(:find) { mock_<%= singular_table_name %>(:update_attributes => false) }
-        put :update, :id => "1"
-        expect(response).to render_template("edit")
-      end
-    end
-
-  end
-  <% end -%>
-
-  describe "DELETE destroy" do
-    it "destroys the requested <%= singular_table_name %>" do
-      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
-      allow(<%= class_name %>).to receive(:find) { mock_<%= singular_table_name %> }
-      delete :destroy, :id => "1"
-      expect(response).to redirect_to(<%= options[:ns] %>_<%= plural_table_name %>_url)
-    end
-  end
-
-end
-