adminpanel 2.0.1 → 2.1.0

data/spec/generators/gallery_generator_spec.rb

@@ -25,7 +25,7 @@ describe Adminpanel::Generators::GalleryGenerator do
 
 
     it 'should migrate the correct fields' do
-      migration_file('db/migrate/create_adminpanel_productfiles_table.rb').should(
+      migration_file('db/migrate/create_adminpanel_productfiles.rb').should(
         contain(/t.integer :product_id/) &&
         contain(/create_table :adminpanel_productfiles/)
       )

data/spec/generators/resource_generator_spec.rb

@@ -13,8 +13,35 @@ describe Adminpanel::Generators::ResourceGenerator do
 		prepare_destination
 	end
 
+	describe 'with args and option -g false' do
+
+    before do
+			# File.new "#{Rails.root}/tmp/config/initializers/adminpanel_setup.rb", 'w+' do |f|
+			# 	create config/initializers/adminpanel_setup.rb file under generator
+			# 	f.puts 'hi'
+			# end
+			run_generator %w(
+				post
+				name
+				description:wysiwyg
+				number:float
+				-g=false
+			)
+		end
+
+		it "shouldn't generate the gallery " do
+			file('app/models/adminpanel/postfile.rb').should_not exist
+		end
+
+		# it "should add ':posts,' to file adminpanel_setup.rb" do
+		# 	file('config/initializers/adminpanel_setup.rb').should(
+		# 		contain(/:posts,/)
+		# 	)
+		# end
+	end
+
 	describe 'with arguments %w(post name description:wysiwyg number:float
-		quantity:integer date:datepicker photo:images)' do
+		quantity:integer date:datepicker)' do
 
     before do
 			run_generator %w(
@@ -25,17 +52,16 @@ describe Adminpanel::Generators::ResourceGenerator do
 				flag:boolean
 				quantity:integer
 				date:datepicker
-				photo:images
 			)
 		end
 
     it 'should generate the posts migration' do
-			migration_file('db/migrate/create_posts_table.rb').should be_a_migration
+			migration_file('db/migrate/create_adminpanel_posts.rb').should be_a_migration
 		end
 
 		context 'the migration' do
 			it 'should have the correct fields' do
-				migration_file('db/migrate/create_posts_table.rb').should(
+				migration_file('db/migrate/create_adminpanel_posts.rb').should(
 					contain(/t.string :name/) &&
 					contain(/t.float :number/) &&
 					contain(/t.boolean :flag/) &&
@@ -60,10 +86,9 @@ describe Adminpanel::Generators::ResourceGenerator do
 					contain(/:flag/) &&
 					contain(/:quantity/) &&
 					contain(/:date/) &&
-					contain(/{:postfiles_attributes => \[:id, :file, :_destroy\]}/)
+					contain(/{ postfiles_attributes: \[:id, :file, :_destroy\] }/)
 				)
 			end
-
 		end
 
 
@@ -113,7 +138,7 @@ describe Adminpanel::Generators::ResourceGenerator do
 			)
 		end
 
-		it 'shouldn\'t generate categorizations controller' do
+		it "shouldn't generate categorizations controller" do
 			file('app/controllers/adminpanel/categorizations_controller').should_not exist
 		end
 
@@ -125,19 +150,19 @@ describe Adminpanel::Generators::ResourceGenerator do
 		end
 	end
 
-	describe 'with arguments post name products,categorizations:has_many_through' do
+	describe 'with arguments post name products:has_many' do
 		before do
 			run_generator %w(
 				post
 				name
-				products,categorizations:has_many_through
+				products:has_many
 			)
 		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/)
+				contain(/# has_many :categorizations/) &&
+				contain(/# has_many :products, :through => :categorizations/)
 			)
 		end
 	end

data/spec/spec_helper.rb

@@ -5,36 +5,35 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../dummy/config/environment", __FILE__)
-require "rspec/rails"
-require "capybara/rspec"
-require "factory_girl_rails"
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../dummy/config/environment', __FILE__)
+require 'rspec/rails'
+require 'capybara/rspec'
+require 'factory_girl_rails'
 require 'carrierwave/orm/activerecord'
-require "carrierwave/test/matchers"
-require "active_record"
-require "rake"
-
+require 'carrierwave/test/matchers'
+require 'active_record'
+require 'rake'
 
 Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
 
-# FactoryGirl.find_definitions
+Capybara.javascript_driver = :webkit
+
 RSpec.configure do |config|
 	config.treat_symbols_as_metadata_keys_with_true_values = true
 	config.run_all_when_everything_filtered = true
 	config.filter_run :focus
 
-	# root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 	ActiveRecord::Base.establish_connection(
 	  :adapter => 'sqlite3',
 	  :database => ':memory:'
 	)
 
-	config.include ActionDispatch::TestProcess
-
 	puts "creating sqlite in memory database"
 	load "#{Rails.root}/db/schema.rb"
 
+	ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+
 	config.use_transactional_fixtures = false
 
 	config.include Rails.application.routes.url_helpers

data/spec/support/capybara_matchers.rb

@@ -0,0 +1,17 @@
+RSpec::Matchers::define :have_title do |text|
+  match do |page|
+    Capybara.string(page.body).has_selector?('title', :text => text)
+  end
+end
+
+RSpec::Matchers.define(:have_image) do |src|
+  match { |node| node.has_selector? %(img[src="#{src}"]) }
+
+  failure_message_for_should do
+    "Expected an image with src #{src.inspect}"
+  end
+
+  failure_message_for_should_not do
+    "Found image with src #{src.inspect}!"
+  end
+end

data/spec/support/factories.rb

@@ -15,7 +15,7 @@ FactoryGirl.define do
 
 	factory :product, :class => Adminpanel::Product do
 		price "12392.2"
-		name "very little description"
+		name 'product name'
 		description "this is a little longer description, can be very long"
 	end
 

data/spec/support/helper_methods.rb

@@ -25,24 +25,6 @@ def get_user
 	end
 end
 
-RSpec::Matchers::define :have_title do |text|
-  match do |page|
-    Capybara.string(page.body).has_selector?('title', :text => text)
-  end
-end
-
 def clean_uploads_folder
 	FileUtils.rm_rf(Dir["#{Rails.root}/public/uploads/."])
 end
-
-RSpec::Matchers.define(:have_image) do |src|
-  match { |node| node.has_selector? %(img[src="#{src}"]) }
-
-  failure_message_for_should do
-    "Expected an image with src #{src.inspect}"
-  end
-
-  failure_message_for_should_not do
-    "Found image with src #{src.inspect}!"
-  end
-end

data/spec/support/shared_connection.rb

@@ -0,0 +1,10 @@
+class ActiveRecord::Base
+  mattr_accessor :shared_connection
+  @@shared_connection = nil
+
+  def self.connection
+    @@shared_connection || retrieve_connection
+  end
+end
+# Forces all threads to share the same connection. This works on
+# Capybara because it starts the web server in a thread.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adminpanel
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Jose Ramon Camacho
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -265,20 +265,46 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: 4.1.0
+- !ruby/object:Gem::Dependency
+  name: koala
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.9
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.9
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -343,16 +369,22 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.1.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -367,6 +399,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.42.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.42.0
+- !ruby/object:Gem::Dependency
+  name: capybara-webkit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 description: Gem that makes the administrative panel for a site a breeze!
 email:
 - joserracamacho@gmail.com
@@ -424,7 +484,7 @@ files:
 - app/assets/images/adminpanel/toolbar.png
 - app/assets/javascripts/adminpanel/bootstrap-datepicker.js
 - app/assets/javascripts/adminpanel/bootstrap-timepicker.js
-- app/assets/javascripts/adminpanel/bootstrap-wysihtml5-3.min.js
+- app/assets/javascripts/adminpanel/bootstrap-wysihtml5-4pre.js
 - app/assets/javascripts/adminpanel/bootstrap-wysihtml5-advanced.js
 - app/assets/javascripts/adminpanel/bootstrap-wysihtml5.js
 - app/assets/javascripts/adminpanel/bootstrap.js
@@ -434,31 +494,32 @@ files:
 - app/assets/javascripts/adminpanel/jquery.facybox.js
 - app/assets/javascripts/adminpanel/jquery.masonry.min.js
 - app/assets/javascripts/adminpanel/jquery.slimscroll.min.js
-- app/assets/javascripts/adminpanel/medium-editor.js
 - app/assets/javascripts/adminpanel/realm.js
+- app/assets/javascripts/adminpanel/spinner.js.coffee
 - app/assets/javascripts/adminpanel/tables.js
-- app/assets/javascripts/adminpanel/wysiwyg.js
+- app/assets/javascripts/adminpanel/wysiwyg.js.coffee
 - app/assets/javascripts/application-admin.js
 - app/assets/stylesheets/adminpanel/_clearfix.css
 - app/assets/stylesheets/adminpanel/alertify.css
 - app/assets/stylesheets/adminpanel/bootstrap-wysihtml5.css
-- app/assets/stylesheets/adminpanel/bootstrap.css
+- app/assets/stylesheets/adminpanel/bootstrap.css.erb
 - app/assets/stylesheets/adminpanel/datepicker.css
 - app/assets/stylesheets/adminpanel/facybox.css
 - app/assets/stylesheets/adminpanel/fullcalendar.css
 - app/assets/stylesheets/adminpanel/fullcalendar.print.css
-- app/assets/stylesheets/adminpanel/medium-editor.css.scss
 - app/assets/stylesheets/adminpanel/select2.css
-- app/assets/stylesheets/adminpanel/theme.css
+- app/assets/stylesheets/adminpanel/theme.css.erb
 - 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/auths_controller.rb
 - app/controllers/adminpanel/categories_controller.rb
 - app/controllers/adminpanel/galleries_controller.rb
 - app/controllers/adminpanel/sections_controller.rb
 - app/controllers/adminpanel/sessions_controller.rb
 - app/controllers/adminpanel/users_controller.rb
+- app/controllers/concerns/adminpanel/facebook_actions.rb
 - app/controllers/concerns/adminpanel/galleryzable_actions.rb
 - app/controllers/concerns/adminpanel/rest_actions.rb
 - app/helpers/adminpanel/adminpanel_form_builder.rb
@@ -468,12 +529,14 @@ files:
 - app/helpers/adminpanel/sessions_helper.rb
 - app/helpers/adminpanel/shared_pages_helper.rb
 - app/models/adminpanel/analytic.rb
+- app/models/adminpanel/auth.rb
 - app/models/adminpanel/gallery.rb
 - app/models/adminpanel/group.rb
 - app/models/adminpanel/image.rb
 - app/models/adminpanel/section.rb
 - app/models/adminpanel/user.rb
 - app/models/concerns/adminpanel/base.rb
+- app/models/concerns/adminpanel/facebook.rb
 - app/models/concerns/adminpanel/galleryzation.rb
 - app/models/contact.rb
 - app/uploaders/adminpanel/gallery_uploader.rb
@@ -501,13 +564,15 @@ files:
 - app/views/layouts/admin-login.html.erb
 - app/views/layouts/admin.html.erb
 - app/views/shared/_breadcrumb.html.erb
+- app/views/shared/_create_remote_resource_button.html.erb
 - app/views/shared/_delete_icon_button.html.erb
 - app/views/shared/_edit_icon_button.html.erb
 - app/views/shared/_error_messages.html.erb
+- app/views/shared/_fb_icon_button.html.erb
+- app/views/shared/_fb_publish_modal.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/_modal.html.erb
 - app/views/shared/_new_resource_button.html.erb
 - app/views/shared/_remote_form_fields.html.erb
@@ -515,6 +580,7 @@ files:
 - app/views/shared/create_belongs_to.js.erb
 - app/views/shared/create_has_many.js.erb
 - app/views/shared/edit.html.erb
+- app/views/shared/fb_choose_page.html.erb
 - app/views/shared/gallery_entries.js.erb
 - app/views/shared/index.html.erb
 - app/views/shared/new.html.erb
@@ -540,7 +606,6 @@ files:
 - lib/generators/adminpanel/initialize/templates/section_uploader.rb
 - lib/generators/adminpanel/resource/resource_generator.rb
 - lib/generators/adminpanel/resource/templates/controller.rb
-- lib/generators/adminpanel/resource/templates/migration.rb
 - lib/generators/adminpanel/resource/templates/resource.rb
 - lib/tasks/adminpanel/adminpanel.rake
 - spec/dummy/.gitignore
@@ -553,6 +618,7 @@ files:
 - spec/dummy/app/controllers/adminpanel/.gitkeep
 - spec/dummy/app/controllers/adminpanel/mugs_controller.rb
 - spec/dummy/app/controllers/adminpanel/products_controller.rb
+- spec/dummy/app/controllers/adminpanel/salesmen_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
@@ -563,6 +629,7 @@ files:
 - spec/dummy/app/models/adminpanel/mug.rb
 - spec/dummy/app/models/adminpanel/photo.rb
 - spec/dummy/app/models/adminpanel/product.rb
+- spec/dummy/app/models/adminpanel/salesman.rb
 - spec/dummy/app/uploader/adminpanel/photo_uploader.rb
 - spec/dummy/app/uploader/adminpanel/section_uploader.rb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -597,7 +664,10 @@ files:
 - spec/features/authentication_pages_spec.rb
 - spec/features/galleries_pages_spec.rb
 - spec/features/section_pages_spec.rb
-- spec/features/shared_pages_spec.rb
+- spec/features/shared_pages/edit_spec.rb
+- spec/features/shared_pages/index_spec.rb
+- spec/features/shared_pages/new_spec.rb
+- spec/features/shared_pages/show_spec.rb
 - spec/generators/gallery_generator_spec.rb
 - spec/generators/initialize_generator_spec.rb
 - spec/generators/resource_generator_spec.rb
@@ -605,8 +675,10 @@ files:
 - spec/models/section_spec.rb
 - spec/models/user_spec.rb
 - spec/spec_helper.rb
+- spec/support/capybara_matchers.rb
 - spec/support/factories.rb
 - spec/support/helper_methods.rb
+- spec/support/shared_connection.rb
 - spec/tasks/adminpanel_rake_spec.rb
 homepage: https://github.com/joseramonc/adminpanel
 licenses:
@@ -621,7 +693,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -644,6 +716,7 @@ test_files:
 - spec/dummy/app/controllers/adminpanel/.gitkeep
 - spec/dummy/app/controllers/adminpanel/mugs_controller.rb
 - spec/dummy/app/controllers/adminpanel/products_controller.rb
+- spec/dummy/app/controllers/adminpanel/salesmen_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
@@ -654,6 +727,7 @@ test_files:
 - spec/dummy/app/models/adminpanel/mug.rb
 - spec/dummy/app/models/adminpanel/photo.rb
 - spec/dummy/app/models/adminpanel/product.rb
+- spec/dummy/app/models/adminpanel/salesman.rb
 - spec/dummy/app/uploader/adminpanel/photo_uploader.rb
 - spec/dummy/app/uploader/adminpanel/section_uploader.rb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -688,7 +762,10 @@ test_files:
 - spec/features/authentication_pages_spec.rb
 - spec/features/galleries_pages_spec.rb
 - spec/features/section_pages_spec.rb
-- spec/features/shared_pages_spec.rb
+- spec/features/shared_pages/edit_spec.rb
+- spec/features/shared_pages/index_spec.rb
+- spec/features/shared_pages/new_spec.rb
+- spec/features/shared_pages/show_spec.rb
 - spec/generators/gallery_generator_spec.rb
 - spec/generators/initialize_generator_spec.rb
 - spec/generators/resource_generator_spec.rb
@@ -696,6 +773,8 @@ test_files:
 - spec/models/section_spec.rb
 - spec/models/user_spec.rb
 - spec/spec_helper.rb
+- spec/support/capybara_matchers.rb
 - spec/support/factories.rb
 - spec/support/helper_methods.rb
+- spec/support/shared_connection.rb
 - spec/tasks/adminpanel_rake_spec.rb