markbates / mack fork watch download tarball
public
Forks4Right
Watchers46Right
Description: A Ruby web application framework
Homepage: http://www.mackframework.com
Clone URL: git://github.com/markbates/mack.git
Click here to lend your support to: mack and make a donation at www.pledgie.com ! 
Removed deprecated app_config.orm code. [#92 state:resolved]
markbates (author)
Fri Aug 15 10:58:46 -0700 2008
commit  8f1ee6905f78eed632f0027e2dfae53d373211a4
tree    53db3c2acc596f30b57609af0c8c96fcc5fdb5dc
parent  52b8dee642efc5aef7024af468c1402582499685
0
CHANGELOG 
...
 
1
2
3
 
...
1
2
3
4
 
0
@@ -1,3 +1,4 @@
0
+* [#92] Removed deprecated app_config.orm code.
0
 * [#91] Fixed Mack blowing up if there is no config/initializers/gems.rb file.
0
 * [#90] Added deprecation system.
0
 * [#89] rake gems:* will now only display warning if any gem required is not installed (and not break)
0
lib/mack_core.rb 
...
42
43
44
45
46
47
48
49
 
...
42
43
44
 
 
45
46
47
 
0
@@ -42,8 +42,6 @@ unless Mack::Configuration.initialized_core
0
   
0
   require File.join(fl, "runner")
0
   
0
-  require File.join(fl, "initialization", "orm_support.rb")
0
-  
0
   Mack::Configuration.initialized_core = true if Mack::Configuration.initialized_core.nil?
0
 
0
   Mack.logger.debug "Initialization of Mack Core finished." unless app_config.log.disable_initialization_logging
0
lib/mack_tasks.rb 
...
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
 
...
16
17
18
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
19
20
21
 
0
@@ -16,21 +16,6 @@ if File.exists?(gems_rb)
0
   end
0
 end
0
 
0
-orm = app_config.orm
0
-unless orm.nil?
0
-  Mack.logger.warn %{
0
-    Please note that setting up orm in app_config has been deprecated, and will not be supported in future mack releases.
0
-    Here's how to update your existing application:
0
-    1.  Remove the line:
0
-        orm: data_mapper
0
-        from the app_config/default.yml file
0
-    2.  In gem.rb, add the following line in the require_gems block:
0
-        gem.add "mack-data_mapper", :libs => "mack-data_mapper"
0
-        ** if you use active record, then change it to mack-active_record instead of mack-data_mapper
0
-    }
0
-  require "mack-#{orm}_tasks"
0
-end
0
-
0
 # Requires all rake tasks that ship with the Mack framework.
0
 [File.join(File.dirname(__FILE__)), File.join(FileUtils.pwd, "lib"), File.join(FileUtils.pwd, "vendor", "plugins")].each do |dir|
0
   begin
0
test/unit/lib/tasks/generator_tasks_spec.rb 
...
11
12
13
14
15
 
16
17
18
...
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
 
...
11
12
13
 
 
14
15
16
17
...
28
29
30
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
31
32
33
 
0
@@ -11,8 +11,7 @@ describe "rake" do
0
         rake_task("generator:list") do
0
           ENV["__generator_list"].should_not be_nil
0
 
0
-          if app_config.orm.nil?
0
-            list = <<-LIST
0
+          list = <<-LIST
0
 
0
 Available Generators:
0
 
0
@@ -29,25 +28,6 @@ ViewHelperGenerator
0
 
0
 
0
             LIST
0
-          else
0
-            list = <<-LIST
0
-
0
-Available Generators:
0
-
0
-MackApplicationGenerator
0
-  rake generate:mack_application
0
-MigrationGenerator
0
-  rake generate:migration
0
-ModelGenerator
0
-  rake generate:model
0
-PluginGenerator
0
-  rake generate:plugin
0
-ScaffoldGenerator
0
-  rake generate:scaffold
0
-
0
-
0
-            LIST
0
-          end
0
 
0
           ENV["__generator_list"].should == list
0
         end

Comments