Merge branch 'master' into rails3

Victor Costa
2 parents 409f4f8a 07d794e3
Showing 14 changed files with 120 additions and 121 deletions Show diff stats
app/controllers/my_profile/profile_editor_controller.rb
app/models/person.rb
app/models/profile.rb
app/views/layouts/_javascript.html.erb
app/views/profile/_profile_wall.html.erb
app/views/profile_editor/_person_form.html.erb
etc/init.d/noosfero
etc/noosfero/varnish-accept-language.vcl
etc/noosfero/varnish-noosfero.vcl
features/edit_profile.feature
lib/tasks/release.rake
public/javascripts/application.js
public/javascripts/autogrow.js
test/unit/person_test.rb
@@ -15,20 +15,14 @@ class ProfileEditorController &lt; MyProfileController
     @possible_domains = profile.possible_domains
     if request.post?
       params[:profile_data][:fields_privacy] ||= {} if profile.person? && params[:profile_data].is_a?(Hash)
-      begin
-        Profile.transaction do
-        Image.transaction do
-          if profile.update_attributes!(params[:profile_data])
-            redirect_to :action => 'index', :profile => profile.identifier
-          end
+      Profile.transaction do
+      Image.transaction do
+        if @profile_data.update_attributes(params[:profile_data])
+          redirect_to :action => 'index', :profile => profile.identifier
+        else
+          profile.identifier = params[:profile] if profile.identifier.blank?
         end
-        end
-      rescue Exception => ex
-        if profile.identifier.blank?
-          profile.identifier = params[:profile]
-        end
-        session[:notice] = _('Cannot update profile')
-        logger.error ex.to_s
+      end
       end
     end
   end
@@ -157,11 +157,6 @@ class Person &lt; Profile
   validates_multiparameter_assignments
-  validates_each :birth_date do |record,attr,value|
-    date_str = record.birth_date_before_type_cast
-    record.errors.add(attr) if value.blank? && !date_str.blank?
-  end
-
   def self.fields
     FIELDS
   end
@@ -3,7 +3,7 @@
 # which by default is the one returned by Environment:default.
 class Profile < ActiveRecord::Base
-  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n
+  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
@@ -3,7 +3,7 @@
 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
 'jquery-ui-1.10.4/js/jquery-ui-1.10.4.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
 'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
-'add-and-join', 'report-abuse', 'catalog', 'manage-products',
+'add-and-join', 'report-abuse', 'catalog', 'manage-products', 'autogrow',
 'jquery-timepicker-addon/dist/jquery-ui-timepicker-addon', 'application.js', 'rails.js', :cache => 'cache/application' %>
 <% language = FastGettext.locale %>
@@ -2,7 +2,7 @@
 <div id='leave_scrap'>
   <%= flash[:error] %>
   <%= form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''", :complete => "jQuery('#leave_scrap_form').removeClass('loading').find('*').attr('disabled', false)", :loading => "jQuery('#leave_scrap_form').addClass('loading').find('*').attr('disabled', true)", :html => {:id => 'leave_scrap_form' } do %>
-    <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2 %>
+    <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2, :class => 'autogrow' %>
     <%= submit_button :new, _('Share') %>
   <% end %>
 </div>
@@ -16,7 +16,7 @@
 <%= optional_field(@person, 'jabber_id', f.text_field(:jabber_id, :rel => _('Jabber'))) %>
 <%= optional_field(@person, 'personal_website', f.text_field(:personal_website, :rel => _('Personal website'))) %>
 <%= optional_field(@person, 'sex', f.radio_group(:profile_data, :sex, [ ['male',_('Male')], ['female',_('Female')] ])) %>
-<%= optional_field(@person, 'birth_date', labelled_form_field(_('Birth date'), '<div class="select-birth-date">' + pick_date(:profile_data, :birth_date, {:start_year => (Date.today.year - 100), :end_year => (Date.today.year - 5)}) + '</div>')) %>
+<%= optional_field(@person, 'birth_date', labelled_form_field(_('Birth date'), date_field('profile_data[birth_date]', @profile_data. birth_date, '%Y-%m-%d', {:change_month => true, :change_year => true, :year_range => '-100:-5', :date_format => 'yy-mm-dd'}, {:id => 'profile_data_birth_date'}))) %>
 <%= optional_field(@person, 'nationality', f.text_field(:nationality, :rel => _('Nationality'))) %>
 <%= optional_field(@person, 'country', select_country(_('Country'), 'profile_data', 'country', {:class => 'type-select'})) %>
 <%= optional_field(@person, 'state', f.text_field(:state, :id => 'state_field', :rel => _('State'))) %>
@@ -54,10 +54,10 @@ fi
 ######################
 main_script() {
-  cd $NOOSFERO_DIR
   if [ "$NOOSFERO_USER" != "$USER" ]; then
-    su $NOOSFERO_USER -l -c "./script/production $1"
+    su $NOOSFERO_USER -l -c "cd $NOOSFERO_DIR && ./script/production $1"
   else
+    cd $NOOSFERO_DIR
     ./script/production $1
   fi
 }
@@ -186,7 +186,7 @@ sub vcl_recv {
 sub vcl_fetch {
   if (beresp.http.Vary) {
-    set beresp.http.Vary = beresp.http.Vary ", X-Varnish-Accept-Language";
+    set beresp.http.Vary = beresp.http.Vary + ", X-Varnish-Accept-Language";
   } else {
     set beresp.http.Vary = "X-Varnish-Accept-Language";
   }
@@ -45,7 +45,7 @@ sub vcl_error {
   <div id='wrap'>
     <div id='header'>
       <div id='logo'>&nbsp;</div>
-      <div id='details'><b>"} obj.status "</b> - " obj.response {"</div>
+      <div id='details'><b>"} + obj.status + "</b> - " + obj.response + {"</div>
     </div>
     <div id='de' style='display: none' class='message'>
@@ -6,30 +6,6 @@ Feature: edit profile
       | joao    |
     Given I am logged in as "joao"
-  Scenario: Warn about invalid birth date when active
-    Given the following person fields are active fields
-      | display_name |
-      | birth_date |
-    When I go to joao's control panel
-    And I follow "Edit Profile"
-    And I select "November" from "profile_data_birth_date_2i"
-    And I select "15" from "profile_data_birth_date_3i"
-    And I press "Save"
-    Then I should see "Birth date is invalid"
-    And I should not see "Birth date can't be blank"
-
-  Scenario: Warn about invalid birth date when required
-    Given the following person fields are required fields
-      | display_name |
-      | birth_date |
-    When I go to joao's control panel
-    And I follow "Edit Profile"
-    And I select "November" from "profile_data_birth_date_2i"
-    And I select "15" from "profile_data_birth_date_3i"
-    And I press "Save"
-    Then I should see "Birth date is invalid"
-    And I should not see "Birth date can't be blank"
-
   Scenario: Not warn if birth date is valid when active
     Given the following person fields are active fields
       | display_name |
@@ -41,7 +41,7 @@ namespace :noosfero do
   end
   def version
-    require_dependency 'noosfero'
+    require 'noosfero'
     Noosfero::VERSION
   end
@@ -130,42 +130,6 @@ EOF
     choice
   end
-  desc 'sets the new version on apropriate files'
-  task :set_version, :release_kind do |t, args|
-    next if File.exist?("tmp/pending-release")
-    release_kind = args[:release_kind] || 'stable'
-
-    if release_kind == 'test'
-      version_question = "Release candidate of which version"
-      distribution = 'squeeze-test'
-    else
-      version_question = "Version that is being released"
-      distribution = 'unstable'
-    end
-
-    version_name = new_version = ask(version_question)
-
-    if release_kind == 'test'
-      rc_version = ask('RC version', Time.now.strftime('%Y%m%d%H%M%S'))
-      version_name += "~rc#{rc_version}"
-    end
-    release_message = ask("Release message")
-
-    sh 'git checkout debian/changelog lib/noosfero.rb'
-    sh "sed -i \"s/VERSION = '[^']*'/VERSION = '#{version_name}'/\" lib/noosfero.rb"
-    sh "dch --newversion #{version_name} --distribution #{distribution} --force-distribution '#{release_message}'"
-
-    sh 'git diff debian/changelog lib/noosfero.rb'
-    if confirm("Commit version bump to #{version_name} on #{distribution} distribution")
-      sh 'git add debian/changelog lib/noosfero.rb'
-      sh "git commit -m 'Bumping version #{version_name}'"
-      sh "touch tmp/pending-release"
-    else
-      sh 'git checkout debian/changelog lib/noosfero.rb'
-      abort 'Version update not confirmed. Reverting changes and exiting...'
-    end
-  end
-
   desc "uploads the packages to the repository"
   task :upload_packages, :release_kind do |t, args|
     release_kind = args[:release_kind] || 'stable'
@@ -177,9 +141,13 @@ EOF
     next if File.exist?("tmp/pending-release")
     release_kind = args[:release_kind] || 'stable'
-    if release_kind == 'test'
+    if release_kind =~ /test/
       version_question = "Release candidate of which version: "
-      distribution = 'squeeze-test'
+      if release_kind == 'squeeze-test'
+        distribution = 'squeeze-test'
+      elsif release_kind == 'wheezy-test'
+        distribution = 'wheezy-test'
+      end
     else
       version_question = "Version that is being released: "
       distribution = 'unstable'
@@ -187,7 +155,7 @@ EOF
     version_name = new_version = ask(version_question)
-    if release_kind == 'test'
+    if release_kind =~ /test/
       timestamp = Time.now.strftime('%Y%m%d%H%M%S')
       version_name += "~rc#{timestamp}"
     end
@@ -208,12 +176,6 @@ EOF
     end
   end
-  desc "uploads the packages to the repository"
-  task :upload_packages, :release_kind do |t, args|
-    release_kind = args[:release_kind] || 'stable'
-    sh "dput --unchecked #{release_kind} #{Dir['pkg/*.changes'].first}"
-  end
-
   desc 'prepares a release tarball'
   task :release, :release_kind do |t, args|
     release_kind = args[:release_kind] || 'stable'
@@ -283,5 +245,5 @@ EOF
       sh 'apt-ftparchive release . > Release'
     end
   end
-    
+
 end
@@ -683,7 +683,6 @@ function hide_and_show(hide_elements, show_elements) {
 function limited_text_area(textid, limit) {
   var text = jQuery('#' + textid).val();
-  grow_text_area(textid);
   var textlength = text.length;
   jQuery('#' + textid + '_left span').html(limit - textlength);
   if (textlength > limit) {
@@ -698,14 +697,9 @@ function limited_text_area(textid, limit) {
   }
 }
-function grow_text_area(textid) {
-  var height = jQuery('#' + textid).attr('scrollHeight');
-  if (jQuery.browser.webkit) {
-    height -= parseInt(jQuery('#' + textid).css('padding-top')) +
-              parseInt(jQuery('#' + textid).css('padding-bottom'));
-  }
-  jQuery('#' + textid).css('height', height + 'px');
-}
+jQuery(function($) {
+  $('.autogrow').autogrow();
+});
 jQuery(function($) {
   $('a').each(function() {
@@ -0,0 +1,93 @@
+;(function($){    
+    //pass in just the context as a $(obj) or a settings JS object
+    $.fn.autogrow = function(opts) {
+        var that = $(this).css({overflow: 'hidden', resize: 'none'}) //prevent scrollies
+            , selector = that.selector
+            , defaults = {
+                context: $(document) //what to wire events to
+                , animate: true //if you want the size change to animate
+                , speed: 200 //speed of animation
+                , fixMinHeight: true //if you don't want the box to shrink below its initial size
+                , cloneClass: 'autogrowclone' //helper CSS class for clone if you need to add special rules
+                , onInitialize: false //resizes the textareas when the plugin is initialized
+            }
+        ;
+        opts = $.isPlainObject(opts) ? opts : {context: opts ? opts : $(document)};
+        opts = $.extend({}, defaults, opts);
+        that.each(function(i, elem){
+            var min, clone;
+            elem = $(elem);
+            //if the element is "invisible", we get an incorrect height value
+            //to get correct value, clone and append to the body. 
+            if (elem.is(':visible') || parseInt(elem.css('height'), 10) > 0) {
+                min = parseInt(elem.css('height'), 10) || elem.innerHeight();
+            } else {
+                clone = elem.clone()
+                    .addClass(opts.cloneClass)
+                    .val(elem.val())
+                    .css({
+                        position: 'absolute'
+                        , visibility: 'hidden'
+                        , display: 'block'
+                    })
+                ;
+                $('body').append(clone);
+                min = clone.innerHeight();
+                clone.remove();
+            }
+            if (opts.fixMinHeight) {
+                elem.data('autogrow-start-height', min); //set min height                                
+            }
+            elem.css('height', min);
+            
+            if (opts.onInitialize) {
+                resize.call(elem);
+            }
+        });
+        opts.context
+            .on('keyup paste', selector, resize)
+        ;
+
+        function resize (e){
+            var box = $(this)
+                , oldHeight = box.innerHeight()
+                , newHeight = this.scrollHeight
+                , minHeight = box.data('autogrow-start-height') || 0
+                , clone
+            ;
+            if (oldHeight < newHeight) { //user is typing
+                this.scrollTop = 0; //try to reduce the top of the content hiding for a second
+                opts.animate ? box.stop().animate({height: newHeight}, opts.speed) : box.innerHeight(newHeight);
+            } else if (!e || e.which == 8 || e.which == 46 || (e.ctrlKey && e.which == 88)) { //user is deleting, backspacing, or cutting
+                if (oldHeight > minHeight) { //shrink!
+                    //this cloning part is not particularly necessary. however, it helps with animation
+                    //since the only way to cleanly calculate where to shrink the box to is to incrementally
+                    //reduce the height of the box until the $.innerHeight() and the scrollHeight differ.
+                    //doing this on an exact clone to figure out the height first and then applying it to the
+                    //actual box makes it look cleaner to the user
+                    clone = box.clone()
+                        .addClass(opts.cloneClass) //add clone class for extra css rules
+                        .css({position: 'absolute', zIndex:-10}) //make "invisible"
+                        .val(box.val()) //populate with content for consistent measuring
+                    ;
+                    box.after(clone); //append as close to the box as possible for best CSS matching for clone
+                    do { //reduce height until they don't match
+                        newHeight = clone[0].scrollHeight - 1;
+                        clone.innerHeight(newHeight);
+                    } while (newHeight === clone[0].scrollHeight);
+                    newHeight++; //adding one back eliminates a wiggle on deletion 
+                    clone.remove();
+                    box.focus(); // Fix issue with Chrome losing focus from the textarea.
+                    
+                    //if user selects all and deletes or holds down delete til beginning
+                    //user could get here and shrink whole box
+                    newHeight < minHeight && (newHeight = minHeight);
+                    oldHeight > newHeight && opts.animate ? box.stop().animate({height: newHeight}, opts.speed) : box.innerHeight(newHeight);
+                } else { //just set to the minHeight
+                    box.innerHeight(minHeight);
+                }
+            } 
+        }
+        return that;
+    }
+})(jQuery);
@@ -1152,21 +1152,6 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert_includes Person.more_active, profile
   end
-  should 'handle multiparameter attribute exception on birth date field' do
-    assert_nothing_raised ActiveRecord::MultiparameterAssignmentErrors do
-      p = Person.new(
-        :name => 'birthday', :identifier => 'birthday',
-        'birth_date(1i)' => '', 'birth_date(2i)' => '6', 'birth_date(3i)' => '16'
-      )
-    end
-  end
-
-  should 'not accept an empty year on birth date' do
-    p = Person.new(:birth_date => "1115")
-    p.valid?
-    assert p.errors[:birth_date.to_s].present?
-  end
-
   should 'associate report with the correct complaint' do
     p1 = create_user('user1').person
     p2 = create_user('user2').person
	@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
3	# which by default is the one returned by Environment:default.	3	# which by default is the one returned by Environment:default.
4	class Profile < ActiveRecord::Base	4	class Profile < ActiveRecord::Base
5		5
6	- attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n	6	+ attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time
7		7
8	# use for internationalizable human type names in search facets	8	# use for internationalizable human type names in search facets
9	# reimplement on subclasses	9	# reimplement on subclasses
	@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
3	'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',	3	'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
4	'jquery-ui-1.10.4/js/jquery-ui-1.10.4.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',	4	'jquery-ui-1.10.4/js/jquery-ui-1.10.4.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
5	'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',	5	'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
6	-'add-and-join', 'report-abuse', 'catalog', 'manage-products',	6	+'add-and-join', 'report-abuse', 'catalog', 'manage-products', 'autogrow',
7	'jquery-timepicker-addon/dist/jquery-ui-timepicker-addon', 'application.js', 'rails.js', :cache => 'cache/application' %>	7	'jquery-timepicker-addon/dist/jquery-ui-timepicker-addon', 'application.js', 'rails.js', :cache => 'cache/application' %>
8		8
9	<% language = FastGettext.locale %>	9	<% language = FastGettext.locale %>
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2	<div id='leave_scrap'>	2	<div id='leave_scrap'>
3	<%= flash[:error] %>	3	<%= flash[:error] %>
4	<%= form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''", :complete => "jQuery('#leave_scrap_form').removeClass('loading').find('').attr('disabled', false)", :loading => "jQuery('#leave_scrap_form').addClass('loading').find('').attr('disabled', true)", :html => {:id => 'leave_scrap_form' } do %>	4	<%= form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''", :complete => "jQuery('#leave_scrap_form').removeClass('loading').find('').attr('disabled', false)", :loading => "jQuery('#leave_scrap_form').addClass('loading').find('').attr('disabled', true)", :html => {:id => 'leave_scrap_form' } do %>
5	- <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2 %>	5	+ <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2, :class => 'autogrow' %>
6	<%= submit_button :new, _('Share') %>	6	<%= submit_button :new, _('Share') %>
7	<% end %>	7	<% end %>
8	</div>	8	</div>
	@@ -16,7 +16,7 @@		@@ -16,7 +16,7 @@
16	<%= optional_field(@person, 'jabber_id', f.text_field(:jabber_id, :rel => _('Jabber'))) %>	16	<%= optional_field(@person, 'jabber_id', f.text_field(:jabber_id, :rel => _('Jabber'))) %>
17	<%= optional_field(@person, 'personal_website', f.text_field(:personal_website, :rel => _('Personal website'))) %>	17	<%= optional_field(@person, 'personal_website', f.text_field(:personal_website, :rel => _('Personal website'))) %>
18	<%= optional_field(@person, 'sex', f.radio_group(:profile_data, :sex, [ ['male',_('Male')], ['female',_('Female')] ])) %>	18	<%= optional_field(@person, 'sex', f.radio_group(:profile_data, :sex, [ ['male',_('Male')], ['female',_('Female')] ])) %>
19	-<%= optional_field(@person, 'birth_date', labelled_form_field(_('Birth date'), '<div class="select-birth-date">' + pick_date(:profile_data, :birth_date, {:start_year => (Date.today.year - 100), :end_year => (Date.today.year - 5)}) + '</div>')) %>	19	+<%= optional_field(@person, 'birth_date', labelled_form_field(_('Birth date'), date_field('profile_data[birth_date]', @profile_data. birth_date, '%Y-%m-%d', {:change_month => true, :change_year => true, :year_range => '-100:-5', :date_format => 'yy-mm-dd'}, {:id => 'profile_data_birth_date'}))) %>
20	<%= optional_field(@person, 'nationality', f.text_field(:nationality, :rel => _('Nationality'))) %>	20	<%= optional_field(@person, 'nationality', f.text_field(:nationality, :rel => _('Nationality'))) %>
21	<%= optional_field(@person, 'country', select_country(_('Country'), 'profile_data', 'country', {:class => 'type-select'})) %>	21	<%= optional_field(@person, 'country', select_country(_('Country'), 'profile_data', 'country', {:class => 'type-select'})) %>
22	<%= optional_field(@person, 'state', f.text_field(:state, :id => 'state_field', :rel => _('State'))) %>	22	<%= optional_field(@person, 'state', f.text_field(:state, :id => 'state_field', :rel => _('State'))) %>
	@@ -54,10 +54,10 @@ fi		@@ -54,10 +54,10 @@ fi
54	######################	54	######################
55		55
56	main_script() {	56	main_script() {
57	- cd $NOOSFERO_DIR
58	if [ "$NOOSFERO_USER" != "$USER" ]; then	57	if [ "$NOOSFERO_USER" != "$USER" ]; then
59	- su $NOOSFERO_USER -l -c "./script/production $1"	58	+ su $NOOSFERO_USER -l -c "cd $NOOSFERO_DIR && ./script/production $1"
60	else	59	else
		60	+ cd $NOOSFERO_DIR
61	./script/production $1	61	./script/production $1
62	fi	62	fi
63	}	63	}
	@@ -186,7 +186,7 @@ sub vcl_recv {		@@ -186,7 +186,7 @@ sub vcl_recv {
186		186
187	sub vcl_fetch {	187	sub vcl_fetch {
188	if (beresp.http.Vary) {	188	if (beresp.http.Vary) {
189	- set beresp.http.Vary = beresp.http.Vary ", X-Varnish-Accept-Language";	189	+ set beresp.http.Vary = beresp.http.Vary + ", X-Varnish-Accept-Language";
190	} else {	190	} else {
191	set beresp.http.Vary = "X-Varnish-Accept-Language";	191	set beresp.http.Vary = "X-Varnish-Accept-Language";
192	}	192	}
	@@ -45,7 +45,7 @@ sub vcl_error {		@@ -45,7 +45,7 @@ sub vcl_error {
45	<div id='wrap'>	45	<div id='wrap'>
46	<div id='header'>	46	<div id='header'>
47	<div id='logo'> </div>	47	<div id='logo'> </div>
48	- <div id='details'><b>"} obj.status "</b> - " obj.response {"</div>	48	+ <div id='details'><b>"} + obj.status + "</b> - " + obj.response + {"</div>
49	</div>	49	</div>
50		50
51	<div id='de' style='display: none' class='message'>	51	<div id='de' style='display: none' class='message'>
	@@ -6,30 +6,6 @@ Feature: edit profile		@@ -6,30 +6,6 @@ Feature: edit profile
6	\| joao \|	6	\| joao \|
7	Given I am logged in as "joao"	7	Given I am logged in as "joao"
8		8
9	- Scenario: Warn about invalid birth date when active
10	- Given the following person fields are active fields
11	- \| display_name \|
12	- \| birth_date \|
13	- When I go to joao's control panel
14	- And I follow "Edit Profile"
15	- And I select "November" from "profile_data_birth_date_2i"
16	- And I select "15" from "profile_data_birth_date_3i"
17	- And I press "Save"
18	- Then I should see "Birth date is invalid"
19	- And I should not see "Birth date can't be blank"
20	-
21	- Scenario: Warn about invalid birth date when required
22	- Given the following person fields are required fields
23	- \| display_name \|
24	- \| birth_date \|
25	- When I go to joao's control panel
26	- And I follow "Edit Profile"
27	- And I select "November" from "profile_data_birth_date_2i"
28	- And I select "15" from "profile_data_birth_date_3i"
29	- And I press "Save"
30	- Then I should see "Birth date is invalid"
31	- And I should not see "Birth date can't be blank"
32	-
33	Scenario: Not warn if birth date is valid when active	9	Scenario: Not warn if birth date is valid when active
34	Given the following person fields are active fields	10	Given the following person fields are active fields
35	\| display_name \|	11	\| display_name \|
	@@ -41,7 +41,7 @@ namespace :noosfero do		@@ -41,7 +41,7 @@ namespace :noosfero do
41	end	41	end
42		42
43	def version	43	def version
44	- require_dependency 'noosfero'	44	+ require 'noosfero'
45	Noosfero::VERSION	45	Noosfero::VERSION
46	end	46	end
47		47
	@@ -130,42 +130,6 @@ EOF		@@ -130,42 +130,6 @@ EOF
130	choice	130	choice
131	end	131	end
132		132
133	- desc 'sets the new version on apropriate files'
134	- task :set_version, :release_kind do \|t, args\|
135	- next if File.exist?("tmp/pending-release")
136	- release_kind = args[:release_kind] \|\| 'stable'
137	-
138	- if release_kind == 'test'
139	- version_question = "Release candidate of which version"
140	- distribution = 'squeeze-test'
141	- else
142	- version_question = "Version that is being released"
143	- distribution = 'unstable'
144	- end
145	-
146	- version_name = new_version = ask(version_question)
147	-
148	- if release_kind == 'test'
149	- rc_version = ask('RC version', Time.now.strftime('%Y%m%d%H%M%S'))
150	- version_name += "~rc#{rc_version}"
151	- end
152	- release_message = ask("Release message")
153	-
154	- sh 'git checkout debian/changelog lib/noosfero.rb'
155	- sh "sed -i \"s/VERSION = '[^']*'/VERSION = '#{version_name}'/\" lib/noosfero.rb"
156	- sh "dch --newversion #{version_name} --distribution #{distribution} --force-distribution '#{release_message}'"
157	-
158	- sh 'git diff debian/changelog lib/noosfero.rb'
159	- if confirm("Commit version bump to #{version_name} on #{distribution} distribution")
160	- sh 'git add debian/changelog lib/noosfero.rb'
161	- sh "git commit -m 'Bumping version #{version_name}'"
162	- sh "touch tmp/pending-release"
163	- else
164	- sh 'git checkout debian/changelog lib/noosfero.rb'
165	- abort 'Version update not confirmed. Reverting changes and exiting...'
166	- end
167	- end
168	-
169	desc "uploads the packages to the repository"	133	desc "uploads the packages to the repository"
170	task :upload_packages, :release_kind do \|t, args\|	134	task :upload_packages, :release_kind do \|t, args\|
171	release_kind = args[:release_kind] \|\| 'stable'	135	release_kind = args[:release_kind] \|\| 'stable'
	@@ -177,9 +141,13 @@ EOF		@@ -177,9 +141,13 @@ EOF
177	next if File.exist?("tmp/pending-release")	141	next if File.exist?("tmp/pending-release")
178	release_kind = args[:release_kind] \|\| 'stable'	142	release_kind = args[:release_kind] \|\| 'stable'
179		143
180	- if release_kind == 'test'	144	+ if release_kind =~ /test/
181	version_question = "Release candidate of which version: "	145	version_question = "Release candidate of which version: "
182	- distribution = 'squeeze-test'	146	+ if release_kind == 'squeeze-test'
		147	+ distribution = 'squeeze-test'
		148	+ elsif release_kind == 'wheezy-test'
		149	+ distribution = 'wheezy-test'
		150	+ end
183	else	151	else
184	version_question = "Version that is being released: "	152	version_question = "Version that is being released: "
185	distribution = 'unstable'	153	distribution = 'unstable'
	@@ -187,7 +155,7 @@ EOF		@@ -187,7 +155,7 @@ EOF
187		155
188	version_name = new_version = ask(version_question)	156	version_name = new_version = ask(version_question)
189		157
190	- if release_kind == 'test'	158	+ if release_kind =~ /test/
191	timestamp = Time.now.strftime('%Y%m%d%H%M%S')	159	timestamp = Time.now.strftime('%Y%m%d%H%M%S')
192	version_name += "~rc#{timestamp}"	160	version_name += "~rc#{timestamp}"
193	end	161	end
	@@ -208,12 +176,6 @@ EOF		@@ -208,12 +176,6 @@ EOF
208	end	176	end
209	end	177	end
210		178
211	- desc "uploads the packages to the repository"
212	- task :upload_packages, :release_kind do \|t, args\|
213	- release_kind = args[:release_kind] \|\| 'stable'
214	- sh "dput --unchecked #{release_kind} #{Dir['pkg/*.changes'].first}"
215	- end
216	-
217	desc 'prepares a release tarball'	179	desc 'prepares a release tarball'
218	task :release, :release_kind do \|t, args\|	180	task :release, :release_kind do \|t, args\|
219	release_kind = args[:release_kind] \|\| 'stable'	181	release_kind = args[:release_kind] \|\| 'stable'
	@@ -283,5 +245,5 @@ EOF		@@ -283,5 +245,5 @@ EOF
283	sh 'apt-ftparchive release . > Release'	245	sh 'apt-ftparchive release . > Release'
284	end	246	end
285	end	247	end
286	-	248	+
287	end	249	end
@@ -0,0 +1,93 @@		@@ -0,0 +1,93 @@
	1	+;(function($){
	2	+ //pass in just the context as a $(obj) or a settings JS object
	3	+ $.fn.autogrow = function(opts) {
	4	+ var that = $(this).css({overflow: 'hidden', resize: 'none'}) //prevent scrollies
	5	+ , selector = that.selector
	6	+ , defaults = {
	7	+ context: $(document) //what to wire events to
	8	+ , animate: true //if you want the size change to animate
	9	+ , speed: 200 //speed of animation
	10	+ , fixMinHeight: true //if you don't want the box to shrink below its initial size
	11	+ , cloneClass: 'autogrowclone' //helper CSS class for clone if you need to add special rules
	12	+ , onInitialize: false //resizes the textareas when the plugin is initialized
	13	+ }
	14	+ ;
	15	+ opts = $.isPlainObject(opts) ? opts : {context: opts ? opts : $(document)};
	16	+ opts = $.extend({}, defaults, opts);
	17	+ that.each(function(i, elem){
	18	+ var min, clone;
	19	+ elem = $(elem);
	20	+ //if the element is "invisible", we get an incorrect height value
	21	+ //to get correct value, clone and append to the body.
	22	+ if (elem.is(':visible') \|\| parseInt(elem.css('height'), 10) > 0) {
	23	+ min = parseInt(elem.css('height'), 10) \|\| elem.innerHeight();
	24	+ } else {
	25	+ clone = elem.clone()
	26	+ .addClass(opts.cloneClass)
	27	+ .val(elem.val())
	28	+ .css({
	29	+ position: 'absolute'
	30	+ , visibility: 'hidden'
	31	+ , display: 'block'
	32	+ })
	33	+ ;
	34	+ $('body').append(clone);
	35	+ min = clone.innerHeight();
	36	+ clone.remove();
	37	+ }
	38	+ if (opts.fixMinHeight) {
	39	+ elem.data('autogrow-start-height', min); //set min height
	40	+ }
	41	+ elem.css('height', min);
	42	+
	43	+ if (opts.onInitialize) {
	44	+ resize.call(elem);
	45	+ }
	46	+ });
	47	+ opts.context
	48	+ .on('keyup paste', selector, resize)
	49	+ ;
	50	+
	51	+ function resize (e){
	52	+ var box = $(this)
	53	+ , oldHeight = box.innerHeight()
	54	+ , newHeight = this.scrollHeight
	55	+ , minHeight = box.data('autogrow-start-height') \|\| 0
	56	+ , clone
	57	+ ;
	58	+ if (oldHeight < newHeight) { //user is typing
	59	+ this.scrollTop = 0; //try to reduce the top of the content hiding for a second
	60	+ opts.animate ? box.stop().animate({height: newHeight}, opts.speed) : box.innerHeight(newHeight);
	61	+ } else if (!e \|\| e.which == 8 \|\| e.which == 46 \|\| (e.ctrlKey && e.which == 88)) { //user is deleting, backspacing, or cutting
	62	+ if (oldHeight > minHeight) { //shrink!
	63	+ //this cloning part is not particularly necessary. however, it helps with animation
	64	+ //since the only way to cleanly calculate where to shrink the box to is to incrementally
	65	+ //reduce the height of the box until the $.innerHeight() and the scrollHeight differ.
	66	+ //doing this on an exact clone to figure out the height first and then applying it to the
	67	+ //actual box makes it look cleaner to the user
	68	+ clone = box.clone()
	69	+ .addClass(opts.cloneClass) //add clone class for extra css rules
	70	+ .css({position: 'absolute', zIndex:-10}) //make "invisible"
	71	+ .val(box.val()) //populate with content for consistent measuring
	72	+ ;
	73	+ box.after(clone); //append as close to the box as possible for best CSS matching for clone
	74	+ do { //reduce height until they don't match
	75	+ newHeight = clone[0].scrollHeight - 1;
	76	+ clone.innerHeight(newHeight);
	77	+ } while (newHeight === clone[0].scrollHeight);
	78	+ newHeight++; //adding one back eliminates a wiggle on deletion
	79	+ clone.remove();
	80	+ box.focus(); // Fix issue with Chrome losing focus from the textarea.
	81	+
	82	+ //if user selects all and deletes or holds down delete til beginning
	83	+ //user could get here and shrink whole box
	84	+ newHeight < minHeight && (newHeight = minHeight);
	85	+ oldHeight > newHeight && opts.animate ? box.stop().animate({height: newHeight}, opts.speed) : box.innerHeight(newHeight);
	86	+ } else { //just set to the minHeight
	87	+ box.innerHeight(minHeight);
	88	+ }
	89	+ }
	90	+ }
	91	+ return that;
	92	+ }
	93	+})(jQuery);