spud_core 0.8.18 → 0.8.19

data/README.markdown

@@ -59,4 +59,5 @@ Spud uses RSpec for testing. Get the tests running with a few short commands:
 After the tests have completed the current code coverage stats is available by opening ```/coverage/index.html``` in a browser.
 
 
+NOTE: Spud Core is Retina Resolution Compatible Now
 

data/app/controllers/spud/application_controller.rb

@@ -1,12 +1,11 @@
 class Spud::ApplicationController < ActionController::Base
 	unloadable
 	protect_from_forgery
-	helper_method :current_user_session, :current_user, :current_site_name
+	helper_method :current_user_session, :current_user, :current_site_name, :current_site_id
 	around_filter :set_time_zone
   around_filter :multisite_caching
   before_filter :to
 
-
   def current_site_name
     # puts "request.host_with_port = #{request.host_with_port}"
     return Spud::Core.site_name if !Spud::Core.multisite_mode_enabled
@@ -16,6 +15,11 @@ class Spud::ApplicationController < ActionController::Base
     return config[:site_name]
   end
 
+  def current_site_id
+    config = Spud::Core.site_config_for_host(request.host_with_port)
+    return config[:site_id] unless config.blank?
+  end
+
   private
 
     def to

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

@@ -1,14 +1,5 @@
 module Spud::Admin::ApplicationHelper
 
-  def hidpi_asset(path)
-    begin
-      return nil if Rails.application.assets.find_asset(path.gsub(/\.png/,"@2x.png")).nil?
-      asset_path = asset_path(path.gsub(/\.png/,"@2x.png"))
-      return asset_path
-    rescue
-      return nil
-    end
-  end
   def timestamp(timedate=nil)
     return "Never" if timedate.blank?
     return Time.now() - timedate > 604800 ? timedate.strftime("%B %d") + ' at ' + timedate.strftime("%I:%M %p") : time_ago_in_words(timedate) + ' ago'

data/app/views/layouts/spud/admin/detail.html.erb

@@ -5,7 +5,7 @@
 		</span>
 		<h2>
 			<%if @page_thumbnail%>
-				<span class="thumb_wrapper"><%=image_tag(@page_thumbnail,:hidpi_src => hidpi_asset(@page_thumbnail))%></span>
+				<span class="thumb_wrapper"><%=image_tag(@page_thumbnail)%></span>
 			<%end%>
 			<%=@page_name%>
 		</h2>

data/lib/spud_core/configuration.rb

@@ -1,21 +1,36 @@
 module Spud
   module Core
     include ActiveSupport::Configurable
-    config_accessor :site_name,:admin_applications,:sitemap_urls,:multisite_mode_enabled,:multisite_config,:from_address
+    config_accessor :site_name,:admin_applications,:sitemap_urls,:multisite_mode_enabled,:multisite_config,:from_address,:site_id,:short_name
     self.admin_applications = [{:name => "Users",:thumbnail => "spud/admin/users_thumb.png",:url => "/spud/admin/users",:order => 100}]
     self.site_name = "Company Name"
+    self.site_id = 0
+    self.short_name = 'default'
     self.sitemap_urls = []
     self.multisite_mode_enabled = false
     self.multisite_config = []
     self.from_address = "no-reply@spudengine.com"
+
     def self.site_config_for_host(host)
-      
-        configs = Spud::Core.multisite_config.select{|p| p[:hosts].include?(host)}
-        if configs.blank?
-          return nil
-        else
-          return configs[0]
-        end
-  	end
+      configs = Spud::Core.multisite_config.select{|p| p[:hosts].include?(host)}
+      if configs.blank?
+        return default_site_config
+      else
+        return configs[0]
+      end
+    end
+
+    def self.site_config_for_id(id)
+      if(id == Spud::Core.config.site_id)
+        return self.default_site_config
+      else
+        matches = Spud::Core.config.multisite_config.select{ |site| site[:site_id] == id }
+        return matches[0] if matches.any?
+      end
+    end
+
+    def self.default_site_config
+      return {:site_id => Spud::Core.config.site_id, :site_name => Spud::Core.config.site_name, :short_name => Spud::Core.config.short_name}
+    end
   end
 end

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Core
-	  VERSION = "0.8.18"
+	  VERSION = "0.8.19"
 	end
 end

data/spec/controllers/spud/application_controller_spec.rb

@@ -2,21 +2,18 @@ require 'spec_helper'
 
 describe Spud::ApplicationController do
 
-  
   before :each do
     activate_authlogic
     @user = FactoryGirl.create(:spud_user)
     @session = SpudUserSession.create(@user)
   end
   
-
-
-    describe :current_site_name do
-      controller(Spud::ApplicationController) do
-        def index
-          render :nothing => true
-        end
+  describe :current_site_name do
+    controller(Spud::ApplicationController) do
+      def index
+        render :nothing => true
       end
+    end
     it "should return config site name if multisite is disabled" do
       Spud::Core.configure do |config|
         config.site_name = "Test Site"
@@ -36,14 +33,41 @@ describe Spud::ApplicationController do
       Spud::Core.configure do |config|
         config.site_name = "Test Site"
         config.multisite_mode_enabled = true
-        config.multisite_config += [{:hosts => ["test.host"],:site_name =>"Site B"}]
+        config.multisite_config += [{:hosts => ["test.host"], :site_name =>"Site B", :site_id => 1}]
       end
 
       # puts request.host_with_port
       # helper.request = {:host_with_port => "example.com"}
       @controller.request = request
       @controller.current_site_name.should == 'Site B'
+    end 
+  end
+
+  describe :current_site_id do
+
+    controller(Spud::ApplicationController) do
+      def index
+        render :nothing => true
+      end
     end
     
+    it "should return the default site id if multisite is disabled" do
+      Spud::Core.configure do |config|
+        config.site_id = 0
+        config.multisite_mode_enabled = false
+        config.multisite_config = []
+      end
+      @controller.current_site_id.should == 0
+    end
+
+    it "should return the current site id if multisite is enabled" do
+      Spud::Core.configure do |config|
+        config.multisite_mode_enabled = true
+        config.multisite_config = [{:hosts => ["test.host"], :site_name =>"Site B", :site_id => 1}]
+      end
+      @controller.request = request
+      @controller.current_site_id.should == 1
+    end
+
   end
 end

data/spec/dummy/log/development.log

@@ -1,17 +1,39 @@
 Connecting to database specified by database.yml
-   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
-   (22.6ms)  DROP DATABASE IF EXISTS `spud_core_test`
+   (65.4ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (144.1ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
+   (0.3ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+Migrating to CreateSpudAdminPermissions (20111214161011)
+   (103.8ms)  CREATE TABLE `spud_admin_permissions` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `user_id` int(11), `name` varchar(255), `access` tinyint(1), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (0.8ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20111214161011')
+Migrating to CreateSpudUsers (20111214161146)
+   (113.1ms)  CREATE TABLE `spud_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `super_admin` tinyint(1), `login` varchar(255) NOT NULL, `email` varchar(255) NOT NULL, `crypted_password` varchar(255) NOT NULL, `password_salt` varchar(255) NOT NULL, `persistence_token` varchar(255) NOT NULL, `single_access_token` varchar(255) NOT NULL, `perishable_token` varchar(255) NOT NULL, `login_count` int(11) DEFAULT 0 NOT NULL, `failed_login_count` int(11) DEFAULT 0 NOT NULL, `last_request_at` datetime, `current_login_at` datetime, `last_login_at` datetime, `current_login_ip` varchar(255), `last_login_ip` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (117.7ms)  CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`)
+   (111.0ms)  CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`)
+   (0.8ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20111214161146')
+Migrating to AddTimeZoneToSpudUser (20120327124229)
+   (149.1ms)  ALTER TABLE `spud_users` ADD `time_zone` varchar(255)
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120327124229')
+Migrating to AddScopeToSpudAdminPermissions (20120328235431)
+   (130.5ms)  ALTER TABLE `spud_admin_permissions` ADD `scope` varchar(255)
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120328235431')
+Migrating to CreateSpudUserSettings (20120329174000)
+   (105.9ms)  CREATE TABLE `spud_user_settings` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `key` varchar(255), `value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (0.8ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120329174000')
+   (0.3ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+Connecting to database specified by database.yml
+   (0.3ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+   (0.5ms)  DROP DATABASE IF EXISTS `spud_core_test`
    (0.3ms)  CREATE DATABASE `spud_core_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
-   (23.9ms)  CREATE TABLE `spud_admin_permissions` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `user_id` int(11), `name` varchar(255), `access` tinyint(1), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `scope` varchar(255)) ENGINE=InnoDB
-   (20.2ms)  CREATE TABLE `spud_user_settings` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `key` varchar(255), `value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (9.2ms)  CREATE TABLE `spud_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `super_admin` tinyint(1), `login` varchar(255) NOT NULL, `email` varchar(255) NOT NULL, `crypted_password` varchar(255) NOT NULL, `password_salt` varchar(255) NOT NULL, `persistence_token` varchar(255) NOT NULL, `single_access_token` varchar(255) NOT NULL, `perishable_token` varchar(255) NOT NULL, `login_count` int(11) DEFAULT 0 NOT NULL, `failed_login_count` int(11) DEFAULT 0 NOT NULL, `last_request_at` datetime, `current_login_at` datetime, `last_login_at` datetime, `current_login_ip` varchar(255), `last_login_ip` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `time_zone` varchar(255)) ENGINE=InnoDB
-   (13.0ms)  CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`)
-   (11.9ms)  CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`)
-   (10.6ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
-   (15.6ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
-   (0.1ms)  SELECT version FROM `schema_migrations`
-   (1.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120329174000')
-   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20111214161011')
-   (0.7ms)  INSERT INTO `schema_migrations` (version) VALUES ('20111214161146')
-   (0.6ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120327124229')
-   (0.6ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120328235431')
+   (54.2ms)  CREATE TABLE `spud_admin_permissions` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `user_id` int(11), `name` varchar(255), `access` tinyint(1), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `scope` varchar(255)) ENGINE=InnoDB
+   (177.3ms)  CREATE TABLE `spud_user_settings` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `key` varchar(255), `value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (191.0ms)  CREATE TABLE `spud_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `super_admin` tinyint(1), `login` varchar(255) NOT NULL, `email` varchar(255) NOT NULL, `crypted_password` varchar(255) NOT NULL, `password_salt` varchar(255) NOT NULL, `persistence_token` varchar(255) NOT NULL, `single_access_token` varchar(255) NOT NULL, `perishable_token` varchar(255) NOT NULL, `login_count` int(11) DEFAULT 0 NOT NULL, `failed_login_count` int(11) DEFAULT 0 NOT NULL, `last_request_at` datetime, `current_login_at` datetime, `last_login_at` datetime, `current_login_ip` varchar(255), `last_login_ip` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `time_zone` varchar(255)) ENGINE=InnoDB
+   (105.0ms)  CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`)
+   (100.1ms)  CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`)
+   (115.5ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (127.3ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
+   (0.3ms)  SELECT version FROM `schema_migrations`
+   (0.6ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120329174000')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20111214161011')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20111214161146')
+   (0.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120327124229')
+   (0.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120328235431')