adminpanel 3.2.1 → 3.3.0

data/app/models/adminpanel/section.rb

@@ -7,26 +7,22 @@ module Adminpanel
     validates_length_of :description,
         minimum: 10,
         maximum: 10,
-        on: :update,
+        allow_blank: true,
         if: :is_a_phone?,
         message: I18n.t('activerecord.errors.messages.not_phone')
     validates_presence_of :description,
         minimum: 9,
         on: :update,
         if: :has_description
-    validates :description,
-        numericality: { only_integer: true },
-        on: :update,
-        if: :is_a_phone?
     validates_presence_of :key
     validates_presence_of :name
     validates_presence_of :page
 
     VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
-    validates_format_of :description, with: VALID_EMAIL_REGEX, if: :is_email?
+    validates_format_of :description, with: VALID_EMAIL_REGEX, if: :is_email?, allow_blank: true
 
     default_scope do
-      order :order => :asc
+      order order: :asc
     end
 
     scope :of_page, -> (page) do
@@ -34,7 +30,7 @@ module Adminpanel
     end
 
     scope :with_description, -> do
-      where.not( description: '')
+      where.not(description: '')
     end
 
     def self.form_attributes
@@ -56,10 +52,10 @@ module Adminpanel
     end
 
     def description
-      if self.has_description && !self.attributes['description'].nil?
-        return self.attributes['description'].html_safe
+      if self.has_description
+        return super.try(:html_safe)
       else
-        return self.attributes['description']
+        return super
       end
     end
 
@@ -68,16 +64,13 @@ module Adminpanel
     end
 
     protected
-    def has_description?
-      !self.has_description.nil? || self.has_description
-    end
 
     def is_email?
-      key == 'email' && description != ''
+      self.key == 'email'
     end
 
     def is_a_phone?
-      key == 'phone' && description != ''
+      self.key == 'phone'
     end
   end
 end

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

@@ -239,7 +239,7 @@ module Adminpanel
       end
 
       def destroy_unattached_images
-        self.class.galleries.each{|gallery| gallery.last.constantize.delete_all(model_id: nil) }
+        self.class.galleries.each{|gallery| gallery.last.constantize.where(model_id: nil).delete_all }
       end
 
       def correlative_order_gallery

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

@@ -1,7 +1,6 @@
 module Adminpanel
   module Sitemap
     extend ActiveSupport::Concern
-    include Rails.application.routes.url_helpers
 
     included do
       after_create :ping_engines
@@ -18,11 +17,10 @@ module Adminpanel
     end
 
     def ping_engines
-      logger.info Time.now
       ping_urls.each do |name, url|
-        request = url % CGI.escape("#{root_url}/sitemap.xml")
+        request = url % CGI.escape("#{Rails.application.routes.url_helpers.root_url}/sitemap.xml")
         logger.info "  Pinging #{name} with #{request}"
-        if !Rails.env.development?
+        if Rails.env.production?
           response = Net::HTTP.get_response(URI.parse(request))
           logger.info "    #{response.code}: #{response.message}"
           logger.info "    Body: #{response.body}"

data/app/views/adminpanel/form/_select.html.erb

@@ -9,11 +9,11 @@
                     collection,
                     properties['id_method'],
                     properties['name_method'],
-                    @resource_instance.send(attribute)
+                    @resource_instance.try(attribute)
                   )
 
   elsif ['Hash', 'Array', 'HashWithIndifferentAccess'].include? collection.class.to_s.demodulize
-    collection = options_for_select(collection)
+    collection = options_for_select(collection, @resource_instance.try(attribute))
   end
 %>
 <%= f.select attribute, collection, { include_blank: true }, args  %>

data/config/routes.rb

@@ -7,15 +7,15 @@ Adminpanel::Engine.routes.draw do
     when :analytics
       resources :analytics, only: [:index] do
         collection do
-          get :google,               to: 'analytics#google', path: 'google'
+          get :google,               to: 'analytics#google'
 
-          get :twitter,              to:'analytics#twitter', path:'twitter'
-          post 'reply_to_tweet/:id', to: 'analytics#reply_to_tweet', as: 'reply_to', path: "twitter/#{I18n.t('routes.reply')}/:id"
-          post 'favorite_tweet/:id', to: 'analytics#favorite_tweet', as: 'favorite', path: "twitter/#{I18n.t('routes.favorite')}/:id"
-          post 'retweet_tweet/:id',  to: 'analytics#retweet_tweet',  as: 'retweet',  path: "twitter/#{I18n.t('routes.retweet')}/:id"
+          get :twitter,              to:'analytics#twitter'
+          post "twitter/#{I18n.t('routes.reply')}/:id", action: 'reply_to_tweet/:id', to: 'analytics#reply_to_tweet', as: 'reply_to'
+          post "twitter/#{I18n.t('routes.favorite')}/:id", action: 'favorite_tweet/:id', to: 'analytics#favorite_tweet', as: 'favorite'
+          post "twitter/#{I18n.t('routes.retweet')}/:id", action: 'retweet_tweet/:id',  to: 'analytics#retweet_tweet',  as: 'retweet'
 
           get :instagram,            to:'analytics#instagram'
-          post 'comment_to_instagram/:id', to: 'analytics#instagram_comment', as: 'comment_instagram', path: "instagram/#{I18n.t('routes.comment')}/:id"
+          post "instagram/#{I18n.t('routes.comment')}/:id", action: 'comment_to_instagram/:id', to: 'analytics#instagram_comment', as: 'comment_instagram'
         end
       end
     else
@@ -81,8 +81,8 @@ Adminpanel::Engine.routes.draw do
       get 'instagram_callback'
     end
   end
-  delete '/signout', to: 'sessions#destroy', as: 'signout', path: I18n.t('routes.signout')
-  get    '/signin',  to: 'sessions#new',     as: 'signin',  path: I18n.t('routes.signin')
+  delete I18n.t('routes.signout'), to: 'sessions#destroy', as: 'signout'
+  get    I18n.t('routes.signin'),  to: 'sessions#new',     as: 'signin'
 
 end
 

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = '3.2.1'
+  VERSION = '3.3.0'
 end

data/lib/generators/adminpanel/gallery/templates/uploader.rb

@@ -74,7 +74,7 @@ module Adminpanel
     # |            |
     # |____________|
 
-    #  resize_to_limit: [500, 500] resize_to_fit, but only resizing if original image is larger
+    #  resize_to_limit: [500, 500] resize_to_fit, but only if original image is larger while retaining original
     #  _________________
     # |                 |
     # |        0        |

data/lib/generators/adminpanel/initialize/templates/create_adminpanel_tables.rb

@@ -3,10 +3,10 @@ class CreateAdminpanelTables < ActiveRecord::Migration
     super
     # Create a default user
     if direction == :up && Rails.env.development?
-      role = Adminpanel::Role.new(:name => "Admin")
+      role = Adminpanel::Role.new(name: "Admin")
       role.save
-      Adminpanel::User.new(:email => 'admin@admin.com', :name => "Admin", :password => 'password', :password_confirmation => 'password', :role_id => role.id).save
-      puts "The password for admin@admin.com is: password"
+      Adminpanel::User.new(email: 'webmaster@codn.mx', name: "Admin", password: '123456', password_confirmation: '123456', role_id: role.id).save
+      puts "The password for admin@admin.com is: 123456"
     end
   end
 
@@ -41,6 +41,7 @@ class CreateAdminpanelTables < ActiveRecord::Migration
       t.string :type
       t.string :file_size
       t.string :content_type
+      t.integer :position
       t.timestamps
     end
   end

data/test/dummy/.gitignore

@@ -6,14 +6,13 @@ capybara-*.html
 /tmp/test.log
 /tmp/development.log
 /db/*.sqlite3
-/public/uploads
+/public/uploads/
 /coverage/
 /spec/tmp
 **.orig
 rerun.txt
 pickle-email-*.html
 config/initializers/secret_token.rb
-/public/uploads/tmp
 
 ## Environment normalisation:
 /.bundle

data/test/dummy/app/models/adminpanel/galleryfile.rb

@@ -3,5 +3,15 @@ module Adminpanel
     include Adminpanel::SortableGallery
 
     mount_uploader :file, Adminpanel::PhotoUploader
+
+    belongs_to :gallery
+
+    def self.relation_field
+      'gallery_id'
+    end
+
+    def self.dispaly_name
+      'ja'
+    end
   end
 end

data/test/dummy/config/environments/test.rb

@@ -13,12 +13,13 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_files  = true
-  config.static_cache_control = 'public, max-age=3600'
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
+  config.action_dispatch.show_exceptions = true
 
   # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false

data/test/dummy/db/schema.rb

@@ -126,10 +126,6 @@ ActiveRecord::Schema.define do
       t.integer  :test_object_id
       t.integer  :category_id
   end
-  create_table :adminpanel_file_resourcefiles do |t|
-      t.integer  :file_resource_id
-      t.string   :file
-  end
   create_table :adminpanel_file_resources do |t|
     t.string :name
     t.datetime :created_at

data/test/dummy/test/fixtures/adminpanel/galleries.yml

@@ -1,15 +1,15 @@
 one:
-  file: <%= File.open(Rails.root.join("test", "fixtures", "attachments", "hipster.jpg")) %>
+  file: hipster.jpg
   position: 1
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>
 two:
-  file: <%= File.open(Rails.root.join("test", "fixtures", "attachments", "hipster.jpg")) %>
+  file: hipster.jpg
   position: 2
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>
 three:
-  file: <%= File.open(Rails.root.join("test", "fixtures", "attachments", "hipster.jpg")) %>
+  file: hipster.jpg
   position: 3
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>

data/test/dummy/test/fixtures/adminpanel/images.yml

@@ -1,47 +1,47 @@
 first:
-  file: <%= File.open(Rails.root.join("test", "fixtures", 'attachments', 'dog-fries.png')) %>
+  file: dog-fries.png
   type: Adminpanel::Galleryfile
   position: 1
   model: one(Adminpanel::Gallery)
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>
 second:
-  file: <%= File.open(Rails.root.join("test", "fixtures", 'attachments', 'dog-fries.png')) %>
+  file: dog-fries.png
   type: Adminpanel::Galleryfile
   model: one(Adminpanel::Gallery)
   position: 2
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>
 third:
-  file: <%= File.open(Rails.root.join("test", "fixtures", 'attachments', 'dog-fries.png')) %>
+  file: dog-fries.png
   type: Adminpanel::Galleryfile
   model: one(Adminpanel::Gallery)
   position: 3
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>
 fourth:
-  file: <%= File.open(Rails.root.join("test", "fixtures", 'attachments', 'dog-fries.png')) %>
+  file: dog-fries.png
   type: Adminpanel::Galleryfile
   model: one(Adminpanel::Gallery)
   position: 4
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>
 fifth:
-  file: <%= File.open(Rails.root.join("test", "fixtures", 'attachments', 'dog-fries.png')) %>
+  file: dog-fries.png
   type: Adminpanel::Galleryfile
   model: one(Adminpanel::Gallery)
   position: 5
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>
 first_2:
-  file: <%= File.open(Rails.root.join("test", "fixtures", 'attachments', 'dog-fries.png')) %>
+  file: dog-fries.png
   type: Adminpanel::Galleryfile
   model: two(Adminpanel::Gallery)
   position: 1
   created_at: <%= Date.today %>
   updated_at: <%= Date.today %>
 second_2:
-  file: <%= File.open(Rails.root.join("test", "fixtures", 'attachments', 'dog-fries.png')) %>
+  file: dog-fries.png
   type: Adminpanel::Galleryfile
   model: two(Adminpanel::Gallery)
   position: 2
@@ -52,7 +52,7 @@ unassigned:
   created_at: <%= Date.yesterday %>
   updated_at: <%= Date.yesterday %>
 first_product_photo:
-  file: <%= File.open(Rails.root.join("test", "fixtures", 'attachments', 'dog-fries.png')) %>
+  file: dog-fries.png
   type: Adminpanel::Photo
   model: first(Adminpanel::Product)
   position: 1

data/test/features/shared/concerns/sortable_gallery_ui_test.rb

@@ -10,7 +10,8 @@ class SortableGalleryUiTest < ViewCase
     visit adminpanel.gallery_path(adminpanel_galleries(:one))
 
     # assert for sortable stuff
-    assert_selector 'td.draggable.img'
+    assert adminpanel_galleries(:one).galleryfiles.count > 0
+    assert_selector 'td.draggable.img', count: adminpanel_galleries(:one).galleryfiles.count
   end
 
   protected

data/test/features/shared/resource/show_test.rb

@@ -5,6 +5,7 @@ class ShowTest < ViewCase
 
   setup :sign_in
   def test_resource_contenets_and_links
+    visit adminpanel.product_path(adminpanel_products(:first))
     assert_content(adminpanel_products(:first).name)
     assert_content(adminpanel_products(:first).price)
     assert_content(adminpanel_products(:first).description)
@@ -16,6 +17,5 @@ class ShowTest < ViewCase
   def sign_in
     visit adminpanel.signin_path
     login
-    visit adminpanel.product_path( adminpanel_products(:first) )
   end
 end

data/test/features/shared/ui/dropzone_element_generation_test.rb

@@ -14,7 +14,7 @@ class DropzoneElementGenerationTest < ViewCase
   test "render the form should add a hidden input for each existing photos" do
     product = adminpanel_products(:first)
     visit adminpanel.edit_product_path(product)
-
+    assert product.photos.count > 0
     assert_selector '#photo_dropzone'
     assert_selector "input[type='hidden'][name='product[photo_ids][]']", count: product.photos.count
   end

data/test/helpers/shared_pages_helper_test.rb

@@ -112,8 +112,9 @@ class SharedPagesHelperTest < ActionView::TestCase
   def test_file_field_in_field_value
     test_object = adminpanel_galleries(:one)
     attribute = 'file'
+
     assert_equal(
-      test_object[attribute],
+      link_to('hipster.jpg', test_object.file_url),
       field_value(
         'file_field',
         attribute,

data/test/models/adminpanel/section_test.rb

@@ -13,9 +13,6 @@ module Adminpanel
       @telephone.update_attribute(:description, '1' * 11)
       assert @telephone.invalid?
 
-      @telephone.update_attribute(:description, '01-2-3-4-5')
-      assert @telephone.invalid?
-
       @telephone.update_attribute(:description, '')
       assert @telephone.valid?
     end

data/test/test_helper.rb

@@ -2,10 +2,10 @@ ENV['RAILS_ENV'] = 'test'
 
 require File.expand_path('../dummy/config/environment', __FILE__)
 require 'rails/test_help'
-require 'minitest/autorun'
 require 'minitest/emoji' #emoji output
 require 'capybara/rails'
 require 'capybara/poltergeist'
+require 'minitest/capybara'
 
 Capybara.current_driver = :poltergeist
 
@@ -13,6 +13,7 @@ load Rails.root.join('db', 'schema.rb')
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
+Capybara.raise_server_errors = false
 class ActiveSupport::TestCase
   #fixtures live inside the dummy app
   fixtures :all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adminpanel
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Jose Ramon Camacho
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,20 +18,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -208,20 +208,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -248,20 +248,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -308,20 +308,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -348,7 +348,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: 5.7.0
     - - "<="
       - !ruby/object:Gem::Version
         version: 6.0.0
@@ -358,7 +358,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: 5.7.0
     - - "<="
       - !ruby/object:Gem::Version
         version: 6.0.0
@@ -376,6 +376,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: minitest-capybara
   requirement: !ruby/object:Gem::Requirement
@@ -413,7 +427,7 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: 1.3.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -423,7 +437,7 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: 1.3.12
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -522,7 +536,7 @@ files:
 - app/assets/stylesheets/adminpanel/theme.css.scss.erb
 - app/assets/stylesheets/adminpanel/timepicker.css
 - app/assets/stylesheets/adminpanel/trix.scss
-- app/assets/stylesheets/adminpanel/turbolinks_progress_load.css.scss
+- app/assets/stylesheets/adminpanel/turbolinks_progress_load.css
 - app/controllers/adminpanel/analytics_controller.rb
 - app/controllers/adminpanel/application_controller.rb
 - app/controllers/adminpanel/auths_controller.rb
@@ -762,7 +776,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -771,7 +785,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - imagemagick installed
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Made with <3 by CoDN
@@ -881,4 +895,3 @@ test_files:
 - test/support/view_case.rb
 - test/tasks/adminpanel_rake_test.rb
 - test/test_helper.rb
-has_rdoc: