refinerycms-theming 0.9.9 → 0.9.9.1

data/app/models/theme.rb

@@ -4,15 +4,15 @@ class Theme
     ::RefinerySetting[:theme]
   end
 
-	def self.root
-		Pathname.new( File.expand_path('../../../', __FILE__) )
-	end
+  def self.root
+    Pathname.new( File.expand_path('../../../', __FILE__) )
+  end
 
-	def self.current_theme_dir
-		theme = self.current_theme
-		theme_dir = Rails.root.join("themes",theme)
-		theme_dir = self.root.join('themes', theme) unless theme_dir.directory?
-		theme_dir
-	end
+  def self.current_theme_dir
+    theme = self.current_theme
+    theme_dir = Rails.root.join("themes",theme)
+    theme_dir = self.root.join('themes', theme) unless theme_dir.directory?
+    theme_dir
+  end
 
 end

data/features/step_definitions/theme_generator_steps.rb

@@ -1,15 +1,20 @@
+require File.expand_path('../../../lib/generators/refinery_theme/refinery_theme_generator', __FILE__)
+
 Before do
   @theme_generator_root  = File.join(File.dirname(__FILE__), "/../../")
   @tmp_refinery_app_name  = "tmp_refinery_app"
-  @tmp_refinery_app_root  = File.join(@theme_generator_root, @tmp_refinery_app_name)
+  require 'tmpdir'
+  @tmp_refinery_app_root  = File.join(Dir.tmpdir, @tmp_refinery_app_name)
   @app_root = @tmp_refinery_app_root
-  Rails::Generator::Base.append_sources(Rails::Generator::PathSource.new(:theme, "#{@theme_generator_root}/generators/"))
 end
 
 After do
   FileUtils.rm_rf(@tmp_refinery_app_root)
 end
 
-When /^I generate a theme with the name of "([^"]*)"$/ do |name|
-  Rails::Generator::Scripts::Generate.new.run(['refinery_theme', name], {:quiet => true, :destination => @app_root})
+When /^I generate a theme with the name "([^\"]*)"$/ do |name|
+  generator = RefineryThemeGenerator.new([name])
+  generator.destination_root = @app_root
+  generator.options = {:quiet => true}
+  generator.generate
 end

data/features/theme_generator.feature

@@ -1,11 +1,13 @@
+@theming
 Feature: Theme generation
   In order to create my own theme
   As a refinery user
   I want to generate a basic theme directory structure
 
+  @theming-generate
   Scenario: Generating a theme with a name
     Given I have a refinery application
-    When I generate a theme with the name of "modern"
+    When I generate a theme with the name "modern"
     Then I should have a directory "themes/modern"
     And I should have a file "themes/modern/stylesheets/application.css"
     And I should have a file "themes/modern/stylesheets/home.css"

data/lib/gemspec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-version = '0.9.9'
+version = '0.9.9.1'
 raise "Could not get version so gemspec can not be built" if version.nil?
 files = Dir[%q{**/*}].flatten.reject{|f| f =~ /\.gem$/}
 

data/lib/generators/refinery_theme/refinery_theme_generator.rb

@@ -1,8 +1,8 @@
 class RefineryThemeGenerator < Rails::Generators::Base
-  source_root File.expand_path('../templates', __FILE__)  
+  source_root File.expand_path('../templates', __FILE__)
   argument :theme_name, :type => :string
 
-  def create_theme
+  def generate
     copy_file "stylesheets/application.css", "themes/#{theme_name}/stylesheets/application.css"
     copy_file "stylesheets/formatting.css", "themes/#{theme_name}/stylesheets/formatting.css"
     copy_file "stylesheets/home.css", "themes/#{theme_name}/stylesheets/home.css"
@@ -12,6 +12,8 @@ class RefineryThemeGenerator < Rails::Generators::Base
     copy_file "views/pages/show.html.erb", "themes/#{theme_name}/views/pages/show.html.erb"
     copy_file "views/pages/home.html.erb", "themes/#{theme_name}/views/pages/home.html.erb"
 
+    copy_file "javascripts/application.js", "themes/#{theme_name}/javascripts/application.js"
+
     if RefinerySetting.get(:theme).nil?
       RefinerySetting.set(:theme, theme_name)
       puts "NOTE: \"theme\" setting created and set to #{theme_name}"

data/lib/generators/refinery_theme/templates/javascripts/application.js

@@ -0,0 +1,4 @@
+/*
+  Place application specific javascripts into this file.
+  Include this into your template using javascript_include_tag('application', :theme => true)
+*/

data/lib/refinerycms-theming.rb

@@ -74,6 +74,13 @@ module Refinery
       end
     end
 
+    config.after_initialize do
+      ::Refinery::Plugin.register do |plugin|
+        plugin.name = "refinerycms_theming_plugin"
+        plugin.version = '0.9.9.1'
+      end
+    end
+
     initializer 'themes.middleware' do |app|
       app.config.middleware.insert_before ::ActionDispatch::Static, ::Refinery::ThemeServer
     end

data/lib/theme_server.rb

@@ -1,6 +1,3 @@
-# Allow the metal piece to run in isolation
-require File.expand_path('../../../config/environment', __FILE__) unless defined?(Rails)
-
 # Serves theme files from the theme directory without touching Rails too much
 module Refinery
   class ThemeServer

data/refinerycms-theming.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-theming}
-  s.version           = %q{0.9.9}
+  s.version           = %q{0.9.9.1}
   s.description       = %q{Theming functionality for the Refinery CMS project, extracted from Refinery CMS core.}
-  s.date              = %q{2010-12-15}
+  s.date              = %q{2011-02-16}
   s.summary           = %q{Theming functionality for the Refinery CMS project.}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
@@ -26,6 +26,8 @@ Gem::Specification.new do |s|
     'lib/generators/refinery_theme/README',
     'lib/generators/refinery_theme/refinery_theme_generator.rb',
     'lib/generators/refinery_theme/templates',
+    'lib/generators/refinery_theme/templates/javascripts',
+    'lib/generators/refinery_theme/templates/javascripts/application.js',
     'lib/generators/refinery_theme/templates/stylesheets',
     'lib/generators/refinery_theme/templates/stylesheets/application.css',
     'lib/generators/refinery_theme/templates/stylesheets/formatting.css',

data/themes/hemingway/stylesheets/application.css

@@ -661,10 +661,10 @@ img.alignleft {
 
 /*
 Firefox Dotted Line Fix
-	- http://sonspring.com/journal/removing-dotted-links
+  - http://sonspring.com/journal/removing-dotted-links
 */
 a:focus {
-	outline: none;
+  outline: none;
 }
 
 /*
@@ -673,19 +673,19 @@ Clearfix docs
  - IE7 change: http://www.456bereastreet.com/archive/200603/new_clearing_method_needed_for_ie7/
 */
 .clearfix:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
+  content: ".";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
 }
 .clearfix {
-	display: inline-block;
+  display: inline-block;
 }
 
 /* Hide from IE Mac \*/
 .clearfix {
-	display:block;
+  display:block;
 }
 /* End hide from IE Mac */
 
@@ -696,11 +696,11 @@ display: block;
 }
 
 .inquiries .field {
-	margin: 12px 0px;
+  margin: 12px 0px;
 }
 
 .inquiries form {
-	padding-top: 12px;
+  padding-top: 12px;
 }
 
 .page_not_live {

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-theming
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 9
-  version: 0.9.9
+  prerelease: 
+  version: 0.9.9.1
 platform: ruby
 authors: 
 - Resolve Digital
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 +13:00
+date: 2011-02-16 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 9
         version: 0.9.9
   type: :runtime
   version_requirements: *id001
@@ -48,6 +40,7 @@ files:
 - lib/generators/refinery_theme/Rakefile
 - lib/generators/refinery_theme/README
 - lib/generators/refinery_theme/refinery_theme_generator.rb
+- lib/generators/refinery_theme/templates/javascripts/application.js
 - lib/generators/refinery_theme/templates/stylesheets/application.css
 - lib/generators/refinery_theme/templates/stylesheets/formatting.css
 - lib/generators/refinery_theme/templates/stylesheets/home.css
@@ -100,21 +93,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Theming functionality for the Refinery CMS project.