cartoonist 0.0.6 → 0.0.7

data/app/controllers/admin_controller.rb

@@ -1,4 +1,4 @@
-class AdminController < ApplicationController
+class AdminController < CartoonistController
   before_filter :ensure_ssl!, :except => [:cache_cron, :tweet_cron]
   before_filter :check_admin!, :except => [:cache_cron, :tweet_cron]
 

data/app/controllers/cache_controller.rb

@@ -1,4 +1,4 @@
-class CacheController < ApplicationController
+class CacheController < CartoonistController
   before_filter :ensure_ssl!
   before_filter :check_admin!
   layout "general_admin"

data/app/controllers/{application_controller.rb → cartoonist_controller.rb}

@@ -1,4 +1,5 @@
-class ApplicationController < ActionController::Base
+class CartoonistController < ActionController::Base
+  helper :cartoonist
   protect_from_forgery
   before_filter :check_mobile
 

data/app/controllers/settings_controller.rb

@@ -1,4 +1,4 @@
-class SettingsController < ApplicationController
+class SettingsController < CartoonistController
   before_filter :ensure_ssl!
   before_filter :check_admin!, :except => [:initial_setup, :save_initial_setup]
 

data/app/controllers/site_controller.rb

@@ -1,4 +1,4 @@
-class SiteController < ApplicationController
+class SiteController < CartoonistController
   def favicon
     respond_to do |format|
       format.html { redirect_to "/" }
@@ -28,7 +28,7 @@ class SiteController < ApplicationController
 
       format.xml do
         @entries = load_sitemap_content
-        render :content_type => "application/xml"
+        render :content_type => "application/xml", :layout => "cartoonist"
       end
     end
   end

data/app/controllers/static_cache_controller.rb

@@ -1,4 +1,4 @@
-class StaticCacheController < ApplicationController
+class StaticCacheController < CartoonistController
   before_filter :ensure_ssl!
   before_filter :check_admin!
   layout "general_admin"

data/app/helpers/{application_helper.rb → cartoonist_helper.rb}

@@ -1,4 +1,4 @@
-module ApplicationHelper
+module CartoonistHelper
   def selected(a, b = true)
     if a == b
       'selected="selected"'.html_safe

data/app/views/layouts/{application.html.erb → cartoonist.html.erb}

@@ -31,7 +31,7 @@
     <div class="site-wrapper">
       <div class="header">
         <div class="main-header">
-          <div class="logo"><%= t "application.layout.logo" %></div>
+          <div class="logo"><%= t "cartoonist.layout.logo" %></div>
           <h1 class="site-name"><%= Setting[:site_name] %></h1>
           <h2 class="heading"><%= Setting[:site_heading] %></h2>
           <h2 class="site-updates"><%= Setting[:site_update_description] %></h2>
@@ -66,7 +66,7 @@
             <% end %>
           </div>
           <noscript>
-            <%= t "application.layout.disqus.noscript_pre_link" %><a href="http://disqus.com/?ref_noscript"><%= t "application.layout.disqus.noscript_link" %></a><%= t "application.layout.disqus.noscript_post_link" %>
+            <%= t "cartoonist.layout.disqus.noscript_pre_link" %><a href="http://disqus.com/?ref_noscript"><%= t "cartoonist.layout.disqus.noscript_link" %></a><%= t "cartoonist.layout.disqus.noscript_post_link" %>
           </noscript>
         </div>
       <% end %>
@@ -128,7 +128,7 @@
       </script>
     <% end %>
     <% if Cartoonist::Asset.included_js? %>
-      <%= javascript_include_tag "application" %>
+      <%= javascript_include_tag "cartoonist" %>
     <% end %>
   </body>
 </html>

data/config/locales/en.yml

@@ -17,7 +17,7 @@ en:
       not_live_warning: development
       production_warning: PRODUCTION
       user_heading: "%{user}:"
-  application:
+  cartoonist:
     layout:
       disqus:
         noscript_pre_link: "Please enable JavaScript to view the "

data/lib/cartoonist.rb

@@ -50,12 +50,12 @@ module Cartoonist
 
     class << self
       # This does not include javascript files included in
-      # application.js.  This is purely standalone assets.
+      # cartoonist.js.  This is purely standalone assets.
       def all
         @@all
       end
 
-      # Include the following js files into application.js.
+      # Include the following js files into cartoonist.js.
       def include_js(*js_files)
         @@included_js.push *js_files
         @@included_js.tap &:uniq!

data/lib/cartoonist/engine.rb

@@ -226,7 +226,7 @@ module Cartoonist
 
     config.before_initialize do
       # Add in various configuration from plugins
-      Rails.application.config.assets.precompile += ["admin.css"]
+      Rails.application.config.assets.precompile += ["admin.css", "cartoonist.js"]
       Rails.application.config.assets.precompile += Cartoonist::Asset.all
       Rails.application.config.paths["db/migrate"] += Cartoonist::Migration.all
       Rails.application.config.action_controller.include_all_helpers = false
@@ -315,7 +315,7 @@ module Cartoonist
 
     Mime::Type.register "image/x-icon", :ico
     Cartoonist::Admin::Tab.add :general, :url => "/admin", :order => 3
-    Cartoonist::Navigation::Link.add :url => (lambda { "https://twitter.com/#{Setting[:twitter_handle]}" }), :class => "follow-us", :label => "application.layout.navigation.follow_on_twitter", :title => "application.layout.navigation.follow_on_twitter_title", :order => 2
+    Cartoonist::Navigation::Link.add :url => (lambda { "https://twitter.com/#{Setting[:twitter_handle]}" }), :class => "follow-us", :label => "cartoonist.layout.navigation.follow_on_twitter", :title => "cartoonist.layout.navigation.follow_on_twitter_title", :order => 2
     Cartoonist::Migration.add_for self
 
     Cartoonist::Backup.for :files do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &17891860 !ruby/object:Gem::Requirement
+  requirement: &13208780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *17891860
+  version_requirements: *13208780
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &17890900 !ruby/object:Gem::Requirement
+  requirement: &13206920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *17890900
+  version_requirements: *13206920
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &17890160 !ruby/object:Gem::Requirement
+  requirement: &13205660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *17890160
+  version_requirements: *13205660
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &17889400 !ruby/object:Gem::Requirement
+  requirement: &13205080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *17889400
+  version_requirements: *13205080
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &17888660 !ruby/object:Gem::Requirement
+  requirement: &13204340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *17888660
+  version_requirements: *13204340
 description: This provides the main functionality and plugin api for Cartoonist.
 email: reasonnumber@gmail.com
 executables: []
@@ -73,16 +73,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- app/assets/javascripts/application.js.erb
+- app/assets/javascripts/cartoonist.js.erb
 - app/assets/stylesheets/admin.css.scss
 - app/controllers/admin_controller.rb
-- app/controllers/application_controller.rb
 - app/controllers/cache_controller.rb
+- app/controllers/cartoonist_controller.rb
 - app/controllers/settings_controller.rb
 - app/controllers/site_controller.rb
 - app/controllers/static_cache_controller.rb
-- app/helpers/application_helper.rb
 - app/helpers/cache_helper.rb
+- app/helpers/cartoonist_helper.rb
 - app/models/backup.rb
 - app/models/database_file.rb
 - app/models/markdown.rb
@@ -96,9 +96,9 @@ files:
 - app/views/admin/main.html.erb
 - app/views/cache/index.html.erb
 - app/views/layouts/admin.html.erb
-- app/views/layouts/application.html.erb
-- app/views/layouts/application.rss.erb
-- app/views/layouts/application.xml.erb
+- app/views/layouts/cartoonist.html.erb
+- app/views/layouts/cartoonist.rss.erb
+- app/views/layouts/cartoonist.xml.erb
 - app/views/layouts/general_admin.html.erb
 - app/views/layouts/initial_setup.html.erb
 - app/views/layouts/users.html.erb