clubhouse 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c071c2f20d58b6b72686bea0e764f062ade1cbfe
-  data.tar.gz: 591afe4fbd09c83cec779630e43ade13f7cfafdf
+  metadata.gz: 2165d37ca3a4f155a97f5385653daedb54fb8e84
+  data.tar.gz: 033b5365b61a3470ea507a30d6624192e6556899
 SHA512:
-  metadata.gz: 19311d1ea71c6b1f76bf6b1c2cc3b7fc08978fecea20c453afa1f6485b0da9dc5e44f074921d7b71e08168fe6d50917167365a3663149b92e92cb0f3de41defd
-  data.tar.gz: 6a5d16af03b10a06e11c3666d46716768019a7493e7ba1d024701698e21bc5566adedd4ad6937b830db9e57ff5f3c943de5cf0554ebd094a4127a6f51ac34f22
+  metadata.gz: 8f185bc564d16063fd08a724690f1282a09ecf533b4baef53597e2699412e805aa9ea96f011cbe0dbb4d26b622aa86f4f3d6727df13eb32a57fde898526a8afd
+  data.tar.gz: dfe76e16fe982906e7731f6efbdf8bc5683a0f7313e769c7b374c6456a319faba90a03b7a0270f2a492b14e864dc0b2d19b4a008918cbee8214ae62a44b9f937

data/config/routes.rb

@@ -1,7 +1,7 @@
 Clubhouse::Engine.routes.draw do
   scope shallow: true, format: false do
     resources :organizations, except: [:new, :edit] do
-      match ":id", action: :check, on: :collection, via: :head
+      get :check, on: :member
 
       resources :invitations, except: [:new, :edit]
 

data/lib/clubhouse.rb

@@ -15,10 +15,6 @@ module Clubhouse
       !!(ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Uuid::ACCEPTABLE_UUID =~ value)
     end
 
-    def normalize_name(name)
-      name.to_s.downcase.gsub(/\s+/, "-")
-    end
-
     def normalize_email(email)
       email.to_s.downcase.gsub(/\s+/, "")
     end

data/lib/clubhouse/concerns/controllers/organizations_controller.rb

@@ -21,8 +21,9 @@ module Clubhouse
         end
 
         def check
-          authorize!(fetch_organization)
-          head :ok
+          skip_authorization
+
+          head :ok if Organization.validate_attributes!(name: params[:id])
         end
 
         def show

data/lib/clubhouse/concerns/models.rb

@@ -1,3 +1,4 @@
+require "clubhouse/concerns/models/attribute_validatable"
 require "clubhouse/concerns/models/invitation"
 require "clubhouse/concerns/models/membership"
 require "clubhouse/concerns/models/organization"

data/lib/clubhouse/concerns/models/attribute_validatable.rb

@@ -0,0 +1,24 @@
+module Clubhouse
+  module Concerns
+    module Models
+      module AttributeValidatable
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          def validate_attributes!(attributes)
+            record = new(attributes)
+
+            record.validate
+
+            ignorable = record.errors.keys - attributes.keys
+            ignorable.each { |attribute| record.errors.delete(attribute) }
+
+            raise ActiveRecord::RecordInvalid.new(record) unless record.errors.empty?
+
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/clubhouse/concerns/models/organization.rb

@@ -5,19 +5,19 @@ module Clubhouse
         extend ActiveSupport::Concern
 
         include Emailable
+        include AttributeValidatable
 
         NAME_REGEX = /\A[a-z][a-z\d\-]*\z/
+        FORMAT_MESSAGE = "can only contain lowercase letters, numbers, and dashes"
 
         included do
           has_many :invitations
           has_many :memberships
           has_many :members, through: :memberships, class_name: Clubhouse.config.member_model
 
-          before_validation :normalize_name
-
           validates :name, presence: true,
                            length: { maximum: 30 },
-                           format: NAME_REGEX,
+                           format: { with: NAME_REGEX, message: FORMAT_MESSAGE },
                            uniqueness: true
         end
 
@@ -34,6 +34,7 @@ module Clubhouse
             field = Clubhouse.is_id?(id_or_name) ? :id : :name
             where(field => id_or_name)
           end
+
         end
 
         def member?(member)
@@ -43,11 +44,6 @@ module Clubhouse
         def admin?(member)
           memberships.exists?(admin: true, member: member)
         end
-
-        private
-        def normalize_name
-          self.name = Clubhouse.normalize_name(name)
-        end
       end
     end
   end

data/lib/clubhouse/version.rb

@@ -1,3 +1,3 @@
 module Clubhouse
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/requests/organizations_spec.rb

@@ -23,22 +23,30 @@ describe "Organizations" do
     end
   end
 
-  describe "HEAD /organizations/:name" do
-    it_requires_authentication(:head, "/organizations/name")
+  describe "GET /organizations/:name/check" do
+    it_requires_authentication(:get, "/organizations/name/check")
 
     context "when name is taken" do
-      it "responds with ok" do
-        a_head("/organizations/#{existing.name}", session)
+      it "responds with unprocessable" do
+        a_get("/organizations/#{existing.name}/check", session)
 
-        expect_status(200)
+        expect_status(422)
+      end
+    end
+
+    context "when name is invalid" do
+      it "responds with unprocessable" do
+        a_get("/organization/#{'a' * 31}/check", session)
+
+        expect_status(422)
       end
     end
 
     context "when name is available" do
-      it "responds with not found" do
-        expect do
-          a_head("/organizations/available", session)
-        end.to raise_error(ActiveRecord::RecordNotFound)
+      it "responds with ok" do
+        a_get("/organizations/available/check", session)
+
+        expect_status(200)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clubhouse
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jason Kriss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -194,6 +194,7 @@ files:
 - lib/clubhouse/concerns/mailers.rb
 - lib/clubhouse/concerns/mailers/mailer.rb
 - lib/clubhouse/concerns/models.rb
+- lib/clubhouse/concerns/models/attribute_validatable.rb
 - lib/clubhouse/concerns/models/emailable.rb
 - lib/clubhouse/concerns/models/invitation.rb
 - lib/clubhouse/concerns/models/membership.rb