adminpanel 2.0.1 → 2.1.0

data/lib/generators/adminpanel/resource/templates/controller.rb

@@ -3,7 +3,10 @@ module Adminpanel
 
     private
       def <%= lower_singularized_name %>_params
-        params.require(:<%= lower_singularized_name%>).permit(<%= symbolized_attributes %>)
+        params.require(:<%= lower_singularized_name%>).permit(
+<%= indent("{ #{gallery_name.pluralize}_attributes: [:id, :file, :_destroy] }", 10) + ',' if has_gallery? %>
+<%= indent(symbolized_attributes, 10) %>
+        )
       end
   end
 end

data/lib/generators/adminpanel/resource/templates/resource.rb

@@ -3,9 +3,12 @@ module Adminpanel
     include Adminpanel::Base
 
     <%= associations if has_associations? -%>
+    <%= get_gallery if has_gallery? -%>
 
     def self.form_attributes
-      [<%= adminpanel_form_attributes %>
+      [
+<%= indent(get_attribute_hash, 8) + ',' %>
+<%= indent(file_field_form_hash, 8) if has_gallery? %>
       ]
     end
 

data/lib/tasks/adminpanel/adminpanel.rake

@@ -168,7 +168,7 @@ private
     "Adminpanel::Section.new(\n" +
     "\t:name => \"#{section.name}\",\n" +
     "\t:has_description => #{section.has_description},\n" +
-    "\t:description => \"#{section.description}\",\n" +
+    "\t:description => \"#{escape_double_quotes(section.description)}\",\n" +
     "\t:key => \"#{section.key}\",\n" +
     "\t:page => \"#{section.page}\",\n" +
     "\t:has_image => #{section.has_image}\n" +
@@ -177,11 +177,15 @@ private
 
   def creation_command_category(category)
     "Adminpanel::Category.new(\n" +
-    "\t:name => \"#{category.name}\",\n" +
+    "\t:name => \"#{escape_double_quotes(category.name)}\",\n" +
     "\t:model => \"#{category.model}\"\n" +
     ").save\n"
   end
 
+  def escape_double_quotes(string)
+    string.gsub('"', '\\"')
+  end
+
   def change_dates(instance)
     date = rand(Date.parse('2010-01-01')..Date.today)
     instance.update_attribute(:created_at, date)

data/spec/dummy/app/controllers/adminpanel/salesmen_controller.rb

@@ -0,0 +1,9 @@
+module Adminpanel
+  class SalesmenController < Adminpanel::ApplicationController
+
+    private
+      def salesman_params
+        params.require(:salesman).permit(:name, :product_id)
+      end
+  end
+end

data/spec/dummy/app/models/adminpanel/category.rb

@@ -2,6 +2,7 @@ module Adminpanel
   class Category < ActiveRecord::Base
     include Adminpanel::Base
     validates_presence_of :model
+    validates_presence_of :name
 
     has_many :categorizations
     has_many :products, :through => :categorizations, :dependent => :destroy

data/spec/dummy/app/models/adminpanel/mug.rb

@@ -1,8 +1,8 @@
 module Adminpanel
   class Mug < ActiveRecord::Base
     include Adminpanel::Base
-
-
+    validates_presence_of :name
+    
     def self.form_attributes
       [
 			{

data/spec/dummy/app/models/adminpanel/product.rb

@@ -1,7 +1,7 @@
 module Adminpanel
   class Product < ActiveRecord::Base
     include Adminpanel::Base
-    
+
     has_many :categorizations
     has_many :categories, :through => :categorizations
 		mount_images :photos
@@ -18,7 +18,6 @@ module Adminpanel
 			{
 				'name' => {
 					'type' => 'text_field',
-					'name' => 'name',
 					'label' => 'name',
 					'placeholder' => 'name'}
 			},
@@ -31,22 +30,21 @@ module Adminpanel
 			{
 				'photos' => {
 					'type' => 'adminpanel_file_field',
-					'name' => 'photo',
 					'label' => 'photo',
 					'placeholder' => 'photo'}
 			},
 			{
 				'description' => {
 					'type' => 'wysiwyg_field',
-					'name' => 'description',
 					'label' => 'description',
-					'placeholder' => 'description'}
+					'placeholder' => 'description'
+        }
 			},
       ]
     end
 
     def self.display_name
-      "Product"
+      "Producto"
     end
 
     def self.icon

data/spec/dummy/app/models/adminpanel/salesman.rb

@@ -0,0 +1,35 @@
+module Adminpanel
+  class Salesman < ActiveRecord::Base
+    include Adminpanel::Base
+
+    belongs_to :product
+
+    def self.form_attributes
+      [
+			{
+				'name' => {
+					'type' => 'text_field',
+					'label' => 'name',
+					'placeholder' => 'name'
+				}
+			},
+			{
+				'product_id' => {
+					'type' => 'belongs_to',
+					'model' => 'Adminpanel::Product',
+					'label' => 'product',
+					'placeholder' => 'product'
+				}
+			},
+      ]
+    end
+
+    def self.display_name
+      'Agente' #singular
+    end
+
+    # def self.icon
+    #     "truck" # fa-{icon}
+    # end
+  end
+end

data/spec/dummy/config/initializers/adminpanel_setup.rb

@@ -18,6 +18,7 @@ Adminpanel.setup do |config|
     :categories,
     :products,
     :users,
-    :mugs
+    :mugs,
+    :salesmen
   ]
 end

data/spec/dummy/db/schema.rb

@@ -51,6 +51,13 @@ ActiveRecord::Schema.define do
       t.datetime :created_at,      :null => false
       t.datetime :updated_at,      :null => false
   end
+  create_table :adminpanel_auths do |t|
+      t.string   :name
+      t.string   :key
+      t.string   :value
+      t.datetime :created_at,      :null => false
+      t.datetime :updated_at,      :null => false
+  end
   create_table :adminpanel_categorizations do |t|
       t.integer  :product_id
       t.integer  :category_id
@@ -68,6 +75,12 @@ ActiveRecord::Schema.define do
       t.datetime :created_at,      :null => false
       t.datetime :updated_at,      :null => false
   end
+  create_table :adminpanel_salesmen do |t|
+      t.string   :name
+      t.integer  :product_id
+      t.datetime :created_at,      :null => false
+      t.datetime :updated_at,      :null => false
+  end
   create_table :adminpanel_sections do |t|
       t.string   :name
       t.text     :description

data/spec/features/shared_pages/edit_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe 'Shared edit', js: true do
+  subject { page }
+
+  let(:user) { get_user }
+
+  before do
+    Adminpanel::User.delete_all
+    visit adminpanel.signin_path
+    valid_signin_as_admin(user)
+  end
+
+  after do
+    Adminpanel::User.delete_all
+  end
+
+  context 'edit' do
+    let!(:product) { FactoryGirl.create(:product) }
+    let!(:category){ FactoryGirl.create(:category) }
+
+    before do
+      product.category_ids = [category.id]
+      visit adminpanel.edit_product_path(product)
+    end
+
+    it { should have_link('Agregar Categoria') }
+
+    it { should have_content('Test Category') }
+
+    it { should have_title(I18n.t('action.update') + " " + Adminpanel::Product.display_name) }
+
+    describe "with invalid information" do
+      before do
+        fill_in "product_name", with: ""
+        fill_in "product_price", with: ""
+        click_button('Guardar Product')
+      end
+
+      it 'should have an error alert' do
+        should have_content('Producto no pudo guardarse debido a')
+      end
+
+      it { should have_title(I18n.t('action.update') + " " + Adminpanel::Product.display_name) }
+    end
+
+  end
+end

data/spec/features/shared_pages/index_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe 'Shared index' do
+  subject { page }
+
+  let(:user) { get_user }
+
+  before do
+    Adminpanel::User.delete_all
+    visit adminpanel.signin_path
+    valid_signin_as_admin(user)
+  end
+
+  after do
+    Adminpanel::User.delete_all
+  end
+
+  context 'mugs#index excluding every rest action with configurtions but index' do
+    before do
+      Adminpanel::Mug.create
+      visit adminpanel.mugs_path
+    end
+
+    after do
+      Adminpanel::Mug.delete_all
+    end
+
+    it 'should not have create mug button' do
+      should_not have_link('a', href:'/adminpanel/tazas/new')
+    end
+    it 'should not have show or destroy button' do
+      should_not have_link('a', href:'/adminpanel/tazas/1')
+    end
+    it 'should not have edit button' do
+      should_not have_link('a', href:'/adminpanel/tazas/1/edit')
+    end
+  end
+
+
+  context 'index' do
+    let!(:product) { FactoryGirl.create(:product) }
+    before do
+      visit adminpanel.products_path
+    end
+
+    it { should have_link(Adminpanel::Product.display_name, adminpanel.new_product_path)}
+    it { should have_link('i', adminpanel.product_path(product)) }
+    it { should have_link('i', adminpanel.edit_product_path(product)) }
+  end
+end

data/spec/features/shared_pages/new_spec.rb

@@ -0,0 +1,128 @@
+require 'spec_helper'
+
+describe 'Shared new', js: true do
+  subject { page }
+
+  let(:user) { get_user }
+
+  before do
+    Adminpanel::User.delete_all
+    visit adminpanel.signin_path
+    valid_signin_as_admin(user)
+    visit adminpanel.new_product_path
+  end
+
+  after do
+    Adminpanel::User.delete_all
+  end
+
+
+  describe 'when submtting with invalid information' do
+    before do
+      click_button('Agregar Producto')
+    end
+
+    it { should have_title("#{I18n.t('action.create')} #{Adminpanel::Product.display_name}") }
+
+    it 'should have validation alert' do
+      should have_content('Producto no pudo guardarse debido a')
+    end
+  end
+
+  describe 'when submitting with valid information' do
+    before do
+      fill_in 'product_name', :with => 'product name'
+      fill_in 'product_price', :with => '855.5'
+      page.execute_script(
+        %Q(
+          $('#product_description').data('wysihtml5').editor.setValue('que pepsi');
+        )
+      ) # to fill the wysiwyg editor
+
+      click_button('Agregar Producto')
+    end
+
+    it { should have_content(I18n.t("action.save_success"))}
+    it { should have_title('Ver Producto')}
+  end
+
+  describe 'when clicking create remote category link (has_many through)' do
+    before do
+      click_link('Agregar Categoria')
+    end
+
+    it 'the modal should have the correct title' do
+      sleep 1
+      find('#modal-title').text.should eq('Agregar Categoria')
+    end
+
+    it 'should show the cateogry form in a modal' do
+      should have_content('Agregar Categoria')
+    end
+
+    context 'when submitting the remote (checkboxes) category form' do
+      describe 'with valid information' do
+        before do
+          fill_in 'category_name', with: 'remote category'
+          click_button 'Agregar Categoria'
+        end
+
+        it 'should have the created category in the checkboxes options' do
+          should have_content 'remote category'
+        end
+      end
+
+      describe 'with invalid information' do
+        before do
+          click_button 'Agregar Categoria'
+        end
+
+        it 'should have the errors' do
+          should have_content I18n.t('errors', model: 'Categoria', count: 1)
+        end
+      end
+    end
+  end
+
+  context 'new salesman' do
+    before do
+      visit adminpanel.new_salesman_path
+    end
+
+    describe 'when clicking the create remote product link (belongs_to)' do
+      before do
+        click_link 'Agregar Producto'
+        sleep 1
+      end
+
+      it 'the modal should have the correct title' do
+        find('#modal-title').text.should eq('Agregar Producto')
+      end
+
+      context 'submitting the remote (select) product form' do
+        describe 'with valid information' do
+          before do
+            fill_in 'product_name', with: 'remote product'
+            fill_in 'product_description', with: 'remote description lorem'
+            fill_in 'product_price', with: '12.3'
+            click_button 'Agregar Producto'
+          end
+
+          it 'should have the created product in the select options' do
+            should have_xpath "//option[contains(text(), 'remote product' )]"
+          end
+        end
+
+        describe 'with invalid information' do
+          before do
+            click_button 'Agregar Producto'
+          end
+
+          it 'should have the errors' do
+            should have_content I18n.t('errors', model: 'Producto', count: 3)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/features/shared_pages/show_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe 'Shared show', js: true do
+  subject { page }
+
+  let(:user) { get_user }
+  let!(:category){ FactoryGirl.create(:category) }
+  let!(:product) { FactoryGirl.create(:product) }
+  let!(:photo) { FactoryGirl.create(:photo) }
+
+  before do
+    Adminpanel::User.delete_all
+    visit adminpanel.signin_path
+    valid_signin_as_admin(user)
+    product.category_ids = [category.id]
+    photo.product_id = product.id
+    visit adminpanel.product_path(product)
+  end
+
+  after do
+    Adminpanel::User.delete_all
+  end
+
+  it { page.should have_selector('div', text: product.name) }
+  it { page.should have_selector('div', text: product.price) }
+  it { page.should have_selector('div', text: product.description) }
+  it { should have_content("#{I18n.t("gallery.container")}: #{Adminpanel::Product.display_name}")}
+  it { should have_content("#{category.name}")}
+  it { should have_link('i', adminpanel.edit_product_path(product)) }
+end