alchemy_domains 0.0.2 → 0.0.3

data/app/controllers/alchemy/alchemy_base_controller_extension.rb

@@ -16,9 +16,14 @@ module Alchemy
 			@domain = AlchemyDomains::Domain.find_by_hostname(request.host)
 			if @domain
 				session[:domain_id] ||= @domain.id
-			else
-				redirect_to request.protocol + AlchemyDomains::Domain.find_by_default(true).hostname, :status => 301
+			elsif default_domain = AlchemyDomains::Domain.default
+				redirect_to request.protocol + default_domain.hostname, :status => 301
 				return false
+			else
+				# No Domains found. We need to create the requested.
+				@domain = AlchemyDomains::Domain.create!(:hostname => request.host)
+				@domain.localizations.create!(:language => Language.get_default)
+				session[:domain_id] = @domain.id
 			end
 		end
 
@@ -52,7 +57,7 @@ module Alchemy
 			if @language
 				store_language_in_session(@language)
 			else
-				raise "No Default Language for requested Domain found! Did you run `rake alchemy:db:seed` task?"
+				raise "No Default Language for requested Domain found! Did you run `rake alchemy_domains:add:domain` task?"
 			end
 		end
 

data/app/models/alchemy_domains/domain.rb

@@ -8,7 +8,9 @@ module AlchemyDomains
 		validates_presence_of :hostname
 		validates_uniqueness_of :hostname
 		validates_presence_of :default, :message => "Es muss eine Standard Domain geben", :if => proc { |m| m.default_changed? && m.default_was == true }
-		validates_format_of :hostname, :with => /^[a-z\d]+([\-\.][a-z\d]+)*\.[a-z]{2,6}/
+		# locahost is not valid, so we cant validate the format like that.
+		#validates_format_of :hostname, :with => /^[a-z\d]+([\-\.][a-z\d]+)*\.[a-z]{2,6}/
+		validates_format_of :hostname, :with => /^[a-z\d]+([\-\.][a-z\d]+)/
 
 		before_create :set_to_default, :if => proc { |m| Domain.default.blank? && self.default == false }
 		before_save :remove_old_default, :if => proc { |m| m.default_changed? && m != Domain.default }

data/config/module_definition.yml

@@ -5,7 +5,7 @@ navigation:
   name: modules.domains
   controller: alchemy_domains/admin/domains
   action: index
-  icon: /assets/module_icon.png
+  image: /assets/alchemy_domains/module_icon.png
   sub_navigation:
     - name: domains
       controller: alchemy_domains/admin/domains

data/lib/alchemy_domains/version.rb

@@ -1,3 +1,3 @@
 module AlchemyDomains
-	VERSION = "0.0.2"
+	VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_domains
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70182800423060 !ruby/object:Gem::Requirement
+  requirement: &70098845456700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70182800423060
+  version_requirements: *70098845456700
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
-  requirement: &70182800422220 !ruby/object:Gem::Requirement
+  requirement: &70098841742440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70182800422220
+  version_requirements: *70098841742440
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70182800421360 !ruby/object:Gem::Requirement
+  requirement: &70098841741940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182800421360
+  version_requirements: *70098841741940
 description: This gem adds domains and associats them with languages. Your website
   can provide certain languages depending on the requested domain.
 email:
@@ -52,6 +52,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/images/alchemy_domains/module_icon.png
 - app/controllers/alchemy/alchemy_base_controller_extension.rb
 - app/controllers/alchemy/pages_controller_extension.rb
 - app/controllers/alchemy_domains/admin/domains_controller.rb
@@ -94,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1787099043171750498
+      hash: -579412331182660416
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -103,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1787099043171750498
+      hash: -579412331182660416
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10