erp_base_erp_svcs 3.0.7 → 3.1.0

data/spec/models/email_address_spec.rb

@@ -6,7 +6,7 @@ describe EmailAddress do
   end
 
   it "can be saved successfully" do
-    EmailAddress.create.should be_persisted
+    EmailAddress.create!(:email_address => 'test@test.com').should be_persisted
   end
   
 end

data/spec/models/party_spec.rb

@@ -10,41 +10,41 @@ describe Party do
   end
 
   it "has method to check for phone number passing in a number" do
-    party = Factory(:party)
-    contact_purpose = Factory(:contact_purpose, :description => 'billing', :internal_identifier => 'billing')
+    party = FactoryGirl.create(:party)
+    contact_purpose = FactoryGirl.create(:contact_purpose, :description => 'billing', :internal_identifier => 'billing')
     party.update_or_add_contact_with_purpose(PhoneNumber, contact_purpose, :phone_number => '123-123-1234')
     party.has_phone_number?('123-123-1234').should eq true
   end
 
   it "has method to check for zip code passing in a zip code" do
-    party = Factory(:party)
-    contact_purpose = Factory(:contact_purpose, :description => 'billing', :internal_identifier => 'billing')
+    party = FactoryGirl.create(:party)
+    contact_purpose = FactoryGirl.create(:contact_purpose, :description => 'billing', :internal_identifier => 'billing')
     party.update_or_add_contact_with_purpose(PostalAddress, contact_purpose, :zip => '34711')
     party.has_zip_code?('34711').should eq true
   end
 
   it "has method to_label to return description" do
-    party = Factory(:party, :description => 'Joe Smith')
+    party = FactoryGirl.create(:party, :description => 'Joe Smith')
     party.to_label.should eq "Joe Smith"
   end
 
   it "has method to_s to return description" do
-    party = Factory(:party, :description => 'Joe Smith')
+    party = FactoryGirl.create(:party, :description => 'Joe Smith')
     party.to_s.should eq "Joe Smith"
   end
 
   it "overrids respond_to? and method_missing to find contacts" do
-    party = Factory(:party)
-    contact_purpose = Factory(:contact_purpose, :description => 'billing', :internal_identifier => 'billing')
+    party = FactoryGirl.create(:party)
+    contact_purpose = FactoryGirl.create(:contact_purpose, :description => 'billing', :internal_identifier => 'billing')
     party.update_or_add_contact_with_purpose(PhoneNumber, contact_purpose, :phone_number => '123-123-1234')
     party.billing_phone_number.should_not eq nil
     party.billing_phone_number.phone_number.should eq '123-123-1234'
   end
 
   it "has method to get all contacts by contact mechanism" do
-    party = Factory(:party)
-    contact_purpose_billing = Factory(:contact_purpose, :description => 'billing', :internal_identifier => 'billing')
-    contact_purpose_home = Factory(:contact_purpose, :description => 'home', :internal_identifier => 'home')
+    party = FactoryGirl.create(:party)
+    contact_purpose_billing = FactoryGirl.create(:contact_purpose, :description => 'billing', :internal_identifier => 'billing')
+    contact_purpose_home = FactoryGirl.create(:contact_purpose, :description => 'home', :internal_identifier => 'home')
     party.update_or_add_contact_with_purpose(PhoneNumber, contact_purpose_billing, :phone_number => '123-123-1234')
     party.update_or_add_contact_with_purpose(PhoneNumber, contact_purpose_home, :phone_number => '123-123-1234')
 
@@ -52,24 +52,24 @@ describe Party do
   end
 
   it "has method to find contact with a contact purpose and can take internal identifier of contact purpose" do
-    party = Factory(:party)
-    contact_purpose_billing = Factory(:contact_purpose, :description => 'billing', :internal_identifier => 'billing')
+    party = FactoryGirl.create(:party)
+    contact_purpose_billing = FactoryGirl.create(:contact_purpose, :description => 'billing', :internal_identifier => 'billing')
     party.update_or_add_contact_with_purpose(PhoneNumber, contact_purpose_billing, :phone_number => '123-123-1234')
 
     party.find_contact_with_purpose(PhoneNumber, 'billing').contact_mechanism.phone_number.should eq '123-123-1234'
   end
 
   it "has method to find contact with a contact purpose and can take a contact purpose instance" do
-    party = Factory(:party)
-    contact_purpose_billing = Factory(:contact_purpose, :description => 'billing', :internal_identifier => 'billing')
+    party = FactoryGirl.create(:party)
+    contact_purpose_billing = FactoryGirl.create(:contact_purpose, :description => 'billing', :internal_identifier => 'billing')
     party.update_or_add_contact_with_purpose(PhoneNumber, contact_purpose_billing, :phone_number => '123-123-1234')
 
     party.find_contact_with_purpose(PhoneNumber, contact_purpose_billing).contact_mechanism.phone_number.should eq '123-123-1234'
   end
 
   it "can update contact" do
-    party = Factory(:party)
-    contact_purpose_billing = Factory(:contact_purpose, :description => 'billing', :internal_identifier => 'billing')
+    party = FactoryGirl.create(:party)
+    contact_purpose_billing = FactoryGirl.create(:contact_purpose, :description => 'billing', :internal_identifier => 'billing')
     party.update_or_add_contact_with_purpose(PhoneNumber, contact_purpose_billing, :phone_number => '123-123-1234')
 
     party.find_contact_with_purpose(PhoneNumber, contact_purpose_billing).contact_mechanism.phone_number.should eq '123-123-1234'
@@ -80,8 +80,8 @@ describe Party do
   end
 
   it "should update contact if contact already exists" do
-    party = Factory(:party)
-    contact_purpose_billing = Factory(:contact_purpose, :description => 'billing', :internal_identifier => 'billing')
+    party = FactoryGirl.create(:party)
+    contact_purpose_billing = FactoryGirl.create(:contact_purpose, :description => 'billing', :internal_identifier => 'billing')
     party.update_or_add_contact_with_purpose(PhoneNumber, contact_purpose_billing, :phone_number => '123-123-1234')
 
     current_contact = party.find_contact_with_purpose(PhoneNumber, contact_purpose_billing)

data/spec/spec_helper.rb

@@ -31,22 +31,30 @@ Spork.prefork do
 
   RSpec.configure do |config|
     config.use_transactional_fixtures = true
+    config.include FactoryGirl::Syntax::Methods
   end
 end
 
 Spork.each_run do
-  FactoryGirl.find_definitions
-
   #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 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
 
+  Rails::Application::Railties.engines.map{|p| p.config.root.to_s}.each do |engine_dir|
+    Dir.glob(File.join(engine_dir,'spec','factories','*')) {|file| require file} if File.directory? File.join(engine_dir,'spec','factories')
+  end
+
   require 'simplecov'
   SimpleCov.start 'rails' do
     add_filter "spec/"
@@ -54,4 +62,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}
+  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_base_erp_svcs
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,80 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: actionmailer
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: activeresource
+  name: attr_encrypted
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,15 +26,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,15 +42,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 2.1.3
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: data_migrator
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,47 +58,31 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: attr_encrypted
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: awesome_nested_set
+  name: has_many_polymorphic
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: data_migrator
+  name: uuid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,39 +90,23 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: has_many_polymorphic
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.3.5
 - !ruby/object:Gem::Dependency
-  name: uuid
+  name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.4
-  type: :runtime
+        version: 1.3.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.4
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -224,97 +128,97 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: spork
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0.rc
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0.rc
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: watchr
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 description: contains an implementation of the ubiquitous 'party model' for managing
   people, organizations, roles, relationships and contact information. The models
   in this library are designed to be useful in a variety of circumstances, including
@@ -363,19 +267,16 @@ files:
 - db/data_sets/geo_countries.yml
 - db/data_sets/geo_zones.yml
 - db/migrate/20080805000020_base_erp_services.rb
-- db/migrate/20110913145329_create_compass_ae_instance.rb
-- db/migrate/upgrade/20110907171257_add_notes.rb
 - lib/erp_base_erp_svcs/ar_fixtures.rb
 - lib/erp_base_erp_svcs/config.rb
 - lib/erp_base_erp_svcs/engine.rb
 - lib/erp_base_erp_svcs/extensions/active_record/acts_as_category.rb
 - lib/erp_base_erp_svcs/extensions/active_record/acts_as_erp_type.rb
 - lib/erp_base_erp_svcs/extensions/active_record/acts_as_note_type.rb
-- lib/erp_base_erp_svcs/extensions/active_record/data_migrator.rb
 - lib/erp_base_erp_svcs/extensions/active_record/has_contact.rb
 - lib/erp_base_erp_svcs/extensions/active_record/has_notes.rb
 - lib/erp_base_erp_svcs/extensions/active_record/is_describable.rb
-- lib/erp_base_erp_svcs/extensions/active_record/migrator.rb
+- lib/erp_base_erp_svcs/extensions/active_record/migration.rb
 - lib/erp_base_erp_svcs/extensions/active_record/sti_instantiation.rb
 - lib/erp_base_erp_svcs/extensions/active_record/to_hash.rb
 - lib/erp_base_erp_svcs/extensions/core/array.rb
@@ -411,6 +312,13 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/data_migrations/20110525001935_add_usd_currency.erp_base_erp_svcs.rb
+- spec/dummy/db/data_migrations/20110609150135_add_iso_codes.erp_base_erp_svcs.rb
+- spec/dummy/db/data_migrations/20110913145838_setup_compass_ae_instance.erp_base_erp_svcs.rb
+- spec/dummy/db/migrate/20130107214414_base_erp_services.erp_base_erp_svcs.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/db/spec.sqlite3
+- spec/dummy/log/spec.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -462,12 +370,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2074992093686783973
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2074992093686783973
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -495,6 +409,13 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/data_migrations/20110525001935_add_usd_currency.erp_base_erp_svcs.rb
+- spec/dummy/db/data_migrations/20110609150135_add_iso_codes.erp_base_erp_svcs.rb
+- spec/dummy/db/data_migrations/20110913145838_setup_compass_ae_instance.erp_base_erp_svcs.rb
+- spec/dummy/db/migrate/20130107214414_base_erp_services.erp_base_erp_svcs.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/db/spec.sqlite3
+- spec/dummy/log/spec.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html

data/db/migrate/20110913145329_create_compass_ae_instance.rb

@@ -1,15 +0,0 @@
-class CreateCompassAeInstance < ActiveRecord::Migration
-  def self.up
-    unless table_exists?(:compass_ae_instances)
-      create_table :compass_ae_instances do |t|
-        t.decimal :version, :scale => 8, :precision => 3
-        
-        t.timestamps
-      end
-    end
-  end
-
-  def self.down
-    drop_table :compass_ae_instances
-  end
-end

data/db/migrate/upgrade/20110907171257_add_notes.rb

@@ -1,63 +0,0 @@
-class AddNotes < ActiveRecord::Migration
-  def self.up
-    unless table_exists?(:notes)
-      create_table   :notes do |t|
-        t.integer    :created_by_id
-        t.text       :content
-        t.references :noted_record, :polymorphic => true
-        t.references :note_type
-
-        t.timestamps
-      end
-
-      add_index :notes, [:noted_record_id, :noted_record_type]
-      add_index :notes, :note_type_id
-      add_index :notes, :created_by_id
-      add_index :notes, :content
-    end
-
-    unless table_exists?(:note_types)
-      create_table :note_types do |t|
-        #these columns are required to support the behavior of the plugin 'awesome_nested_set'
-        t.integer  	:parent_id
-        t.integer  	:lft
-        t.integer  	:rgt
-
-        t.string     :description
-        t.string     :internal_identifier
-        t.string     :external_identifier
-        t.references :note_type_record, :polymorphic => true
-
-        t.timestamps
-      end
-
-      add_index :note_types, [:note_type_record_id, :note_type_record_type], :name => "note_type_record_idx"
-    end
-
-    unless table_exists?(:valid_note_types)
-      create_table   :valid_note_types do |t|
-        t.references :valid_note_type_record, :polymorphic => true
-        t.references :note_type
-
-        t.timestamps
-      end
-
-      add_index :valid_note_types, [:valid_note_type_record_id, :valid_note_type_record_type], :name => "valid_note_type_record_idx"
-      add_index :valid_note_types, :note_type_id
-    end
-  end
-
-  def self.down
-    if table_exists?(:valid_note_types)
-      drop_table :valid_note_types
-    end
-
-    if table_exists?(:note_types)
-      drop_table :note_types
-    end
-
-    if table_exists?(:notes)
-      drop_table :notes
-    end
-  end
-end