adminpanel 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 168388f624ff10390b5898a686c29edcd1d772cc
-  data.tar.gz: a1c32d92c2fdff934e5540a1e64fd6a5832c2604
+  metadata.gz: d8786bc62300628c7d87037f3e529408e44b4dd0
+  data.tar.gz: dd2c11295e1b0b9d39f26d72697e05e7b8189a58
 SHA512:
-  metadata.gz: 7f68e76e5a18707a981e7af28fa11bb3636ddaa166d1d46f97e38855f21a63d579e64405193b8a42473d5dff936dd42cca7d1bb7fa1fa1056cc56094436bb775
-  data.tar.gz: 39eb19f7bcbeabae03e8ed6b9727d76b347a0a2c51608756fd60ff36fa7f82520883f51983b6d8712c87ca6d04a08054aed5b3b2d2a1ef63d6282952d9c0502f
+  metadata.gz: 9c8a839e94618e65d911c6f8e4bd9667138660e46c78a746a670d54404f766d387d9ec13ff0e60d912f150fdbe2377e67cfd6bceead9395cd79f76994c83a312
+  data.tar.gz: 1b2e8b33ebef3b4b535ca73df2c8067e02c0a42de5d919f55d4510a85d521e37abe657e097424434a1a400afc0dddfe32770e14520da84eccc127636cb66c9d9

data/.travis.yml

@@ -1,7 +1,4 @@
 language: ruby
-before_install:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
 rvm:
   - 2.1.1
 env:

data/Gemfile

@@ -21,13 +21,13 @@ group :assets do
 	gem 'sass-rails', '>= 4.0.3', require: true
 end
 
+gem 'minitest'
 group :development, :test do
-	gem 'selenium-webdriver', '2.42.0'
-	gem 'capybara-webkit', '1.1.1'
-	gem 'factory_girl_rails', '~> 4.4.1'
-	gem 'rspec', '~> 2.14.1'
-	gem 'rspec-rails', '~> 2.14.2'
 	gem 'sqlite3', '>= 1.3.9', '<= 2.0.0', :platform => [:ruby, :mswin, :mingw]
-	gem 'capybara', '>= 2.1.0', '<= 3.0.0'
-	gem 'ammeter', '~> 1.0.0'
+	gem 'minitest-emoji'
+	gem 'minitest-capybara'
+	gem 'mocha'
+	gem 'poltergeist'
+  gem 'parallel_tests'
+	# gem 'minitest-debugger'
 end

data/Rakefile

@@ -1,4 +1,20 @@
-require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new
-task :default => :spec
+require 'rake/testtask'
+require 'rubygems/package_task'
+
+task :default => :test
+
+Rake::TestTask.new do |t|
+  # t.libs.delete 'lib'
+  # t.libs = ['test', 'app']
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.warning = false
+end
+
+# namespace :test do
+#   task :isolated do
+#     Dir.glob("test/**/*_test.rb").all? do |file|
+#       sh(Gem.ruby, '-w', '-Ilib:test', file)
+#     end or raise "Failures"
+#   end
+# end

data/adminpanel.gemspec

@@ -36,11 +36,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'koala', '>= 1.9.0', '<= 2.0.0'
 
   spec.add_development_dependency 'sqlite3', '>= 1.3.9', '<= 2.0.0'
-  spec.add_development_dependency 'factory_girl_rails', '>= 4.4.1', '<= 5.0.0'
-  spec.add_development_dependency 'rspec', '>= 2.14.1', ' <= 3.0.0'
-  spec.add_development_dependency 'rspec-rails', '>= 2.14.1', '<= 3.0.0'
-  spec.add_development_dependency 'capybara', '>= 2.1.0', '<= 3.0.0'
-  spec.add_development_dependency 'ammeter', '1.0.0'
-  spec.add_development_dependency 'selenium-webdriver', '2.42.0'
-  spec.add_development_dependency 'capybara-webkit', '1.1.1'
+  spec.add_dependency 'minitest'
+  spec.add_development_dependency 'minitest-emoji'
+  spec.add_development_dependency 'minitest-capybara'
+  spec.add_development_dependency 'mocha'
+  spec.add_development_dependency 'minitest-metadata'
+  spec.add_development_dependency 'poltergeist'
+  # spec.add_development_dependency 'minitest-debugger'
 end

data/app/controllers/adminpanel/categories_controller.rb

@@ -18,11 +18,7 @@ module Adminpanel
 
 
     def create
-      params.merge({:model_name => params[:model_name]}) if params[:model_name].present?
-      params.merge({:model => params[:model]}) if params[:model].present?
-      params.merge({:currentcontroller => params[:currentcontroller]}) if params[:currentcontroller].present?
-      params.merge({:belongs_request => params[:belongs_request]}) if params[:belongs_request].present?
-
+      merge_params
       create! do |success, failure|
         success.html do
           flash[:success] = I18n.t("action.save_success")

data/app/controllers/adminpanel/galleries_controller.rb

@@ -27,29 +27,13 @@ module Adminpanel
     def move_better
       @gallery = Gallery.find(params[:id])
       @gallery.move_to_better_position
-      respond_to do |format|
-        format.html do
-          redirect_to galleries_path
-        end
-        format.js do
-          @galleries = Gallery.all
-          render :locals => { :galleries => @galleries }
-        end
-      end
+      respond
     end
 
     def move_worst
       @gallery = Gallery.find(params[:id])
       @gallery.move_to_worst_position
-      respond_to do |format|
-        format.html do
-          redirect_to galleries_path
-        end
-        format.js do
-          @galleries = Gallery.all
-          render :locals => { :galleries => @galleries }
-        end
-      end
+      respond
     end
 
     def destroy
@@ -75,7 +59,18 @@ module Adminpanel
     private
     def gallery_params
       params.require(:gallery).permit(:file)
+    end
 
+    def respond
+      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
   end
 end

data/app/controllers/concerns/adminpanel/facebook_actions.rb

@@ -1,10 +1,9 @@
 module Adminpanel
   module FacebookActions
     extend ActiveSupport::Concern
-    include ActionView::Helpers::TextHelper
 
     included do
-      before_filter :set_auths_count, only:[:index, :show, :destroy]
+      before_filter :set_auths_count
     end
 
     def fb_choose_page
@@ -17,36 +16,28 @@ module Adminpanel
           id: resource,
           host: request.host
         })
-      ).get_access_token(params[:code]) if params[:code]
+      ).get_access_token(params[:code])
       user = Koala::Facebook::API.new(access_token)
       @pages = user.get_connections('me', 'accounts')
       user_object = user.get_object('me')
       @name = user_object['name']
-      user_hash = { 'name' => @name, 'access_token' => access_token }
-      @pages << user_hash # to permit post on own profile
+      @pages << { 'name' => @name, 'access_token' => access_token } # to permit posts on own wall
       render 'shared/fb_choose_page'
     end
 
     def fb_save_token
-      page_selected = Koala::Facebook::API.new(params[@model.name.demodulize.downcase][:fb_page_access_key])
-      @auths = Auth.where(key: 'facebook', name: page_selected.get_object('me')['name'])
-      if @auths.count == 0
-        Auth.create(
-          key: 'facebook',
-          name: page_selected.get_object('me')['name'],
-          value: params[@model.name.demodulize.downcase][:fb_page_access_key]
-        )
-      else
-        @auths.first.update_attribute(:value, params[@mode.name.demodulize.downcase][:fb_page_access_key])
-      end
-      flash[:success] = I18n.t('fb.saved-token')
+      page_selected = Koala::Facebook::API.new(
+        params[model_name][:fb_page_access_key]
+      )
+      update_facebook_auth(page_selected.get_object('me')['name'])
+      flash[:success] = I18n.t('fb.saved_token')
       redirect_to resource
     end
 
     def fb_publish
       page_graph = Koala::Facebook::API.new(Auth.find_by_key('facebook').value)
       page_graph.put_wall_post(
-        strip_tags(params[@model.name.demodulize.downcase][:fb_message]),
+        params[model_name][:fb_message],
         {
           link: resource.fb_link,
           name: resource.name
@@ -60,5 +51,22 @@ module Adminpanel
     def set_auths_count
       @fb_auths_count = Auth.where(key: 'facebook').count
     end
+
+    def update_facebook_auth(account_selected_name)
+      auths = Auth.where(key: 'facebook', name: account_selected_name)
+      if auths.count == 0
+        Auth.create(
+          key: 'facebook',
+          name: account_selected_name,
+          value: params[model_name][:fb_page_access_key]
+        )
+      else
+        auths.first.update_attribute(:value, params[model_name][:fb_page_access_key])
+      end
+    end
+
+    def model_name
+      @model.name.demodulize.downcase # ex: posts
+    end
   end
 end

data/app/controllers/concerns/adminpanel/rest_actions.rb

@@ -22,9 +22,7 @@ module Adminpanel
     end
 
     def create
-      params.merge({:model => params[:model]}) if params[:model].present?
-      params.merge({:model_name => params[:model_name]}) if params[:model_name].present?
-      params.merge({:belongs_request => params[:belongs_request]}) if params[:belongs_request].present?
+      merge_params
       create! do |success, failure|
         success.html do
           flash[:success] = I18n.t('action.save_success')
@@ -104,5 +102,12 @@ module Adminpanel
         @collections.merge!({"#{class_variable}" => class_variable.all})
       end
     end
+
+    def merge_params
+      params.merge({:model => params[:model]}) if params[:model].present?
+      params.merge({:model_name => params[:model_name]}) if params[:model_name].present?
+      params.merge({:belongs_request => params[:belongs_request]}) if params[:belongs_request].present?
+      params.merge({:currentcontroller => params[:currentcontroller]}) if params[:currentcontroller].present?
+    end
   end
 end

data/app/helpers/adminpanel/router_helper.rb

@@ -8,6 +8,10 @@ module Adminpanel
       resource_class(resource).routes_options
     end
 
+    def has_fb_share?(resource)
+      resource_class(resource).fb_share?
+    end
+
     def rest_path_names
       {
         path_names: {

data/app/models/adminpanel/section.rb

@@ -10,7 +10,7 @@ module Adminpanel
 				minimum: 10,
 				maximum: 10,
 				on: :update,
-				if: :is_invalid_phone?,
+				if: :is_a_phone?,
 				message: I18n.t('activerecord.errors.messages.not_phone')
 	  validates_presence_of :description,
 				minimum: 9,
@@ -19,7 +19,7 @@ module Adminpanel
 	  validates :description,
 				numericality: { only_integer: true },
 				on: :update,
-				if: :is_invalid_phone?
+				if: :is_a_phone?
 	  validates_presence_of :key
 	  validates_presence_of :name
 	  validates_presence_of :page
@@ -54,7 +54,7 @@ module Adminpanel
 		end
 
 		def description
-			if self.has_description
+			if self.has_description && !self.attributes['description'].nil?
 				return self.attributes['description'].html_safe
 			else
 				return self.attributes['description']
@@ -62,7 +62,7 @@ module Adminpanel
 		end
 
 		private
-		def is_invalid_phone?
+		def is_a_phone?
 			key == 'phone' && description != ''
 		end
 	end

data/app/views/adminpanel/sessions/new.html.erb

@@ -20,7 +20,7 @@
 					<%= f.password_field :password, :class => "btn-block", :id => "inputPassword", :placeholder => t("session.password") %>
 				</div>
 			</div>
-			<%= f.submit "Iniciar Sesión", :class => "btn pull-right", :id => "signin-button" %>
+			<%= f.submit I18n.t('authentication.new-session'), :class => "btn pull-right", :id => "signin-button" %>
 		<% end %>
 	</div>
 </div>

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

@@ -21,9 +21,31 @@
         <ul class="pull-right">
           <li>
             <% if signed_in? %>
-              <%= link_to content_tag('i', nil, :class => 'fa fa-power-off') + ' Logout', signout_path, :method => "delete", :escape => true %>
+              <%=
+              link_to(
+                content_tag(
+                  'i',
+                  nil,
+                  class: 'fa fa-power-off'
+                  ) + " #{I18n.t('authentication.logout')}",
+                signout_path,
+                method: :delete,
+                escape: true,
+                id: 'signout-button'
+              )
+              %>
             <% else %>
-              <%= link_to content_tag('i', nil, :class => 'fa fa-power-off') + ' Login', signin_path, :escape => true %>
+              <%=
+              link_to(
+                content_tag(
+                  'i',
+                  nil,
+                  class: 'fa fa-power-off'
+                  ) + " #{I18n.t('authentication.login')}",
+                signin_path,
+                escape: true
+              )
+              %>
             <% end %>
           </li>
         </ul>

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

@@ -7,9 +7,8 @@
 		<%= 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 "adminpanel/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/app/views/shared/fb_choose_page.html.erb

@@ -29,7 +29,7 @@
           <%= f.select(
             :fb_page_access_key,
             options_for_select(@pages.map{ |p| [ p['name'], p['access_token'] ] }),
-            { 'label' => I18n.t('fb.page-select') }
+            { 'label' => I18n.t('fb.page_select') }
           )
           %>
 
@@ -37,9 +37,9 @@
     </div>
     <div class = "widget-footer">
       <%=
-      f.submit t('action.add') + " " + @model.display_name,
+      f.submit t('fb.confirm_page'),
         data: {:disable_with => t("action.submitting")},
-        :id =>"new-#{@model.name.demodulize}-button"
+        :id =>"save-fb-page-button"
       %>
     </div>
   <% end -%>

data/app/views/shared/new.html.erb

@@ -1,40 +1,41 @@
 <% provide(:page_title, t("action.create") + " #{@model.display_name.capitalize}") -%>
-<% breadcrumb_add(
+<%
+  breadcrumb_add(
   @model.display_name.capitalize.pluralize(I18n.default_locale),
     {
       :controller => params[:controller],
       :action => "index"
     }
-  ) %>
-
+  )
+%>
 <div class="row-fluid">
   <div class = "widget widget-padding span12">
     <div class = "widget-header">
       <%= content_tag(:i, nil, :class => "fa fa-#{@model.icon}") %>
       <h5><%= t("action.create") + " " + @model.display_name %></h5>
     </div>
-    <div class = "widget-body">
-      <div class = "widget-forms clearfix">
+    <%=
+    adminpanel_form_for(
+      resource,
+      :html => {
+        :class => 'form-horizontal',
+        :id => 'new_resource'
+      }
+    ) do |f| -%>
+      <div class = "widget-body">
+        <div class = "widget-forms clearfix">
+            <%= render 'shared/error_messages', :object => resource %>
+            <%= render 'shared/form_fields', :f => f %>
+        </div>
+      </div>
+      <div class = "widget-footer">
         <%=
-        adminpanel_form_for(
-          resource,
-          :html => {
-            :class => 'form-horizontal',
-            :id => 'new_resource'
-          }
-        ) do |f| -%>
-          <%= render 'shared/error_messages', :object => resource %>
-          <%= render 'shared/form_fields', :f => f %>
+        f.submit t('action.add') + " " + @model.display_name,
+          data: {:disable_with => t("action.submitting")},
+          :id =>"new-#{@model.name.demodulize}-button"
+        %>
       </div>
-    </div>
-    <div class = "widget-footer">
-      <%=
-      f.submit t('action.add') + " " + @model.display_name,
-        data: {:disable_with => t("action.submitting")},
-        :id =>"new-#{@model.name.demodulize}-button"
-      %>
-    </div>
-      <% end -%>
+    <% end -%>
   </div>
 </div>
 <%= render 'shared/modal' %>

data/config/locales/es.yml

@@ -53,6 +53,7 @@ es:
     submitting: 'Enviando...'
     save: 'Guardar'
     save_success: 'Se ha guardado con éxito'
+    save_account: 'Seleccionar cuenta'
     update: 'Actualizar'
     view: 'Ver'
     is_true: 'Sí'
@@ -61,7 +62,10 @@ es:
     welcome: 'Bienvenido! Inicia Sesión'
     signin_error: 'Correo y/o Contraseña incorrecta.'
     signin_success: 'Bienvenido!'
+    new-session: 'Iniciar Sesión'
     not_authorized: 'No tienes permisos para acceder'
+    logout: 'Logout'
+    login: 'Log in'
   gallery:
     container: 'Imágenes'
     new: 'Agregar Imagen'
@@ -95,8 +99,9 @@ es:
     signin: 'iniciar-sesion'
   fb:
     posted: 'Publicado en el muro de %{user}'
-    not-posted: 'Hubo un error, no fue publicado en ningún muro, por favor intenta otra vez.'
+    confirm_page: 'Seleccionar Cuenta'
+    # not-posted: 'Hubo un error, no fue publicado en ningún muro, por favor intenta otra vez.'
     pages: 'Publiar como %{name}'
-    page-select: 'Selecciona una cuenta para la publicación'
+    page_select: 'Selecciona una cuenta para la publicación'
     message: 'Mensaje de la publicación'
-    saved-token: 'Se guardó el token de Facebook con éxito, ya puede publicar con la cuenta de Facebook'
+    saved_token: 'Log in con Facebook exitoso, ya puedes publicar con la cuenta de Facebook'