refinerycms-theming 0.9.9.2 → 1.0.0

data/lib/gemspec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-version = '0.9.9.2'
+version = '1.0.0'
 raise "Could not get version so gemspec can not be built" if version.nil?
 files = Dir[%q{**/*}].flatten.reject{|f| f =~ /\.gem$/}
 
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
     '#{Dir.glob("test/**/*.rb").join("',\n    '")}'
   ]" if File.directory?("test")}
 
-  s.add_dependency('refinerycms', '>= 0.9.9')
+  s.add_dependency('refinerycms-core', '>= 0.9.9.1')
 end
 EOF
 

data/lib/{theme_server.rb → refinery/theme_server.rb}

@@ -1,4 +1,4 @@
-# Serves theme files from the theme directory without touching Rails too much
+# Serves theme files from the theme directory without touching Rails.
 module Refinery
   class ThemeServer
 

data/lib/refinerycms-theming.rb

@@ -1,4 +1,7 @@
+require 'refinerycms-core'
+
 require File.expand_path('../theming', __FILE__)
+require File.expand_path('../theme', __FILE__)
 
 module Refinery
   class ThemingEngine < ::Rails::Engine
@@ -77,13 +80,13 @@ module Refinery
     config.after_initialize do
       ::Refinery::Plugin.register do |plugin|
         plugin.name = "refinerycms_theming_plugin"
-        plugin.version = '0.9.9.2'
+        plugin.version = '1.0.0'
         plugin.hide_from_menu = true
       end
     end
 
     initializer 'themes.middleware' do |app|
-      app.config.middleware.insert_before ::ActionDispatch::Static, ::Refinery::ThemeServer
+      app.config.middleware.insert_after ::Rack::Lock, ::Refinery::ThemeServer
     end
 
   end

data/lib/theme.rb

@@ -0,0 +1,18 @@
+module Theme
+  class << self
+    def current_theme(env = nil)
+      ::RefinerySetting[:theme]
+    end
+
+    def root
+      Pathname.new( File.expand_path('../../', __FILE__) )
+    end
+
+    def 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
+end

data/lib/theming.rb

@@ -1,2 +1,2 @@
 # Before the application gets setup this will fail badly if there's no database.
-require File.expand_path('../theme_server', __FILE__)
+require File.expand_path('../refinery/theme_server', __FILE__)

data/refinerycms-theming.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-theming}
-  s.version           = %q{0.9.9.2}
+  s.version           = %q{1.0.0}
   s.description       = %q{Theming functionality for the Refinery CMS project, extracted from Refinery CMS core.}
-  s.date              = %q{2011-02-16}
+  s.date              = %q{2011-03-19}
   s.summary           = %q{Theming functionality for the Refinery CMS project.}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
@@ -11,9 +11,6 @@ Gem::Specification.new do |s|
   s.require_paths     = %w(lib)
 
   s.files             = [
-    'app',
-    'app/models',
-    'app/models/theme.rb',
     'features',
     'features/step_definitions',
     'features/step_definitions/theme_generator_steps.rb',
@@ -39,8 +36,10 @@ Gem::Specification.new do |s|
     'lib/generators/refinery_theme/templates/views/pages/home.html.erb',
     'lib/generators/refinery_theme/templates/views/pages/show.html.erb',
     'lib/generators/refinery_theme/USAGE',
+    'lib/refinery',
+    'lib/refinery/theme_server.rb',
     'lib/refinerycms-theming.rb',
-    'lib/theme_server.rb',
+    'lib/theme.rb',
     'lib/theming.rb',
     'license.md',
     'readme.md',
@@ -85,5 +84,5 @@ Gem::Specification.new do |s|
   ]
   
 
-  s.add_dependency('refinerycms', '>= 0.9.9')
+  s.add_dependency('refinerycms-core', '>= 0.9.9.1')
 end

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-theming
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.2
+  version: 1.0.0
 platform: ruby
 authors: 
 - Resolve Digital
@@ -10,18 +10,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 +13:00
+date: 2011-03-19 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: refinerycms
+  name: refinerycms-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: 0.9.9.1
   type: :runtime
   version_requirements: *id001
 description: Theming functionality for the Refinery CMS project, extracted from Refinery CMS core.
@@ -33,7 +33,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- app/models/theme.rb
 - features/step_definitions/theme_generator_steps.rb
 - features/theme_generator.feature
 - lib/gemspec.rb
@@ -48,8 +47,9 @@ files:
 - lib/generators/refinery_theme/templates/views/pages/home.html.erb
 - lib/generators/refinery_theme/templates/views/pages/show.html.erb
 - lib/generators/refinery_theme/USAGE
+- lib/refinery/theme_server.rb
 - lib/refinerycms-theming.rb
-- lib/theme_server.rb
+- lib/theme.rb
 - lib/theming.rb
 - license.md
 - readme.md
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Theming functionality for the Refinery CMS project.

data/app/models/theme.rb

@@ -1,18 +0,0 @@
-class Theme
-
-  def self.current_theme(env = nil)
-    ::RefinerySetting[:theme]
-  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
-
-end