adminpanel 1.2.5 → 1.2.6

data/spec/dummy/app/uploader/adminpanel/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/spec/features/section_pages_spec.rb

@@ -4,11 +4,11 @@ describe "Section pages" do
 	subject {page}
 
 	let(:user) { Factory(:user) }
-	before do 
+	before do
 		visit adminpanel.signin_path
 		valid_signin(user)
 	end
-	
+
 	describe "index" do
 		let(:section) { Factory(:section_with_gallery) }
 		before do
@@ -22,7 +22,7 @@ describe "Section pages" do
 	describe "show" do
 		describe "with gallery" do
 			let(:section) { Factory(:section_with_gallery) }
-			let(:image) { Factory(:image_section, :foreign_key => section.id) }
+			let(:image) { Factory(:image_section, :section_id => section.id) }
 			# let(:image2) { Factory(:image_section, :foreign_key => section.id) }
 			# let(:image3) { Factory(:image_section, :foreign_key => section.id) }
 
@@ -35,4 +35,4 @@ describe "Section pages" do
 			it { should have_link("i", adminpanel.edit_section_path(section)) }
 		end
 	end
-end
+end

data/spec/features/shared_pages_spec.rb

@@ -1,29 +1,29 @@
-require "spec_helper"
+require 'spec_helper'
 
-describe "shared pages" do
+describe 'shared pages' do
 	subject {page}
 
 	let(:user) { Factory(:user) }
-	before do 
+	before do
 		visit adminpanel.signin_path
 		valid_signin(user)
 	end
-	
-	context "when visiting" do
-		describe "index" do
+
+	context 'when visiting' do
+		describe 'index' do
 			let(:product) { Factory(:product) }
 			before do
 				visit adminpanel.products_path
 			end
 
 			it { should have_link(Adminpanel::Product.display_name, adminpanel.new_product_path)}
-			it { should have_link("i", adminpanel.product_path(product)) }
-			it { should have_link("i", adminpanel.edit_product_path(product)) }
+			it { should have_link('i', adminpanel.product_path(product)) }
+			it { should have_link('i', adminpanel.edit_product_path(product)) }
 		end
 
-		describe "new" do
+		describe 'new' do
 			let(:category){ Factory(:category) }
-			before do 
+			before do
 				category.id = 1 #to force instantiation and id.
 				visit adminpanel.new_product_path
 			end
@@ -55,7 +55,7 @@ describe "shared pages" do
 			let(:category){ Factory(:category) }
 			let(:product){ Factory(:product) }
 
-			before do 
+			before do
 				category.id = 1 #to force instantiation and id.
 				product.category_ids = ["1"]
 				visit adminpanel.edit_product_path(product)
@@ -64,7 +64,7 @@ describe "shared pages" do
 			it { should have_title(I18n.t("action.update") + " " + Adminpanel::Product.display_name) }
 
 			describe "with invalid information" do
-				before do 
+				before do
 					fill_in "product_name", :with => ""
 					fill_in "product_price", :with => ""
 					find("form#edit_resource").submit_form!
@@ -97,10 +97,10 @@ describe "shared pages" do
 
 		describe "show" do
 			let(:product) { Factory(:product) }
-			let(:image) { Factory(:image_resource) }
+			let(:photo) { Factory(:photo) }
 
 			before do
-				image.foreign_key = product.id
+				photo.product_id = product.id
 				visit adminpanel.product_path(product)
 			end
 
@@ -111,4 +111,4 @@ describe "shared pages" do
 			it { should have_link("i", adminpanel.edit_product_path(product)) }
 		end
 	end
-end
+end

data/spec/generators/gallery_generator_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe "adminpanel:gallery" do
+
+  with_args :Product do
+    it 'should generate the model' do
+      subject.should generate('app/models/adminpanel/productfile.rb'){ |content|
+        content.should =~ /attr_accessible :product_id, :file/ &&
+        content.should =~ /mount_uploader :file, ProductfileUploader/
+      }
+    end
+
+    it 'should generate the uploader' do
+      subject.should generate('app/uploader/adminpanel/productfile_uploader.rb')
+    end
+
+    # it 'should generate the migration' do
+    #   subject.should generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_adminpanel_productfields_table.rb"){|content|
+    #     content.should =~ /t.integer :product_id/
+    #   }
+    #
+    # end
+  #
+  #   it "should generate the default category model" do
+  #     subject.should generate("app/models/adminpanel/category.rb")
+  #   end
+  #
+  #   it 'should generate the categories migration' do
+  #     subject.should generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_adminpanel_categories_table.rb")
+  #   end
+  # end
+  #
+  # with_args :'-c', :false do
+  #   it "shouldn't generate the default category model" do
+  #     subject.should_not generate("app/models/adminpanel/category.rb")
+  #   end
+  #
+  #   it "shouldn't generate the categories migration" do
+  #     subject.should_not generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_adminpanel_categories_table.rb")
+  #   end
+  #
+  #   it "should generate the initialization migration" do
+  #     subject.should generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_adminpanel_tables.rb")
+  #   end
+  #
+  # end
+  #
+  # it 'should generate the configuration initializer' do
+  #   subject.should generate('config/initializers/adminpanel_setup.rb'){ |content|
+  #     content.should =~ /Adminpanel.setup do |config|/
+  #   }
+  end
+end

data/spec/generators/initialize_generator_spec.rb

@@ -1,34 +1,41 @@
 require 'spec_helper'
 
 describe "adminpanel:initialize" do
+
   context "with no arguments or options" do
-    it "should generate a migration" do
-      subject.should generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_adminpanel_tables.rb")
+    it "should generate the initialization migration" do
+      subject.should generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S").to_i + 1}_create_adminpanel_tables.rb")
     end
 
-    it "should generate the default category and migration" do
+    it "should generate the default category model" do
       subject.should generate("app/models/adminpanel/category.rb")
     end
 
     it 'should generate the categories migration' do
-      subject.should generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_adminpanel_categories_tables.rb")
+      subject.should generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_adminpanel_categories_table.rb")
+    end
+
+    it 'should generate the configuration initializer' do
+      subject.should generate('config/initializers/adminpanel_setup.rb'){ |content|
+        content.should =~ /Adminpanel.setup do |config|/
+      }
     end
   end
 
-  with_args :'-c', :false do
-    it "shouldn't generate the default category and migration" do
+  with_args :'-c', :true, :'-u', :true, :'-m', :true do
+
+    it "shouldn't generate the default category model" do
       subject.should_not generate("app/models/adminpanel/category.rb")
     end
 
     it "shouldn't generate the categories migration" do
-      subject.should_not generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_adminpanel_categories_tables.rb")
+      subject.should_not generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_adminpanel_categories_table.rb")
     end
 
-  end
+    it "shouldn't generate the initialization migration" do
+      subject.should_not generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S").to_i + 1}_create_adminpanel_tables.rb")
+    end
 
-  it 'should generate the configuration initializer' do
-    subject.should generate('config/initializers/adminpanel_setup.rb'){ |content|
-      content.should =~ /Adminpanel.setup do |config|/
-    }
   end
+
 end

data/spec/generators/resource_generator_spec.rb

@@ -1,39 +1,39 @@
-require "spec_helper"
+require 'spec_helper'
+
+describe 'adminpanel:resource' do
 
-describe "adminpanel:resource" do
-	
 	with_args :category do
-		it "should generate categories migration" do
+		it 'should generate categories migration' do
 			subject.should generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_categories_table.rb")
 		end
-		it "should generate categories controller" do
-			subject.should generate("app/controllers/adminpanel/categories_controller.rb")
+		it 'should generate categories controller' do
+			subject.should generate('app/controllers/adminpanel/categories_controller.rb')
 		end
-		it "should generate category model" do
-			subject.should generate("app/models/adminpanel/category.rb")
+		it 'should generate category model' do
+			subject.should generate('app/models/adminpanel/category.rb')
 		end
 
 		context "with has_many and belongs_to" do
 			with_args :"products,categorizations:has_many_through", :"product:belongs_to" do
 				it "should generate categories migration" do
 					subject.should generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_categories_table.rb") { |content|
-						content.should =~ /t.integer \:product_id/ &&
+						content.should =~ /t.integer :product_id/ &&
 						(
-							content.should_not =~ /t.integer \:products_id/ ||
-							content.should_not =~ /t.integer \:categorizations_id/
+							content.should_not =~ /t.integer :products_id/ ||
+							content.should_not =~ /t.integer :categorizations_id/
 						)
 					}
 				end
 
 				it "should generate model with has_many categorizations" do
 					subject.should generate("app/models/adminpanel/category.rb") { |content|
-						content.should =~ /has_many \:categorizations/
+						content.should =~ /has_many :categorizations/
 					}
 				end
 
 				it "should generate model with has_many products through categorizations" do
 					subject.should generate("app/models/adminpanel/category.rb") { |content|
-						content.should =~ /has_many \:products, \:through => \:categorizations/
+						content.should =~ /has_many :products, :through => :categorizations/
 					}
 				end
 
@@ -76,28 +76,35 @@ describe "adminpanel:resource" do
 					:"name:string", :"quantity:integer" do
 			it "should generate migration with correct values" do
 				subject.should generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_products_table.rb") { |content|
-					content.should =~ /t.text \:description/ &&
-					content.should =~ /t.text \:long_text/ &&
-					content.should =~ /t.float \:price/ &&
-					content.should =~ /t.string \:date/ &&
-					content.should =~ /t.string \:name/ &&
-					content.should =~ /t.integer \:quantity/
+					content.should =~ /t.text :description/ &&
+					content.should =~ /t.text :long_text/ &&
+					content.should =~ /t.float :price/ &&
+					content.should =~ /t.string :date/ &&
+					content.should =~ /t.string :name/ &&
+					content.should =~ /t.integer :quantity/
 				}
 			end
 		end
 
-		with_args :"image:images" do
+		with_args :"photo:images" do
 			it "should generate model with image relationship" do
 				subject.should generate("app/models/adminpanel/product.rb") { |content|
-					content.should =~ /has_many :images, :foreign_key => "foreign_key", :conditions => \{ :model => "product" \}/
-				}
-			end
-
-			it "should accept nested attributes for image" do
-				subject.should generate("app/models/adminpanel/product.rb") { |content|
-					content.should =~ /accepts_nested_attributes_for :images, :allow_destroy => true/
+					content.should =~ /mount_images :photos/ &&
+					content.should =~ /'photos' => \{/ &&
+					content.should =~ /'type' => 'adminpanel_file_field'/
 				}
 			end
+			#
+			# it "should generate a photos uploader" do
+			# 	subject.should generate("app/uploader/adminpanel/photos_uploader.rb")
+			# end
+			#
+			# it "should generate a photo model" do
+			# 	subject.should generate("app/models/adminpanel/photo.rb"){ |content|
+			# 		content.should =~ /mount_uploader :file, CameraUploader/ &&
+			# 		content.should =~ /:camera_id/
+			# 	}
+			# end
 		end
 
 
@@ -118,21 +125,21 @@ describe "adminpanel:resource" do
 
 			it "should generate model with description hash" do
 				subject.should generate("app/models/adminpanel/product.rb") { |content|
-					content.should =~ /\{\"description\" => \{/ &&
-					content.should =~ /\"type\" => \"wysiwyg_field\", /&&
-					content.should =~ /\"name\" => \"description\", / &&
-					content.should =~ /\"label\" => \"description\", / &&
-					content.should =~ /\"placeholder\" => \"description\"\}\}/
+					content.should =~ /'description' => \{/ &&
+					content.should =~ /'type' => 'wysiwyg_field',/&&
+					content.should =~ /'name' => 'description',/ &&
+					content.should =~ /'label' => 'description',/ &&
+					content.should =~ /'placeholder' => 'description'\}/
 				}
 			end
 
 			it "should generate model with name hash" do
 				subject.should generate("app/models/adminpanel/product.rb") { |content|
-					content.should =~ /\{\"name\" => \{/
-					content.should =~ /\"type\" => \"text_field\", /
-					content.should =~ /\"name\" => \"name\", /
-					content.should =~ /\"label\" => \"name\", /
-					content.should =~ /\"placeholder\" => \"name\"\}\}/
+					content.should =~ /'name' => \{/
+					content.should =~ /'type' => 'text_field',/
+					content.should =~ /'name' => 'name',/
+					content.should =~ /'label' => 'name',/
+					content.should =~ /'placeholder' => 'name'\}/
 				}
 			end
 

data/spec/support/define_factory_models.rb

@@ -12,7 +12,6 @@ Factory.define :gallery, :class => Adminpanel::Gallery do |gallery|
 end
 
 Factory.define :image_section, :class => Adminpanel::Image do |image|
-	image.model "Section"
 	image.file { fixture_file_upload(Rails.root.join('app', 'assets', 'images', 'hipster.jpg'), 'image/jpeg') }
 end
 
@@ -26,9 +25,8 @@ Factory.define :category, :class => Adminpanel::Category do |category|
 	category.name "Test Category"
 end
 
-Factory.define :image_resource, :class => Adminpanel::Image do |image|
-	image.model "Product"
-	image.file { fixture_file_upload(Rails.root.join('app', 'assets', 'images', 'hipster.jpg'), 'image/jpeg') }
+Factory.define :photo, :class => Adminpanel::Photo do |photo|
+	photo.file { fixture_file_upload(Rails.root.join('app', 'assets', 'images', 'hipster.jpg'), 'image/jpeg') }
 end
 
 Factory.define :section_with_gallery, :class => Adminpanel::Section do |section|
@@ -38,4 +36,4 @@ Factory.define :section_with_gallery, :class => Adminpanel::Section do |section|
 	section.has_description false
 	section.name "section_name"
 	section.page "index"
-end
+end