tog-desert 0.3.4 → 0.3.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGES CHANGED
@@ -1,3 +1,5 @@
1
+ 0.3.2
2
+ - Fixed exception in testspec.rake when rspec is not loaded
1
3
  - Fix template loading on Edge Rails and on Rails 2.1.0
2
4
 
3
5
  0.3.1
@@ -25,4 +27,4 @@
25
27
 
26
28
  0.1.0
27
29
  - Fixed [#13346] ActionController::Base.helper raises error when helper is only in plugin
28
- - Desert does not require files that have been required before Desert was loaded
30
+ - Desert does not require files that have been required before Desert was loaded
data/Rakefile CHANGED
@@ -26,14 +26,14 @@ task(:tag_release) do
26
26
  end
27
27
 
28
28
  PKG_NAME = "desert"
29
- PKG_VERSION = "0.3.4"
29
+ PKG_VERSION = "0.3.5"
30
30
  PKG_FILES = FileList[
31
31
  '[A-Z]*',
32
32
  '*.rb',
33
33
  'lib/**/*.rb',
34
34
  'generators/**/*',
35
- 'generators/**/templates/*'
36
- #'examples/**/*.rb'
35
+ 'generators/**/templates/*',
36
+ 'examples/**/*.rb'
37
37
  ]
38
38
 
39
39
  spec = Gem::Specification.new do |s|
@@ -47,8 +47,8 @@ spec = Gem::Specification.new do |s|
47
47
  s.require_path = 'lib'
48
48
 
49
49
  s.has_rdoc = true
50
- #s.extra_rdoc_files = [ "README.rdoc", "CHANGES" ]
51
- #s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--line-numbers"]
50
+ s.extra_rdoc_files = [ "README.rdoc", "CHANGES" ]
51
+ s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--line-numbers"]
52
52
 
53
53
  #s.test_files = Dir.glob('spec/*_spec.rb')
54
54
  #s.require_path = 'lib'
@@ -1,8 +1,7 @@
1
1
  module ActionView #:nodoc:
2
2
  class TemplateFinder #:nodoc:
3
- def initialize_with_desert_plugins(base, *paths)
4
- self.class.process_view_paths(*paths)
5
- initialize_without_desert_plugins base, *paths
3
+ def initialize_with_desert_plugins(*args)
4
+ initialize_without_desert_plugins *args
6
5
 
7
6
  Desert::Manager.plugins.reverse.each do |plugin|
8
7
  append_view_path plugin.templates_path
@@ -1,4 +1,5 @@
1
1
  dir = File.dirname(__FILE__)
2
+
2
3
  if ActionView.const_defined?(:TemplateFinder)
3
4
  require "#{dir}/2.1.0/action_view"
4
5
  else
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tog-desert
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.4
4
+ version: 0.3.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pivotal Labs