spree 0.6.0 → 0.7.0

data/vendor/gems/{active_presenter-0.0.4 → active_presenter-0.0.6}/lib/active_presenter/version.rb

@@ -2,7 +2,7 @@ module ActivePresenter
   module VERSION
     MAJOR    = 0
     MINOR    = 0
-    TINY     = 4
+    TINY     = 6
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
   end

data/vendor/gems/{active_presenter-0.0.4 → active_presenter-0.0.6}/test/base_test.rb

@@ -1,79 +1,87 @@
 require File.dirname(__FILE__)+'/test_helper'
 
 Expectations do
+  expect nil do
+    SignupPresenter.new.id
+  end
+
+  expect true do
+    SignupPresenter.new.new_record?
+  end
+
   expect :user => User, :account => Account do
     SignupPresenter.presented
   end
-  
+
   expect User.create!(hash_for_user) do |u|
     SignupPresenter.new(:user => u.expected).user
   end
-  
+
   expect User do
     SignupPresenter.new.user
   end
-  
+
   expect User.any_instance.to.receive(:login=).with('james') do
     SignupPresenter.new(:user_login => 'james')
   end
-  
+
   # admin= should be protected from mass assignment
   expect SignupPresenter.new.to.be.attribute_protected?(:user_admin)
   expect SignupPresenter.new(:user_admin => true).user.not.to.be.admin?
-  
+
   expect 'mymockvalue' do
     User.any_instance.stubs(:login).returns('mymockvalue')
     SignupPresenter.new.user_login
   end
-  
+
   expect User.any_instance.to.receive(:login=).with('mymockvalue') do
     SignupPresenter.new.user_login = 'mymockvalue'
   end
-  
+
   expect SignupPresenter.new.not.to.be.valid?
   expect SignupPresenter.new(:user => User.new(hash_for_user)).to.be.valid?
-  
+
   expect ActiveRecord::Errors do
     s = SignupPresenter.new
     s.valid?
     s.errors
   end
-  
+
   expect ActiveRecord::Errors do
     s = SignupPresenter.new
     s.valid?
     s.user_errors
   end
-  
+
   expect ActiveRecord::Errors do
     s = SignupPresenter.new
     s.valid?
     s.account_errors
   end
-  
+
   expect String do
     s = SignupPresenter.new
     s.valid?
     s.errors.on(:user_login)
   end
-  
+
   expect ActiveRecord::Base.to.receive(:transaction) do
     s = SignupPresenter.new
     s.save
   end
-  
+
   expect User.any_instance.to.receive(:save) do
     s = SignupPresenter.new :user => User.new(hash_for_user)
     s.save
   end
-  
+
   expect Account.any_instance.to.receive(:save) do
     s = SignupPresenter.new :user => User.new(hash_for_user)
     s.save
   end
-  
+
   expect SignupPresenter.new.not.to.be.save
-  
+
   expect ActiveRecord::Rollback do
     ActiveRecord::Base.stubs(:transaction).yields
     User.any_instance.stubs(:save).returns(false)
@@ -81,72 +89,100 @@ Expectations do
     s = SignupPresenter.new :user => User.new(hash_for_user)
     s.save
   end
-  
+
   expect ActiveRecord::Base.to.receive(:transaction) do
     s = SignupPresenter.new
     s.save!
   end
-  
+
   expect User.any_instance.to.receive(:save!) do
     s = SignupPresenter.new
     s.save!
   end
-  
+
   expect Account.any_instance.to.receive(:save!) do
     User.any_instance.stubs(:save!)
     s = SignupPresenter.new
     s.save!
   end
-  
+
   expect ActiveRecord::RecordInvalid do
     SignupPresenter.new.save!
   end
-  
+
   expect SignupPresenter.new(:user => User.new(hash_for_user)).to.be.save!
-  
+
   expect SignupPresenter.new.to.be.respond_to?(:user_login)
   expect SignupPresenter.new.to.be.respond_to?(:user_password_confirmation)
   expect SignupPresenter.new.to.be.respond_to?(:valid?) # just making sure i didn't break everything :)
-  
+
   expect User.create!(hash_for_user).not.to.be.login_changed? do |user|
     s = SignupPresenter.new(:user => user)
     s.update_attributes :user_login => 'Something Totally Different'
   end
-  
+
   expect SignupPresenter.new(:user => User.create!(hash_for_user)).to.receive(:save) do |s|
     s.update_attributes :user_login => 'Something'
   end
-  
+
   expect 'Something Different' do
     s = SignupPresenter.new
     s.update_attributes :user_login => 'Something Different'
     s.user_login
   end
-  
+
   # this is a regression test to make sure that _title is working. we had a weird conflict with using String#delete
   expect 'something' do
     s = SignupPresenter.new :account_title => 'something'
     s.account_title
   end
-  
+
   expect String do
     s = SignupPresenter.new
     s.save
     s.errors.on(:user_login)
   end
-  
+
   expect String do
     s = SignupPresenter.new
     s.save! rescue
     s.errors.on(:user_login)
   end
-  
+
   expect 'Login' do
     SignupPresenter.human_attribute_name(:user_login)
   end
-  
+
   # it was raising with nil
   expect SignupPresenter do
     SignupPresenter.new(nil)
   end
+  
+  expect EndingWithSPresenter.new.address.not.to.be.nil?
+
+  # this should act as ActiveRecord models do
+  expect NoMethodError do
+    SignupPresenter.new({:i_dont_exist=>"blah"})
+  end
+  
+  expect CantSavePresenter.new.not.to.be.save # it won't save because the filter chain will halt
+  
+  expect ActiveRecord::RecordNotSaved do
+    CantSavePresenter.new.save!
+  end
+  
+  expect 'Some Street' do
+    p = AfterSavePresenter.new
+    p.save
+    p.address.street
+  end
+  
+  expect 'Some Street' do
+    p = AfterSavePresenter.new
+    p.save!
+    p.address.street
+  end
+  
+  expect SamePrefixPresenter.new.to.be.respond_to?(:account_title)
+  expect SamePrefixPresenter.new.to.be.respond_to?(:account_info_info)
 end

data/vendor/gems/{active_presenter-0.0.4 → active_presenter-0.0.6}/test/test_helper.rb

@@ -19,6 +19,14 @@ ActiveRecord::Schema.define(:version => 0) do
     t.string :subdomain, :default => ''
     t.string :title,     :default => ''
   end
+  
+  create_table :addresses do |t|
+    t.string :street
+  end
+
+  create_table :account_infos do |t|
+    t.string :info
+  end
 end
 
 class User < ActiveRecord::Base
@@ -27,11 +35,39 @@ class User < ActiveRecord::Base
   attr_accessor   :password_confirmation
 end
 class Account < ActiveRecord::Base; end
+class Address < ActiveRecord::Base; end
+class AccountInfo < ActiveRecord::Base; end
 
 class SignupPresenter < ActivePresenter::Base
   presents :account, :user
 end
 
+class EndingWithSPresenter < ActivePresenter::Base
+  presents :address
+end
+
+class CantSavePresenter < ActivePresenter::Base
+  presents :address
+  
+  before_save :halt
+  
+  def halt; false; end
+end
+
+class AfterSavePresenter < ActivePresenter::Base
+  presents :address
+  
+  after_save :set_street
+  
+  def set_street
+    address.street = 'Some Street'
+  end
+end
+
+class SamePrefixPresenter < ActivePresenter::Base
+  presents :account, :account_info
+end
+
 def hash_for_user(opts = {})
   {:login => 'jane', :password => 'seekrit' }.merge(opts)
 end

data/vendor/plugins/attribute_fu/lib/attribute_fu/associated_form_helper.rb

@@ -21,7 +21,7 @@ module AttributeFu
     def fields_for_associated(associated, *args, &block)
       conf            = args.last.is_a?(Hash) ? args.last : {}
       associated_name = extract_option_or_class_name(conf, :name, associated)
-      name            = associated_base_name associated_name
+      name            = associated_base_name(associated_name, conf[:object_name])
       
       unless associated.new_record?
         name << "[#{associated.new_record? ? 'new' : associated.id}]"
@@ -53,8 +53,12 @@ module AttributeFu
 
       css_selector = options.delete(:selector) || ".#{@object.class.name.split("::").last.underscore}"
       function     = options.delete(:function) || ""
-      
+                                            
+      # HACK - added by sean to allow another javascript function to be called after the removal
+      after        = options.delete(:after) || ""
+            
       function << "$(this).up('#{css_selector}').remove()"
+      function << after
       
       @template.link_to_function(name, function, *args.push(options))
     end
@@ -84,12 +88,15 @@ module AttributeFu
       opts.symbolize_keys!
       partial          = opts.delete(:partial)    || associated_name
       container        = opts.delete(:expression) || "'#{opts.delete(:container) || associated_name.pluralize}'"
+                 
+      # Hack by sean
+      object_name      = opts.delete(:object_name)
       
       form_builder     = self # because the value of self changes in the block
       
       @template.link_to_function(name, opts) do |page|
         page << "if (typeof #{variable} == 'undefined') #{variable} = 0;"
-        page << "new Insertion.Bottom(#{container}, new Template("+form_builder.render_associated_form(object, :fields_for => { :javascript => true }, :partial => partial).to_json+").evaluate({'number': --#{variable}}).gsub(/__number_/, #{variable}))"
+        page << "new Insertion.Bottom(#{container}, new Template("+form_builder.render_associated_form(object, :fields_for => { :javascript => true, :object_name => object_name }, :partial => partial).to_json+").evaluate({'number': --#{variable}}).gsub(/__number_/, #{variable}))"
       end
     end
     
@@ -128,7 +135,8 @@ module AttributeFu
     end
     
     private
-      def associated_base_name(associated_name)
+      def associated_base_name(associated_name, object_name)        
+        return "#{object_name}[#{associated_name}_attributes]" if object_name #HACK - Added by sean to allow attribute_fu to use prepopulated objects
         "#{@object_name}[#{associated_name}_attributes]"
       end
       

data/vendor/plugins/find_by_param/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007 [name of plugin creator]
+Copyright (c) 2007 [Michael Bumann - Railslove.com]
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/vendor/plugins/find_by_param/{README → README.markdown}

@@ -1,3 +1,9 @@
+NOTE
+====
+
+This is a customized version of the original `find_by_param` plugin.  Its been simplified to take advantage of new Rails 2.2 functionality and I've also stripped out some stuff that I really didn't need.  We're using this customized version in the [Spree](http://spreehq.org) commerce platform.
+
+
 FindByParam
 ===========
 
@@ -41,7 +47,7 @@ options for make_permalink:
 Issues
 =======
 
-* The database table must be created before you can use make_permalink
+* Alex Sharp (http://github.com/ajsharp) pointed to an issue with STI. Better call make_permalink in every child class and not only in the parent class..
 * write nice docs
 * write nicer tests
 

data/vendor/plugins/find_by_param/init.rb

@@ -1,4 +1,3 @@
-require 'iconv'
 require 'find_by_param'
 class ActiveRecord::Base
   class_inheritable_accessor :permalink_options

data/vendor/plugins/find_by_param/lib/find_by_param.rb

@@ -1,3 +1,11 @@
+# This is a modified version of the original find_by_param plugin by Michael Bumann.  Simplified to use Rails 2.2
+# functionality and tossed out some features not worth supporting.
+begin
+  require "active_support/multibyte"
+rescue LoadError
+  require "rubygems"
+  require "active_support/multibyte"
+end
 module Railslove
   module Plugins
     module FindByParam
@@ -7,89 +15,37 @@ module Railslove
       end
       
       module ClassMethods
-        
-        
-=begin rdoc
-
-This method initializes find_by_param
-
-  class Post < ActiveRecord::Base
-    make_permalink :with => :title, :prepend_id=>true
-  end
-
-The only required parameter, is <tt>:with</tt>. 
-
-If you want to use a non URL-save attribute as permalink your model should have a permalink-column to save the escaped permalink value. This field is then used for search.
-
-If your you can just say make_permalink :with => :login and you're done. 
-
-You can use for example User.find_by_param(params[:id], args) to find the user by the defined permalink. 
-
-== Available options
-
-<tt>:with</tt>:: (required) The attribute that should be used as permalink
-<tt>:field</tt>:: The name of your permalink column. make_permalink first checks if there is a column. 
-<tt>:prepend_id</tt>:: [true|false] Do you want to prepend the ID to the permalink? for URLs like: posts/123-my-post-title - find_by_param uses the ID column to search.
-<tt>:escape</tt>:: [true|false] Do you want to escape the permalink value? (strip chars like öä?&?) - actually you must do that
-
-=end
+                
         def make_permalink(options={})
           options[:field] ||= "permalink"
-          options[:param] = options.delete(:with)
-          options[:escape] ||= true
-          options[:prepend_id] ||= false
-    
+          
           if self.column_names.include?(options[:field].to_s)
-            options[:field_to_encode] = options[:param]
             options[:param] = options[:field]
-      
-            before_validation :save_permalink
-            validates_uniqueness_of options[:param]
-            validates_presence_of options[:param]
+            before_save :save_permalink
           end
     
           self.permalink_options = options
   	      extend Railslove::Plugins::FindByParam::SingletonMethods
         	include Railslove::Plugins::FindByParam::InstanceMethods
     	  rescue
-    	    puts "Database not available"
+    	    puts "[find_by_param error] database not available?"
         end
       end
       
       module SingletonMethods
-  
-        # found somewhere on the web.... don't know where... but it's from a clever guy - (done some motifications)
-        def escape(str)
-          return "" if str.blank? # hack if the str/attribute is nil/blank
-          s = Iconv.iconv('ascii//ignore//translit', 'utf-8', str.dup).to_s
-          returning str.dup.to_s do |s|
-            s.gsub!(/\ +/, '-') # spaces to dashes, preferred separator char everywhere
-            s.gsub!(/[^\w^-]+/, '') # kill non-word chars except -
-            s.strip!            # ohh la la
-            s.downcase!         # :D
-            s.gsub!(/([^ a-zA-Z0-9_-]+)/n,"") # and now kill every char not allowed.
-          end
-        end
-        
-=begin rdoc
 
-Search for an object by the defined permalink column. Similar to find_by_login.
-Returns nil if nothing is found
-Accepts an options hash as a second parameter which is passed on to the rails finder.
-=end
         def find_by_param(value,args={})
-          param = permalink_options[:prepend_id] ? "id" : permalink_options[:param]
+          if permalink_options[:prepend_id]
+            param = "id"
+            value = value.to_i
+          else
+            param = permalink_options[:field]
+          end
           self.send("find_by_#{param}".to_sym, value, args)
         end
 
-=begin rdoc
-
-Like find_by_param but raises an ActiveRecord::RecordNotFound error if nothing is found. Similar to find() 
-
-Accepts an options hash as a second parameter which is passed on to the rails finder.
-=end
         def find_by_param!(value, args={})
-          param = permalink_options[:param]
+          param = permalink_options[:field]
           obj = find_by_param(value, args)
           raise ::ActiveRecord::RecordNotFound unless obj
           obj
@@ -97,22 +53,12 @@ Accepts an options hash as a second parameter which is passed on to the rails fi
       end
       
       module InstanceMethods
-        def to_param
-          value = self.send(permalink_options[:param]).dup.to_s.downcase rescue ""
-          returning "" do |param|
-            param << "#{id}" if value.blank? || permalink_options[:prepend_id]
-            param << "-" if permalink_options[:prepend_id]
-            param << "#{escape_and_truncate_for_permalink(value)}"
-          end
-        end
-        
-        private
-        
+
+        protected        
         def save_permalink
           return unless self.class.column_names.include?(permalink_options[:field].to_s)
           counter = 0
-          base_value = escape_and_truncate_for_permalink(read_attribute(permalink_options[:field_to_encode]))
-          permalink_value = "#{base_value}"
+          permalink_value = self.to_param
           
           conditions = ["#{self.class.table_name}.#{permalink_options[:field]} = ?", permalink_value]
           unless new_record?
@@ -120,22 +66,12 @@ Accepts an options hash as a second parameter which is passed on to the rails fi
             conditions       << self.send(self.class.primary_key.to_sym)
           end
           while self.class.count(:all, :conditions => conditions) > 0
-            permalink_value = "#{base_value}-#{counter += 1}"
+            permalink_value = "#{permalink_value}-#{counter += 1}"
             conditions[1] = permalink_value
           end
           write_attribute(permalink_options[:field], permalink_value)
           true
         end
-        
-        def escape(value)
-          self.class.escape(value)
-        end
-        
-        #this escapes and truncates a value. default length is 100
-        #used to escape and truncate permalink value
-        def escape_and_truncate_for_permalink(value, length=100)
-          self.class.escape(value)[0..length]
-        end
       end
       
     end