tog-desert 0.3.4 → 0.3.5

data/CHANGES

@@ -1,3 +1,5 @@
+0.3.2
+- Fixed exception in testspec.rake when rspec is not loaded
 - Fix template loading on Edge Rails and on Rails 2.1.0
 
 0.3.1
@@ -25,4 +27,4 @@
 
 0.1.0
 - Fixed [#13346] ActionController::Base.helper raises error when helper is only in plugin
-- Desert does not require files that have been required before Desert was loaded
+- Desert does not require files that have been required before Desert was loaded

data/Rakefile

@@ -26,14 +26,14 @@ task(:tag_release) do
 end
 
 PKG_NAME = "desert"
-PKG_VERSION = "0.3.4"
+PKG_VERSION = "0.3.5"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',
   'lib/**/*.rb',
   'generators/**/*',
-  'generators/**/templates/*'
-  #'examples/**/*.rb'
+  'generators/**/templates/*',
+  'examples/**/*.rb'
 ]
 
 spec = Gem::Specification.new do |s|
@@ -47,8 +47,8 @@ spec = Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   s.has_rdoc = true
-  #s.extra_rdoc_files = [ "README.rdoc", "CHANGES" ]
-  #s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--line-numbers"]
+  s.extra_rdoc_files = [ "README.rdoc", "CHANGES" ]
+  s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--line-numbers"]
 
   #s.test_files = Dir.glob('spec/*_spec.rb')
   #s.require_path = 'lib'

data/lib/desert/plugin_templates/2.1.0/action_view.rb

@@ -1,8 +1,7 @@
 module ActionView #:nodoc:
   class TemplateFinder #:nodoc:
-    def initialize_with_desert_plugins(base, *paths)
-      self.class.process_view_paths(*paths)
-      initialize_without_desert_plugins base, *paths
+    def initialize_with_desert_plugins(*args)
+      initialize_without_desert_plugins *args
 
       Desert::Manager.plugins.reverse.each do |plugin|
         append_view_path plugin.templates_path

data/lib/desert/plugin_templates/action_view.rb

@@ -1,4 +1,5 @@
 dir = File.dirname(__FILE__)
+
 if ActionView.const_defined?(:TemplateFinder)
   require "#{dir}/2.1.0/action_view"
 else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tog-desert
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Pivotal Labs