spud_core 0.8.2 → 0.8.4

data/app/helpers/spud/admin/application_helper.rb

@@ -4,7 +4,7 @@ module Spud::Admin::ApplicationHelper
     return Time.now() - timedate > 604800 ? timedate.strftime("%B %d") + ' at ' + timedate.strftime("%I:%M %p") : time_ago_in_words(timedate) + ' ago'
   end
 
-  def current_site_name
+  def current_admin_site_name
     return Spud::Core.site_name if !Spud::Core.multisite_mode_enabled || session[:admin_site].blank?
 
     config = Spud::Core.multisite_config.select{|p| p[:site_id].to_i == session[:admin_site].to_i}
@@ -13,6 +13,14 @@ module Spud::Admin::ApplicationHelper
     return config[0][:site_name]
 
   end
+
+  def current_site_name
+    return Spud::Core.site_name if !Spud::Core.multisite_mode_enabled
+    config = Spud::Core.site_config_for_host(request.host_with_port)
+    return Spud::Core.site_name if config.blank?
+
+    return config[:site_name]
+  end
   def header_style
     if !Spud::Core.multisite_mode_enabled
       return ''

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Core
-	  VERSION = "0.8.2"
+	  VERSION = "0.8.4"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_core
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000 Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70323150663120 !ruby/object:Gem::Requirement
+  requirement: &70312460602760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70323150663120
+  version_requirements: *70312460602760
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70323150662700 !ruby/object:Gem::Requirement
+  requirement: &70312460602340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70323150662700
+  version_requirements: *70312460602340
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70323150697040 !ruby/object:Gem::Requirement
+  requirement: &70312460601880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70323150697040
+  version_requirements: *70312460601880
 - !ruby/object:Gem::Dependency
   name: breadcrumbs_on_rails
-  requirement: &70323150695620 !ruby/object:Gem::Requirement
+  requirement: &70312460601460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70323150695620
+  version_requirements: *70312460601460
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70323150693660 !ruby/object:Gem::Requirement
+  requirement: &70312460601040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70323150693660
+  version_requirements: *70312460601040
 - !ruby/object:Gem::Dependency
   name: bootstrap-will_paginate
-  requirement: &70323150721880 !ruby/object:Gem::Requirement
+  requirement: &70312460600560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70323150721880
+  version_requirements: *70312460600560
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70323150721040 !ruby/object:Gem::Requirement
+  requirement: &70312460616440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323150721040
+  version_requirements: *70312460616440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70323150720300 !ruby/object:Gem::Requirement
+  requirement: &70312460615880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323150720300
+  version_requirements: *70312460615880
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70323150719520 !ruby/object:Gem::Requirement
+  requirement: &70312460615260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323150719520
+  version_requirements: *70312460615260
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70323150718640 !ruby/object:Gem::Requirement
+  requirement: &70312460614500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70323150718640
+  version_requirements: *70312460614500
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70323150717780 !ruby/object:Gem::Requirement
+  requirement: &70312460614000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -131,10 +131,10 @@ dependencies:
         version: 0.10.3
   type: :development
   prerelease: false
-  version_requirements: *70323150717780
+  version_requirements: *70312460614000
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70323150715980 !ruby/object:Gem::Requirement
+  requirement: &70312460613500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -142,7 +142,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *70323150715980
+  version_requirements: *70312460613500
 description: Spud Core Engine
 email:
 - destes@redwindsw.com
@@ -548,7 +548,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -159433235533953728
+      hash: -1378594038769383874
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -557,7 +557,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -159433235533953728
+      hash: -1378594038769383874
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15