adminpanel 1.2.8 → 1.2.9

data/Gemfile

@@ -23,5 +23,5 @@ group :test do
 	gem "capybara", "~> 1.1.4"
 	gem "nokogiri", "~> 1.5.9"
 	gem "rubyzip", "~> 0.9.9"
-	gem "genspec", "~> 0.2.8"
+	gem "ammeter", "~> 0.2.9"
 end

data/adminpanel.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "activerecord", "~> 3.2.12"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", '10.1.1'
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "factory_girl", "2.6.4"
   spec.add_development_dependency "rspec", "~> 2.14.0"
@@ -38,5 +38,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "capybara", "1.1.4"
   spec.add_development_dependency "nokogiri", "1.5.9"
   spec.add_development_dependency "rubyzip", "0.9.9"
-  spec.add_development_dependency "genspec", "0.2.8"
+  spec.add_development_dependency "ammeter", "0.2.9"
 end

data/app/controllers/adminpanel/{pages_controller.rb → analytics_controller.rb}

@@ -1,6 +1,6 @@
 module Adminpanel
-    class PagesController < Adminpanel::ApplicationController
-		
+    class AnalyticsController < Adminpanel::ApplicationController
+
 		skip_before_filter :set_model
 
 		API_VERSION = 'v3'
@@ -46,13 +46,13 @@ module Adminpanel
 				startDate = DateTime.now.prev_month.strftime("%Y-%m-%d")
 				endDate = DateTime.now.strftime("%Y-%m-%d")
 
-				@visitCount = client.execute(:api_method => analytics.data.ga.get, :parameters => { 
-				  'ids' => "ga:" + profileID, 
+				@visitCount = client.execute(:api_method => analytics.data.ga.get, :parameters => {
+				  'ids' => "ga:" + profileID,
 				  'start-date' => startDate,
 				  'end-date' => endDate,
 				  'dimensions' => "ga:day,ga:month",
 				  'metrics' => "ga:visits",
-				  'sort' => "ga:month,ga:day" 
+				  'sort' => "ga:month,ga:day"
 				})
 
 				@visits = @visitCount.data.rows.collect do |r|
@@ -60,7 +60,12 @@ module Adminpanel
 				end
 
 				@visitDates = @visitCount.data.rows.collect { |r| "#{r[0]}/#{r[1]}" }
+
 			end
+      respond_to do |format|
+        format.html
+        format.json {render :json => {:visit_count => @visitCount, :visits => @visits, :visit_dates => @visitDates }}
+      end
 		end
 	end
-end
+end

data/app/controllers/adminpanel/application_controller.rb

@@ -6,11 +6,10 @@ module Adminpanel
 
         include SessionsHelper
         include RestActionsHelper
-        include RouterHelper
 
         layout "admin"
 
-        before_filter :signed_in_user, :set_model, :get_menu_elements
+        before_filter :signed_in_user, :set_model
 
 
         def signed_in_user
@@ -26,8 +25,8 @@ module Adminpanel
             super
         end
 
-        def get_menu_elements
-            @menu_items = menu_items
-        end
+        # def get_menu_elements
+        #     @menu_items = menu_items
+        # end
     end
-end
+end

data/app/controllers/adminpanel/galleries_controller.rb

@@ -8,9 +8,9 @@ module Adminpanel
       @gallery = Gallery.find(params[:id])
     end
 
-    def edit
-      @gallery = Gallery.find(params[:id])
-    end
+    # def edit
+    #   @gallery = Gallery.find(params[:id])
+    # end
 
     def create
       @gallery = Gallery.new(params[:gallery])
@@ -29,15 +29,15 @@ module Adminpanel
       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
+      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
@@ -47,15 +47,15 @@ module Adminpanel
       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
+      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
@@ -74,8 +74,8 @@ module Adminpanel
       end
     end
 
-    def new
-      @gallery = Gallery.new
-    end
+    # def new
+    #   @gallery = Gallery.new
+    # end
   end
-end
+end

data/app/controllers/adminpanel/sections_controller.rb

@@ -16,6 +16,10 @@ module Adminpanel
 
     def edit
       @section = Section.find(params[:id])
+      respond_to do |format|
+        format.html
+        format.json {render :json => {:section => @section }}
+      end
     end
 
     def update
@@ -43,4 +47,4 @@ module Adminpanel
       @sections = Section.all
     end
   end
-end
+end

data/app/controllers/adminpanel/sessions_controller.rb

@@ -5,16 +5,20 @@ module Adminpanel
 		skip_before_filter :signed_in_user, :set_model
 
 		def new
+			respond_to do |format|
+				format.html
+				format.json { render :json => {:session => @session }}
+			end
 		end
 
 		def create
 			user = User.find_by_email(params[:session][:email].downcase)
 			if user && user.authenticate(params[:session][:password])
 					sign_in user
-					flash[:success] = t("authentication.signin success")
+					flash[:success] = I18n.t("authentication.signin success")
 					redirect_to root_url
 			else
-				flash.now[:error] = t("authentication.signin error")
+				flash.now[:error] = I18n.t("authentication.signin error")
 				render 'new'
 			end
 		end
@@ -24,4 +28,4 @@ module Adminpanel
 			redirect_to signin_path
 		end
 	end
-end
+end

data/app/helpers/adminpanel/application_helper.rb

@@ -21,8 +21,8 @@ module Adminpanel
 			end
 		end
 
-		def is_current_section?(controller_name)
-			"adminpanel/#{controller_name.downcase.pluralize}".include?(params[:controller]) ? 'active' : nil
+		def is_current_section?(display_name)
+			display_name == params[:controller].classify.constantize.display_name ? 'active' : nil
 		end
 
 		def section_is_login(section_name)
@@ -42,7 +42,11 @@ module Adminpanel
 		end
 
 		def route_symbol(model_name)
-			model_name.downcase.pluralize.downcase
+			model_name.pluralize.downcase
+		end
+
+		def symbol_class(symbol)
+			"adminpanel/#{symbol.to_s}".classify.constantize
 		end
 
 		def main_root_path

data/app/helpers/adminpanel/rest_actions_helper.rb

@@ -60,6 +60,26 @@ module Adminpanel
 			end
 		end
 
+		def move_better
+			respond_to do |format|
+				format.js do
+					resource = @model.find(params[:id])
+					resource.move_to_better_position
+					render 'shared/gallery_entries', :locals => { :collection => @model.where(@model.relation_field.to_sym => resource.send(@model.relation_field)) }
+				end
+			end
+		end
+
+		def move_worst
+			respond_to do |format|
+				format.js do
+					resource = @model.find(params[:id])
+					resource.move_to_worst_position
+					render 'shared/gallery_entries', :locals => { :collection => @model.where(@model.relation_field.to_sym => resource.send(@model.relation_field)) }
+				end
+			end
+		end
+
 	private
 
 		def set_collections

data/app/helpers/adminpanel/router_helper.rb

@@ -1,37 +1,7 @@
 module Adminpanel
   module RouterHelper
-    def adminpanel_resources
-      @files ||= find_resources
-    end
-
-    def find_resources
-      resources_path
-      if File.directory?(resources_path)
-        files = Dir.entries(resources_path).collect do |f|
-          unless default_controllers.include?(f)
-            file_path = "#{resources_path}#{f}"
-            File.file?(file_path) ? file_path.sub!(resources_path, '').sub!('_controller.rb', '') : nil
-          end
-        end
-
-        files.compact!
-      end
-    end
-
-    def menu_items
-      @menu ||= adminpanel_resources.each.collect { |resource| resource.classify }
-    end
-
-    def default_controllers
-      ["application_controller.rb", "sessions_controller.rb", "galleries_controller.rb", "users_controller.rb", "sections_controller.rb", "pages_controller.rb"]
-    end
-
-    def resources_path
-      route = "#{Rails.root.to_s}/app/controllers/adminpanel/"
-      if !File.directory?(route)
-        Dir.mkdir(route)
-      end
-      route
+    def acts_as_a_gallery?(resource)
+      "adminpanel/#{resource}_controller".classify.constantize.resource_class.act_as_a_gallery?
     end
   end
 end

data/app/helpers/adminpanel/shared_pages_helper.rb

@@ -2,14 +2,14 @@ module Adminpanel
 	module SharedPagesHelper
 		def parent_object_name(resource, parent_model)
 			@model.reflect_on_all_associations.each do |association|
-                if association.klass.to_s == parent_model
-                	if !resource.send(association.name).nil?
-                		return resource.send(association.name).name
-                	else
-                		return "N/A"
-                	end
-	            end
-	        end
+        if association.klass.to_s == parent_model
+        	if !resource.send(association.name).nil?
+        		return resource.send(association.name).name
+        	else
+        		return "N/A"
+        	end
+        end
+      end
 		end
 
 		def pluralize_model(class_name)

data/app/models/adminpanel/analytic.rb

@@ -0,0 +1,12 @@
+module Adminpanel
+  class Analytic #< ActiveRecord::Base
+
+    def self.display_name
+      "Google Analytics"
+    end
+
+    def self.icon
+      'icon-dashboard'
+    end
+  end
+end

data/app/models/adminpanel/gallery.rb

@@ -6,43 +6,43 @@ module Adminpanel
 
 	  mount_uploader :file, Adminpanel::GalleryUploader
 	  validates_presence_of :file
-	  before_create :set_position
-	  before_destroy :rearrange_positions
 
+		act_as_a_gallery
 
-	  default_scope { order("position ASC")}
-
+		def move_to_better_position
+			if self.position > 1
+				conflicting_gallery = Gallery.find_by_position(position - 1)
+				self.update_attribute(:position, self.position - 1)
+				conflicting_gallery.update_attribute(
+					:position, conflicting_gallery.position + 1
+					)
+				true
+			else
+				false
+			end
+		end
 
-	  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 = self.class.count
+			if self.position < records
+				conflicting_gallery = Gallery.find_by_position(position + 1)
+				update_attribute(:position, self.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
 
 		def self.form_attributes
 			[
-				{'file' => { 'name' => 'Archivo' }}
+				{'file' => {
+					'type' => 'file_field',
+					'name' => 'Archivo' }
+				}
 			]
 		end
 
@@ -50,22 +50,27 @@ module Adminpanel
 			"Galería"
 		end
 
-  	private
-  		def rearrange_positions
-  			unarranged_galleries = Gallery.where("position > ?", position)
-  			unarranged_galleries.each do |gallery|
-  				gallery.update_attribute(:position, gallery.position - 1)
-  			end
+		def self.icon
+			'icon-picture'
+		end
 
-  		end
+	private
+		def rearrange_positions
+			unarranged_galleries = Gallery.where("position > ?", self.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
+			last_record = Gallery.last
+			if last_record.nil?
+				self.position = 1
+			else
+				self.position = last_record.position + 1
+			end
 		end
+
 	end
 end