erp_tech_svcs 3.0.12 → 3.1.0

data/spec/dummy/move_test_tmp/file_asset_spec_text.txt

@@ -0,0 +1 @@
+#Empty File

data/spec/lib/erp_tech_svcs/extensions/active_record/has_roles_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe ErpTechSvcs::Extensions::ActiveRecord::HasRoles do
+describe ErpTechSvcs::Extensions::ActiveRecord::HasSecurityRoles do
   before(:all) do
-    @user = Factory(:user)
-    @user_2 = Factory(:user)
-    @admin_role = SecurityRole.create(:internal_identifier => 'admin')
-    @employee_role = SecurityRole.create(:internal_identifier => 'employee')
-    @manager_role = SecurityRole.create(:internal_identifier => 'manager')
+    @user = FactoryGirl.create(:user)
+    @user_2 = FactoryGirl.create(:user)
+    @admin_role = SecurityRole.create(:description => 'Admin', :internal_identifier => 'admin')
+    @employee_role = SecurityRole.create(:description => 'Employee', :internal_identifier => 'employee')
+    @manager_role = SecurityRole.create(:description => 'Manager', :internal_identifier => 'manager')
   end
   
   it "should allow you to add a role" do

data/spec/lib/file_support/s3_manager_spec.rb

@@ -65,6 +65,7 @@ describe ErpTechSvcs::FileSupport::S3Manager do
     @file_support.exists?('test_rename.txt').should eq true
 
     result, message, is_directory = @file_support.delete_file('test_rename.txt')
+    result.should eq true
     @file_support.exists?('test_rename.txt').should eq false
 
     result, message = @file_support.rename_file('not_real.txt', 'test_rename.txt')

data/spec/models/audit_log_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe AuditLog do
   before(:all) do
-    @party = Factory(:party)
+    @party = FactoryGirl.create(:party)
   end
   
   it "should allow you to create custom application log message" do

data/spec/models/file_asset_spec.rb

@@ -24,11 +24,13 @@ describe FileAsset do
   describe "class methods" do
 
     it "should have method to get valid extensions based on subclass" do
-      TextFile.valid_extensions.should eq %w(.txt .text)
+      TextFile.valid_extensions.should eq %w(.txt .TXT .text)
     end
 
     it "should have method to get all valid extensions for all subclasses" do
-      FileAsset.all_valid_extensions.should eq [".jpg", ".jpeg", ".gif", ".png", ".ico", ".PNG", ".JPEG", ".JPG", ".txt", ".text", ".js", ".css", ".erb", ".haml", ".liquid", ".builder", ".html", ".pdf", ".swf"]
+      FileAsset.all_valid_extensions.should eq [".jpg", ".JPG", ".jpeg", ".JPEG", ".gif", ".GIF", ".png", ".PNG", ".ico", ".ICO", 
+                                                ".bmp", ".BMP", ".tif", ".tiff", ".TIF", ".TIFF", ".txt", ".TXT", ".text", ".swf", ".SWF", 
+                                                ".js", ".JS", ".css", ".CSS", ".erb", ".haml", ".liquid", ".builder", ".html", ".HTML", ".xml", ".XML", ".pdf", ".PDF"]
     end
 
     it "should be able to lookup subclass based on extension" do
@@ -57,18 +59,25 @@ describe FileAsset do
     end
 
     it "should allow you to move a file" do
-      new_path = File.join(Rails.root.to_s, 'move_test_tmp')
+      new_path = File.join('move_test_tmp')
 
       File.exists?(@base_path).should eq true
-
       result, message = @file_asset.move(new_path)
       result.should eq true
       File.exists?(@base_path).should eq false
-      File.exists?(File.join(new_path,@name)).should eq true
+      File.exists?(File.join(Rails.root,new_path,@name)).should eq true
 
       FileUtils.rm_rf(new_path)
     end
 
+    it "should allow you to secure a file with capabilities" do
+      @file_asset.protected_with_capability?('download').should eq false
+      @file_asset.add_capability('download')
+      @file_asset.protected_with_capability?('download').should eq true
+      @file_asset.remove_capability('download')
+      @file_asset.protected_with_capability?('download').should eq false
+    end
+
     after(:all) do
       @file_asset.destroy
     end

data/spec/models/group_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Group do
+
+  before(:all) do
+    @group = Group.create(:description => "Test Group")
+    @user = FactoryGirl.create(:user)
+  end
+
+  it "should allow you to add and remove roles" do
+    role = SecurityRole.create(:description => "Test Role", :internal_identifier => 'test role')
+    @group.has_role?(role).should eq false
+    @group.add_role(role)
+    @group.has_role?(role).should eq true
+    @group.remove_role(role)
+    @group.has_role?(role).should eq false
+  end
+
+  it "should allow you to add and remove capabilities" do
+    c = FileAsset.add_capability('upload')
+    @group.capabilities.include?(c).should eq false
+    @group.add_capability(c)
+    @group.capabilities.include?(c).should eq true
+    @group.remove_capability(c)
+    @group.capabilities.include?(c).should eq false
+  end
+
+  it "should allow you to add and remove users" do
+    @group.users.include?(@user).should eq false
+    @group.add_user(@user)
+    @group.users.include?(@user).should eq true
+    @group.remove_user(@user)
+    @group.users.include?(@user).should eq false
+  end
+
+  after(:all) do
+    User.destroy_all
+    SecurityRole.destroy_all
+  end
+
+end

data/spec/models/security_role_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe SecurityRole do
+
+  before(:all) do
+    @role = SecurityRole.create(:description => "Test Role", :internal_identifier => 'test role')
+  end
+
+  it "should allow you to add and remove capabilities" do
+    c = FileAsset.add_capability('upload')
+    @role.capabilities.include?(c).should eq false
+    @role.add_capability(c)
+    @role.capabilities.include?(c).should eq true
+    @role.remove_capability(c)
+    @role.capabilities.include?(c).should eq false
+  end
+
+  it "can transform into xml" do
+    @role.to_xml
+  end
+
+  after(:all) do
+    SecurityRole.destroy_all
+  end
+
+end

data/spec/models/user_spec.rb

@@ -3,17 +3,27 @@ require 'spec_helper'
 describe User do
 
   before(:all) do
-    @user = Factory(:user)
+    @user = FactoryGirl.create(:user)
   end
 
   it "should allow you to add and remove roles" do
-    role = SecurityRole.create(:internal_identifier => 'employee')
+    role = SecurityRole.create(:description => "Test Role", :internal_identifier => 'test role')
+    @user.has_role?(role).should eq false
     @user.add_role(role)
     @user.has_role?(role).should eq true
     @user.remove_role(role)
     @user.has_role?(role).should eq false
   end
 
+  it "should allow you to add and remove capabilities" do
+    c = FileAsset.add_capability('upload')
+    @user.has_capability?('upload','FileAsset').should eq false
+    @user.add_capability(c)
+    @user.has_capability?('upload','FileAsset').should eq true
+    @user.remove_capability(c)
+    @user.has_capability?('upload','FileAsset').should eq false
+  end
+
   it "should allow you to add instance attributes" do
     @user.add_instance_attribute(:test, 'result')
     @user.instance_attributes[:test].should eq 'result'

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'spork'
 require 'rake'
+require 'factory_girl'
 
 Spork.prefork do
   # Loading more in this block will cause your tests to run faster. However,
@@ -28,9 +29,10 @@ Spork.prefork do
 
   require 'rspec/rails'
   require 'erp_dev_svcs'
-  
+
   RSpec.configure do |config|
     config.use_transactional_fixtures = true
+    config.include FactoryGirl::Syntax::Methods
     config.include Sorcery::TestHelpers::Rails
     config.include ErpDevSvcs
     config.include ErpDevSvcs::ControllerSupport, :type => :controller
@@ -40,13 +42,17 @@ end
 Spork.each_run do
   #We have to execute the migrations from dummy app directory
   Dir.chdir DUMMY_APP_ROOT
-  `rake db:drop`
+  `rake db:drop RAILS_ENV=spec`
   Dir.chdir ENGINE_RAILS_ROOT
 
-  #We have to execute the migrations from dummy app directory
+  #We have to execute the migratiapp:compass_ae:install:data_migrationsons from dummy app directory
   Dir.chdir DUMMY_APP_ROOT
-  `rake db:migrate`
-  `rake db:migrate_data`
+  
+  
+  `rake compass_ae:install:migrations RAILS_ENV=spec`
+  `rake compass_ae:install:data_migrations RAILS_ENV=spec`
+  `rake db:migrate RAILS_ENV=spec`
+  `rake db:migrate_data RAILS_ENV=spec`
   Dir.chdir ENGINE_RAILS_ROOT
 
   ErpDevSvcs::FactorySupport.load_engine_factories
@@ -58,6 +64,5 @@ Spork.each_run do
   #Need to explictly load the files in lib/ until we figure out how to
   #get rails to autoload them for spec like it used to...
   Dir[File.join(ENGINE_RAILS_ROOT, "lib/**/*.rb")].each {|f| load f}
-  #we need to load initializers too
-  Dir[File.join(ENGINE_RAILS_ROOT, "config/**/*.rb")].each {|f| load f}
+  Dir[File.join(ENGINE_RAILS_ROOT, "app/models/extensions/**/*.rb")].each {|f| load f}
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_tech_svcs
 version: !ruby/object:Gem::Version
-  version: 3.0.12
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erp_base_erp_svcs
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: erp_dev_svcs
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: pdfkit
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: sorcery
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.12
+        version: 0.7.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,23 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.12
+        version: 0.7.13
+- !ruby/object:Gem::Dependency
+  name: mail_alternatives_with_attachments
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: This engine is implemented with the premise that services like logging,
   tracing and encryption would likely already exist in many organizations, so they
   are factored here so they can easily be re-implemented. There are default implementations
@@ -150,6 +166,8 @@ files:
 - app/models/capability_accessor.rb
 - app/models/capability_type.rb
 - app/models/encryption_key.rb
+- app/models/extensions/category.rb
+- app/models/extensions/compass_ae_instance.rb
 - app/models/extensions/contact_purpose.rb
 - app/models/extensions/contact_type.rb
 - app/models/extensions/note.rb
@@ -177,19 +195,11 @@ files:
 - db/data_migrations/20111111144706_setup_audit_log_types.rb
 - db/data_migrations/20121116155018_create_group_relationship_and_role_types.rb
 - db/data_migrations/20121130212146_note_capabilities.rb
-- db/data_migrations/upgrade/20120727152144_set_image_dimensions_on_file_assets.rb
 - db/migrate/20080805000010_base_tech_services.rb
 - db/migrate/20111117183144_create_has_attribute_tables.rb
 - db/migrate/20121116151510_create_groups.rb
 - db/migrate/20121126171612_upgrade_security.rb
 - db/migrate/20121126173506_upgrade_security2.rb
-- db/migrate/upgrade/20111109161549_add_capabilites.rb
-- db/migrate/upgrade/20111109161550_update_roles.rb
-- db/migrate/upgrade/20111109161551_update_user.rb
-- db/migrate/upgrade/20120329161641_add_file_asset_indexes.rb
-- db/migrate/upgrade/20120517203052_add_queue_to_delayed_jobs.rb
-- db/migrate/upgrade/20120725205131_add_image_dimension_columns_to_file_asset.rb
-- lib/erp_tech_svcs/application_installer.rb
 - lib/erp_tech_svcs/config.rb
 - lib/erp_tech_svcs/engine.rb
 - lib/erp_tech_svcs/erp_tech_svcs_audit_log.rb
@@ -200,6 +210,8 @@ files:
 - lib/erp_tech_svcs/extensions/active_record/has_relational_dynamic_attributes.rb
 - lib/erp_tech_svcs/extensions/active_record/has_security_roles.rb
 - lib/erp_tech_svcs/extensions/active_record/protected_with_capabilities.rb
+- lib/erp_tech_svcs/extensions/railties/action_view/base.rb
+- lib/erp_tech_svcs/extensions/railties/action_view/helpers/include_helper.rb
 - lib/erp_tech_svcs/extensions/sorcery/user_activation.rb
 - lib/erp_tech_svcs/extensions.rb
 - lib/erp_tech_svcs/file_support/base.rb
@@ -214,12 +226,9 @@ files:
 - lib/erp_tech_svcs/sessions/delete_expired_sessions_service.rb
 - lib/erp_tech_svcs/sms_wrapper/clickatell.rb
 - lib/erp_tech_svcs/sms_wrapper.rb
-- lib/erp_tech_svcs/utils/attachment_fu_patch.rb
 - lib/erp_tech_svcs/utils/compass_access_negotiator.rb
 - lib/erp_tech_svcs/utils/compass_logger.rb
-- lib/erp_tech_svcs/utils/compass_pdf.rb
 - lib/erp_tech_svcs/utils/default_nested_set_methods.rb
-- lib/erp_tech_svcs/utils/pdf_processor.rb
 - lib/erp_tech_svcs/version.rb
 - lib/erp_tech_svcs.rb
 - lib/tasks/erp_tech_svcs_tasks.rake
@@ -245,6 +254,7 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/config/s3.yml
 - spec/dummy/config.ru
 - spec/dummy/db/data_migrations/20110109173616_create_capability_scope_types.erp_tech_svcs.rb
 - spec/dummy/db/data_migrations/20110525001935_add_usd_currency.erp_base_erp_svcs.rb
@@ -252,18 +262,19 @@ files:
 - spec/dummy/db/data_migrations/20110802200222_schedule_delete_expired_sessions_job.erp_tech_svcs.rb
 - spec/dummy/db/data_migrations/20110913145838_setup_compass_ae_instance.erp_base_erp_svcs.rb
 - spec/dummy/db/data_migrations/20111111144706_setup_audit_log_types.erp_tech_svcs.rb
+- spec/dummy/db/data_migrations/20120109173616_create_download_capability_type.erp_tech_svcs.rb
 - spec/dummy/db/data_migrations/20121116155018_create_group_relationship_and_role_types.erp_tech_svcs.rb
 - spec/dummy/db/data_migrations/20121130212146_note_capabilities.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130105133955_base_erp_services.erp_base_erp_svcs.rb
-- spec/dummy/db/migrate/20130105133956_base_tech_services.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130105133957_create_has_attribute_tables.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130105133958_create_groups.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130105133959_upgrade_security.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130105133960_upgrade_security2.erp_tech_svcs.rb
+- spec/dummy/db/migrate/20130107214445_base_erp_services.erp_base_erp_svcs.rb
+- spec/dummy/db/migrate/20130107214446_base_tech_services.erp_tech_svcs.rb
+- spec/dummy/db/migrate/20130107214447_create_has_attribute_tables.erp_tech_svcs.rb
+- spec/dummy/db/migrate/20130107214448_create_groups.erp_tech_svcs.rb
+- spec/dummy/db/migrate/20130107214449_upgrade_security.erp_tech_svcs.rb
+- spec/dummy/db/migrate/20130107214450_upgrade_security2.erp_tech_svcs.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/spec.sqlite3
-- spec/dummy/log/adam.log
 - spec/dummy/log/spec.log
+- spec/dummy/move_test_tmp/file_asset_spec_text.txt
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -271,7 +282,6 @@ files:
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
 - spec/factories/capability_type.rb
-- spec/factories/role.rb
 - spec/factories/users.rb
 - spec/lib/erp_tech_svcs/extensions/active_record/has_roles_spec.rb
 - spec/lib/file_support/file_system_manager_spec.rb
@@ -279,8 +289,8 @@ files:
 - spec/models/audit_log_spec.rb
 - spec/models/audit_log_type_spec.rb
 - spec/models/file_asset_spec.rb
-- spec/models/role_spec.rb
-- spec/models/secured_model_spec.rb
+- spec/models/group_spec.rb
+- spec/models/security_role_spec.rb
 - spec/models/user_spec.rb
 - spec/spec_helper.rb
 homepage: http://development.compassagile.com
@@ -295,15 +305,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 697401427352755655
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 697401427352755655
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This engine is implemented with the premise that services like logging, tracing
@@ -329,6 +345,7 @@ test_files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/config/s3.yml
 - spec/dummy/config.ru
 - spec/dummy/db/data_migrations/20110109173616_create_capability_scope_types.erp_tech_svcs.rb
 - spec/dummy/db/data_migrations/20110525001935_add_usd_currency.erp_base_erp_svcs.rb
@@ -336,18 +353,19 @@ test_files:
 - spec/dummy/db/data_migrations/20110802200222_schedule_delete_expired_sessions_job.erp_tech_svcs.rb
 - spec/dummy/db/data_migrations/20110913145838_setup_compass_ae_instance.erp_base_erp_svcs.rb
 - spec/dummy/db/data_migrations/20111111144706_setup_audit_log_types.erp_tech_svcs.rb
+- spec/dummy/db/data_migrations/20120109173616_create_download_capability_type.erp_tech_svcs.rb
 - spec/dummy/db/data_migrations/20121116155018_create_group_relationship_and_role_types.erp_tech_svcs.rb
 - spec/dummy/db/data_migrations/20121130212146_note_capabilities.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130105133955_base_erp_services.erp_base_erp_svcs.rb
-- spec/dummy/db/migrate/20130105133956_base_tech_services.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130105133957_create_has_attribute_tables.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130105133958_create_groups.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130105133959_upgrade_security.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130105133960_upgrade_security2.erp_tech_svcs.rb
+- spec/dummy/db/migrate/20130107214445_base_erp_services.erp_base_erp_svcs.rb
+- spec/dummy/db/migrate/20130107214446_base_tech_services.erp_tech_svcs.rb
+- spec/dummy/db/migrate/20130107214447_create_has_attribute_tables.erp_tech_svcs.rb
+- spec/dummy/db/migrate/20130107214448_create_groups.erp_tech_svcs.rb
+- spec/dummy/db/migrate/20130107214449_upgrade_security.erp_tech_svcs.rb
+- spec/dummy/db/migrate/20130107214450_upgrade_security2.erp_tech_svcs.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/spec.sqlite3
-- spec/dummy/log/adam.log
 - spec/dummy/log/spec.log
+- spec/dummy/move_test_tmp/file_asset_spec_text.txt
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -355,7 +373,6 @@ test_files:
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
 - spec/factories/capability_type.rb
-- spec/factories/role.rb
 - spec/factories/users.rb
 - spec/lib/erp_tech_svcs/extensions/active_record/has_roles_spec.rb
 - spec/lib/file_support/file_system_manager_spec.rb
@@ -363,7 +380,7 @@ test_files:
 - spec/models/audit_log_spec.rb
 - spec/models/audit_log_type_spec.rb
 - spec/models/file_asset_spec.rb
-- spec/models/role_spec.rb
-- spec/models/secured_model_spec.rb
+- spec/models/group_spec.rb
+- spec/models/security_role_spec.rb
 - spec/models/user_spec.rb
 - spec/spec_helper.rb

data/db/data_migrations/upgrade/20120727152144_set_image_dimensions_on_file_assets.rb

@@ -1,13 +0,0 @@
-class SetImageDimensionsOnFileAssets < ActiveRecord::Migration
-  
-  def self.up
-    FileAsset.where(:type => 'Image').all.each do |i|
-      i.save_dimensions
-    end
-  end
-  
-  def self.down
-    # do nothing
-  end
-
-end

data/db/migrate/upgrade/20111109161549_add_capabilites.rb

@@ -1,56 +0,0 @@
-class AddCapabilites < ActiveRecord::Migration
-  def up
-    unless table_exists?(:capable_models)
-      # create the roles table
-      create_table :capable_models do |t|
-        t.references :capable_model_record, :polymorphic => true
-
-        t.timestamps
-      end
-
-      add_index :capable_models, [:capable_model_record_id, :capable_model_record_type], :name => 'capable_model_record_idx'
-    end
-
-    unless table_exists?(:capability_types)
-      # create the roles table
-      create_table :capability_types do |t|
-        t.string :internal_identifier
-        t.string :description
-        t.timestamps
-      end
-    end
-
-    unless table_exists?(:capabilities)
-      # create the roles table
-      create_table :capabilities do |t|
-        t.string :resource
-        t.references :capability_type
-        t.timestamps
-      end
-
-      add_index :capabilities, :capability_type_id
-    end
-
-    unless table_exists?(:capabilities_capable_models)
-      # create the roles table
-      create_table :capabilities_capable_models, :id => false do |t|
-        t.references :capable_model
-        t.references :capability
-        t.timestamps
-      end
-
-      add_index :capabilities_capable_models, :capable_model_id
-      add_index :capabilities_capable_models, :capability_id
-    end
-  end
-
-  def down
-    [
-      :capable_models, :capability_types, :capabilities,:capabilities_capable_models
-    ].each do |tbl|
-      if table_exists?(tbl)
-        drop_table tbl
-      end
-    end
-  end
-end

data/db/migrate/upgrade/20111109161550_update_roles.rb

@@ -1,35 +0,0 @@
-class UpdateRoles < ActiveRecord::Migration
-  def up
-
-    if table_exists?(:roles_users)
-      roles_users = ActiveRecord::Base.connection.select_all("select * from roles_users")
-      roles_users.each do |role_user|
-        secured_model = SecuredModel.find_by_secured_record_id_and_secured_record_type(role_user['user_id'], 'User')
-        if secured_model.nil?
-          secured_model = SecuredModel.new
-          secured_model.secured_record = User.find(role_user['user_id'])
-          secured_model.save
-        end
-        secured_model.roles << Role.find(role_user['role_id'])
-      end
-
-      roles_widgets = ActiveRecord::Base.connection.select_all("select * from roles_widgets")
-      roles_widgets.each do |role_widget|
-        secured_model = SecuredModel.find_by_secured_record_id_and_secured_record_type(role_widget['widget_id'], 'Widget')
-        if secured_model.nil?
-          secured_model = SecuredModel.new
-          secured_model.secured_record = Widget.find(role_widget['widget_id'])
-          secured_model.save
-        end
-        secured_model.roles << Role.find(role_widget['role_id'])
-      end
-
-      drop_table :roles_users
-      drop_table :roles_widgets
-    end
-
-  end
-
-  def down
-  end
-end