adminpanel 2.6.0 → 2.6.1

data/app/helpers/adminpanel/adminpanel_form_builder.rb

@@ -94,7 +94,7 @@ module Adminpanel
     def enum_field(method, *args)
       select(
         method,
-        self.object.class.send(method.pluralize).map{|option, value|
+        self.object.class.send(method.to_s.pluralize).map{|option, value|
           [I18n.t("#{self.object.class.name.demodulize.downcase}.#{option}"), option]
         },
         *args
@@ -216,14 +216,15 @@ module Adminpanel
       end
 
       def datepickerize_base(method, options)
-        options.reverse_merge! 'value' => Time.now.strftime("%d-%m-%Y")
+        options['data'] ||= {}
+        options['data']['date_format'] ||= 'dd-mm-yyyy'
+        options['data']['date'] ||= Time.now.strftime("%d-%m-%Y")
+        options['value'] = options['data']['date']
+        
         @template.content_tag(
                   :div,
                   class: 'input-append date datepicker datepicker-basic',
-                  data: {
-                    date_format: 'dd-mm-yyyy',
-                    date: options['value']
-                  }
+                  data: options['data']
                 ) do
           text_field_original(method, options) +
           (

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = '2.6.0'
+  VERSION = '2.6.1'
 end

data/lib/generators/adminpanel/gallery/gallery_generator.rb

@@ -30,7 +30,7 @@ module Adminpanel
     end
 
     def class_name
-      "#{lower_name.capitalize}"
+      "#{reference_name.camelize}file"
     end
 
   end

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

@@ -40,7 +40,7 @@ module Adminpanel
         "app/models/adminpanel/#{resource_migrating}.rb",
         after: '      ['
       ) do
-        indent ("\n" + get_attribute_hash + ','), 8
+        indent ("\n" + form_attributes_hash + ','), 8
       end
     end
 

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

@@ -23,6 +23,9 @@ module Adminpanel
         when 'wysiwyg'
           fields_to_delete << attribute
           fields << attribute.split(':').first + ':' + 'text'
+        when 'datepicker'
+          fields_to_delete << attribute
+          fields << attribute.split(':').first + ':' + 'date'
         when 'belongs_to'
           fields_to_delete << attribute
           fields << attribute.split(':').first + ':' + 'select'

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

@@ -76,7 +76,7 @@ module Adminpanel
       end.join(",\n")
     end
 
-    def get_attribute_hash
+    def form_attributes_hash
       fields.map do |attribute|
         assign_attributes_variables(attribute)
         send(@attr_type + '_form_hash')
@@ -107,8 +107,8 @@ module Adminpanel
       attribute_hash(@attr_field, 'boolean')
     end
 
-    def datepicker_form_hash
-      attribute_hash(@attr_field, 'datepicker')
+    def date_form_hash
+      attribute_hash(@attr_field, 'date')
     end
 
     def file_field_form_hash
@@ -148,7 +148,7 @@ module Adminpanel
     end
 
     def model_type(model_name)
-      "'options' => Proc.new { |object|\n" +
+      "'options' => Proc.new { |#{resource_name.downcase}_instance|\n" +
         indent("Adminpanel::#{model_name}.all\n", 2) +
       '}'
     end

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

@@ -12,7 +12,7 @@ module Adminpanel
 
     def self.form_attributes
       [
-<%= indent(get_attribute_hash, 8) + "," %>
+<%= indent(form_attributes_hash, 8) + "," %>
 <%= indent(file_field_form_hash, 8) if has_gallery? %>
       ]
     end

data/test/generators/gallery_generator_test.rb

@@ -13,20 +13,29 @@ class GalleryGeneratorTest < Rails::Generators::TestCase
       /t.integer :product_id/,
       /create_table :adminpanel_productfiles/
     )
-  end
-
-  def test_the_generation_of_the_productfile
-    run_generator ['Product']
     assert_file(
       'app/models/adminpanel/productfile.rb',
       /mount_uploader :file, ProductfileUploader/
     )
+    assert_file(
+      'app/uploaders/adminpanel/productfile_uploader.rb'
+    )
   end
 
-  def test_the_generation_of_the_productfile_uploader
-    run_generator ['Product']
+  def test_the_generation_of_the_snake_cases_migration
+    run_generator ['snake_case']
+    assert_migration(
+      'db/migrate/create_adminpanel_snake_casefiles.rb',
+      /t.integer :snake_case_id/,
+      /create_table :adminpanel_snake_casefiles/
+    )
     assert_file(
-      'app/uploaders/adminpanel/productfile_uploader.rb'
+      'app/models/adminpanel/snake_casefile.rb',
+      /mount_uploader :file, SnakeCasefileUploader/
+    )
+    assert_file(
+      'app/uploaders/adminpanel/snake_casefile_uploader.rb',
+      /class SnakeCase/
     )
   end
 

data/test/generators/resource_generator_test.rb

@@ -7,6 +7,7 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
   setup :prepare_destination
 
   def after_setup
+    # Create setup dynamically to test over it.
     Dir.mkdir Rails.root.join('tmp', 'generators', 'config')
     Dir.mkdir Rails.root.join('tmp', 'generators', 'config', 'initializers')
     File.open Rails.root.join('tmp', 'generators', 'config', 'initializers', 'adminpanel_setup.rb'), 'w' do |f|
@@ -139,7 +140,7 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
       /'quantity' => {/,
       /'type' => 'number_field',/,
       /'date' => {/,
-      /'type' => 'datepicker',/,
+      /'type' => 'date',/,
       /'admin_postfiles' => {/,
       /'type' => 'adminpanel_file_field',/,
       /'category_ids' => {/,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adminpanel
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Jose Ramon Camacho
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,14 +38,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.7
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -92,20 +92,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -130,28 +130,28 @@ dependencies:
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.6
 - !ruby/object:Gem::Dependency
   name: instagram
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.3
 - !ruby/object:Gem::Dependency
@@ -240,30 +240,42 @@ dependencies:
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.4
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.4
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.0.4
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.5
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.5
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.0.5
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement