adminpanel 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  metadata.gz: 6d8f123e3a3faf4e15d9314743b74780780988363dcb070d23b4cea17671beb6fc807be8ac42f392cdee3949c4dea68ceb824bfe8226f311d465475f5e39a8d7
-  data.tar.gz: 819a1638157388e34921f75d3fe4f707fd8f6a6cc7e102da078ce0761ad3aa4d474b1e1d6b2d61df54beeca2b9f7ae7851fc2515b7af3d53f5668e07f8e3cd74
 SHA1: 
-  metadata.gz: 6b1cb78b89c6b70303680facd5f010f5ac177828
-  data.tar.gz: 459579d0e5a2168f0a4cc4d31a4dc83912cd2612
+  metadata.gz: 435b2e9a0b1762665f46f09b0139867b12b4309e
+  data.tar.gz: 2ada99e5776704ba5872ffa3345673fb7d2b6626
+SHA512: 
+  metadata.gz: c956d64b07c304bdf6f650bc78b0ad4c455f59d4195219985c6ae8c344fa059c2e46cd8c2949cf8eaa5955e7ceba8a11d910f311be29bcb41a911aed775c0475
+  data.tar.gz: cdfe59993943b62d09aed0dca24177d10cce055041b8a47e0b640b495eaf2c107f9c256dd538f820f34833c21baf32c5cb7005b03d42403e73a20ab67c2e65a1

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
-notifications:
-  email: false
+before_install:
+  - gem update --system 2.1.11
+  - gem --version
 rvm:
   - "1.8.7"
 env:

data/Gemfile

@@ -1,24 +1,24 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in adminpanel.gemspec
-# gemspec
-
-gem "rails", "~> 3.2.12"
-gem "carrierwave", "~> 0.9.0"
-gem "rmagick", "~> 2.13.2"
-gem "jquery-rails", "~> 3.0.4"
-gem "bcrypt-ruby", "~> 3.0.0"
-gem "rails-i18n", "~> 3.0.0"
-
-group :test do 
-	gem "bundler", "~> 1.3"
-	gem "activerecord", "3.2.12"
-	gem "rspec", "2.14.0"
-	gem "rspec-rails"
-	gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
-	gem "rake"
-	gem "factory_girl", "2.6.4"
-	gem "capybara", "1.1.4"
-	gem "nokogiri", "1.5.9"
-	gem "rubyzip", "0.9.9"
-end
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in adminpanel.gemspec
+# gemspec
+
+gem "rails", "~> 3.2.12"
+gem "carrierwave", "~> 0.9.0"
+gem "rmagick", "~> 2.13.2"
+gem "jquery-rails", "~> 3.0.4"
+gem "bcrypt-ruby", "~> 3.0.0"
+gem "rails-i18n", "~> 3.0.0"
+
+group :test do 
+	gem "bundler", "~> 1.3"
+	gem "activerecord", "3.2.12"
+	gem "rspec", "2.14.0"
+	gem "rspec-rails"
+	gem "sqlite3", :platform => [:ruby, :mswin, :mingw]
+	gem "rake"
+	gem "factory_girl", "2.6.4"
+	gem "capybara", "1.1.4"
+	gem "nokogiri", "1.5.9"
+	gem "rubyzip", "0.9.9"
+end

data/README.md

@@ -29,13 +29,16 @@ Then run:
 
     rails g adminpanel:install create_migrations
     rake db:migrate
-to create the database that the adminpanel it's expecting.
+to create the database that the adminpanel it's expecting, this will also seed the database with the default user.
 
 Then, mount the gem wherever you like!
 
     mount Adminpanel::Engine => "/admin"
 
-Any doubts or errors feel free to ask me!
+Also make sure to include adminpanel assets in your application.rb if you need to precompile them:
+
+    config.assets.precompile += ['application-admin.js', 'application-admin.css']
+The version 0.1.0 is the first stable version, feel free to use it, any doubts or errors feel free to ask me!.
 
 ## Contributing
 
@@ -49,3 +52,6 @@ Any doubts or errors feel free to ask me!
 
 1. Add english support
 2. Add the medium editor to the custom builder so it inits itself
+3. Get a section generator or some kind of it
+4. Add test to section edit(the only tests remaining)
+5. Add a generator that let you create scaffolded model/controller/view in way that you can change them in the main app.

data/adminpanel.gemspec

@@ -1,39 +1,39 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'adminpanel/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "adminpanel"
-  spec.version       = Adminpanel::VERSION
-  spec.authors       = ["Jose Ramon Camacho", "Victor Camacho"]
-  spec.email         = ["joserracamacho@gmail.com"]
-  spec.description   = %q{Gem that makes the admin panel for a site a breeze!}
-  spec.summary       = %q{Developed with love for ruby 1.8.7}
-  spec.homepage      = "https://github.com/joseramonc/adminpanel"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib", "app/assets"]
-
-
-  spec.add_dependency "rails", "~> 3.2.12"
-  spec.add_dependency "carrierwave", "~> 0.9.0"
-  spec.add_dependency "rmagick", "~> 2.13.2"
-  spec.add_dependency "jquery-rails", "~> 3.0.4"
-  spec.add_dependency "bcrypt-ruby", "~> 3.0.0"
-  spec.add_dependency "rails-i18n", "~> 3.0.0"
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "activerecord", "~> 3.2.12"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "factory_girl_rails", "2.6.4"
-  spec.add_development_dependency "rspec", "~> 2.14.0"
-  spec.add_development_dependency "rspec-rails", "~> 2.14.0"
-  spec.add_development_dependency "capybara", "1.1.4"
-  spec.add_development_dependency "nokogiri", "1.5.9"
-  spec.add_development_dependency "rubyzip", "0.9.9"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'adminpanel/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "adminpanel"
+  spec.version       = Adminpanel::VERSION
+  spec.authors       = ["Jose Ramon Camacho", "Victor Camacho"]
+  spec.email         = ["joserracamacho@gmail.com"]
+  spec.description   = %q{Gem that makes the admin panel for a site a breeze!}
+  spec.summary       = %q{Developed with love for ruby 1.8.7}
+  spec.homepage      = "https://github.com/joseramonc/adminpanel"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib", "app/assets"]
+
+
+  spec.add_dependency "rails", "~> 3.2.12"
+  spec.add_dependency "carrierwave", "~> 0.9.0"
+  spec.add_dependency "rmagick", "~> 2.13.2"
+  spec.add_dependency "jquery-rails", "~> 3.0.4"
+  spec.add_dependency "bcrypt-ruby", "~> 3.0.0"
+  spec.add_dependency "rails-i18n", "~> 3.0.0"
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "activerecord", "~> 3.2.12"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "factory_girl_rails", "2.6.4"
+  spec.add_development_dependency "rspec", "~> 2.14.0"
+  spec.add_development_dependency "rspec-rails", "~> 2.14.0"
+  spec.add_development_dependency "capybara", "1.1.4"
+  spec.add_development_dependency "nokogiri", "1.5.9"
+  spec.add_development_dependency "rubyzip", "0.9.9"
+end

data/app/assets/javascripts/adminpanel/realm.js

@@ -60,9 +60,6 @@ $(function() {
 }); // end document reday
 
 
-
-
-
 //-----  Side menu functions -----//
 
   // slide menu out of view

data/app/controllers/adminpanel/galleries_controller.rb

@@ -1,7 +1,7 @@
 module Adminpanel
   class GalleriesController < Adminpanel::ApplicationController
     def index
-      @galleries = Gallery.all
+      @galleries = Gallery.find(:all)
     end
 
     def show
@@ -22,11 +22,47 @@ module Adminpanel
       end
     end
 
+    def move_better
+      @gallery = Gallery.find(params[:id])
+      if @gallery.move_to_better_position
+        flash[:success] = t("gallery.moved")
+      else
+        flash[:warning] = t("gallery.not-moved")
+      end
+        respond_to do |format|
+          format.html do 
+            redirect_to galleries_path 
+          end
+          format.js do
+            @galleries = Gallery.all
+            render :locals => { :galleries => @galleries }
+          end
+        end
+    end
+
+    def move_worst
+      @gallery = Gallery.find(params[:id])
+      if @gallery.move_to_worst_position
+        flash[:success] = t("gallery.moved")
+      else
+        flash[:warning] = t("gallery.not-moved")
+      end
+        respond_to do |format|
+          format.html do 
+            redirect_to galleries_path 
+          end
+          format.js do
+            @galleries = Gallery.all
+            render :locals => { :galleries => @galleries }
+          end
+        end
+    end
+
     def destroy
       @gallery = Gallery.find(params[:id])
       @gallery.destroy
 
-      redirect_to galleries_path, :notice => "La imagen ha sido eliminada"
+      redirect_to galleries_path, :notice => t("gallery.deleted")
     end
 
     def update

data/app/models/adminpanel/gallery.rb

@@ -6,5 +6,56 @@ module Adminpanel
 
 	  mount_uploader :file, Adminpanel::GalleryUploader
 	  validates_presence_of :file
+	  before_create :set_position
+	  before_destroy :rearrange_positions
+
+
+	  default_scope { order("position ASC")}
+
+
+	  def move_to_better_position
+	  	if position > 1
+		  	conflicting_gallery = Gallery.find_by_position(position - 1)
+		  	update_attribute(:position, position - 1)
+		  	conflicting_gallery.update_attribute(
+		  		:position, conflicting_gallery.position + 1
+		  		)
+		  	true
+	  	else
+	  		false
+	  	end
+	  end
+
+	  def move_to_worst_position
+	  	records = Gallery.count
+	  	if position < records
+		  	conflicting_gallery = Gallery.find_by_position(position + 1)
+		  	update_attribute(:position, position + 1)
+		  	conflicting_gallery.update_attribute(
+		  		:position, conflicting_gallery.position - 1
+		  		)
+		  	true
+	  	else
+	  		false
+	  	end
+	  end
+
+  	private
+  		def rearrange_positions
+  			unarranged_galleries = Gallery.where("position > ?", position)
+  			unarranged_galleries.each do |gallery|
+  				gallery.update_attribute(:position, gallery.position - 1)
+  			end
+
+  		end
+		
+		def set_position
+		  	last_record = Gallery.last
+		  	if last_record.nil?
+		  		self.position = 1
+		  	else
+		  		self.position = last_record.position + 1
+		  	end
+		end
 	end
 end

data/app/models/adminpanel/section.rb

@@ -2,7 +2,7 @@ require 'carrierwave'
 require 'carrierwave/orm/activerecord'
 module Adminpanel
 	class Section < ActiveRecord::Base
-	  attr_accessible :description, :has_image, :key, :name, :has_description, :images_attributes
+	  attr_accessible :description, :has_image, :key, :page, :name, :has_description, :images_attributes
 	  has_many :images, :foreign_key => "foreign_key", :conditions => { :model => "Section" }
 	  accepts_nested_attributes_for :images, :allow_destroy => true
 	  validates_length_of :description, :minimum => 10, :maximum => 10, :on => :update, :if => lambda{|section| section.key == "telephone"}
@@ -10,6 +10,11 @@ module Adminpanel
 	  validates :description, :numericality => { :only_integer => true }, :on => :update, :if => lambda{|section| section.key == "telephone"}
 	  validates_presence_of :key
 	  validates_presence_of :name
+	  validates_presence_of :page
+
+	  default_scope { order("page ASC")}
+
+	  scope :of_page, lambda{|page| where(:page => page)}
 
 	  def simple_name
 	  	"Section"

data/app/views/adminpanel/galleries/_galleries_table.html.erb

@@ -0,0 +1,15 @@
+<% @galleries.each do |gallery| %>
+	<tr>
+		<td><%= link_to image_tag(gallery.file_url(:thumb)), gallery_path(gallery) %></td>
+		<td>
+			<%= link_to content_tag(:i, nil, :class => "icon-chevron-up"), move_to_better_gallery_path(gallery), :method => :put, :remote => true %>
+			<%= link_to content_tag(:i, nil, :class => "icon-chevron-down"), move_to_worst_gallery_path(gallery), :method => :put, :remote => true %>
+		</td>
+		<td>
+			<%= link_to content_tag(:i, nil, :class => 'icon-pencil'), edit_gallery_path(gallery), :title => t("action.edit") %>
+			<%= link_to content_tag(:i, nil, :class => 'icon-remove'), gallery_path(gallery), :title => t("action.delete"), :method => :delete,
+													:data => { :confirm => t("action.delete confirmation") }
+			%>
+		</td>
+	</tr>
+<% end %>

data/app/views/adminpanel/galleries/index.html.erb

@@ -29,25 +29,16 @@
         </div>
     <div class="widget-body">
       <div class="dataTables_wrapper form-inline">
-        <table id="information-table" class="table table-striped table-bordered dataTable">
+        <table class="table table-striped table-bordered dataTable">
           <thead>
             <tr>
-              <th>Imagen</th>
-              <th>Acción</th>
+              <th><%= t("gallery.image") %></th>
+              <th><%= t("gallery.position") %></th>
+              <th><%= t("gallery.action") %></th>
             </tr>
           </thead>
-          <tbody>
-            <% @galleries.each do |gallery| %>
-            <tr>
-              <td><%= link_to image_tag(gallery.file_url(:thumb)), gallery_path(gallery) %></td>
-                <td>
-                  <%= link_to content_tag(:i, nil, :class => 'icon-pencil'), edit_gallery_path(gallery), :title => t("action.edit") %>
-                  <%= link_to content_tag(:i, nil, :class => 'icon-remove'), gallery_path(gallery), :title => t("action.delete"), :method => :delete,
-                                      :data => { :confirm => t("action.delete confirmation") }
-                  %>
-                </td>
-            </tr>
-            <% end %>
+          <tbody id = "galleries-content">
+            <%= render 'galleries_table', :galleries => @galleries %>
           </tbody>
         </table>
         <div class="row-fluid">

data/app/views/adminpanel/galleries/move_better.js.erb

@@ -0,0 +1 @@
+$("#galleries-content").html("<%= escape_javascript(render 'galleries_table', :locals => { :galleries => @galleries } ) %>");

data/app/views/adminpanel/galleries/move_worst.js.erb

@@ -0,0 +1 @@
+$("#galleries-content").html("<%= escape_javascript(render 'galleries_table', :locals => { :galleries => @galleries } ) %>");

data/app/views/adminpanel/sections/_sections_table.html.erb

@@ -0,0 +1,17 @@
+<table class="table table-striped table-bordered">
+	<tr>
+	 <th><%= t("section.name") %></th>
+	 <th><%= t("section.description") %></th>
+	 <th><%= t("actions") %></th>
+	</tr>
+	<% sections.each do |section| %>
+        <tr>
+          <td><%= link_to section.name, section_path(section) %></td>
+          <td><%= strip_tags section.description %></td>
+          <td>
+            <%= link_to content_tag(:i, nil, :class => 'icon-pencil'), edit_section_path(section), :title => "Editar" %>
+          </td>
+        </tr>
+	<% end %>
+
+</table>

data/app/views/adminpanel/sections/index.html.erb

@@ -1,38 +1,44 @@
 <%= provide(:page_title, "Secciones") %>
 
 <div class="row-fluid">
-  <div class="widget widget-padding span12">
+  <div class="widget widget-padding span12" id="wizard">
     <div class="widget-header">
-          <i class="icon-tasks"></i>
-          <h5>Secciones</h5>
-        </div>
+      <ul class="nav nav-tabs">
+        <% current_page = "no-page" %>
+        <% @sections.each_with_index do |section, index| %>
+          <% if current_page != section.page %>
+          <% if index == 0 %>
+            <li class = "active">
+          <% else %>
+            <li>
+          <% end %>
+              <%= link_to (section.page.capitalize), "#tab#{index}", "data-toggle" => "tab" %></li>
+            <% current_page = section.page %>
+          <% end %>
+        <% end %>
+      </ul>
+    </div>
+
     <div class="widget-body">
-      <div class="dataTables_wrapper form-inline">
-        <table id="information-table" class="table table-striped table-bordered dataTable">
-          <thead>
-            <tr>
-              <th>Nombre</th>
-              <th>Descripción</th>
-              <th>Acción</th>
-            </tr>
-          </thead>
-          <tbody>
-            <% @sections.each do |section| %>
-            <tr>
-              <td><%= link_to section.name, section_path(section) %></td>
-              <td><%= strip_tags section.description %></td>
-              <td>
-                <%= link_to content_tag(:i, nil, :class => 'icon-pencil'), edit_section_path(section), :title => "Editar" %>
-              </td>
-            </tr>
-            <% end %>
-          </tbody>
-        </table>
-        <div class="row-fluid">
-          <div class="span6"></div>
-          <div class="span6"></div>
-        </div>
-      </div>
+      <div class="tab-content">
+        <% current_page = "no-page" %>
+        <% @sections.each_with_index do |section, index| %>
+          <% if current_page != section.page %>
+          <% if index == 0 %>
+            <div class="tab-pane active" id="tab<%= index %>">
+          <% else %>
+            <div class="tab-pane" id="tab<%= index %>">
+          <% end %>
+              <% section_pages = Adminpanel::Section.of_page section.page %>
+              <%= render "sections_table", :sections => section_pages %>
+            </div>
+            <% current_page = section.page %>
+          <% end %>
+        <% end %>
+      </div>  
+
     </div>
   </div>
 </div>
+
+

data/app/views/layouts/admin.html.erb

@@ -4,13 +4,12 @@
 		<meta charset="utf-8">
 		<title><%= full_title(yield(:page_title)) %></title>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<meta name="author" content="Bluth Company">
 		<%= stylesheet_link_tag    "application-admin", :media => "all" %>
 		<%= javascript_include_tag "application-admin" %>
 		<%= csrf_meta_tags %>
-		<link rel="shortcut icon" href="favicon.ico">
+  		<%= favicon_link_tag "favicon.ico" %>
 		<link href="http://fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
-		<link rel="Favicon Icon" href="favicon.ico">
+		
 		<%= render 'layouts/shim' %>
 	</head>
 

data/config/locales/es.yml

@@ -89,6 +89,7 @@ es:
   Write description here: "Escriba la descripción aquí"
   Panel title: "Panel Administrativo"
   New: "Nuevo"
+  actions: "Acciones"
   action:
     submiting: "Enviando..."
     save: "Guardar"
@@ -108,11 +109,20 @@ es:
   gallery:
     new: "Agregar Imagen"
     success: "La imagen ha sido guardada"
+    deleted: "La imagen ha sido eliminada"
+    moved : "Se ha actualizado la posición de la galería"
+    not-moved: "No se pudo mover la Imagen"
+    image: "Imagen"
+    position: "Posición"
+    action: "Acción"
   user:
     new: "Agregar Usuario"
     success: "El usuario ha sido guardado"
   section:
+    name: "Nombre"
+    description: "Descripción"
     edit: "Editar Sección"
+    default: "Sin Sección"
   session:
     password: "Contraseña"
     email: "Correo electrónico"

data/config/routes.rb

@@ -1,7 +1,12 @@
 Adminpanel::Engine.routes.draw do
   	resources :sections, :except => [:new]
     resources :users
-    resources :galleries
+    resources :galleries do
+    	member do 
+    		put :move_better, :as => "move_to_better"
+    		put :move_worst, :as => "move_to_worst"
+    	end
+    end
     resources :sessions, :only => [:new, :create, :destroy]
     resources :products
     resources :categories

data/lib/adminpanel.rb

@@ -1,7 +1,7 @@
-require "adminpanel/version"
-require "adminpanel/engine"
-
-module Adminpanel
- class AccessDenied < StandardError
- end
-end
+require "adminpanel/version"
+require "adminpanel/engine"
+
+module Adminpanel
+ class AccessDenied < StandardError
+ end
+end

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
-module Adminpanel
-  VERSION = "0.1.0"
-end
+module Adminpanel
+  VERSION = "0.1.1"
+end

data/lib/generators/adminpanel/install/templates/migrations/create_adminpanel_tables.rb

@@ -1,4 +1,12 @@
 class CreateAdminpanelTables < ActiveRecord::Migration
+	def migrate(direction)
+		super
+		# Create a default user
+		if direction == :up
+			Adminpanel::User.new(:email => 'admin@admin.com', :name => "Admin", :password => 'password', :password_confirmation => 'password').save
+		end
+	end
+	
 	def change
 		create_table :adminpanel_products do |t|
 	      t.integer :category_id
@@ -20,6 +28,7 @@ class CreateAdminpanelTables < ActiveRecord::Migration
 
         create_table :adminpanel_galleries do |t|
 	      t.string :file
+	      t.integer :position
 	      t.timestamps
 	    end
 
@@ -35,9 +44,17 @@ class CreateAdminpanelTables < ActiveRecord::Migration
 	      t.boolean :has_description
 	      t.text :description
 	      t.string :key
+	      t.string :page
 	      t.boolean :has_image
 	      t.timestamps
 	    end
+
+	    create_table :adminpanel_clients do |t|
+	    	t.string :name
+	    	t.string :logo
+	    	t.timestamps
+	    end
+
 	    add_index :adminpanel_sections, [:key]
 
 	    create_table :adminpanel_categories do |t|

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,55 +10,6 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20131120070259) do
-
-  create_table "adminpanel_users", :force => true do |t|
-    t.string   "name"
-    t.string   "email"
-    t.string   "password_digest"
-    t.string   "remember_token"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "adminpanel_categories", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "adminpanel_galleries", :force => true do |t|
-    t.string   "file"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "adminpanel_images", :force => true do |t|
-    t.string   "file"
-    t.integer  "foreign_key"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "model"
-  end
-
-  create_table "adminpanel_products", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "category_id"
-    t.string   "brief"
-  end
-
-  create_table "adminpanel_sections", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.string   "key"
-    t.boolean  "has_image"
-    t.string   "file"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-    t.boolean  "has_description"
-  end
+ActiveRecord::Schema.define(:version => 0) do
 
 end

data/spec/features/galleries_pages_spec.rb

@@ -11,7 +11,7 @@ describe "Gallery pages" do
 	end
 	
 	describe "galleries" do
-	let(:gallery) { Factory(:gallery) }
+		let(:gallery) { Factory(:gallery) }
 		before do
 			visit adminpanel.galleries_path
 		end
@@ -19,6 +19,74 @@ describe "Gallery pages" do
 		it { should have_link(I18n.t("gallery.new"), adminpanel.new_gallery_path)}
 		it { should have_link("i", adminpanel.gallery_path(gallery)) }
 		it { should have_link("i", adminpanel.edit_gallery_path(gallery)) }
+		it { should have_link("i", adminpanel.move_to_better_gallery_path(gallery)) }
+		it { should have_link("i", adminpanel.move_to_worst_gallery_path(gallery)) }
+	end
+
+	describe "when creating" do
+		describe "a single image" do
+			let(:gallery) { Factory(:gallery)}
+			it { gallery.position.should eq 1 }
+		end
+
+		describe "3 images" do
+			let!(:gallery_1) { Factory(:gallery) }
+			let!(:gallery_2) { Factory(:gallery) }
+			let!(:gallery_3) { Factory(:gallery) }
+
+			it { gallery_2.position.should eq 2 }
+			it { gallery_3.position.should eq 3 }
+			describe "when moving down the image in position 1" do
+				before do
+					gallery_1.move_to_worst_position
+					gallery_2.reload
+					gallery_3.reload
+				end
+
+				it { gallery_1.move_to_worst_position.should eq true}
+				it { gallery_3.move_to_worst_position.should eq false}
+				it { gallery_1.position.should eq 2}
+				it { gallery_2.position.should eq 1}
+				it { gallery_3.position.should eq 3}
+
+				after do
+					gallery_1.position = 1
+					gallery_2.position = 2
+					gallery_3.position = 3
+				end
+			end
+
+			describe "when moving up the image in position 2" do
+				before do
+					gallery_2.move_to_better_position
+					gallery_1.reload
+					gallery_3.reload
+				end
+
+				it { gallery_1.move_to_better_position.should eq true}
+				it { gallery_2.move_to_better_position.should eq false}
+				it { gallery_1.position.should eq 2}
+				it { gallery_2.position.should eq 1}
+				it { gallery_3.position.should eq 3}
+
+				after do
+					gallery_1.position = 1
+					gallery_2.position = 2
+					gallery_3.position = 3
+				end
+			end
+
+			describe "when deleting the image in position 1" do
+				before do
+					gallery_1.destroy
+					gallery_2.reload
+					gallery_3.reload
+				end
+
+				it { gallery_2.position.should eq 1}
+				it { gallery_3.position.should eq 2}
+			end
+		end
 	end
 
 	describe "new" do

data/spec/features/section_pages_spec.rb

@@ -28,7 +28,7 @@ describe "Section pages" do
 
 			before do
 				visit adminpanel.section_path(section)
-				image.file = image.file
+			end
 
 		    it { should have_title(section.name.humanize) }
 		    it { should have_content(section.description) }

data/spec/models/gallery_spec.rb

@@ -15,4 +15,8 @@ describe Adminpanel::Gallery do
 		before {@gallery.file = " "}
 		it {should_not be_valid}
 	end
+
+	describe "default scope" do
+		it { expect(Adminpanel::Gallery.scoped.to_sql).to eq Adminpanel::Gallery.reorder('').order('position ASC').to_sql}
+	end
 end

data/spec/models/section_spec.rb

@@ -3,10 +3,12 @@ require 'spec_helper'
 describe Adminpanel::Section do
 	before do
 		@section = Adminpanel::Section.new(
-			:description => "Test description for product",
+			:name => "Section name",
+			:description => "Test description for index",
 			:has_image => true,
 			:key => "example_key",
-			:has_description => true
+			:has_description => true,
+			:page => "index"
 		)
 	end
 
@@ -17,39 +19,49 @@ describe Adminpanel::Section do
 	it { should respond_to(:key) }
 	it { should respond_to(:name) }
 	it { should respond_to(:has_description) }	
+	it { should respond_to(:page) }	
 
 	describe "when key is telephone and has less than 10 chars" do
-		before {@section.key = "telephone"}
-		before {@section.description = "1" * 9}
-		it {should_not be_valid}
+		before do 
+			@section.key = "telephone"
+			@section.description = "1" * 9
+		end
+		it { @section.valid? eq false}
 	end	
 
 	describe "when key is telephone and has more than 10 chars" do
-		before {@section.key = "telephone"}
-		before {@section.description = "1" * 11}
-		it {should_not be_valid}
+		before do 
+			@section.key = "telephone"
+			@section.description = "1" * 11
+		end
+		it { @section.valid? eq false}
 	end	
 
 	describe "when key is telephone and has 10 chars" do
-		before {
+		before do
 			@section.key = "telephone"
 			@section.description = "1" * 10
-		}
-		it {@section.description.length.should eql(10)}
+		end
+		it { @section.valid? eq true}
+
 	end	
 
 	describe "when key is blank" do
 		before {@section.key = " "}
-		it {should_not be_valid}
+		it { @section.valid? eq false}
 	end	
 
 	describe "when name is blank" do
 		before {@section.name = " "}
-		it {should_not be_valid}
+		it { @section.valid? eq false}
 	end	
 
 	describe "when description is blank" do
 		before {@section.description = " "}
-		it {should_not be_valid}
-	end	
+		it { @section.valid? eq false}
+	end
+
+	describe "default scope" do
+		it { expect(Adminpanel::Section.scoped.to_sql).to eq Adminpanel::Section.reorder('').order('page ASC').to_sql}
+	end
 end

data/spec/spec_helper.rb

@@ -9,6 +9,8 @@ ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require "rspec/rails"
 require "factory_girl"
+require "carrierwave/test/matchers"
+require "active_record"
 
 Dir["./spec/support/**/*.rb"].sort.each {|f| require f}
 

data/spec/support/define_factory_models.rb

@@ -33,4 +33,5 @@ Factory.define :section_with_gallery, :class => Adminpanel::Section do |section|
 	section.has_image true
 	section.has_description false
 	section.name "section_name"
+	section.page "index"
 end

data/spec/support/{active_record.rb → test_database.rb}

@@ -1,5 +1,3 @@
-require "active_record"
-
 ActiveRecord::Migration.create_table :adminpanel_users do |t|
     t.string   :name
     t.string   :email
@@ -15,6 +13,7 @@ ActiveRecord::Migration.create_table :adminpanel_categories do |t|
 end
 ActiveRecord::Migration.create_table :adminpanel_galleries do |t|
     t.string   :file
+    t.integer  :position
     t.datetime :created_at,      :null => false
     t.datetime :updated_at,      :null => false
 end
@@ -38,7 +37,7 @@ ActiveRecord::Migration.create_table :adminpanel_sections do |t|
     t.text     :description
     t.string   :key
     t.boolean  :has_image
-    t.string   :file
+    t.string   :page
     t.datetime :created_at,      :null => false
     t.datetime :updated_at,      :null => false
     t.boolean  :has_description

data/spec/uploaders/gallery_uploader_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'support/active_record'
+require 'support/test_database'
 require 'carrierwave/test/matchers'
 
 describe Adminpanel::GalleryUploader do

data/spec/uploaders/image_uploader_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'support/active_record'
 require 'carrierwave/test/matchers'
 
 describe Adminpanel::ImageUploader do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adminpanel
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jose Ramon Camacho
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-11 00:00:00 Z
+date: 2014-01-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -282,10 +282,13 @@ files:
 - app/views/adminpanel/categories/index.html.erb
 - app/views/adminpanel/categories/new.html.erb
 - app/views/adminpanel/categories/show.html.erb
+- app/views/adminpanel/galleries/_galleries_table.html.erb
 - app/views/adminpanel/galleries/create.html.erb
 - app/views/adminpanel/galleries/delete.html.erb
 - app/views/adminpanel/galleries/edit.html.erb
 - app/views/adminpanel/galleries/index.html.erb
+- app/views/adminpanel/galleries/move_better.js.erb
+- app/views/adminpanel/galleries/move_worst.js.erb
 - app/views/adminpanel/galleries/new.html.erb
 - app/views/adminpanel/galleries/show.html.erb
 - app/views/adminpanel/galleries/update.html.erb
@@ -297,6 +300,7 @@ files:
 - app/views/adminpanel/products/new.html.erb
 - app/views/adminpanel/products/show.html.erb
 - app/views/adminpanel/sections/_image_fields.html.erb
+- app/views/adminpanel/sections/_sections_table.html.erb
 - app/views/adminpanel/sections/create.html.erb
 - app/views/adminpanel/sections/destroy.html.erb
 - app/views/adminpanel/sections/edit.html.erb
@@ -364,9 +368,6 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/uploads/gallery/file/1/hipster.jpg
 - spec/dummy/public/uploads/gallery/file/1/thumb_hipster.jpg
-- spec/dummy/public/uploads/image/file/1/hipster.jpg
-- spec/dummy/public/uploads/image/file/1/portfolio_hipster.jpg
-- spec/dummy/public/uploads/image/file/1/thumb_hipster.jpg
 - spec/dummy/script/rails
 - spec/features/authentication_pages_spec.rb
 - spec/features/categories_pages_spec.rb
@@ -380,11 +381,10 @@ files:
 - spec/models/section_spec.rb
 - spec/models/user_spec.rb
 - spec/spec_helper.rb
-- spec/support/active_record.rb
 - spec/support/define_factory_models.rb
 - spec/support/helper_methods.rb
-- spec/support/schema.rb
 - spec/support/submit_forms_without_button.rb
+- spec/support/test_database.rb
 - spec/uploaders/gallery_uploader_spec.rb
 - spec/uploaders/image_uploader_spec.rb
 homepage: https://github.com/joseramonc/adminpanel
@@ -450,9 +450,6 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/uploads/gallery/file/1/hipster.jpg
 - spec/dummy/public/uploads/gallery/file/1/thumb_hipster.jpg
-- spec/dummy/public/uploads/image/file/1/hipster.jpg
-- spec/dummy/public/uploads/image/file/1/portfolio_hipster.jpg
-- spec/dummy/public/uploads/image/file/1/thumb_hipster.jpg
 - spec/dummy/script/rails
 - spec/features/authentication_pages_spec.rb
 - spec/features/categories_pages_spec.rb
@@ -466,10 +463,9 @@ test_files:
 - spec/models/section_spec.rb
 - spec/models/user_spec.rb
 - spec/spec_helper.rb
-- spec/support/active_record.rb
 - spec/support/define_factory_models.rb
 - spec/support/helper_methods.rb
-- spec/support/schema.rb
 - spec/support/submit_forms_without_button.rb
+- spec/support/test_database.rb
 - spec/uploaders/gallery_uploader_spec.rb
 - spec/uploaders/image_uploader_spec.rb

data/spec/support/schema.rb

@@ -1,64 +0,0 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20131120070259) do
-
-  create_table "adminpanel_users", :force => true do |t|
-    t.string   "name"
-    t.string   "email"
-    t.string   "password_digest"
-    t.string   "remember_token"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-  end
-
-  create_table "adminpanel_categories", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "adminpanel_galleries", :force => true do |t|
-    t.string   "file"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "adminpanel_images", :force => true do |t|
-    t.string   "file"
-    t.integer  "foreign_key"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "model"
-  end
-
-  create_table "adminpanel_products", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "category_id"
-    t.string   "brief"
-  end
-
-  create_table "adminpanel_sections", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.string   "key"
-    t.boolean  "has_image"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-    t.boolean  "has_description"
-  end
-
-end