saucy 0.1.11 → 0.1.12

data/app/controllers/accounts_controller.rb

@@ -46,6 +46,6 @@ class AccountsController < ApplicationController
   private
 
   def current_account
-    Account.find_by_url!(params[:id])
+    Account.find_by_keyword!(params[:id])
   end
 end

data/app/models/signup.rb

@@ -7,8 +7,8 @@ class Signup
 
   FIELDS = {
     :account => {
-      :name => :account_name,
-      :url  => :url,
+      :name    => :account_name,
+      :keyword => :keyword,
     },
     :user => {
       :name                  => :user_name,
@@ -18,7 +18,7 @@ class Signup
     }
   }.freeze
 
-  attr_accessor :account_name, :url, :user_name, :email, :password,
+  attr_accessor :account_name, :keyword, :user_name, :email, :password,
     :password_confirmation
 
   def initialize(attributes = {})

data/app/views/accounts/edit.html.erb

@@ -7,7 +7,7 @@
   <%= semantic_form_for @account do |form| %>
     <%= form.inputs do %>
       <%= form.input :name, :label => "Account name" %>
-      <%= form.input :url %>
+      <%= form.input :keyword %>
     <% end %>
 
     <%= form.buttons do %>

data/app/views/accounts/new.html.erb

@@ -6,7 +6,7 @@
   <h5 class="legend">Basic Information</h5>
   <%= form.inputs do %>
     <%= form.input :account_name, :label => 'Company Name' %>
-    <%= form.input :url, :label => 'Account URL', :hint => "http://copycopter.com/accounturl" %>
+    <%= form.input :keyword, :hint => "#{root_url}/accounts/<span>accounturl</span>" %>
   <% end %>
 
   <% unless signed_in? -%>

data/app/views/invitations/new.html.erb

@@ -1,3 +1,4 @@
+<h2>Invite a new User</h2>
 <%= semantic_form_for [current_account, @invitation] do |form| -%>
   <%= form.inputs do -%>
     <%= form.input :email %>

data/app/views/projects/_form.html.erb

@@ -1,5 +1,5 @@
 <%= form.inputs do %>
   <%= form.input :name %>
-  <%= form.input :url %>
+  <%= form.input :keyword %>
   <%= form.input :users, :as => :check_boxes, :collection => users %>
 <% end %>

data/lib/generators/saucy/features/templates/factories.rb

@@ -14,8 +14,8 @@ Factory.define :user do |user|
 end
 
 Factory.define :account do |f|
-  f.name { Factory.next(:name) }
-  f.url  { Factory.next(:name) }
+  f.name     { Factory.next(:name) }
+  f.keyword  { Factory.next(:name) }
 end
 
 Factory.define :membership do |f|
@@ -25,7 +25,7 @@ end
 
 Factory.define :signup do |f|
   f.account_name          { Factory.next(:name) }
-  f.url                   { Factory.next(:name) }
+  f.keyword               { Factory.next(:name) }
   f.user_name             { "test user" }
   f.email                 { Factory.next :email }
   f.password              { "password" }
@@ -35,7 +35,7 @@ end
 Factory.define :project do |f|
   f.association :account
   f.name        { Factory.next(:name) }
-  f.url         { Factory.next(:name) }
+  f.keyword     { Factory.next(:name) }
 end
 
 Factory.define :permission do |f|

data/lib/generators/saucy/features/templates/features/manage_projects.feature

@@ -12,7 +12,7 @@ Feature: Manage Projects
     When I go to the projects page for the "Test" account
     And I follow "New Project"
     And I fill in "Name" with "Project 1"
-    And I fill in "Url" with "project1"
+    And I fill in "Keyword" with "project1"
     And I press "Create"
     And I go to the projects page for the "Test" account
     Then I should see "Project 1" within "ul.projects"

data/lib/generators/saucy/features/templates/features/new_account.feature

@@ -9,13 +9,13 @@ Feature: user adds a new account
     And I fill in "Email" with "user@example.com"
     And I fill in "Password" with "test"
     And I fill in "Company Name" with "Robots"
-    And I fill in "Account URL" with "robots"
+    And I fill in "Keyword" with "robots"
     And I press "Sign up"
     Then I should see "created"
     But I should not see "Instructions for confirming"
     When I go to the settings page
     And I follow "Robots"
-    Then the "Url" field should contain "robots"
+    Then the "Keyword" field should contain "robots"
 
   Scenario: sign up for two accounts
     When I go to the sign up page for the "Free" plan
@@ -24,21 +24,21 @@ Feature: user adds a new account
     And I fill in "Confirm password" with "password"
     And I fill in "Your name" with "Robot"
     And I fill in "Company Name" with "Robots, Inc"
-    And I fill in "Account URL" with "robots"
+    And I fill in "Keyword" with "robots"
     And I press "Sign up"
     Then I should see "created"
     When I go to the settings page
     And I follow "Robots, Inc"
-    Then the "Url" field should contain "robots"
+    Then the "Keyword" field should contain "robots"
     When I go to the settings page
     And I follow "Add new account"
     And I follow "Free"
     And I fill in "Company Name" with "Machines"
-    And I fill in "Account URL" with "machines"
+    And I fill in "Keyword" with "machines"
     And I press "Sign up"
     Then I should see "created"
     But I should not see "Instructions for confirming"
     When I go to the settings page
     And I follow "Machines"
-    Then the "Url" field should contain "machines"
+    Then the "Keyword" field should contain "machines"
 

data/lib/generators/saucy/features/templates/features/sign_up.feature

@@ -22,6 +22,6 @@ Feature: Sign up
     And I fill in "Confirm password" with "password"
     And I fill in "Your name" with "Robot"
     And I fill in "Company Name" with "Robots, Inc"
-    And I fill in "Account URL" with "robotsinc"
+    And I fill in "Keyword" with "robotsinc"
     And I press "Sign up"
     Then I should see "created"

data/lib/generators/saucy/install/templates/create_saucy_tables.rb

@@ -13,11 +13,12 @@ class CreateSaucyTables < ActiveRecord::Migration
     create_table :accounts do |table|
       table.belongs_to :plan
       table.string   :name
-      table.string   :url
+      table.string   :keyword
       table.datetime :created_at
       table.datetime :updated_at
     end
     add_index :accounts, :plan_id
+    add_index :accounts, :keyword
 
     create_table :invitations do |table|
       table.string   :email
@@ -42,11 +43,12 @@ class CreateSaucyTables < ActiveRecord::Migration
 
     create_table :projects do |table|
       table.string   :name
-      table.string   :url
+      table.string   :keyword
       table.integer  :account_id
       table.datetime :created_at
       table.datetime :updated_at
     end
+    add_index :projects, :keyword
 
     alter_table :users do |table|
       table.string :name, :default => ""

data/lib/saucy/account.rb

@@ -12,22 +12,19 @@ module Saucy
 
       belongs_to :plan
 
-      validates_uniqueness_of :name, :url
-      validates_presence_of :name, :url
+      validates_uniqueness_of :name, :keyword
+      validates_presence_of :name, :keyword
 
-      attr_accessible :name, :url
+      attr_accessible :name, :keyword
 
-      validates_format_of     :url,
-                              :with    => %r{^[a-z0-9]+$},
-                              :message => "must be only lower case letters."
-      validates_exclusion_of  :url,
-                              :in      => %w[app admin blog dev ftp mail pop pop3 imap smtp staging stats status www],
-                              :message => 'is reserved.'
+      validates_format_of :keyword,
+                          :with    => %r{^[a-z0-9]+$},
+                          :message => "must be only lower case letters."
     end
 
     module InstanceMethods
       def to_param
-        url
+        keyword
       end
 
       def has_member?(user)

data/lib/saucy/account_authorization.rb

@@ -11,11 +11,11 @@ module Saucy
       protected
 
       def current_account
-        ::Account.find_by_url!(params[:account_id])
+        ::Account.find_by_keyword!(params[:account_id])
       end
 
       def current_project
-        ::Project.find_by_url!(params[:project_id])
+        ::Project.find_by_keyword!(params[:project_id])
       end
 
       def authorize_admin

data/lib/saucy/project.rb

@@ -7,11 +7,11 @@ module Saucy
       has_many :permissions, :dependent => :destroy
       has_many :users, :through => :permissions
 
-      validates_presence_of :account_id, :url, :name
+      validates_presence_of :account_id, :keyword, :name
 
-      validates_uniqueness_of :url, :scope => :account_id
+      validates_uniqueness_of :keyword, :scope => :account_id
 
-      validates_format_of :url,
+      validates_format_of :keyword,
                           :with    => %r{^[a-z0-9]+$},
                           :message => "must be only lower case letters."
 
@@ -37,7 +37,7 @@ module Saucy
 
     module InstanceMethods
       def to_param
-        url
+        keyword
       end
 
       def has_member?(user)

data/lib/saucy/projects_controller.rb

@@ -23,11 +23,11 @@ module Saucy
       end
 
       def edit
-        @project = ::Project.find_by_url!(params[:id])
+        @project = ::Project.find_by_keyword!(params[:id])
       end
 
       def update
-        @project = ::Project.find_by_url!(params[:id])
+        @project = ::Project.find_by_keyword!(params[:id])
         if @project.update_attributes params[:project]
           flash[:success] = 'Project was updated.'
           redirect_to account_projects_url(current_account)
@@ -37,7 +37,7 @@ module Saucy
       end
 
       def destroy
-        @project = ::Project.find_by_url!(params[:id])
+        @project = ::Project.find_by_keyword!(params[:id])
         @project.destroy
         flash[:success] = "Project has been deleted"
         redirect_to account_projects_url(@project.account)

data/spec/controllers/application_controller_spec.rb

@@ -5,7 +5,7 @@ describe ApplicationController do
   describe "with a valid account id in the params" do
     before do
       @account = Factory(:account)
-      @controller.stubs(:params).returns(:account_id => @account.url)
+      @controller.stubs(:params).returns(:account_id => @account.to_param)
     end
 
     it "should return the corresponding account from current_account" do

data/spec/controllers/invitations_controller_spec.rb

@@ -27,7 +27,7 @@ describe InvitationsController, "new", :as => :account_admin do
   let(:projects) { ['one', 'two'] }
 
   before do
-    Account.stubs(:find_by_url! => account)
+    Account.stubs(:find_by_keyword! => account)
     account.stubs(:projects_by_name => projects)
     Invitation.stubs(:new => invitation)
     get :new, :account_id => account.to_param
@@ -81,7 +81,7 @@ describe InvitationsController, "invalid create", :as => :account_admin do
   before do
     Invitation.stubs(:new => invitation)
     invitation.stubs(:save => false)
-    Account.stubs(:find_by_url! => account)
+    Account.stubs(:find_by_keyword! => account)
     account.stubs(:projects_by_name => projects)
     post :create, :account_id => account.to_param, :invitation => {}
   end

data/spec/controllers/memberships_controller_spec.rb

@@ -26,7 +26,7 @@ describe MembershipsController, "index", :as => :account_admin do
   let(:memberships) { [Factory.stub(:membership), Factory.stub(:membership)] }
 
   before do
-    Account.stubs(:find_by_url! => account)
+    Account.stubs(:find_by_keyword! => account)
     account.stubs(:memberships_by_name => memberships)
     get :index, :account_id => account.to_param
   end

data/spec/controllers/projects_controller_spec.rb

@@ -91,7 +91,7 @@ describe ProjectsController, "index", :as => :account_admin do
   let(:projects) { ['one', 'two'] }
 
   before do
-    Account.stubs(:find_by_url! => account)
+    Account.stubs(:find_by_keyword! => account)
     account.stubs(:projects => projects)
     get :index, :account_id => account.to_param
   end

data/spec/models/account_spec.rb

@@ -8,30 +8,25 @@ describe Account do
   it { should have_many(:projects) }
 
   it { should validate_uniqueness_of(:name) }
-  it { should validate_uniqueness_of(:url) }
+  it { should validate_uniqueness_of(:keyword) }
   it { should validate_presence_of(  :name) }
-  it { should validate_presence_of(:url) }
+  it { should validate_presence_of(:keyword) }
 
   it { should_not allow_mass_assignment_of(:id) }
   it { should_not allow_mass_assignment_of(:updated_at) }
   it { should_not allow_mass_assignment_of(:created_at) }
-  it { should allow_mass_assignment_of(:url) }
+  it { should allow_mass_assignment_of(:keyword) }
 
   [nil, "", "a b", "a.b", "a%b"].each do |value|
-    it { should_not allow_value(value).for(:url).with_message(/letters/i) }
-  end
-
-  ["admin", "blog", "dev", "ftp", "mail", "pop", "pop3", "imap", "smtp",
-    "staging", "stats", "status","www"].each do |value|
-    it { should_not allow_value(value).for(:url).with_message(/reserved/i) }
+    it { should_not allow_value(value).for(:keyword).with_message(/letters/i) }
   end
 
   ["foo", "f00", "37signals"].each do |value|
-    it { should allow_value(value).for(:url) }
+    it { should allow_value(value).for(:keyword) }
   end
 
-  it "should give its url for to_param" do
-    subject.to_param.should == subject.url
+  it "should give its keyword for to_param" do
+    subject.to_param.should == subject.keyword
   end
 
   it "finds admin users" do

data/spec/models/project_spec.rb

@@ -5,7 +5,7 @@ describe Project do
   it { should validate_presence_of(:account_id) }
   it { should have_many(:permissions) }
   it { should have_many(:users).through(:permissions) }
-  it { should validate_presence_of(:url) }
+  it { should validate_presence_of(:keyword) }
   it { should validate_presence_of(:name) }
 
   it "finds projects visible to a user" do
@@ -31,22 +31,22 @@ describe Project do
     Project.by_name.map(&:name).should == %w(abc def ghi)
   end
 
-  it "should give its url for to_param" do
+  it "should give its keyword for to_param" do
     project = Factory(:project)
-    project.to_param.should == project.url
+    project.to_param.should == project.keyword
   end
 end
 
-describe Project, "url uniqueness" do
+describe Project, "keyword uniqueness" do
   let(:project) { Factory(:project) }
   subject do
     Factory.build(:project, :account => project.account)
   end
 
-  it "validates uniqueness of it's url" do
-    subject.url = project.url
+  it "validates uniqueness of it's keyword" do
+    subject.keyword = project.keyword
     subject.save
-    subject.errors[:url].should include("has already been taken")
+    subject.errors[:keyword].should include("has already been taken")
   end
 end
 

data/spec/models/signup_spec.rb

@@ -10,11 +10,11 @@ describe Signup do
 end
 
 describe Signup, "with attributes in the constructor" do
-  subject { Signup.new(:user_name => 'Joe', :account_name => 'blokes', :url => 'blk') }
+  subject { Signup.new(:user_name => 'Joe', :account_name => 'blokes', :keyword => 'blk') }
   it "assigns attributes" do
     subject.user_name.should == 'Joe'
     subject.account_name.should == 'blokes'
-    subject.url.should == 'blk'
+    subject.keyword.should == 'blk'
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 1
-  - 11
-  version: 0.1.11
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - thoughtbot, inc.