Initial changes for shop rework

app/models/end_user.rb

@@ -568,7 +568,33 @@ def self.push_target(email,options = {})
 
     target
   end
+
+  # Return a clone of the current address or work address object 
+  def default_address
+    adr = (self.address &&  !self.address.address.blank?) ? self.address : ( (self.work_address && !self.work_address.blank? ) ? self.work_address : EndUserAddress.new() )
+    adr.first_name = self.first_name
+    adr.last_name = self.last_name
+    adr.end_user_id = self.id
+    adr.clone
+  end
 
+  # Return the current shipping address or the current address if no shipping adr
+  def current_shipping_address
+    if self.shipping_address && !self.shipping_address.address.blank?
+     self.shipping_address
+    else
+      self.default_address
+    end
+  end
+
+  # Return the current billing address
+  def current_billing_address
+    if self.billing_address && !self.billing_address.address.blank?
+     self.billing_address
+    else
+      self.default_address
+    end
+  end
 
   ## Tag Functionality - TODO: Rewrite Needed
 

config/environment.rb

@@ -99,6 +99,9 @@ def webiva_remove_load_paths(file)
   config.gem "json"
 
 
+  if RAILS_ENV == 'test'
+    config.gem 'factory_girl',:source => 'http://gemcutter.org'
+  end
 
   if CMS_CACHE_ACTIVE
     config.gem 'memcache-client', :lib => 'memcache'
@@ -183,7 +186,8 @@ def self.connection
 
 
 CACHE.servers =  [ 'localhost:11211' ]
-ActionController::Base.session_options[:expires] = 1800
+
+ActionController::Base.session_options[:expires] = 5400 unless Rails.env == 'development'
 ActionController::Base.session_options[:cache] = CACHE
 
 

config/environments/test.rb

@@ -30,3 +30,4 @@
 config.gem "webrat",:lib => false,  :version => "0.6.0"
 config.gem "nokogiri", :lib => false, :version => "1.3.1"
 config.gem "cucumber-rails", :lib => false, :version => "0.2.4"
+

lib/hash_model.rb

@@ -131,6 +131,10 @@ def #{name}_url
           return @#{name}_url if @#{name}_url
           @#{name}_url = SiteNode.node_path(self.#{atr})
         end
+        def #{name}_node
+          return @#{name}_node if @#{name}_node
+          @#{name}_node = SiteNode.find_by_id(self.#{atr})
+        end
         EOF
       end
     end

lib/site_node_engine.rb

@@ -139,7 +139,7 @@ def compile_paragraph(site_node,revision,paragraph,opts={})
       paragraph.language = opts[:language]
       # Handle any paragraph inputs
       # return nil unless we have all the inputs we need
-      if paragraph.connections && paragraph.connections[:inputs].is_a?(Hash)
+      if !opts[:edit] && paragraph.connections && paragraph.connections[:inputs].is_a?(Hash)
         opts[:connections] ||= {}
         paragraph.connections[:inputs].each do |input_key,input|
           if input[0].to_s == "0"

lib/webiva_form_elements.rb

@@ -725,6 +725,9 @@ def autocomplete_field(field,url,opts = {})
 
   end
 
+  def root_page_selector(field,opts = {})
+    self.select(field,SiteNode.page_options('--Add to site root--'.t),opts)
+  end
 
   # Selector that lets you pick a page by id
   def page_selector(field,opts = {})
@@ -1010,7 +1013,7 @@ def captcha(field, captcha, options={})
 
   def add_page_selector(field,options={ })
 
-    self.select_original("#{field}_id",[['--Select Page--'.t,nil]] + SiteNode.page_options) +
+    self.select_original("#{field}_id",SiteNode.page_options('--Add to Site Root--'.t)) +
       " / " +
       self.text_field_original("#{field}_subpage",:size => 10, :disabled => !@object.send("#{field}_existing").blank?) + 
     "<br/>" + 

spec/spec_helper.rb

@@ -62,6 +62,15 @@ def reset_domain_tables(*tables)
   before_each_parts << callback
 end
 
+
+def add_factory_girl_path(dir)
+  if !Factory.definition_file_paths.include?(dir)
+    Factory.definition_file_paths <<  dir
+    Factory.definition_file_paths.uniq!
+    Factory.find_definitions
+  end
+end
+
 ActiveSupport::TestCase.fixture_path = RAILS_ROOT + '/spec/fixtures/'