desert 0.3.2 → 0.3.3

data/CHANGES

@@ -1,3 +1,10 @@
+0.3.3
+- Fixed [#20770] Can't get specs to run for desert-based plugin bug (http://rubyforge.org/tracker/index.php?func=detail&aid=20770&group_id=6426&atid=24920)
+- Fixed [#21564] Can't see desert rake tasks (http://rubyforge.org/tracker/index.php?func=detail&aid=21564&group_id=6426&atid=24920)
+- Renamed plugin_schema_info to plugin_schema_migrations when using Rails >= 2.1
+- Migrater#migrated are now properly implemented for plugin_schema_migrations for Rails >= 2.1.0
+
+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
 
@@ -26,4 +33,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,7 +26,7 @@ task(:tag_release) do
 end
 
 PKG_NAME = "desert"
-PKG_VERSION = "0.3.2"
+PKG_VERSION = "0.3.3"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

data/lib/desert/plugin_migrations.rb

@@ -1,3 +1,11 @@
+dir = File.dirname(__FILE__)
+
 dir = File.dirname(__FILE__)
 require "#{dir}/plugin_migrations/migrator"
-require "#{dir}/plugin_migrations/extensions/schema_statements"
+if ActiveRecord::ConnectionAdapters::SchemaStatements.instance_methods.include?('initialize_schema_information')
+  require "#{dir}/plugin_migrations/1.2/migrator"
+  require "#{dir}/plugin_migrations/1.2/extensions/schema_statements"
+else
+  require "#{dir}/plugin_migrations/2.1/migrator"
+  require "#{dir}/plugin_migrations/2.1/extensions/schema_statements"
+end

data/lib/desert/plugin_migrations/1.2/migrator.rb

@@ -0,0 +1,33 @@
+module Desert #:nodoc:
+  module PluginMigrations
+    class Migrator < ActiveRecord::Migrator
+      class << self
+        def current_version #:nodoc:
+          result = ActiveRecord::Base.connection.select_one("SELECT version FROM #{schema_info_table_name} WHERE plugin_name = '#{current_plugin.name}'")
+          if result
+            result['version'].to_i
+          else
+            # There probably isn't an entry for this plugin in the migration info table.
+            0
+          end
+        end
+      end
+
+      def set_schema_version(version)
+        version = down? ? version.to_i - 1 : version.to_i
+
+        if ActiveRecord::Base.connection.select_one("SELECT version FROM #{self.class.schema_info_table_name} WHERE plugin_name = '#{current_plugin.name}'").nil?
+          # We need to create the entry since it doesn't exist
+          ActiveRecord::Base.connection.execute("INSERT INTO #{self.class.schema_info_table_name} (version, plugin_name) VALUES (#{version},'#{current_plugin.name}')")
+        else
+          ActiveRecord::Base.connection.update("UPDATE #{self.class.schema_info_table_name} SET version = #{version} WHERE plugin_name = '#{current_plugin.name}'")
+        end
+      end
+
+      def migrated
+        current_plugin_version = self.class.current_version
+        (1..current_plugin_version).to_a
+      end
+    end
+  end
+end

data/lib/desert/plugin_migrations/2.1/extensions/schema_statements.rb

@@ -0,0 +1,30 @@
+ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
+  def initialize_schema_migrations_table_with_plugins
+    initialize_schema_migrations_table_without_plugins
+
+    begin
+      execute "CREATE TABLE #{Desert::PluginMigrations::Migrator.schema_migrations_table_name} (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:string)})"
+      plugins_and_versions = select_all("SELECT plugin_name, version from #{Desert::PluginMigrations::Migrator.schema_info_table_name}")
+      plugins_and_versions.each do |plugin_data|
+        plugin_name, version = plugin_data["plugin_name"], plugin_data["version"]
+        plugin = Desert::Manager.find_plugin(plugin_name)
+        migration_versions = Dir["#{plugin.migration_path}/*.rb"].map do |path|
+          File.basename(path, ".rb")
+        end.select do |migration|
+          Integer(migration.split("_").first) <= Integer(version)
+        end
+        migration_versions.each do |migration_version|
+          insert_sql = ActiveRecord::Base.send(:sanitize_sql, [
+            "INSERT INTO #{Desert::PluginMigrations::Migrator.schema_migrations_table_name}(plugin_name, version) VALUES(?, ?)",
+            plugin_name,
+            Integer(migration_version.split("_").first)
+          ])
+          execute insert_sql
+        end
+      end
+    rescue ActiveRecord::StatementInvalid
+      # Schema has been initialized
+    end
+  end
+  alias_method_chain :initialize_schema_migrations_table, :plugins
+end

data/lib/desert/plugin_migrations/2.1/migrator.rb

@@ -0,0 +1,35 @@
+module Desert #:nodoc:
+  module PluginMigrations
+    class Migrator < ActiveRecord::Migrator
+      class << self
+        def current_version #:nodoc:
+          result = ActiveRecord::Base.connection.select_one("SELECT version FROM #{schema_migrations_table_name} WHERE plugin_name = '#{current_plugin.name}' order by version desc")
+          if result
+            result['version'].to_i
+          else
+            # There probably isn't an entry for this plugin in the migration info table.
+            0
+          end
+        end
+
+        def get_all_versions
+          ActiveRecord::Base.connection.select_values("SELECT version FROM #{schema_migrations_table_name} where plugin_name='#{current_plugin.name}'").map(&:to_i).sort
+        end
+      end
+
+      def record_version_state_after_migrating(version)
+        sm_table = self.class.schema_migrations_table_name
+
+        if down?
+          ActiveRecord::Base.connection.update("DELETE FROM #{sm_table} WHERE version = '#{version}' WHERE plugin_name = '#{current_plugin.name}'")
+        else
+          ActiveRecord::Base.connection.insert("INSERT INTO #{sm_table} (plugin_name, version) VALUES ('#{current_plugin.name}', '#{version}')")
+        end
+      end
+
+      def migrated
+        self.class.get_all_versions
+      end
+    end
+  end
+end

data/lib/desert/plugin_migrations/migrator.rb

@@ -19,36 +19,11 @@ module Desert #:nodoc:
         def schema_info_table_name #:nodoc:
           ActiveRecord::Base.table_name_prefix + 'plugin_schema_info' + ActiveRecord::Base.table_name_suffix
         end
-        alias_method :schema_migrations_table_name, :schema_info_table_name
-
-        def current_version #:nodoc:
-          result = ActiveRecord::Base.connection.select_one("SELECT version FROM #{schema_info_table_name} WHERE plugin_name = '#{current_plugin.name}'")
-          if result
-            result['version'].to_i
-          else
-            # There probably isn't an entry for this plugin in the migration info table.
-            0
-          end
+        
+        def schema_migrations_table_name
+          ActiveRecord::Base.table_name_prefix + 'plugin_schema_migrations' + ActiveRecord::Base.table_name_suffix
         end
       end
-
-      def set_schema_version(version)
-        version = down? ? version.to_i - 1 : version.to_i
-
-        if ActiveRecord::Base.connection.select_one("SELECT version FROM #{self.class.schema_info_table_name} WHERE plugin_name = '#{current_plugin.name}'").nil?
-          # We need to create the entry since it doesn't exist
-          ActiveRecord::Base.connection.execute("INSERT INTO #{self.class.schema_info_table_name} (version, plugin_name) VALUES (#{version},'#{current_plugin.name}')")
-        else
-          ActiveRecord::Base.connection.update("UPDATE #{self.class.schema_info_table_name} SET version = #{version} WHERE plugin_name = '#{current_plugin.name}'")
-        end
-      end
-      alias_method :record_version_state_after_migrating, :set_schema_version
-
-
-      def migrated
-        current_plugin_version = self.class.current_version
-        (1..current_plugin_version).to_a
-      end
     end
   end
 end

data/lib/desert/supported_rails_versions.rb

@@ -4,6 +4,8 @@ module Desert
     "1.99.0" => {'version' => '1.99.0', 'git_tag' => 'v2.0.0_RC1'},
     "2.0.2" => {'version' => '2.0.2', 'git_tag' => 'v2.0.2'},
     "2.1.0" => {'version' => '2.1.0', 'git_tag' => 'v2.1.0'},
-    "edge" => {'version' => 'edge', 'git_tag' => 'master'},
+    "2.2.0" => {'version' => '2.2.0', 'git_tag' => 'v2.2.0'},
+    "2.2.2" => {'version' => '2.2.2', 'git_tag' => 'v2.2.2'},
+#    "edge" => {'version' => 'edge', 'git_tag' => 'master'},
   }
 end

data/lib/desert/tasks.rb

@@ -0,0 +1,4 @@
+dir = File.dirname(__FILE__)
+Dir["#{dir}/tasks/*.rake"].each do |file|
+  load file
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: desert
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-13 00:00:00 -07:00
+date: 2008-12-27 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -23,47 +23,49 @@ extra_rdoc_files:
 - README.rdoc
 - CHANGES
 files: 
-- CHANGES
 - MIT-LICENSE
-- Rakefile
 - README.rdoc
+- Rakefile
+- CHANGES
 - init.rb
-- lib/desert/manager.rb
-- lib/desert/plugin.rb
-- lib/desert/plugin_migrations/extensions/1.0/schema_statements.rb
-- lib/desert/plugin_migrations/extensions/2.1/schema_statements.rb
-- lib/desert/plugin_migrations/extensions/schema_statements.rb
-- lib/desert/plugin_migrations/migrator.rb
-- lib/desert/plugin_migrations.rb
-- lib/desert/plugin_templates/1.2.0/action_mailer.rb
-- lib/desert/plugin_templates/1.2.0/action_view.rb
-- lib/desert/plugin_templates/1.99.0/action_mailer.rb
-- lib/desert/plugin_templates/1.99.0/action_view.rb
-- lib/desert/plugin_templates/2.0.0/action_mailer.rb
-- lib/desert/plugin_templates/2.0.2/action_view.rb
-- lib/desert/plugin_templates/2.1.0/action_view.rb
-- lib/desert/plugin_templates/action_controller.rb
-- lib/desert/plugin_templates/action_view.rb
-- lib/desert/plugin_templates/edge/action_view.rb
+- lib/desert.rb
 - lib/desert/plugin_templates.rb
-- lib/desert/rails/1.2.0/initializer.rb
-- lib/desert/rails/2.0.0/plugin.rb
 - lib/desert/rails/dependencies.rb
+- lib/desert/rails/2.0.0/plugin.rb
+- lib/desert/rails/1.2.0/initializer.rb
 - lib/desert/rails/migration.rb
 - lib/desert/rails/route_set.rb
 - lib/desert/rails.rb
+- lib/desert/manager.rb
+- lib/desert/plugin_migrations.rb
 - lib/desert/ruby/object.rb
-- lib/desert/ruby.rb
 - lib/desert/supported_rails_versions.rb
+- lib/desert/ruby.rb
 - lib/desert/version_checker.rb
-- lib/desert.rb
+- lib/desert/tasks.rb
+- lib/desert/plugin_migrations/2.1/extensions/schema_statements.rb
+- lib/desert/plugin_migrations/2.1/migrator.rb
+- lib/desert/plugin_migrations/1.2/extensions/schema_statements.rb
+- lib/desert/plugin_migrations/1.2/migrator.rb
+- lib/desert/plugin_migrations/migrator.rb
+- lib/desert/plugin.rb
+- lib/desert/plugin_templates/edge/action_view.rb
+- lib/desert/plugin_templates/action_controller.rb
+- lib/desert/plugin_templates/1.99.0/action_mailer.rb
+- lib/desert/plugin_templates/1.99.0/action_view.rb
+- lib/desert/plugin_templates/2.0.0/action_mailer.rb
+- lib/desert/plugin_templates/2.1.0/action_view.rb
+- lib/desert/plugin_templates/2.0.2/action_view.rb
+- lib/desert/plugin_templates/action_view.rb
+- lib/desert/plugin_templates/1.2.0/action_mailer.rb
+- lib/desert/plugin_templates/1.2.0/action_view.rb
 - generators/desert_plugin
-- generators/desert_plugin/desert_plugin_generator.rb
 - generators/desert_plugin/templates
-- generators/desert_plugin/templates/empty_file
-- generators/desert_plugin/templates/plugin_migration.rb
 - generators/desert_plugin/templates/routes.rb
+- generators/desert_plugin/templates/plugin_migration.rb
 - generators/desert_plugin/templates/spec_helper.rb
+- generators/desert_plugin/templates/empty_file
+- generators/desert_plugin/desert_plugin_generator.rb
 - generators/desert_plugin/USAGE
 has_rdoc: true
 homepage: http://pivotallabs.com
@@ -90,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pivotalrb
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Desert is a component framework for Rails that allows your plugins to be packaged as mini Rails apps.

data/lib/desert/plugin_migrations/extensions/2.1/schema_statements.rb

@@ -1,12 +0,0 @@
-ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
-  def initialize_schema_migrations_table_with_plugins
-    initialize_schema_migrations_table_without_plugins
-
-    begin
-      execute "CREATE TABLE #{Desert::PluginMigrations::Migrator.schema_info_table_name} (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:integer)})"
-    rescue ActiveRecord::StatementInvalid
-      # Schema has been initialized
-    end
-  end
-  alias_method_chain :initialize_schema_migrations_table, :plugins
-end

data/lib/desert/plugin_migrations/extensions/schema_statements.rb

@@ -1,6 +0,0 @@
-dir = File.dirname(__FILE__)
-if ActiveRecord::ConnectionAdapters::SchemaStatements.instance_methods.include?('initialize_schema_information')
-  require "#{dir}/1.0/schema_statements"
-else
-  require "#{dir}/2.1/schema_statements"
-end