adminpanel 1.2.9 → 1.2.10

data/spec/features/shared_pages_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
+require 'support/test_database'
 
 describe 'shared pages' do
-	subject {page}
+	subject { page }
 
 	let(:user) { Factory(:user) }
 	before do
@@ -21,33 +22,76 @@ describe 'shared pages' do
 			it { should have_link('i', adminpanel.edit_product_path(product)) }
 		end
 
-		describe 'new' do
-			let(:category){ Factory(:category) }
-			before do
-				category.id = 1 #to force instantiation and id.
-				visit adminpanel.new_product_path
-			end
-
-			it { should have_title(I18n.t("action.create") + " " + Adminpanel::Product.display_name) }
+		context 'product' do
 
-			describe "with invalid information" do
-				before { find("form#new_resource").submit_form! }
+			describe 'new' do
+				let(:category){ Factory(:category) }
+				before do
+					category.id = 1 #to force instantiation and id.
+					visit adminpanel.new_product_path
+				end
 
 				it { should have_title(I18n.t("action.create") + " " + Adminpanel::Product.display_name) }
-				it { should have_selector("div#alerts") }
-			end
 
-			describe "with valid information" do
-				before do
-					fill_in "product_name", :with => "product name"
-					fill_in "product_price", :with => "855.5"
-					find(:css, "#product_category_ids_[value='1']").set(true)
-					find(:xpath, "//input[@id='description-field']").set "<p>a little longer text</p>"
-					find("form#new_resource").submit_form!
+				it 'should have add remote category button' do
+					should have_selector(
+						'a.btn-info',
+						:text => I18n.t(
+							'other.add',
+							:model => Adminpanel::Category.display_name
+						)
+					)
 				end
 
-				it { should have_content(I18n.t("action.save_success"))}
-				it { Adminpanel::Categorization.count.should equal(1)}
+				describe 'submtting with invalid information' do
+					before do
+						find("form#new_resource").submit_form!
+					end
+
+					it { should have_title(I18n.t("action.create") + " " + Adminpanel::Product.display_name) }
+					it { should have_selector("div#alerts") }
+				end
+
+				# describe 'opening the remote form modal' do
+				# 	before do
+				# 		page.find("a##{Adminpanel::Category.name.demodulize.downcase}-modal-link").click
+				# 	end
+				#
+				# 	it 'should have modal with correct #modal-title' do
+				# 		page.should have_selector(
+				# 		:css,
+				# 		'h3#modal-title',
+				# 		:content => I18n.t('other.add', :model => Adminpanel::Category.display_name)
+				# 		)
+				# 	end
+				#
+				# 	it 'should have the modal with the correct fields' do
+				# 		should have_selector("input#category_name")
+				# 	end
+
+					# describe 'sending the resource remotely with invalid information' do
+					# 	before do
+					# 		find('#new-Category-button').click
+					# 	end
+					# 	it 'should display error message' do
+					# 		page.should have_selector("div#alerts")
+					# 	end
+					# end
+
+				# end
+
+				describe 'submitting with valid information' do
+					before do
+						fill_in "product_name", :with => "product name"
+						fill_in "product_price", :with => "855.5"
+						find(:css, "#product_category_ids_[value='1']").set(true)
+						find(:xpath, "//input[@id='description-field']").set "<p>a little longer text</p>"
+						find("form#new_resource").submit_form!
+					end
+
+					it { should have_content(I18n.t("action.save_success"))}
+					it { Adminpanel::Categorization.count.should equal(1)}
+				end
 			end
 		end
 

data/spec/generators/gallery_generator_spec.rb

@@ -8,9 +8,9 @@ describe Adminpanel::Generators::GalleryGenerator do
     Rails::Generators.options[:rails][:orm] = :active_record
   end
 
-  # after do
-  #   prepare_destination
-  # end
+  after do
+    prepare_destination
+  end
 
   describe 'with "product" as argument' do
     before do

data/spec/generators/resource_generator_spec.rb

@@ -9,9 +9,9 @@ describe Adminpanel::Generators::ResourceGenerator do
     Rails::Generators.options[:rails][:orm] = :active_record
   end
 
-	# after do
-	# 	prepare_destination
-	# end
+	after do
+		prepare_destination
+	end
 
 	describe 'with arguments %w(post name description:wysiwyg number:float
 		quantity:integer date:datepicker photo:images)' do

data/spec/models/gallery_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
+require 'support/test_database'
+
 
 describe Adminpanel::Gallery do
 	before do
@@ -19,4 +21,4 @@ describe Adminpanel::Gallery do
 	describe "default scope" do
 		it { expect(Adminpanel::Gallery.scoped.to_sql).to eq Adminpanel::Gallery.reorder('').order('position ASC').to_sql}
 	end
-end
+end

data/spec/models/section_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'support/test_database'
 
 describe Adminpanel::Section do
 	before do
@@ -15,27 +16,27 @@ describe Adminpanel::Section do
 	subject { @section }
 
 	it { should respond_to(:description) }
-	it { should respond_to(:has_image) }	
+	it { should respond_to(:has_image) }
 	it { should respond_to(:key) }
 	it { should respond_to(:name) }
-	it { should respond_to(:has_description) }	
-	it { should respond_to(:page) }	
+	it { should respond_to(:has_description) }
+	it { should respond_to(:page) }
 
 	describe "when key is telephone and has less than 10 chars" do
-		before do 
+		before do
 			@section.key = "telephone"
 			@section.description = "1" * 9
 		end
 		it { @section.valid? eq false}
-	end	
+	end
 
 	describe "when key is telephone and has more than 10 chars" do
-		before do 
+		before do
 			@section.key = "telephone"
 			@section.description = "1" * 11
 		end
 		it { @section.valid? eq false}
-	end	
+	end
 
 	describe "when key is telephone and has 10 chars" do
 		before do
@@ -44,17 +45,17 @@ describe Adminpanel::Section do
 		end
 		it { @section.valid? eq true}
 
-	end	
+	end
 
 	describe "when key is blank" do
 		before {@section.key = " "}
 		it { @section.valid? eq false}
-	end	
+	end
 
 	describe "when name is blank" do
 		before {@section.name = " "}
 		it { @section.valid? eq false}
-	end	
+	end
 
 	describe "when description is blank" do
 		before {@section.description = " "}
@@ -64,4 +65,4 @@ describe Adminpanel::Section do
 	describe "default scope" do
 		it { expect(Adminpanel::Section.scoped.to_sql).to eq Adminpanel::Section.reorder('').order('page ASC').to_sql}
 	end
-end
+end

data/spec/models/user_spec.rb

@@ -1,13 +1,16 @@
 require 'spec_helper'
+require 'support/test_database'
 
-describe Adminpanel::User do
 
+describe Adminpanel::User do
+  let(:group) { Factory(:group) }
   before do
     @user = Adminpanel::User.new(
       :name => "Example User",
       :email => "user@example.com",
       :password => "foobar",
-      :password_confirmation => "foobar"
+      :password_confirmation => "foobar",
+      :group_id => group.object_id
       )
   end
 
@@ -15,6 +18,7 @@ describe Adminpanel::User do
 
   it { should respond_to(:name) }
   it { should respond_to(:email) }
+  it { should respond_to(:group_id) }
   it { should respond_to(:password_digest) }
   it { should respond_to(:password) }
   it { should respond_to(:password_confirmation) }

data/spec/spec_helper.rb

@@ -8,24 +8,27 @@
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require "rspec/rails"
+require "capybara/rspec"
 require "factory_girl"
 require "carrierwave/test/matchers"
 require "active_record"
 require "rake"
 
-Dir["./spec/support/**/*.rb"].sort.each {|f| require f}
+Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
 
 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__), '..'))
+	# root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 	ActiveRecord::Base.establish_connection(
 	  :adapter => 'sqlite3',
 	  :database => ':memory:'
 	)
 
+	config.use_transactional_fixtures = false
+
 	config.include Rails.application.routes.url_helpers
 
 	config.order = 'random'

data/spec/support/define_factory_models.rb

@@ -5,6 +5,11 @@ Factory.define :user, :class => Adminpanel::User do |user|
 	user.email "email@test.com"
 	user.password "123456"
 	user.password_confirmation "123456"
+	user.group_id '1'
+end
+
+Factory.define :group, :class => Adminpanel::Group do |group|
+	group.name 'Admin'
 end
 
 Factory.define :gallery, :class => Adminpanel::Gallery do |gallery|
@@ -23,6 +28,7 @@ end
 
 Factory.define :category, :class => Adminpanel::Category do |category|
 	category.name "Test Category"
+	category.model "Product"
 end
 
 Factory.define :photo, :class => Adminpanel::Photo do |photo|

data/spec/support/helper_methods.rb

@@ -1,4 +1,5 @@
 def valid_signin(user)
+	Factory(:group)
 	fill_in "inputEmail", :with => user.email
 	fill_in "inputPassword", :with => user.password
  	click_button "signin-button"
@@ -24,4 +25,4 @@ RSpec::Matchers.define(:have_image) do |src|
   failure_message_for_should_not do
     "Found image with src #{src.inspect}!"
   end
-end
+end

data/spec/support/test_database.rb

@@ -3,6 +3,7 @@ ActiveRecord::Migration.create_table :adminpanel_users do |t|
     t.string   :email
     t.string   :password_digest
     t.string   :remember_token
+    t.integer  :group_id
     t.datetime :created_at,      :null => false
     t.datetime :updated_at,      :null => false
 end
@@ -33,6 +34,7 @@ ActiveRecord::Migration.create_table :adminpanel_photos do |t|
 end
 ActiveRecord::Migration.create_table :adminpanel_categories do |t|
     t.string   :name
+    t.string   :model
     t.datetime :created_at,      :null => false
     t.datetime :updated_at,      :null => false
 end
@@ -42,6 +44,11 @@ ActiveRecord::Migration.create_table :adminpanel_categorizations do |t|
     t.datetime :created_at,      :null => false
     t.datetime :updated_at,      :null => false
 end
+ActiveRecord::Migration.create_table :adminpanel_groups do |t|
+    t.string   :name
+    t.datetime :created_at,      :null => false
+    t.datetime :updated_at,      :null => false
+end
 ActiveRecord::Migration.create_table :adminpanel_sections do |t|
     t.string   :name
     t.text     :description

data/spec/tasks/adminpanel_rake_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'support/test_database'
 
 describe "adminpanel rake task" do
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adminpanel
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 2
-  - 9
-  version: 1.2.9
+  - 10
+  version: 1.2.10
 platform: ruby
 authors: 
 - Jose Ramon Camacho
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-28 00:00:00 -06:00
+date: 2014-04-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -132,9 +132,25 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: google-api-client
+  name: cancan
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 6
+        - 10
+        version: 1.6.10
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: google-api-client
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -146,11 +162,11 @@ dependencies:
         - 1
         version: 0.7.1
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -161,11 +177,11 @@ dependencies:
         - 3
         version: "1.3"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -177,11 +193,11 @@ dependencies:
         - 12
         version: 3.2.12
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -193,11 +209,11 @@ dependencies:
         - 1
         version: 10.1.1
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: sqlite3
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -207,11 +223,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -223,11 +239,11 @@ dependencies:
         - 4
         version: 2.6.4
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -239,11 +255,11 @@ dependencies:
         - 0
         version: 2.14.0
   type: :development
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -255,11 +271,11 @@ dependencies:
         - 0
         version: 2.14.0
   type: :development
-  version_requirements: *id015
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: capybara
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -271,11 +287,11 @@ dependencies:
         - 4
         version: 1.1.4
   type: :development
-  version_requirements: *id016
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -287,11 +303,11 @@ dependencies:
         - 9
         version: 1.5.9
   type: :development
-  version_requirements: *id017
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: rubyzip
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -303,11 +319,11 @@ dependencies:
         - 9
         version: 0.9.9
   type: :development
-  version_requirements: *id018
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: ammeter
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -319,7 +335,7 @@ dependencies:
         - 9
         version: 0.2.9
   type: :development
-  version_requirements: *id019
+  version_requirements: *id020
 description: Gem that makes the admin panel for a site a breeze!
 email: 
 - joserracamacho@gmail.com
@@ -428,6 +444,7 @@ files:
 - app/helpers/adminpanel/shared_pages_helper.rb
 - app/models/adminpanel/analytic.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
@@ -467,10 +484,15 @@ files:
 - 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/_remote_form_fields.html.erb
+- 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/gallery_entries.js.erb
 - app/views/shared/index.html.erb
 - app/views/shared/new.html.erb
+- app/views/shared/new.js.erb
 - app/views/shared/show.html.erb
 - config/locales/es.yml
 - config/routes.rb
@@ -483,6 +505,7 @@ files:
 - lib/generators/adminpanel/gallery/templates/gallery_template.rb
 - lib/generators/adminpanel/gallery/templates/uploader.rb
 - lib/generators/adminpanel/initialize/initialize_generator.rb
+- lib/generators/adminpanel/initialize/templates/ability.rb
 - lib/generators/adminpanel/initialize/templates/adminpanel_setup.rb
 - lib/generators/adminpanel/initialize/templates/category_template.rb
 - lib/generators/adminpanel/initialize/templates/create_adminpanel_categories_table.rb
@@ -501,12 +524,12 @@ files:
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/adminpanel/.gitkeep
-- spec/dummy/app/controllers/adminpanel/categories_controller.rb
 - spec/dummy/app/controllers/adminpanel/products_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
+- spec/dummy/app/models/ability.rb
 - spec/dummy/app/models/adminpanel/categorization.rb
 - spec/dummy/app/models/adminpanel/category.rb
 - spec/dummy/app/models/adminpanel/photo.rb
@@ -550,7 +573,6 @@ files:
 - spec/generators/initialize_generator_spec.rb
 - spec/generators/resource_generator_spec.rb
 - spec/models/gallery_spec.rb
-- spec/models/product_spec.rb
 - spec/models/section_spec.rb
 - spec/models/user_spec.rb
 - spec/spec_helper.rb
@@ -605,12 +627,12 @@ test_files:
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/adminpanel/.gitkeep
-- spec/dummy/app/controllers/adminpanel/categories_controller.rb
 - spec/dummy/app/controllers/adminpanel/products_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
+- spec/dummy/app/models/ability.rb
 - spec/dummy/app/models/adminpanel/categorization.rb
 - spec/dummy/app/models/adminpanel/category.rb
 - spec/dummy/app/models/adminpanel/photo.rb
@@ -654,7 +676,6 @@ test_files:
 - spec/generators/initialize_generator_spec.rb
 - spec/generators/resource_generator_spec.rb
 - spec/models/gallery_spec.rb
-- spec/models/product_spec.rb
 - spec/models/section_spec.rb
 - spec/models/user_spec.rb
 - spec/spec_helper.rb