adminpanel 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efc38f8b1f2d0b9edd74586cf882831058760307
-  data.tar.gz: ab6a27f69e79bf15a3e03d57c70d1206832c7b9f
+  metadata.gz: 1507bc64df02e756c6142e0222e98ebe33b1bf09
+  data.tar.gz: 32e379878e099ac52116affe5515589d39f83e91
 SHA512:
-  metadata.gz: 0abbee803b58820f03963b53cb607cb30ba35b62a75a97a74142e34f5e86fe084e885a416afe18c708056192d5eb24cf9d9ae57f43095ec06ba08fbacd4f100f
-  data.tar.gz: 44d14aaa1e658615d1ecb98b66237f16815be4b4e0ab0499c83a2f3dbec11e2e38e9f429007296b443e4ef989c1a3145161da48a8364263d648f3287b7f6b802
+  metadata.gz: 621fed57774947e6ab5aefbde93243d572bde6bb5fc26112e4c75ef0ca37a1e33ca7098ed5990e27c26d9d47f160f9f0437fb4d2871ba6514cb7a87b923d4dd1
+  data.tar.gz: e71a1faf210481f8c792ffbf137ca4d70d6481119d6911b9f9f4b93f31c41998cbcb20ebcff0404c989c62e114835a003aef8becd8c173ca91cce3a1296f90c4

data/README.md

@@ -1,10 +1,10 @@
-# Adminpanel
+# [![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.
 
 [![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)
-[![Code Climate](https://codeclimate.com/github/joseramonc/adminpanel.png)](https://codeclimate.com/github/joseramonc/adminpanel)
+[![Code Climate](https://codeclimate.com/github/joseramonc/adminpanel/badges/gpa.svg)](https://codeclimate.com/github/joseramonc/adminpanel)
 <!-- [![Dependency Status](https://gemnasium.com/joseramonc/adminpanel.svg)](https://gemnasium.com/joseramonc/adminpanel) -->
 ## Installation
 

data/app/controllers/adminpanel/analytics_controller.rb

@@ -83,49 +83,46 @@ module Adminpanel
     def fb
       authorize! :read, Adminpanel::Analytic
       auth = Adminpanel::Auth.find_by_key('facebook')
-      if !auth.nil? && auth.value != '' # not nil & not void
-        if params[:insight].present?
-          period = params[:insight]
-        else
-          period = 'day' #default period
-        end
-        page_graph = Koala::Facebook::API.new(auth.value)
-        @impressions,
-        @impressions_unique,
+      redirect_via_turbolinks_to analytics_path if !auth.nil? && auth.value != '' # not nil & not void
+      if params[:insight].present?
+        period = params[:insight]
+      else
+        period = 'day' #default period
+      end
+      page_graph = Koala::Facebook::API.new(auth.value)
+      @impressions,
+      @impressions_unique,
 
-        @new_likes,
-        @total_likes,
+      @new_likes,
+      @total_likes,
 
-        @hidden,
-        @hidden_unique,
+      @hidden,
+      @hidden_unique,
 
-        @consumptions,
-        @consumptions_unique,
+      @consumptions,
+      @consumptions_unique,
 
-        @views,
-        @views_unique,
+      @views,
+      @views_unique,
 
-        @stories = page_graph.batch do |api|
-          #all information on same request
-          api.get_connections('me', 'insights', metric: 'page_impressions', period: period) #eye
-          api.get_connections('me', 'insights', metric: 'page_impressions_unique', period: period) #eye
+      @stories = page_graph.batch do |api|
+        #all information on same request
+        api.get_connections('me', 'insights', metric: 'page_impressions', period: period) #eye
+        api.get_connections('me', 'insights', metric: 'page_impressions_unique', period: period) #eye
 
-          api.get_connections('me', 'insights', metric: 'page_fan_adds') #fb-thumb
-          api.get_connections('me', 'insights', metric: 'page_fans') #fb-thumb
+        api.get_connections('me', 'insights', metric: 'page_fan_adds') #fb-thumb
+        api.get_connections('me', 'insights', metric: 'page_fans') #fb-thumb
 
-          api.get_connections('me', 'insights', metric: 'page_negative_feedback', period: period)
-          api.get_connections('me', 'insights', metric: 'page_negative_feedback_unique', period: period)
+        api.get_connections('me', 'insights', metric: 'page_negative_feedback', period: period)
+        api.get_connections('me', 'insights', metric: 'page_negative_feedback_unique', period: period)
 
-          api.get_connections('me', 'insights', metric: 'page_consumptions', period: period)
-          api.get_connections('me', 'insights', metric: 'page_consumptions_unique', period: period)
+        api.get_connections('me', 'insights', metric: 'page_consumptions', period: period)
+        api.get_connections('me', 'insights', metric: 'page_consumptions_unique', period: period)
 
-          api.get_connections('me', 'insights', metric: 'page_views')
-          api.get_connections('me', 'insights', metric: 'page_views_unique')
+        api.get_connections('me', 'insights', metric: 'page_views')
+        api.get_connections('me', 'insights', metric: 'page_views_unique')
 
-          api.get_connections('me', 'insights', metric: 'page_stories', period: period)
-        end
-      else
-        redirect_to analytics_path
+        api.get_connections('me', 'insights', metric: 'page_stories', period: period)
       end
     end
 

data/app/controllers/adminpanel/application_controller.rb

@@ -14,8 +14,8 @@ module Adminpanel
     include Adminpanel::FacebookActions
     include Adminpanel::TwitterActions
     include Adminpanel::SitemapActions
-  private
 
+  private
     def strong_params_for_cancan
       resource = controller_name.singularize.to_sym
       method = "#{resource}_params"

data/app/controllers/adminpanel/sections_controller.rb

@@ -47,7 +47,7 @@ module Adminpanel
         :page,
         :name,
         :has_image,
-        images_attributes: [:id, :file]
+        { images_attributes: [:id, :file, :_destroy] }
       )
     end
   end

data/app/controllers/adminpanel/sessions_controller.rb

@@ -1,6 +1,8 @@
 module Adminpanel
   class SessionsController < ActionController::Base
     include SessionsHelper
+    include ApplicationHelper
+
     protect_from_forgery
     layout 'admin-login'
     before_action :configure_instagram, only:[:instagram_login, :instagram_callback]
@@ -13,7 +15,12 @@ module Adminpanel
       if user && user.authenticate(params[:session][:password])
         sign_in user
         flash[:success] = I18n.t('authentication.signin_success')
-        redirect_to root_url
+        permission = user.rol.permissions.first
+        if permission.nil?
+          redirect_to root_url
+        else
+          redirect_to [route_symbol(permission.resource)]
+        end
       else
         flash.now[:error] = I18n.t('authentication.signin_error')
         render 'new'

data/app/helpers/adminpanel/adminpanel_form_builder.rb

@@ -72,11 +72,13 @@ module Adminpanel
     end
 
     def enum_field name, *args
-      select name, self.object.class.actions.map{|action, value| [I18n.t("enum.#{action}"), action]}, *args
+      select name, self.object.class.actions.map{|action, value| [I18n.t("#{self.object.class.name.demodulize.downcase}.#{action}"), action]}, *args
     end
 
     def resource_select name, *args
       select name, Adminpanel.displayable_resources.map{|resource| [symbol_class(resource).display_name, resource.to_s]}, *args
+      # select name, Adminpanel.displayable_resources.map{|resource| ['resource', 'resource']}, *args
+
     end
 
     def select(name, select_options, *args)

data/app/helpers/adminpanel/application_helper.rb

@@ -23,11 +23,7 @@ module Adminpanel
     def is_current_section?(display_name)
       display_name == params[:controller].classify.constantize.display_name ? 'active' : nil
     end
-
-    def section_is_login(section_name)
-      section_name.downcase == 'login'
-    end
-
+    
     def link_to_add_fields(name, f, association)
       new_object = f.object.send(association).klass.new
       id = new_object.object_id

data/app/helpers/adminpanel/router_helper.rb

@@ -16,6 +16,14 @@ module Adminpanel
       resource_class(resource).twitter_share?
     end
 
+    def member_routes(resource)
+      resource_class(resource).member_routes
+    end
+
+    def collection_routes(resource)
+      resource_class(resource).collection_routes
+    end
+
     def rest_path_names
       {
         path_names: {

data/app/models/adminpanel/permission.rb

@@ -9,9 +9,19 @@ module Adminpanel
     belongs_to :rol
 
     def name
-      "#{I18n.t('enum.' + action.to_s)} #{symbol_class(self.resource).display_name}"
+      "#{action} #{symbol_class(self['resource']).display_name}"
     end
 
+    # def action
+    #   Permission.actions.each do |key, value|
+    #     return I18n.t("permission.#{key}") if value == self['action']
+    #   end
+    # end
+
+    # def resource
+    #   symbol_class(self['resource']).display_name.to_s.pluralize(I18n.default_locale)
+    # end
+
     def self.form_attributes
       [
         {
@@ -34,7 +44,6 @@ module Adminpanel
             'label' => I18n.t('permission.resource'),
           }
         },
-
       ]
     end
 

data/app/models/adminpanel/section.rb

@@ -42,7 +42,6 @@ module Adminpanel
         {'key' => {'name' => 'key', 'label' => 'Llave'}},
         {'page' => {'name' => 'page'}},
       ]
-
     end
 
     def self.icon

data/app/models/adminpanel/user.rb

@@ -12,12 +12,12 @@ module Adminpanel
     validates_length_of :name, :maximum => 25
 
   #password validations
-    validates_confirmation_of :password
-    validates_presence_of :password
-    validates_length_of :password, :minimum => 6
+    validates_confirmation_of :password, :on => :create
+    validates_presence_of :password, :on => :create
+    validates_length_of :password, :minimum => 6, :on => :create
 
   #password_confirmation validations
-    validates_presence_of :password_confirmation
+    validates_presence_of :password_confirmation, :on => :create
 
   #email validations
     validates_presence_of :email
@@ -76,6 +76,10 @@ module Adminpanel
       ]
     end
 
+    def root_url
+      self.rol.permissions.first
+    end
+
     def self.display_name
       'Usuario'
     end

data/app/models/concerns/adminpanel/base.rb

@@ -86,10 +86,7 @@ module Adminpanel
       end
 
       def routes_options
-        { path: ActiveSupport::Inflector.transliterate(
-            display_name.pluralize(I18n.default_locale).downcase
-          ).tr(' ', '-')
-        }
+        { path: display_name.pluralize(I18n.default_locale).parameterize }
       end
 
       def has_route?(route)
@@ -108,6 +105,14 @@ module Adminpanel
         false
       end
 
+      def member_routes
+        []
+      end
+
+      def collection_routes
+        []
+      end
+
     private
       def exlude?(route)
         if routes_options[:except].nil?

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

@@ -25,9 +25,9 @@
 <div class="row-fluid">
   <div class="widget widget-padding span12">
     <div class="widget-header">
-          <%= content_tag :i, nil, class: "fa fa-#{@model.icon}" %>
-          <h5><%= @model.display_name.pluralize(I18n.default_locale) %></h5>
-        </div>
+      <%= content_tag :i, nil, class: "fa fa-#{@model.icon}" %>
+      <h5><%= @model.display_name.pluralize(I18n.default_locale) %></h5>
+    </div>
     <div class="widget-body">
       <div class="dataTables_wrapper form-inline">
         <table class="table table-striped table-bordered dataTable">

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

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

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

@@ -7,6 +7,7 @@
         class: 'fa fa-search-plus'
       ),
       [resource],
+      class: 'spinner-link',
       title: t('action.show'),
       id: 'show-resource-icon'
     )

data/config/locales/es.yml

@@ -42,6 +42,18 @@ es:
     description: 'Escriba la descripción aquí'
   Panel title: 'Panel Administrativo'
   permission:
+    0: 'Ver'
+    to_read: 'Ver'
+    1: 'Publicar en Redes Sociales'
+    to_publish: 'Publicar en Redes Sociales'
+    2: 'Crear'
+    to_create: 'Crear'
+    3: 'Actualizar'
+    to_update: 'Actualizar'
+    4: 'Borrar'
+    to_destroy: 'Borrar'
+    5: 'Administrar'
+    to_manage: 'Administrar'
     rol: 'Rol'
     action: 'Acción permitida'
     resource: 'Módulo'
@@ -157,10 +169,3 @@ es:
     page_select: 'Selecciona una cuenta para la publicación'
     message: 'Mensaje de la publicación'
     saved_token: 'Log in con Twitter exitoso, ya puedes publicar con la cuenta de Twitter'
-  enum:
-    to_read: 'Ver'
-    to_publish: 'Publicar en Redes Sociales'
-    to_create: 'Crear'
-    to_update: 'Actualizar'
-    to_destroy: 'Borrar'
-    to_manage: 'Ver, crear, actualizar y borrar'

data/config/routes.rb

@@ -41,13 +41,16 @@ Adminpanel::Engine.routes.draw do
         end
       end
 
-      # normal resource
-      resources resource, resources_parameters(resource).merge(rest_path_names)
-
-      # if resource is going to be shared on facebook
       resources resource, resources_parameters(resource).merge(rest_path_names) do
         member do
+          # adds custom member routes of the resource
+          member_routes(resource).each do |route|
+            route.each do |request_type, args|
+              send(request_type, args['path'].to_sym, args['args'])
+            end
+          end
           if has_fb_share?(resource)
+            # if resource is going to be shared on facebook
             get :fb_choose_page, as: 'fb_choose_page', path: 'publicar-a-pagina-en-fb'
             post :fb_save_token, as: 'fb_save_token', path: 'guardar-token-fb'
             post :fb_publish, to: "#{resource}#fb_publish", as: 'fb_publish', path: 'publicar-a-facebook'
@@ -56,6 +59,14 @@ Adminpanel::Engine.routes.draw do
             post :twitter_publish, to: "#{resource}#twitter_publish", as: 'twitter_publish', path: 'publicar-a-twitter'
           end
         end
+        collection do
+          # add custom collection routes of the resource
+          collection_routes(resource).each do |route|
+            route.each do |request_type, args|
+              send(request_type, args['path'].to_sym, args['args'])
+            end
+          end
+        end
       end
     end
   end

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 end

data/lib/generators/adminpanel/migration/migration_generator.rb

@@ -24,7 +24,14 @@ module Adminpanel
 
     def generate_migration
       parameters = fields
-      parameters.delete_if{ |pair| pair.split(':').second == 'has_many' }
+      parameters.delete_if do |pair|
+        if pair.split(':').second == 'has_many'
+          puts "migrations aren't supported yet, sorry :(, but you can do a pull request"
+          true
+        else
+          false
+        end
+      end
       invoke :migration, [migration_name, parameters]
     end
 

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

@@ -6,11 +6,10 @@ module Adminpanel
     include ResourceGeneratorHelper
     source_root File.expand_path('../templates', __FILE__)
     desc 'Generate the resource files necessary to use a model'
-    class_option :'gallery',
+    class_option :'skip-gallery',
       :type => :boolean,
-      :aliases => '-g',
       :default => true,
-      :desc => 'Creates the gallery for this resource'
+      :desc => 'Choose if we shoud create the gallery for this resource, default: true (skip gallery )'
 
     argument :fields, :type => :array, :default => [], :banner => 'field[:type][:index] field[:type][:index]'
 

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

@@ -40,7 +40,7 @@ module Adminpanel
     end
 
     def has_gallery?
-      options[:'gallery']
+      !options[:'skip-gallery']
     end
 
     def resource_name
@@ -51,8 +51,8 @@ module Adminpanel
       "#{resource_name}file" #ex: postfile
     end
 
-    def capitalized_resource
-      resource_name.capitalize
+    def camelized_resource
+      resource_name.camelize
     end
 
     def pluralized_name

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

@@ -1,5 +1,5 @@
 module Adminpanel
-  class <%= capitalized_resource %> < ActiveRecord::Base
+  class <%= camelized_resource %> < ActiveRecord::Base
     include Adminpanel::Base
 
     <%= associations if has_associations? -%>
@@ -13,7 +13,7 @@ module Adminpanel
     end
 
     def self.display_name
-      '<%= capitalized_resource %>' #singular
+      '<%= camelized_resource %>' #singular
     end
 
     # def self.icon

data/test/generators/resource_generator_test.rb

@@ -6,16 +6,27 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
   destination Rails.root.join('tmp/generators')
   setup :prepare_destination
 
-  def test_not_generation_of_gallery
+  def test_default_not_generation_of_gallery
     run_generator %w(
       post
       name
       description:wysiwyg
       number:float
-      --no-gallery
     )
     assert_no_file 'app/models/adminpanel/postfile.rb'
-    assert_no_migration('db/migrate/create_adminpanel_productfiles.rb')
+    assert_no_migration 'db/migrate/create_adminpanel_postfiles.rb'
+  end
+
+  def test_generation_of_gallery
+    run_generator %w(
+      post
+      name
+      description:wysiwyg
+      number:float
+      --no-skip-gallery
+    )
+    assert_file 'app/models/adminpanel/postfile.rb'
+    assert_migration 'db/migrate/create_adminpanel_postfiles.rb'
   end
 
   # def test_initializer_update
@@ -32,30 +43,6 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
   #   )
   # end
 
-  def test_correct_migration_attributes
-    generator = Adminpanel::ResourceGenerator.new %w(
-      post
-      name
-      description:wysiwyg
-      number:float
-      flag:boolean
-      quantity:integer
-      date:datepicker
-    )
-    
-    # puts generator.generate_migration
-
-    # assert_migration(
-    #   'db/migrate/create_adminpanel_posts.rb',
-    #   /t.string :name/,
-    #   /t.float :number/,
-    #   /t.boolean :flag/,
-    #   /t.integer :quantity/,
-    #   /t.string :date/,
-    #   /t.text :description/
-    # )
-  end
-
   def test_controller_generation
     run_generator %w(
       post
@@ -65,6 +52,7 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
       flag:boolean
       quantity:integer
       date:datepicker
+      --no-skip-gallery
     )
     assert_file(
       'app/controllers/adminpanel/posts_controller.rb',
@@ -81,7 +69,7 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
 
   def test_model_generation
     run_generator %w(
-      post
+      admin_post
       name
       description:wysiwyg
       number:float
@@ -89,11 +77,13 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
       quantity:integer
       date:datepicker
       categories:has_many
+      --no-skip-gallery
     )
     assert_file(
-      'app/models/adminpanel/post.rb',
+      'app/models/adminpanel/admin_post.rb',
+      /class AdminPost </,
       /include Adminpanel::Base/,
-      /mount_images :postfiles/,
+      /mount_images :admin_postfiles/,
       # form_fields generated correctly
       /'description' => {/,
       /'type' => 'wysiwyg_field',/,
@@ -107,7 +97,7 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
       /'type' => 'number_field',/,
       /'date' => {/,
       /'type' => 'datepicker',/,
-      /'postfiles' => {/,
+      /'admin_postfiles' => {/,
       /'type' => 'adminpanel_file_field',/,
       /'category_ids' => {/,
       /'type' => 'has_many'/,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adminpanel
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Jose Ramon Camacho
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails