adminpanel 2.2.5 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef8cb9f6809d31d1fd29fed4bb1300d2b01600d
-  data.tar.gz: 6a4ea45adde1810ffa6ec51960d9675ccff39849
+  metadata.gz: 123fbcbcae72b11036670a7b18cfb0c3d440f087
+  data.tar.gz: c359b05e6b9ede282d438bbec3b62f66f7ac33a6
 SHA512:
-  metadata.gz: a33b1b19df8be2773865076cf9a22b8a088b1fb4099034bfc93df43fd240a03415b850b67691cb003f5ff4e10429c10358613ae581ca38667d94748c6c8971bf
-  data.tar.gz: 00cca2fde41ea57b358ad35fd9af24f0c2010053b4e0ab1c3e3ac9a83d9df0313164473e828f5e033cbb4b1df2f3a05db8383f2b63a5ed7de426a962dd251603
+  metadata.gz: 68a5c8063b763d66909ff3c7b2afc375eae0a5af9c7d5434a43a01b5a024b2fa2d49cc79696a2096cfc162babe59381464bb999acafa893731e39615f3eaadd4
+  data.tar.gz: 870f5a836d674083e4ca78b6fcdf09263f861ab22a7af6ad58fe743ca3bd34f803257d2e42bfb2c6872d8ed6cc9fff9506a8afcd40b9d0c13da9cb5ff8a98d28

data/.travis.yml

@@ -8,8 +8,4 @@ sudo: false
 cache: bundler
 
 env:
-  - RAILS=4.0.8
-  - RAILS=4.1.1
-  - RAILS=4.1.2
-  - RAILS=4.1.3
-  - RAILS=4.1.4
+  - RAILS=4.2.0.rc3

data/CONTRIBUTING.md

@@ -0,0 +1,22 @@
+Consider starting the commit message with an applicable emoji:
+
+* :lipstick: `:lipstick:` when improving the format/structure of the code
+* :racehorse:`:racehorse:` when improving performance
+* :memo:`:memo:` when writing docs
+* :bug:`:bug:` when fixing a bug
+* :fire:`:fire:` when removing code or files
+* :green_heart:`:green_heart:` when fixing the CI build
+* :white_check_mark:`:white_check_mark:` when adding tests
+
+Favor single quotes when not concatenating, double quotes are prefered when concatenating, escaping characters or using a single quote in the string:
+
+Single Quotes:
+`puts 'hello world'`
+Double Quotes:
+```
+h = 'hello'
+w = 'world'
+puts "#{h}, #{w}"
+puts "\n hi"
+puts "it's 6 am"
+```

data/Gemfile

@@ -1,8 +1,3 @@
 source 'https://rubygems.org'
 
-gemspec :development_group => :test
-
-group :assets do
-  gem 'sass-rails', '~> 4.0'
-  gem 'coffee-rails', '~> 4.0.1'
-end
+gemspec development_group: :test

data/README.md

@@ -1,6 +1,6 @@
 # [![CoDN](http://cl.ly/image/130Q0E153d2G/codn180.png)](http://www.codn.mx "CoDN") Adminpanel
 
-CMS for Rails 4, for rails 3.x check the corresponding branch.
+Thank you for considering this gem, we are going to use the lastest Rails version of Rails. make sure you can use it before trying this gem out.
 
 [![Gem Version](https://badge.fury.io/rb/adminpanel.svg)](http://badge.fury.io/rb/adminpanel)
 [![Build Status](https://travis-ci.org/joseramonc/adminpanel.svg?branch=master)](https://travis-ci.org/joseramonc/adminpanel)
@@ -20,7 +20,7 @@ And then execute:
 
 In you application.rb
 
-    config.default_locale = :es # or :en
+    config.i18n.default_locale = :es # or :en
 
 no other language is currently supported, but pull requests are welcome.
 
@@ -28,7 +28,7 @@ Then run:
 
     rails g adminpanel:initialize
     rake db:migrate
-to create the database that the adminpanel it's expecting, this will also seed the database with the default user.
+to create the database that the adminpanel it's expecting, this will also seed the database with the default user (email: 'admin@admin.com', password: 'password').
 
 Make sure you read the wiki, there is the descriptions of every relevant part of the gem.
 
@@ -38,16 +38,11 @@ You can seed the sections with help of the [Section task.](https://github.com/jo
 
 Then, mount the gem wherever you like!
 
-    mount Adminpanel::Engine => "/codn"
-
-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']
-Feel free to use it, any doubts, errors or suggestions are welcome in the issues!
+    mount Adminpanel::Engine => '/panel'
 
 ## Dependencies
 
-Please make sure that you have (rmagick) ImageMagick -v 2.13.2 installed before trying to use the gem.
+Please make sure that you have ImageMagick -v 2.13.2 installed before trying to use the gem.
 
 ## Integrated APIs
 
@@ -55,6 +50,8 @@ Currently the integrations working are:
 
 * [Google Analytics Service](https://github.com/joseramonc/adminpanel/wiki/include-Google-Analytics)
 * [Facebook Share Link to Wall](https://github.com/joseramonc/adminpanel/wiki/include-Adminpanel::Facebook)
+* [Twitter API](https://github.com/joseramonc/adminpanel/wiki/include-Adminpanel::Twitter)
+* [Instagram API](https://github.com/joseramonc/adminpanel/wiki/include-Adminpanel::Instagram)
 
 ## Contributing
 
@@ -64,6 +61,4 @@ Currently the integrations working are:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-## To Do:
-
-#### Check the issues if you'd like to help or request a new feature.
+Any questions, errors or feature suggestions [are welcome in the issues](https://github.com/joseramonc/adminpanel/issues/new)

data/Rakefile

@@ -1,11 +1,9 @@
-require 'rake/testtask'
-require 'rubygems/package_task'
+require "rake/testtask"
+require "rubygems/package_task"
 
-task :default => :test
+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
@@ -15,7 +13,7 @@ end
 namespace :test do
   task :isolated do
     Dir.glob("test/**/*_test.rb").all? do |file|
-      sh(Gem.ruby, '-w', '-Ilib:test', file)
+      sh(Gem.ruby, "-w", "-Ilib:test", file)
     end or raise "Failures"
   end
 end

data/adminpanel.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Adminpanel::VERSION
   spec.authors       = ['Jose Ramon Camacho', 'Victor Camacho']
   spec.email         = ['info@codn.mx']
-  spec.description   = %q{Gem that makes the CMS for a site a breeze while beings very configurable!,
+  spec.description   = %q{Gem that focus on making a public site's resources very quickly while being very configurable!,
     supports facebook sharing, twitter, instagram and google analytics integration}
   spec.summary       = %q{Made with <3 by CoDN}
   spec.homepage      = 'https://github.com/joseramonc/adminpanel'
@@ -21,30 +21,35 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.requirements  << 'rmagick, -v 2.13.2'
-
-  spec.add_runtime_dependency 'rails',                '>= 4.0.0','<= 4.1.4'
-  spec.add_runtime_dependency 'rmagick',              '2.13.2'
-  spec.add_runtime_dependency 'bcrypt',               '~> 3.1',  '>= 3.1.7'
-  spec.add_runtime_dependency 'carrierwave',          '~> 0.10', '>= 0.10.0'
-  spec.add_runtime_dependency 'rails-i18n',           '~> 4.0'
-  spec.add_runtime_dependency 'inherited_resources',  '~> 1.5'
-  spec.add_runtime_dependency 'cancancan',            '~> 1.8'
-  spec.add_runtime_dependency 'google-api-client',    '0.7.1'
-  spec.add_runtime_dependency 'faker',                '~> 1.3',   '>= 1.3.0'
-  spec.add_runtime_dependency 'font-awesome-rails',   '~> 4.1',   '>= 4.1.0'
-  spec.add_runtime_dependency 'koala',                '1.9.0'
-  spec.add_runtime_dependency 'twitter',              '5.11.0'
-  spec.add_runtime_dependency 'omniauth-twitter',     '1.0.1'
-  spec.add_runtime_dependency 'instagram',            '1.1.1'
-
-  spec.add_development_dependency 'jquery-rails',     '~> 3.0.0', '>= 3.0.0'
-  spec.add_development_dependency 'turbolinks',       '~> 2.2.2', '>= 2.2.2'
-
-  spec.add_development_dependency 'sqlite3',          '~> 1.3',   '1.3.9'
-  spec.add_development_dependency 'minitest',         '5.3.5'
+  spec.requirements  << 'imagemagick installed'
+
+  spec.add_runtime_dependency 'rails',       '>= 4.2.0', '< 5.0.0'
+  spec.add_runtime_dependency 'mini_magick', '4.0.1'
+  spec.add_runtime_dependency 'bcrypt',      '~> 3.1',   '>= 3.1.7'
+  spec.add_runtime_dependency 'carrierwave', '~> 0.10',  '>= 0.10.0'
+  spec.add_runtime_dependency 'cancancan',   '~> 1.9.2', '>= 1.9.2'
+
+  # Implemented APIs
+  spec.add_runtime_dependency 'google-api-client', '0.7.1'  # Google analytics
+  spec.add_runtime_dependency 'koala',             '1.10.1' # Facebook
+  spec.add_runtime_dependency 'twitter',           '5.13.0' # Twitter
+  spec.add_runtime_dependency 'omniauth-twitter',  '1.1.0'  # login Twitter
+  spec.add_runtime_dependency 'instagram',         '1.1.3'  # Instagram
+
+  # Asset dependencies
+  spec.add_runtime_dependency 'font-awesome-rails', '~> 4.2',   '>= 4.2.0'
+  spec.add_runtime_dependency 'sass-rails',         '~> 5.0.0', '>= 5.0.0'
+  spec.add_runtime_dependency 'coffee-rails',       '~> 4.1.0', '>= 4.1.0'
+  spec.add_runtime_dependency 'jquery-rails',       '3.1.2'
+  spec.add_runtime_dependency 'turbolinks',         '~> 2.5.0', '>= 2.5.2'
+
+  # Development dependencies
+  spec.add_runtime_dependency 'faker', '~> 1.3',   '>= 1.3.0'
+
+  # Test dependencies
+  spec.add_development_dependency 'sqlite3',          '~> 1.3',   '1.3.10'
+  spec.add_development_dependency 'minitest',         '>= 5.4.0', '<= 6.0.0'
   spec.add_development_dependency 'minitest-emoji',   '2.0.0'
   spec.add_development_dependency 'minitest-capybara','~> 0.7',   '>= 0.7.1'
-  # spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'poltergeist',      '~> 1.5',   '>= 1.5.1'
 end

data/app/assets/javascripts/{application-admin.js → adminpanel/application.js}

@@ -14,5 +14,6 @@
 //= require jquery_ujs
 //= require turbolinks
 //= require adminpanel/bootstrap
-//= require_tree ./adminpanel/.
+//= require_tree .
 Turbolinks.enableTransitionCache();
+Turbolinks.enableProgressBar();

data/app/assets/javascripts/adminpanel/images_form_add_remove_fields.js.coffee

@@ -0,0 +1,11 @@
+$(document).on 'click', '.add-fields', (e) ->
+  e.preventDefault()
+
+  time = new Date().getTime()
+  regexp = new RegExp($(@).data('id'), 'g')
+  $(@).before($(@).data('fields').replace(regexp, time))
+
+$(document).on 'click', '.remove-fields', (e) ->
+  e.preventDefault()
+  $(@).prev('input[type=hidden]').val('1')
+  $(@).parent().parent().parent().addClass('hidden')

data/app/assets/javascripts/adminpanel/sections.js.coffee

@@ -0,0 +1,9 @@
+$(document).on 'click', '.btn.btn-danger.remove-fields', ->
+  $('a.add-fields').removeClass 'hidden'
+
+$(document).on 'click', 'a.add-fields', ->
+  $collectionContainer = $(@).closest('.file-collection-container')
+  maxFiles = $collectionContainer.data('max')
+  numberOfFiles = $collectionContainer.find('.product-image:not(.hidden)').length + 1
+  if maxFiles != 0 && numberOfFiles > maxFiles
+    $(@).addClass('hidden')

data/app/assets/javascripts/adminpanel/spinner.js.coffee

@@ -1,5 +1,5 @@
 $(document).on 'click', 'a.spinner-link', ->
-  $( this ).attr 'data-clicked', true
+  $( @ ).attr 'data-clicked', true
 
 $(document).on 'page:fetch', ->
   $('a.spinner-link[data-clicked="true"]').children('i:first').toggleClass('hidden')
@@ -7,5 +7,5 @@ $(document).on 'page:fetch', ->
 
 $(document).on 'page:restore', ->
   $('a.spinner-link[data-clicked="true"]').children('i:first').remove()
-  $('a.spinner-link[data-clicked="true"]').children('i:first').toggleClass 'hidden'
-  $('a.spinner-link[data-clicked="true"]').data 'clicked', false
+  $('a.spinner-link[data-clicked="true"]').children('i:first').toggleClass('hidden')
+  $('a.spinner-link[data-clicked="true"]').attr 'data-clicked', false

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

@@ -107,12 +107,12 @@ function SwitchCalendars(startCalendar, endCalendar, e) {
 }
 
 var ready = function() {
-	$('#information-table').dataTable( {
+	$('#information-table').dataTable({
 		"sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>",
 		"sPaginationType": "bootstrap",
 		"oLanguage": {
 			"sLengthMenu": "Registros: _MENU_ ",
-			"sZeroRecords": "No se encontro ningún registro que coincida con su búsqueda",
+			"sZeroRecords": "No se encontró ningún registro que coincida con su búsqueda",
 			"sInfo": "Mostrando registros del _START_ al _END_ (_TOTAL_ registros en total)",
 			"sInfoEmpty": "No hay entradas para mostrar",
 			"sInfoFiltered": "(_MAX_ registros fueron filtrados)",
@@ -121,7 +121,8 @@ var ready = function() {
 				"sPrevious": "Anterior",
 				"sNext": "Siguiente"
 			}
-		}
+		},
+		"bDestroy": true
 	});
 }
 

data/app/assets/javascripts/adminpanel/wysiwyg.js.coffee

@@ -1,3 +1,6 @@
-$(document).ready ->
+init_wysiwygs = ->
   $('.wysihtml5').each (i, elem) ->
     $(elem).wysihtml5()
+
+$(document).ready init_wysiwygs
+$(document).on 'page:load', init_wysiwygs

data/app/assets/stylesheets/{application-admin.css → adminpanel/application.css}

@@ -8,7 +8,7 @@
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  *
- *= require_self
+ *= require_tree .
  *= require font-awesome
- *= require_tree ./adminpanel/.
+ *= require_self
  */

data/app/assets/stylesheets/adminpanel/fa-hidden.css.scss

@@ -0,0 +1,7 @@
+// revert font awesome 4.2 to font awesome 4.1 behavior when hidden, in 4.1 the content
+//was empty so there's no space when it's hidden.
+.fa.hidden {
+  &:before {
+    content: "";
+  }
+}

data/app/assets/stylesheets/adminpanel/theme.css.scss.erb

@@ -562,32 +562,8 @@ table.table thead .sorting_desc_disabled { background: url(<%= asset_path 'admin
 }
 
 /* ----------- Side menu ----------- */
-.b_F79999:hover, .b_F79999.active{
-  border-left: 2px solid #F79999;
-}
-.b_C3F7A7:hover, .b_C3F7A7.active{
-  border-left: 2px solid #C3F7A7;
-}
-.b_9FDDF6:hover, .b_9FDDF6.active{
-  border-left: 2px solid #9FDDF6;
-}
-.b_F6F1A2:hover, .b_F6F1A2.active{
-  border-left: 2px solid #F6F1A2;
-}
-.b_C1F8A9:hover, .b_C1F8A9.active{
-  border-left: 2px solid #C1F8A9;
-}
-.b_9FDDF6:hover, .b_9FDDF6.active{
-  border-left: 2px solid #9FDDF6;
-}
-.b_F5C294:hover, .b_F5C294.active{
-  border-left: 2px solid #F5C294;
-}
-.b_D1B2D1:hover, .b_D1B2D1.active{
-  border-left: 2px solid #D1B2D1;
-}
-.b_99FFCC:hover, .b_99FFCC.active{
-  border-left: 2px solid #99FFCC;
+.accordion-navigation:hover, .accordion-navigation.active{
+  border-left: 2px solid #EF5493;
 }
 
 .accordion-heading{
@@ -1576,7 +1552,7 @@ table.table thead .sorting_desc_disabled { background: url(<%= asset_path 'admin
 }
 
 .widget-tasks-statistics{
-  .userstats{
+  .userstats {
     .white.facebook-insights {
       z-index: 0;
       p.insight-value { font-size: 11px; }

data/app/assets/stylesheets/adminpanel/turbolinks_progress_load.css.scss

@@ -0,0 +1,5 @@
+html.turbolinks-progress-bar {
+  &:before {
+    background-color: #6DD0F7 !important;
+  }
+}

data/app/controllers/adminpanel/analytics_controller.rb

@@ -3,7 +3,7 @@ module Adminpanel
     include Adminpanel::Analytics::TwitterAnalytics
     include Adminpanel::Analytics::InstagramAnalytics
 
-    skip_before_filter :set_model
+    skip_before_action :set_resource_collection
     before_action :check_if_fb_account, only:[:fb]
 
     API_VERSION = 'v3'
@@ -69,7 +69,7 @@ module Adminpanel
         )
 
         @visits = visitCount.data.rows.collect do |r|
-        	{
+          {
             date: "#{r[2]}/#{r[1]}/#{r[0]}",
             visits: r[3]
           }
@@ -156,7 +156,7 @@ module Adminpanel
   private
     def check_if_fb_account
       @auth = Adminpanel::Auth.find_by_key('facebook')
-      if @auth.nil? || auth.value == ''
+      if @auth.nil? || @auth.value == ''
         redirect_to analytics_path
       end
     end

data/app/controllers/adminpanel/application_controller.rb

@@ -1,34 +1,28 @@
 module Adminpanel
   class ApplicationController < ActionController::Base
     protect_from_forgery
-    inherit_resources
     authorize_resource
 
-    layout 'admin'
+    layout 'adminpanel/application'
 
-    before_filter :signed_in_user, :set_model, :strong_params_for_cancan
+    before_action :signed_in_user, :set_model
 
     include SessionsHelper
     include Adminpanel::RestActions
+    include Adminpanel::SortableActions
     include Adminpanel::GalleryzableActions
     include Adminpanel::FacebookActions
     include Adminpanel::TwitterActions
     include Adminpanel::SitemapActions
 
   private
-    def strong_params_for_cancan
-      resource = controller_name.singularize.to_sym
-      method = "#{resource}_params"
-      params[resource] &&= send(method) if respond_to?(method, true)
-    end
-
     rescue_from CanCan::AccessDenied do |exception|
       sign_out
-      redirect_to signin_path, :alert => I18n.t('authentication.not_authorized')
+      redirect_to signin_path, alert: I18n.t('authentication.not_authorized')
     end
 
     def signed_in_user
-      redirect_to signin_url, :notice => I18n.t('authentication.welcome') unless signed_in?
+      redirect_to signin_url, notice: I18n.t('authentication.welcome') unless signed_in?
     end
 
     def set_model

data/app/controllers/adminpanel/auths_controller.rb

@@ -1,5 +1,11 @@
 module Adminpanel
   class AuthsController < ApplicationController
+
+    def destroy
+      Rails.cache.clear
+      super
+    end
+
   private
     def auth_params
       params.require(:auth).permit(:name, :value, :key)