desert 0.2.2 → 0.3.0

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,11 +1,12 @@
1
- 0.2.2
1
+ 0.3.0
2
+ - Fixed bug "Desert can't override an ERB template in a plugin with another template in your app"
3
+ - Fixed multipart duplication issue
2
4
  - Fixed script/destroy not removing the routes [From Jeff Dean]
3
5
  - gem includes the Rails generator files [From Jeff Dean]
4
6
  - Fixed readding the route to config/routes.rb in the script/destroy task [From Jeff Dean]
5
7
  - Github now properly formats readme [From Jeff Dean]
6
8
  - Updated the gemspec so rdoc includes it and updated it to add installation and setup instructions [From Jeff Dean]
7
9
  - Removed sample route from generator [From Jeff Dean]
8
- - Fix migration issue with Rails 2.1.0 using timestamps.
9
10
 
10
11
  0.2.1
11
12
  - Fixed ActionMailer rendering in Rails 1.99.0
@@ -150,29 +150,6 @@ All standard routing methods are available in your plugin's routes file, such as
150
150
  admin.resources :posts
151
151
  end
152
152
 
153
- Desert uses a separate table to manage migration version to maintain backwards compatibility with Rails 1.x.
154
- Your plugin app's migration live in your_plugin/db/migrate. To run migrations, follow these steps:
155
-
156
- * Create a new migration in your main app
157
-
158
- script/generate migration migrate_my_plugin_to_045
159
-
160
- * Add the custom `migrate_plugin` method
161
-
162
- class MigrateMyPluginTo045 < ActiveRecord::Migration
163
- def self.up
164
- migrate_plugin(:my_plugin, 20080530223548)
165
- end
166
-
167
- def self.down
168
- migrate_plugin(:my_plugin, 0)
169
- end
170
- end
171
-
172
- * Run your migrations normally
173
-
174
- rake db:migrate
175
-
176
153
  connect "/signup", :controller => "users", :action => "signup"
177
154
 
178
155
  == Share Migrations
data/Rakefile CHANGED
@@ -26,7 +26,7 @@ task(:tag_release) do
26
26
  end
27
27
 
28
28
  PKG_NAME = "desert"
29
- PKG_VERSION = "0.2.2"
29
+ PKG_VERSION = "0.3.0"
30
30
  PKG_FILES = FileList[
31
31
  '[A-Z]*',
32
32
  '*.rb',
@@ -43,12 +43,6 @@ module Desert #:nodoc:
43
43
  end
44
44
  end
45
45
  alias_method :record_version_state_after_migrating, :set_schema_version
46
-
47
-
48
- def migrated
49
- current_plugin_version = self.class.current_version
50
- (1..current_plugin_version).to_a
51
- end
52
46
  end
53
47
  end
54
48
  end
@@ -2,15 +2,11 @@ module ActionMailer #:nodoc
2
2
  class Base #:nodoc:
3
3
  private
4
4
  def template_path_with_plugin_routing
5
- result = nil
6
- Desert::Manager.plugins_and_app.reverse.each do |plugin|
7
- relative_path = "#{plugin.templates_path}/#{mailer_name}"
8
- unless Dir["#{relative_path}/#{@template}.*"].empty?
9
- result = relative_path
10
- break
11
- end
5
+ template_paths = [template_path_without_plugin_routing]
6
+ Desert::Manager.plugins.reverse.each do |plugin|
7
+ template_paths << "#{plugin.templates_path}/#{mailer_name}"
12
8
  end
13
- result || template_path_without_plugin_routing
9
+ "{#{template_paths * ','}}"
14
10
  end
15
11
  alias_method_chain :template_path, :plugin_routing
16
12
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: desert
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.2
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pivotal Labs
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2008-06-20 00:00:00 -07:00
12
+ date: 2008-06-10 00:00:00 -07:00
13
13
  default_executable:
14
14
  dependencies: []
15
15
 
@@ -25,41 +25,41 @@ extra_rdoc_files:
25
25
  files:
26
26
  - CHANGES
27
27
  - MIT-LICENSE
28
- - README.rdoc
29
28
  - Rakefile
29
+ - README.rdoc
30
30
  - init.rb
31
31
  - lib/desert/rails/2.0.0/plugin.rb
32
- - lib/desert/rails/1.2.0/initializer.rb
33
32
  - lib/desert/rails/route_set.rb
34
33
  - lib/desert/rails/migration.rb
34
+ - lib/desert/rails/1.2.0/initializer.rb
35
35
  - lib/desert/rails/dependencies.rb
36
- - lib/desert/rails.rb
37
- - lib/desert/plugin_templates/action_view.rb
38
- - lib/desert/plugin_templates/1.99.0/action_mailer.rb
39
- - lib/desert/plugin_templates/2.0.0/action_mailer.rb
40
- - lib/desert/plugin_templates/1.2.0/action_mailer.rb
41
- - lib/desert/plugin_templates/action_controller.rb
42
- - lib/desert/plugin_templates.rb
43
- - lib/desert/supported_rails_versions.rb
44
36
  - lib/desert/manager.rb
45
37
  - lib/desert/plugin_migrations/migrator.rb
46
38
  - lib/desert/plugin_migrations/extensions/1.0/schema_statements.rb
47
39
  - lib/desert/plugin_migrations/extensions/schema_statements.rb
48
40
  - lib/desert/plugin_migrations/extensions/2.1/schema_statements.rb
41
+ - lib/desert/plugin_templates.rb
42
+ - lib/desert/supported_rails_versions.rb
49
43
  - lib/desert/ruby.rb
50
44
  - lib/desert/version_checker.rb
51
- - lib/desert/plugin_migrations.rb
45
+ - lib/desert/plugin_templates/2.0.0/action_mailer.rb
46
+ - lib/desert/plugin_templates/action_controller.rb
47
+ - lib/desert/plugin_templates/action_view.rb
48
+ - lib/desert/plugin_templates/1.2.0/action_mailer.rb
49
+ - lib/desert/plugin_templates/1.99.0/action_mailer.rb
52
50
  - lib/desert/ruby/object.rb
51
+ - lib/desert/plugin_migrations.rb
52
+ - lib/desert/rails.rb
53
53
  - lib/desert/plugin.rb
54
54
  - lib/desert.rb
55
55
  - generators/desert_plugin
56
56
  - generators/desert_plugin/USAGE
57
- - generators/desert_plugin/desert_plugin_generator.rb
58
57
  - generators/desert_plugin/templates
58
+ - generators/desert_plugin/templates/spec_helper.rb
59
59
  - generators/desert_plugin/templates/plugin_migration.rb
60
60
  - generators/desert_plugin/templates/empty_file
61
- - generators/desert_plugin/templates/spec_helper.rb
62
61
  - generators/desert_plugin/templates/routes.rb
62
+ - generators/desert_plugin/desert_plugin_generator.rb
63
63
  has_rdoc: true
64
64
  homepage: http://pivotallabs.com
65
65
  post_install_message: