adminpanel 1.2.5 → 1.2.6

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

@@ -1,4 +1,4 @@
-class CreateCategoriesTable < ActiveRecord::Migration
+class CreateAdminpanelCategoriesTable < ActiveRecord::Migration
   	def change
 		create_table :adminpanel_categories do |t|
 

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

@@ -17,7 +17,7 @@ class CreateAdminpanelTables < ActiveRecord::Migration
 			end
 		end
 	end
-	
+
 	def change
 	    create_table :adminpanel_users do |t|
 	      t.string :name
@@ -37,8 +37,7 @@ class CreateAdminpanelTables < ActiveRecord::Migration
 
 	    create_table :adminpanel_images do |t|
 	      t.string :file
-	      t.integer :foreign_key
-	      t.string :model
+	      t.integer :section_id
 	      t.timestamps
 	    end
 
@@ -54,4 +53,4 @@ class CreateAdminpanelTables < ActiveRecord::Migration
 
 	    add_index :adminpanel_sections, [:key]
 	end
-end
+end

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

@@ -0,0 +1,86 @@
+module Adminpanel
+  class SectionUploader < CarrierWave::Uploader::Base
+    include CarrierWave::RMagick
+
+    storage :file
+
+    def root
+      Rails.root.join 'public/'
+    end
+
+    def store_dir
+      "uploads/image/#{mounted_as}/#{model.id}"
+    end
+
+    # Process files as they are uploaded:
+    # process :resize_to_fill => [1366, 768]
+
+    # THE THUMB VERSION IS NECESSARY!!!!
+    version :thumb do
+      process :resize_to_limit => [220, 220]
+    end
+
+    # however, you can create your own versions:
+    # version :awesome do
+    #   process :reside_and_pad => [120, 900]
+    # end
+
+    # resize_and_pad(width, height, background=:transparent, gravity=::Magick::CenterGravity)
+    #
+    # Resize the image to fit within the specified dimensions while retaining
+    # the original aspect ratio. If necessary, will pad the remaining area with
+    # the given color, which defaults to transparent (for gif and png, white for jpeg).
+    #
+    # width (Integer)
+    # the width to scale the image to
+    # height (Integer)
+    # the height to scale the image to
+    # background (String, :transparent)
+    # the color of the background as a hexcode, like “ff45de“
+    # gravity (Magick::GravityType)
+    # how to position the image
+
+    # resize_to_fill(width, height)
+    #
+    # From the RMagick documentation: “Resize the image to fit within the
+    # specified dimensions while retaining the aspect ratio of the original image.
+    # If necessary, crop the image in the larger dimension.“
+    #
+    # See even www.imagemagick.org/RMagick/doc/image3.html#resize_to_fill
+    #
+    # width (Integer)
+    # the width to scale the image to
+    # height (Integer)
+    # the height to scale the image to
+
+    # resize_to_fit(width, height)
+    #
+    # From the RMagick documentation: “Resize the image to fit within the
+    # specified dimensions while retaining the original aspect ratio. The image
+    # may be shorter or narrower than specified in the smaller dimension but
+    # will not be larger than the specified values.“
+    #
+    # See even www.imagemagick.org/RMagick/doc/image3.html#resize_to_fit
+    #
+    # width (Integer)
+    # the width to scale the image to
+    # height (Integer)
+    # the height to scale the image to
+
+    # resize_to_limit(width, height)
+    #
+    # Resize the image to fit within the specified dimensions while retaining
+    # the original aspect ratio. Will only resize the image if it is larger than
+    # the specified dimensions. The resulting image may be shorter or narrower
+    # than specified in the smaller dimension but will not be larger than the
+    # specified values.
+    #
+    # width (Integer)
+    # the width to scale the image to
+    # height (Integer)
+    # the height to scale the image to
+    def extension_white_list
+      %w(jpg jpeg png)
+    end
+  end
+end

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

@@ -1,17 +1,12 @@
-require "action_view"
-include Rails::Generators::Migration
+# require "action_view"
+require 'rails/generators/active_record'
 module Adminpanel
 	module Generators
-		class ResourceGenerator < Rails::Generators::Base
-
+		class ResourceGenerator < ActiveRecord::Generators::Base
   		source_root File.expand_path("../templates", __FILE__)
-  		argument :resource_name, :type => :string, :required => true
-  		argument :fields, :type => :array, :default => "name:string"
 			desc "Generate the resource files necessary to use a model"
 
-			def self.next_migration_number(path)
-	  		Time.now.utc.strftime("%Y%m%d%H%M%S")
-			end
+  		argument :fields, :type => :array, :default => "name:string"
 
 			def create_model
     		template 'resource.rb', "app/models/adminpanel/#{lower_name}.rb"
@@ -40,7 +35,7 @@ module Adminpanel
 			end
 
 			def lower_name
-				resource_name.singularize.downcase
+				name.singularize.downcase
 			end
 
 			def capitalized_resource
@@ -88,7 +83,7 @@ module Adminpanel
 					assign_attributes_variables(attribute)
 
         	if @attr_type == "images"
-            	attr_string = attr_string + ":images_attributes, "
+            	attr_string = attr_string + ":#{@attr_field.pluralize.downcase}_attributes, "
         	elsif @attr_type == "belongs_to"
         		attr_string = "#{attr_string}:#{belongs_to_field(@attr_field)}, "
         	elsif @attr_type == "has_many" || @attr_type == "has_many_through"
@@ -115,17 +110,17 @@ module Adminpanel
 					assign_attributes_variables(attribute)
 
 					if @attr_type == "string" || @attr_type == "float"
-						form_hash = form_hash + "\n\t\t\t\t{\"#{@attr_field}\" => {\"type\" => \"text_field\", \"name\" => \"#{@attr_field}\", \"label\" => \"#{@attr_field}\", \"placeholder\" => \"#{@attr_field}\"}},"
+						form_hash = form_hash + "#{attribute_hash('text_field')}"
 					elsif @attr_type == "text" || @attr_type == "wysiwyg"
-						form_hash = form_hash + "\n\t\t\t\t{\"#{@attr_field}\" => {\"type\" => \"wysiwyg_field\", \"name\" => \"#{@attr_field}\", \"label\" => \"#{@attr_field}\", \"placeholder\" => \"#{@attr_field}\"}},"
+						form_hash = form_hash + "#{attribute_hash('wysiwyg_field')}"
 					elsif @attr_type == "integer"
-						form_hash = form_hash + "\n\t\t\t\t{\"#{@attr_field}\" => {\"type\" => \"number_field\", \"name\" => \"#{@attr_field}\", \"label\" => \"#{@attr_field}\", \"placeholder\" => \"#{@attr_field}\"}},"
+						form_hash = form_hash + "#{attribute_hash('number_field')}"
 					elsif @attr_type == "datepicker"
-						form_hash = form_hash + "\n\t\t\t\t{\"#{@attr_field}\" => {\"type\" => \"datepicker\", \"name\" => \"#{@attr_field}\", \"label\" => \"#{@attr_field}\", \"placeholder\" => \"#{@attr_field}\"}},"
+						form_hash = form_hash + "#{attribute_hash('datepicker')}"
 					elsif @attr_type == "images"
-						form_hash = form_hash + "\n\t\t\t\t{\"#{@attr_field}\" => {\"type\" => \"adminpanel_file_field\", \"name\" => \"#{@attr_field}\"}},"
+						form_hash = form_hash + "#{file_field_hash}"
 					elsif @attr_type == "belongs_to"
-						form_hash = form_hash + "\n\t\t\t\t{\"#{belongs_to_field(@attr_field)}\" => {\"@attr_type\" => \"belongs_to\", \"model\" => \"Adminpanel\:\:#{resource_class_name(@attr_field)}\", \"name\" => \"#{belongs_to_field(@attr_field)}\"}},"
+						form_hash = form_hash + "#{belongs_to_attribute_hash(belongs_to_field(@attr_field))}"
 					elsif @attr_type == "has_many" || @attr_type == "has_many_through"
 						if models_in_parameter(@attr_field).second.nil?
 							through_model = @attr_field
@@ -133,12 +128,64 @@ module Adminpanel
 							through_model = models_in_parameter(@attr_field).first
 						end
 						through_model = resource_class_name(through_model)
-						form_hash = form_hash + "\n\t\t\t\t{\"#{has_many_field(through_model)}\" => {\"type\" => \"has_many\", \"model\" => \"Adminpanel\:\:#{through_model}\", \"name\" => \"#{has_many_field(through_model)}\"}},"
+						# form_hash = form_hash + "#{relational_attribute_hash('belongs_to')}"
+						form_hash = form_hash + "\n\t\t\t\t{'#{has_many_field(through_model)}' => {'type' => 'has_many', 'model' => 'Adminpanel::#{through_model}', 'name' => '#{has_many_field(through_model)}'}},"
 					end
 				end
 				form_hash
 			end
 
+			def attribute_hash(type)
+				"#{attribute_name} => {#{form_type(type)}," +
+				"#{name_type}," +
+				"#{label_type}," +
+				"#{placeholder_type}}\n\t\t\t},"
+			end
+
+			def file_field_hash
+				"#{starting_hash(@attr_field.downcase.pluralize)} => {#{form_type('adminpanel_file_field')}," +
+				"#{name_type}," +
+				"#{label_type}," +
+				"#{placeholder_type}}\n\t\t\t},"
+			end
+
+			def belongs_to_attribute_hash(name)
+				"#{starting_hash(name)} => {#{form_type('belongs_to')}," +
+				"#{model_type}," +
+				"#{name_type}," +
+				"#{label_type}," +
+				"#{placeholder_type}}\n\t\t\t},"
+			end
+
+			def attribute_name
+				"\n\t\t\t{\n\t\t\t\t'#{@attr_field}'"
+			end
+
+			def starting_hash(name)
+				"\n\t\t\t{\n\t\t\t\t'#{name}'"
+			end
+
+			def form_type(type)
+				"\n\t\t\t\t\t'type' => '#{type}'"
+			end
+
+			def name_type
+				"\n\t\t\t\t\t'name' => '#{@attr_field}'"
+			end
+
+			def label_type
+				"\n\t\t\t\t\t'label' => '#{@attr_field}'"
+			end
+
+			def placeholder_type
+				"\n\t\t\t\t\t'placeholder' => '#{@attr_field}'"
+			end
+
+			def model_type
+				"\n\t\t\t\t\t'model' => 'Adminpanel::#{resource_class_name(@attr_field)}'"
+
+			end
+
 			def migration_string(field, type)
 				if type == "datepicker"
 					"t.string :#{field}"
@@ -198,11 +245,14 @@ module Adminpanel
 			end
 
 			def image_association
-				return "has_many :images, :foreign_key => \"foreign_key\", " +
-				":conditions => { :model => \"#{lower_name}\" } \n\t\t" +
-				"accepts_nested_attributes_for :images, :allow_destroy => true\n\t\t" +
-				"#remember to change the association if you change this model display_name\n\t\t"
+				generate_gallery
+				return "\n\t\tmount_images :#{@attr_field.pluralize.downcase}\n"
 			end
+
+			def generate_gallery
+				Rails::Generators.invoke("adminpanel:gallery", [@attr_field, lower_name])
+			end
+
 		end
 	end
 end

data/lib/tasks/adminpanel/adminpanel.rake

@@ -2,7 +2,7 @@ namespace :adminpanel do
   desc "Interact with adminpanel models :D"
 
   task :section, [:section, :name, :type] => :environment do |t, args|
-    args.with_defaults(:section => "home", :name => "greeting", :type => "wysiwyg")
+    args.with_defaults(:section => "home", :name => "greeting", :type => "")
     puts "Creating #{args[:name]} in #{args[:section]} section"
 
     s = Adminpanel::Section.new(

data/spec/dummy/.gitignore

@@ -2,7 +2,8 @@
 capybara-*.html
 .rspec
 /log
-/tmp
+/tmp/test.log
+/tmp/development.log
 /db/*.sqlite3
 /public/system
 /coverage/

data/spec/dummy/app/controllers/adminpanel/categories_controller.rb

@@ -1,4 +1,4 @@
 module Adminpanel
-    class CategoriesController < Adminpanel::ApplicationController
-    end
+  class CategoriesController < Adminpanel::ApplicationController
+  end
 end

data/spec/dummy/app/controllers/adminpanel/products_controller.rb

@@ -1,4 +1,4 @@
 module Adminpanel
-	class ProductsController < Adminpanel::ApplicationController
-	end
-end
+  class ProductsController < Adminpanel::ApplicationController
+  end
+end

data/spec/dummy/app/models/adminpanel/categorization.rb

@@ -1,24 +1,24 @@
 module Adminpanel
-    class Categorization < ActiveRecord::Base
-        attr_accessible :product_id, :category_id
+  class Categorization < ActiveRecord::Base
+    attr_accessible :product_id, :category_id
 
-        belongs_to :product
-		    belongs_to :category
+    belongs_to :product
+    belongs_to :category
 
 
-        def self.form_attributes
-            [
-				{"product_id" => {"type" => "belongs_to", "model" => "Adminpanel::Product", "name" => "product_id"}},
-				{"category_id" => {"type" => "belongs_to", "model" => "Adminpanel::Category", "name" => "category_id"}},
-            ]
-        end
-
-        def self.display_name
-            "Categorization"
-        end
+    def self.form_attributes
+        [
+		      {"product_id" => {"type" => "belongs_to", "model" => "Adminpanel::Product", "name" => "product_id"}},
+		      {"category_id" => {"type" => "belongs_to", "model" => "Adminpanel::Category", "name" => "category_id"}},
+        ]
+    end
 
-        # def self.icon
-        #     "icon-truck"
-        # end
+    def self.display_name
+        "Categorization"
     end
+
+    # def self.icon
+    #     "icon-truck"
+    # end
+  end
 end

data/spec/dummy/app/models/adminpanel/photo.rb

@@ -0,0 +1,8 @@
+module Adminpanel
+  class Photo < ActiveRecord::Base
+    attr_accessible :product_id, :file
+
+    mount_uploader :file, PhotoUploader
+    
+  end
+end

data/spec/dummy/app/models/adminpanel/product.rb

@@ -1,33 +1,56 @@
 module Adminpanel
-    class Product < ActiveRecord::Base
-        attr_accessible :price, :name, :category_ids, :description, :images_attributes
-        has_many :images, :foreign_key => "foreign_key", :conditions => { :model => "product" }
-        has_many :categorizations
-        has_many :categories, :through => :categorizations, :dependent => :destroy
+  class Product < ActiveRecord::Base
+    attr_accessible :price, :name, :photos_attributes, :category_ids, :description
 
-		accepts_nested_attributes_for :images, :allow_destroy => true
-		#remember to change the relationship if you change this model display_name
+    has_many :categorizations
+    has_many :categories, :through => :categorizations
+		mount_images :photos
 
-        validates_presence_of :name
-        validates_presence_of :description
-        validates_presence_of :price
+    validates_presence_of :name
+    validates_presence_of :price
+    validates_presence_of :description
 
-        def self.form_attributes
-            [
-                {"category_ids" => {"type" => "has_many", "model" => "Adminpanel::Category", "name" => "category_ids"}},
-				{"price" => {"type" => "text_field", "name" => "price", "label" => "price", "placeholder" => "price"}},
-				{"name" => {"type" => "text_field", "name" => "name", "label" => "name", "placeholder" => "name"}},
-				{"description" => {"type" => "wysiwyg_field", "name" => "description", "label" => "description", "placeholder" => "description"}},
-				{"image" => {"type" => "adminpanel_file_field", "name" => "image"}},
-            ]
-        end
+    def self.form_attributes
 
-        def self.display_name
-            "Product"
-        end
 
-        # def self.icon
-        #     "icon-truck"    
-        # end
+      [
+      {"category_ids" => {"type" => "has_many", "model" => "Adminpanel::Category", "name" => "category_ids"}},
+			{
+				'name' => {
+					'type' => 'text_field',
+					'name' => 'name',
+					'label' => 'name',
+					'placeholder' => 'name'}
+			},
+      {
+        'price' => {
+          'type' => 'text_field',
+          'name' => 'price'
+        }
+      },
+			{
+				'photos' => {
+					'type' => 'adminpanel_file_field',
+					'name' => 'photo',
+					'label' => 'photo',
+					'placeholder' => 'photo'}
+			},
+			{
+				'description' => {
+					'type' => 'wysiwyg_field',
+					'name' => 'description',
+					'label' => 'description',
+					'placeholder' => 'description'}
+			},
+      ]
     end
-end
+
+    def self.display_name
+      "Product"
+    end
+
+    # def self.icon
+    #     "icon-truck"
+    # end
+  end
+end

data/spec/dummy/app/uploader/adminpanel/photo_uploader.rb

@@ -0,0 +1,86 @@
+module Adminpanel
+  class PhotoUploader < CarrierWave::Uploader::Base
+    include CarrierWave::RMagick
+
+    storage :file
+
+    def root
+      Rails.root.join 'public/'
+    end
+
+    def store_dir
+      "uploads/image/#{mounted_as}/#{model.id}"
+    end
+
+    # Process files as they are uploaded:
+    # process :resize_to_fill => [1366, 768]
+
+    # THE THUMB VERSION IS NECESSARY!!!!
+    version :thumb do
+      process :resize_to_limit => [220, 220]
+    end
+
+    # however, you can create your own versions:
+    # version :awesome do
+    #   process :reside_and_pad => [120, 900]
+    # end
+
+    # resize_and_pad(width, height, background=:transparent, gravity=::Magick::CenterGravity)
+    #
+    # Resize the image to fit within the specified dimensions while retaining
+    # the original aspect ratio. If necessary, will pad the remaining area with
+    # the given color, which defaults to transparent (for gif and png, white for jpeg).
+    #
+    # width (Integer)
+    # the width to scale the image to
+    # height (Integer)
+    # the height to scale the image to
+    # background (String, :transparent)
+    # the color of the background as a hexcode, like “ff45de“
+    # gravity (Magick::GravityType)
+    # how to position the image
+
+    # resize_to_fill(width, height)
+    #
+    # From the RMagick documentation: “Resize the image to fit within the
+    # specified dimensions while retaining the aspect ratio of the original image.
+    # If necessary, crop the image in the larger dimension.“
+    #
+    # See even www.imagemagick.org/RMagick/doc/image3.html#resize_to_fill
+    #
+    # width (Integer)
+    # the width to scale the image to
+    # height (Integer)
+    # the height to scale the image to
+
+    # resize_to_fit(width, height)
+    #
+    # From the RMagick documentation: “Resize the image to fit within the
+    # specified dimensions while retaining the original aspect ratio. The image
+    # may be shorter or narrower than specified in the smaller dimension but
+    # will not be larger than the specified values.“
+    #
+    # See even www.imagemagick.org/RMagick/doc/image3.html#resize_to_fit
+    #
+    # width (Integer)
+    # the width to scale the image to
+    # height (Integer)
+    # the height to scale the image to
+
+    # resize_to_limit(width, height)
+    #
+    # Resize the image to fit within the specified dimensions while retaining
+    # the original aspect ratio. Will only resize the image if it is larger than 
+    # the specified dimensions. The resulting image may be shorter or narrower
+    # than specified in the smaller dimension but will not be larger than the
+    # specified values.
+    #
+    # width (Integer)
+    # the width to scale the image to
+    # height (Integer)
+    # the height to scale the image to
+    def extension_white_list
+      %w(jpg jpeg png)
+    end
+  end
+end