adminpanel 1.2.8 → 1.2.9

data/spec/generators/resource_generator_spec.rb

@@ -1,151 +1,123 @@
 require 'spec_helper'
-
-describe 'adminpanel:resource' do
-
-	with_args :category 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')
+require 'generators/adminpanel/resource/resource_generator'
+
+describe Adminpanel::Generators::ResourceGenerator do
+	destination File.expand_path("../../dummy/tmp", __FILE__)
+
+	 before do
+    prepare_destination
+    Rails::Generators.options[:rails][:orm] = :active_record
+  end
+
+	# after do
+	# 	prepare_destination
+	# end
+
+	describe 'with arguments %w(post name description:wysiwyg number:float
+		quantity:integer date:datepicker photo:images)' do
+
+    before do
+			run_generator %w(
+				post
+				name
+				description:wysiwyg
+				number:float
+				quantity:integer
+				date:datepicker
+				photo:images
+			)
 		end
-		it 'should generate category model' do
-			subject.should generate('app/models/adminpanel/category.rb')
+
+    it 'should generate the posts migration' do
+			migration_file('db/migrate/create_posts_table.rb').should be_a_migration
 		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_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/
-					}
-				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/
-					}
-				end
-
-				it "should generate categories model" do
-					subject.should generate("app/models/adminpanel/category.rb") { |content|
-						content.should =~ /belongs_to :product/
-					}
-				end
+		context 'the migration' do
+			it 'should have the correct fields' do
+				migration_file('db/migrate/create_posts_table.rb').should(
+					contain(/t.string :name/) &&
+					contain(/t.float :number/) &&
+					contain(/t.integer :quantity/) &&
+					contain(/t.string :date/) &&
+					contain(/t.text :description/)
+				)
 			end
 		end
-	end
 
-	with_args :categorization do
-		context "with only :belongs_to as types" do
-			with_args :"product:belongs_to", :"category:belongs_to" do
-				it "should generate categorizations migration" do
-					subject.should generate("db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_create_categorizations_table.rb") { |content|
-						content.should =~ /t.integer \:product_id/ &&
-						content.should =~ /t.integer \:category_id/
-					}
-				end
-
-				it "shouldn't generate categorizations controller" do
-					subject.should_not generate("app/controllers/adminpanel/categorizations_controller.rb")
-				end
-
-				it "should generate categorization model" do
-					subject.should generate("app/models/adminpanel/categorization.rb") { |content|
-						content.should =~ /belongs_to :product/ &&
-						content.should =~ /belongs_to :category/
-					}
-				end
-			end
+		it 'should generate posts controller' do
+			file('app/controllers/adminpanel/posts_controller.rb').should exist
 		end
-	end
 
-	with_args "Product" do
-		with_args :"description:wysiwyg", :"long_text:text",
-					:"price:float", :"date:datepicker",
-					:"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/
-				}
-			end
+
+		it 'should generate post model' do
+			file('app/models/adminpanel/post.rb').should exist
 		end
 
-		with_args :"photo:images" do
-			it "should generate model with image relationship" do
-				subject.should generate("app/models/adminpanel/product.rb") { |content|
-					content.should =~ /mount_images :photos/ &&
-					content.should =~ /'photos' => \{/ &&
-					content.should =~ /'type' => 'adminpanel_file_field'/
-				}
+		context 'the model' do
+			it 'should generate the model with correct values' do
+				file('app/models/adminpanel/post.rb').should(
+					contain(/mount_images :postfiles/) &&
+					contain(/'photos' => \{/) &&
+					contain(/'type' => 'adminpanel_file_field'/)
+				)
+			end
+
+			it 'should have the description hash' do
+				file('app/models/adminpanel/post.rb').should(
+					contain(/'description' => \{/) &&
+					contain(/'type' => 'wysiwyg_field',/) &&
+					contain(/'name' => \{/) &&
+					contain(/'type' => 'text_field',/) &&
+					contain(/'number' => \{/) &&
+					contain(/'type' => 'text_field',/) &&
+					contain(/'quantity' => \{/) &&
+					contain(/'type' => 'number_field',/) &&
+					contain(/'date' => \{/) &&
+					contain(/'type' => 'datepicker_field',/) &&
+					contain(/'postfiles' => \{/) &&
+					contain(/'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
+	end
 
+	describe 'with arguments categorizations
+		category:belongs_to product:belongs_to' do
 
-		with_args :"name:string", :"description:wysiwyg" do
-			it "should generate namespaced products_controller.rb" do
-				subject.should generate("app/controllers/adminpanel/products_controller.rb") { |content|
-					content.should =~ /module Adminpanel/ &&
-					content.should =~ /class ProductsController < Adminpanel\:\:ApplicationController/ &&
-					content.should =~ /end\nend/
-				}
-			end
+		before do
+			run_generator %w(
+				categorization
+				category:belongs_to
+				product:belongs_to
+			)
+		end
 
-			it "should generate model with attr_accessible" do
-				subject.should generate("app/models/adminpanel/product.rb") { |content|
-					content.should =~ /attr_accessible/
-				}
-			end
+		it 'shouldn\'t generate categorizations controller' do
+			file('app/controllers/adminpanel/categorizations_controller').should_not exist
+		end
 
-			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 =~ /'label' => 'description',/ &&
-					content.should =~ /'placeholder' => 'description'\}/
-				}
-			end
+		it 'should generate categorization model' do
+			file('app/models/adminpanel/categorization.rb').should(
+				contain(/belongs_to :product/) &&
+				contain(/belongs_to :category/)
+			)
+		end
+	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 =~ /'label' => 'name',/ &&
-					content.should =~ /'placeholder' => 'name'\}/
-				}
-			end
+	describe 'with arguments post name products,categorizations:has_many_through' do
+		before do
+			run_generator %w(
+				post
+				name
+				products,categorizations:has_many_through
+			)
+		end
 
-			it "should generate model with overwritten sample_name" do
-				subject.should generate("app/models/adminpanel/product.rb") { |content|
-					content.should =~ /def self.display_name\n      \"Product\"\n    end/
-				}
-			end
+		it 'should generate the model with has_many :categorizations' do
+			file('app/models/adminpanel/post.rb').should(
+				contain(/has_many :categorizations/) &&
+				contain(/has_many :products, :through => :categorizations/)
+			)
 		end
 	end
 end

data/spec/spec_helper.rb

@@ -11,7 +11,6 @@ require "rspec/rails"
 require "factory_girl"
 require "carrierwave/test/matchers"
 require "active_record"
-require "genspec"
 require "rake"
 
 Dir["./spec/support/**/*.rb"].sort.each {|f| require f}
@@ -28,6 +27,6 @@ RSpec.configure do |config|
 	)
 
 	config.include Rails.application.routes.url_helpers
-	
+
 	config.order = 'random'
 end

data/spec/tasks/adminpanel_rake_spec.rb

@@ -15,12 +15,12 @@ describe "adminpanel rake task" do
     end
 
 
-    it "should generate 10 product records" do
-      Adminpanel::Product.all.count.should eq 10
-    end
+    # it "should generate 10 product records" do
+    #   Adminpanel::Product.find(:all).count.should eq 10
+    # end
 
     it "attributes shouldn't be nil" do
-      Adminpanel::Product.all.each do |product|
+      Adminpanel::Product.find(:all).each do |product|
         if (product.name.nil? || product.description.nil? || product.price.nil? ||
           product.name == "" || product.description == "" || product.price == "")
           has_nil_attribute = true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adminpanel
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
   - 2
-  - 8
-  version: 1.2.8
+  - 9
+  version: 1.2.9
 platform: ruby
 authors: 
 - Jose Ramon Camacho
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-21 00:00:00 -06:00
+date: 2014-03-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -184,12 +184,14 @@ dependencies:
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 73
         segments: 
-        - 0
-        version: "0"
+        - 10
+        - 1
+        - 1
+        version: 10.1.1
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
@@ -303,19 +305,19 @@ dependencies:
   type: :development
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: genspec
+  name: ammeter
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 0
         - 2
-        - 8
-        version: 0.2.8
+        - 9
+        version: 0.2.9
   type: :development
   version_requirements: *id019
 description: Gem that makes the admin panel for a site a breeze!
@@ -409,10 +411,10 @@ files:
 - app/assets/stylesheets/adminpanel/theme.css
 - app/assets/stylesheets/adminpanel/timepicker.css
 - app/assets/stylesheets/application-admin.css
+- app/controllers/adminpanel/analytics_controller.rb
 - app/controllers/adminpanel/application_controller.rb
 - app/controllers/adminpanel/categories_controller.rb
 - app/controllers/adminpanel/galleries_controller.rb
-- app/controllers/adminpanel/pages_controller.rb
 - app/controllers/adminpanel/sections_controller.rb
 - app/controllers/adminpanel/sessions_controller.rb
 - app/controllers/adminpanel/users_controller.rb
@@ -424,6 +426,7 @@ files:
 - app/helpers/adminpanel/router_helper.rb
 - app/helpers/adminpanel/sessions_helper.rb
 - app/helpers/adminpanel/shared_pages_helper.rb
+- app/models/adminpanel/analytic.rb
 - app/models/adminpanel/gallery.rb
 - app/models/adminpanel/image.rb
 - app/models/adminpanel/section.rb
@@ -432,6 +435,7 @@ files:
 - app/uploaders/adminpanel/gallery_uploader.rb
 - app/uploaders/adminpanel/image_uploader.rb
 - app/views/adminpanel/.DS_Store
+- app/views/adminpanel/analytics/index.html.erb
 - app/views/adminpanel/categories/_categories_table.html.erb
 - app/views/adminpanel/categories/_category_form.html.erb
 - app/views/adminpanel/categories/create.js.erb
@@ -447,7 +451,6 @@ files:
 - app/views/adminpanel/galleries/new.html.erb
 - app/views/adminpanel/galleries/show.html.erb
 - app/views/adminpanel/galleries/update.html.erb
-- app/views/adminpanel/pages/index.html.erb
 - app/views/adminpanel/sections/_sections_table.html.erb
 - app/views/adminpanel/sections/edit.html.erb
 - app/views/adminpanel/sections/index.html.erb
@@ -461,9 +464,11 @@ files:
 - app/views/shared/_breadcrumb.html.erb
 - app/views/shared/_error_messages.html.erb
 - app/views/shared/_form_fields.html.erb
+- app/views/shared/_gallery_entries.html.erb
 - app/views/shared/_image_fields.html.erb
 - app/views/shared/_init_editor.html.erb
 - app/views/shared/edit.html.erb
+- app/views/shared/gallery_entries.js.erb
 - app/views/shared/index.html.erb
 - app/views/shared/new.html.erb
 - app/views/shared/show.html.erb
@@ -518,6 +523,7 @@ files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/adminpanel_setup.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -621,6 +627,7 @@ test_files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/adminpanel_setup.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb