scottmotte-merb_auth_slice_multisite 0.2.8 → 0.3.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
-:minor: 2
-:patch: 8
+:minor: 3
+:patch: 0

data/app/models/site.rb

@@ -4,7 +4,6 @@ class Site
   
   # Schema
   property :id, Serial
-  property :domain, String, :nullable => :false, :length => (1..40), :unique => true, :format => /(\.[a-z]{2,4})$/
   property :subdomain, String, :nullable => :false, :length => (1..40), :unique => true, :format => /^[a-zA-Z0-9\-]*?$/
   property :created_at, DateTime
   property :updated_at, DateTime
@@ -24,13 +23,4 @@ class Site
     end
   end
   
-  # Hooks
-  before :valid?, :remove_http_and_www
-  def remove_http_and_www
-    if domain
-      domain.gsub!('http://', '')
-      domain.gsub!('www.', '')
-    end
-  end
-  
 end

data/config/dependencies.rb

@@ -22,7 +22,6 @@ dependency "merb-param-protection", merb_gems_version
 dependency "merb-exceptions", merb_gems_version
 
 dependency "data_objects", do_gems_version
-dependency "do_mysql", do_gems_version # If using another database, replace this
 dependency "dm-core", dm_gems_version         
 dependency "dm-aggregates", dm_gems_version   
 dependency "dm-migrations", dm_gems_version   

data/spec/models/site_spec.rb

@@ -10,23 +10,12 @@ describe Site do
   it "should be valid when new" do
     @site.should be_valid
   end
-
-  it "should be invalid when domain is not unique" do
-    @site.save
-    @site.should be_valid
-    
-    @site2 = Site.new(valid_site_attributes)
-    @site2.subdomain = "differentsubdomain"
-    @site2.save
-    @site2.should_not be_valid
-  end
   
   it "should be invalid when subdomain is not unique" do
     @site.save
     @site.should be_valid
     
     @site2 = Site.new(valid_site_attributes)
-    @site2.domain = "http://differenturl.com"
     @site2.save
     @site2.should_not be_valid
   end
@@ -39,16 +28,6 @@ describe Site do
     end
   end
   
-  it "should be invalid if missing a domain extension" do
-    @site.save
-    @site.domain.should match(/(\.[a-z]{2,4})$/)
-    
-    @site2 = Site.new(valid_site_attributes)
-    @site2.domain = "secondmemorial.com"
-    @site2.save
-    @site2.domain.should match(/(\.[a-z]{2,4})$/)
-  end
-  
   it "should only allow text and numbers as a subdomain and should not allow any odd characters or whitespace" do
     @site.save
     @site.subdomain.should match(/^[a-zA-Z0-9\-]*?$/)
@@ -63,12 +42,6 @@ describe Site do
     @site3.save
     @site3.subdomain.should_not match(/^[a-zA-Z0-9\-]*?$/)
   end
-  
-  it "should clean http:// and www from the domain" do
-    @site.save
-    @site.domain.should_not include("http://")
-    @site.domain.should_not include("www.")
-  end
     
   it "should respond to users" do
     @site.save

data/spec/spec_helper.rb

@@ -68,27 +68,21 @@ end
 # =============================================================================
 def valid_site_attributes(options = {})
   {
-    :domain => 'http://www.example.org',
-    :subdomain => 'example',
-    :id => 1
+    :subdomain => 'example'
   }.merge(options)
 end
 
 def valid_second_site_attributes(options = {})
   {
-    :domain => 'http://www.example2.org',
     :subdomain => 'example2',
-    :active => true,
-    :id => 2
+    :active => true
   }.merge(options)
 end
 
 def valid_third_site_attributes(options = {})
   {
-    :domain => 'http://www.example3.org',
     :subdomain => 'example3',
-    :active => true,
-    :id => 3
+    :active => true
   }.merge(options)
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scottmotte-merb_auth_slice_multisite
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors: 
 - scottmotte
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-27 00:00:00 -07:00
+date: 2009-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: []