adminpanel 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1417bec9885c7f685524fceea628b7c79865ae67
-  data.tar.gz: 9c53619401e07fea797f1967059d8373dc8842af
+  metadata.gz: 1aafbc35eee8d10953a446e2e0a9c8f499d87d2a
+  data.tar.gz: 37dbeddb83a4a4a1b95b415bd3a9e8a9416ad24b
 SHA512:
-  metadata.gz: b4f9aa5c9059bbd9752fdf286c48d513551e1491faf8e608e72a8465d4e76b7653b5f5905cb3c76ea030848440626ab5836d24755588af0d13581896c1c8c660
-  data.tar.gz: 0c78dfe91781b13aa9e70677d24b3f87ef80347546659e9b72c573af48654c19dbfb88d610230a9302d37b2690aacaa1ea7cee6ae3fae612e7819894695a6595
+  metadata.gz: 9d96d604d98c7fd68d23763cc2d267b0220f0db279566134f4fa210a452b7d9ca5079f9ef9d230a48969fb90c330d0dac9feb8db425f25e3f2c0d75cbcfc70d5
+  data.tar.gz: b77117eaa2fab041e598175d36ebbe4035692cb67c565cccbc4acac9c8f14964861759544ebf1c7b9206d2545d8f1d2f8a774ddfd93ba39040ca3d182089beff

data/app/models/adminpanel/section.rb

@@ -28,7 +28,7 @@ module Adminpanel
     validates_format_of :description, with: VALID_EMAIL_REGEX, if: :is_email?
 
     default_scope do
-      order("page ASC")
+      order :order => :asc
     end
 
     scope :of_page, -> (page) do

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "2.3.1"
+  VERSION = "2.4.0"
 end

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

@@ -77,6 +77,7 @@ class CreateAdminpanelTables < ActiveRecord::Migration
       t.string  :page
       t.boolean :has_image
       t.integer :max_files, default: 0
+      t.integer :order
       t.timestamps
     end
     add_index :adminpanel_sections, [:key]

data/lib/tasks/adminpanel/adminpanel.rake

@@ -4,16 +4,24 @@ namespace :adminpanel do
   task :section, [:name, :section, :type] => :environment do |t, args|
     args.with_defaults(:section => "home", :name => "greeting", :type => "")
     puts "Creating #{args[:name]} in #{args[:section]} section" unless Rails.env.test?
+    page_name = args[:section].capitalize
+    order = Adminpanel::Section.find_by(:page => page_name)
 
     s = Adminpanel::Section.new(
       :name => args[:name].titleize,
       :has_description => false,
       :description => "",
       :key => (args[:name].downcase.tr(' ','_')),
-      :page => args[:section].capitalize,
+      :page => page_name,
       :has_image => false
     )
 
+    if order.nil?
+      s.order = Adminpanel::Section.count + 1
+    else
+      s.order = order.order
+    end
+
     args[:type].split(" ").each do |type|
       case type
         when "wysiwyg" || "description"

data/test/dummy/db/schema.rb

@@ -116,6 +116,7 @@ ActiveRecord::Schema.define do
       t.string   :page
       t.datetime :created_at,      null: false
       t.datetime :updated_at,      null: false
+      t.integer :order
       t.boolean  :has_description
   end
   create_table :adminpanel_test_objects do |t|

data/test/models/adminpanel/section_test.rb

@@ -23,7 +23,7 @@ module Adminpanel
     def test_default_scope
       assert_equal(
         Adminpanel::Section.all.to_sql,
-        Adminpanel::Section.reorder('').order('page ASC').to_sql
+        Adminpanel::Section.reorder('').order(:order => :asc).to_sql
       )
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adminpanel
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Jose Ramon Camacho
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-26 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails