erp_base_erp_svcs 3.0.5 → 3.0.6

data/app/models/party.rb

@@ -1,12 +1,15 @@
 class Party < ActiveRecord::Base
   has_notes
-  
+    
   has_many   :contacts, :dependent => :destroy
   has_many   :created_notes, :class_name => 'Note', :foreign_key => 'created_by_id'
   belongs_to :business_party, :polymorphic => true
-  has_many   :party_roles, :dependent => :destroy
+
+  has_many   :party_roles, :dependent => :destroy #role_types
 	has_many   :role_types, :through => :party_roles
 
+  has_and_belongs_to_many :security_roles
+
   after_destroy :destroy_business_party
 
 	attr_reader :relationships
@@ -19,10 +22,9 @@ class Party < ActiveRecord::Base
   end
 
   def find_relationships_by_type(relationship_type_iid)
-    PartyRelationship.includes(:relationship_type)
-                     .where('party_id_from = ? or party_id_to = ?', id, id)
-                     .where('relationship_types.internal_identifier' => relationship_type_iid.to_s)
-
+    PartyRelationship.includes(:relationship_type).
+                      where('party_id_from = ? or party_id_to = ?', id, id).
+                      where('relationship_types.internal_identifier' => relationship_type_iid.to_s)
   end
 
   # Creates a new PartyRelationship for this particular

data/app/models/postal_address.rb

@@ -4,12 +4,16 @@ class PostalAddress < ActiveRecord::Base
   belongs_to :geo_country
   belongs_to :geo_zone
 
-	def summary_line
+  def summary_line
 		"#{description} : #{address_line_1}, #{city}"
 	end
 	
-	def to_label
-		"#{description} : #{address_line_1}, #{city}"    
+	def to_label(&block)
+    if block_given?
+      block.call(self)
+    else
+      "#{description} : #{address_line_1}, #{city}"
+    end
 	end
 
   def zip_eql_to?(zip)

data/lib/erp_base_erp_svcs/engine.rb

@@ -19,11 +19,8 @@ module ErpBaseErpSvcs
       extend ErpBaseErpSvcs::Extensions::ActiveRecord::StiInstantiation::ActMacro
     end
 
-    engine = self
-    config.to_prepare do
-      ErpBaseErpSvcs.register_compass_ae_engine(engine)
-      ErpBaseErpSvcs.load_root_compass_ae_framework_extensions
-    end
+    ErpBaseErpSvcs.register_as_compass_ae_engine(config, self)
+    ErpBaseErpSvcs.load_root_compass_ae_framework_extensions(config)
     
   end
 end

data/lib/erp_base_erp_svcs/version.rb

@@ -2,7 +2,7 @@ module ErpBaseErpSvcs
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/lib/erp_base_erp_svcs.rb

@@ -2,21 +2,30 @@ require "erp_base_erp_svcs/version"
 require "erp_base_erp_svcs/extensions"
 require "erp_base_erp_svcs/ar_fixtures"
 require "erp_base_erp_svcs/config"
-require "erp_base_erp_svcs/engine"
 require "erp_base_erp_svcs/non_escape_json_string"
 
 module ErpBaseErpSvcs
   class << self
+    def determine_callback
+      (Rails.env == 'development') ?  'to_prepare' : 'after_initialize'
+    end
+
     def mount_compass_ae_engines(routes)
       Rails.application.config.erp_base_erp_svcs.compass_ae_engines.each do |engine|
         routes.mount engine => "/#{engine.name.split("::").first.underscore}"
       end
     end
 
-    def register_compass_ae_engine(engine)
+    def register_as_compass_ae_engine(config, engine)
+      config.send(ErpBaseErpSvcs.determine_callback) do
+        ErpBaseErpSvcs.load_compass_ae_engine(engine, config)
+      end
+    end
+
+    def load_compass_ae_engine(engine, config)
       Rails.application.config.erp_base_erp_svcs.compass_ae_engines << engine unless Rails.application.config.erp_base_erp_svcs.compass_ae_engines.include?(engine)
       load_compass_ae_extensions(engine)
-      load_root_compass_ae_framework_extensions()
+      load_root_compass_ae_framework_extensions(config)
     end
 
     #forces rails to reload model extensions and framework extensions
@@ -87,13 +96,19 @@ module ErpBaseErpSvcs
       end
     end
 
-    def load_root_compass_ae_framework_extensions
-      Dir.glob(File.join(Rails.root,"lib/extensions/compass_ae/**/*.rb")).each do |file|
-        load file
+    def load_root_compass_ae_framework_extensions(config)
+      config.send(ErpBaseErpSvcs.determine_callback) do
+        Dir.glob(File.join(Rails.root,"lib/extensions/compass_ae/**/*.rb")).each do |file|
+          load file
+        end
       end
+
     end
     
   end
 end
 
+#load the engine after this module is defined
+require "erp_base_erp_svcs/engine"
+
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_base_erp_svcs
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70130672354840 !ruby/object:Gem::Requirement
+  requirement: &70320522928120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70130672354840
+  version_requirements: *70320522928120
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70130672353840 !ruby/object:Gem::Requirement
+  requirement: &70320522927620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70130672353840
+  version_requirements: *70320522927620
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70130672352580 !ruby/object:Gem::Requirement
+  requirement: &70320522927160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70130672352580
+  version_requirements: *70320522927160
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70130672351280 !ruby/object:Gem::Requirement
+  requirement: &70320522926640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70130672351280
+  version_requirements: *70320522926640
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70130672343880 !ruby/object:Gem::Requirement
+  requirement: &70320523198480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70130672343880
+  version_requirements: *70320523198480
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70130672343080 !ruby/object:Gem::Requirement
+  requirement: &70320523197740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70130672343080
+  version_requirements: *70320523197740
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70130672342160 !ruby/object:Gem::Requirement
+  requirement: &70320523196880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70130672342160
+  version_requirements: *70320523196880
 - !ruby/object:Gem::Dependency
   name: attr_encrypted
-  requirement: &70130672341260 !ruby/object:Gem::Requirement
+  requirement: &70320523196420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70130672341260
+  version_requirements: *70320523196420
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70130672340560 !ruby/object:Gem::Requirement
+  requirement: &70320523195900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +109,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70130672340560
+  version_requirements: *70320523195900
 - !ruby/object:Gem::Dependency
   name: data_migrator
-  requirement: &70130672339700 !ruby/object:Gem::Requirement
+  requirement: &70320523195200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70130672339700
+  version_requirements: *70320523195200
 - !ruby/object:Gem::Dependency
   name: has_many_polymorphic
-  requirement: &70130672338760 !ruby/object:Gem::Requirement
+  requirement: &70320523194520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70130672338760
+  version_requirements: *70320523194520
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &70130672337600 !ruby/object:Gem::Requirement
+  requirement: &70320523193800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -142,10 +142,10 @@ dependencies:
         version: 2.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70130672337600
+  version_requirements: *70320523193800
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70130672336980 !ruby/object:Gem::Requirement
+  requirement: &70320523193240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70130672336980
+  version_requirements: *70320523193240
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70130672336220 !ruby/object:Gem::Requirement
+  requirement: &70320523192400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -164,10 +164,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70130672336220
+  version_requirements: *70320523192400
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70130672329240 !ruby/object:Gem::Requirement
+  requirement: &70320523191420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -175,10 +175,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70130672329240
+  version_requirements: *70320523191420
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70130672328660 !ruby/object:Gem::Requirement
+  requirement: &70320523229800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -186,10 +186,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70130672328660
+  version_requirements: *70320523229800
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70130672328020 !ruby/object:Gem::Requirement
+  requirement: &70320523229340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -197,10 +197,10 @@ dependencies:
         version: 0.9.0.rc
   type: :development
   prerelease: false
-  version_requirements: *70130672328020
+  version_requirements: *70320523229340
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70130672327260 !ruby/object:Gem::Requirement
+  requirement: &70320523228880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -208,10 +208,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70130672327260
+  version_requirements: *70320523228880
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70130672326640 !ruby/object:Gem::Requirement
+  requirement: &70320523228460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,7 +219,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70130672326640
+  version_requirements: *70320523228460
 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