saucy 0.5.4 → 0.5.5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.5.5
+
+Fixes for account and project keywords containing special characters, generated by signup
+
 0.5.4
 
 Changes from an archive project link to a checkbox on the project form.

data/app/models/signup.rb

@@ -98,9 +98,9 @@ class Signup
 
   def short_name
     if email.present?
-      email.split(/@/).first
+      email.split(/@/).first.parameterize
     elsif user && user.email.present?
-      existing_user.email.split(/@/).first
+      existing_user.email.split(/@/).first.parameterize
     end
   end
 

data/lib/saucy/account.rb

@@ -25,7 +25,7 @@ module Saucy
       attr_accessible :name, :keyword
 
       validates_format_of :keyword,
-                          :with    => %r{^[a-z0-9_]+$},
+                          :with    => %r{^[a-z0-9_-]+$},
                           :message => "must be only lower case letters and underscores."
 
       before_create :set_trial_expiration

data/lib/saucy/project.rb

@@ -12,7 +12,7 @@ module Saucy
       validates_uniqueness_of :keyword, :scope => :account_id
 
       validates_format_of :keyword,
-                          :with    => %r{^[a-z0-9_]+$},
+                          :with    => %r{^[a-z0-9_-]+$},
                           :message => "must be only lower case letters or underscores."
 
 

data/spec/models/account_spec.rb

@@ -16,6 +16,7 @@ describe Account do
   it { should allow_value("hello").for(:keyword) }
   it { should allow_value("0123").for(:keyword) }
   it { should allow_value("hello_world").for(:keyword) }
+  it { should allow_value("hello-world").for(:keyword) }
   it { should_not allow_value("HELLO").for(:keyword) }
   it { should_not allow_value("hello world").for(:keyword) }
 

data/spec/models/project_spec.rb

@@ -10,6 +10,7 @@ describe Project do
   it { should allow_value("hello").for(:keyword) }
   it { should allow_value("0123").for(:keyword) }
   it { should allow_value("hello_world").for(:keyword) }
+  it { should allow_value("hello-world").for(:keyword) }
   it { should_not allow_value("HELLO").for(:keyword) }
   it { should_not allow_value("hello world").for(:keyword) }
 

data/spec/models/signup_spec.rb

@@ -91,6 +91,22 @@ describe Signup, "with a valid user and account" do
   end
 end
 
+describe Signup, "with an email with symbols in it" do
+  subject { Factory.build(:signup, :email => "user+extra@example.com") }
+
+  before do
+    subject.save
+  end
+  
+  it "gives a friendly account name" do
+    subject.account.name.should == "user-extra"
+  end
+
+  it "gives a friendly account keyword" do
+    subject.account.keyword.should =~ /^user-extra+/
+  end
+end
+
 describe Signup, "with an invalid user" do
   subject { Factory.build(:signup, :email => nil) }
   it_should_behave_like "invalid signup"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - thoughtbot, inc.