GitHub Sale: sign up for any paid plan this week and pay nothing until January 1, 2009!  [ hide ]

public
Rubygem
Description: Merb Core: All you need. None you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/wycats/merb-core.git
Make Kernel#registred_orm? use simple include lookup.
Thu May 15 12:10:03 -0700 2008
commit  56cc15ab05301d8ed6f440795aabb43203c7179d
tree    5e0e066f68e20ea1fe194bc177646ad136ec75fb
parent  420ade64d339c946c148061e86ae5846e3c33d03
...
115
116
117
118
 
119
120
121
...
140
141
142
143
 
144
145
146
...
115
116
117
 
118
119
120
121
...
140
141
142
 
143
144
145
146
0
@@ -115,7 +115,7 @@ module Kernel
0
   # # This will use the DataMapper generator for your ORM
0
   # $ ruby script/generate model MyModel
0
   def use_orm(orm)
0
- raise "Don't call use_orm more than once" if registred_orm?(orm)
0
+ raise "Don't call use_orm more than once" unless Merb.generator_scope.include?(:merb_default)
0
 
0
     begin
0
       register_orm(orm)
0
@@ -140,7 +140,7 @@ module Kernel
0
   #--
0
   # @semi-public
0
   def registred_orm?(orm)
0
- !Merb.generator_scope.include?(:merb_default)
0
+ Merb.generator_scope.include?(orm)
0
   end
0
 
0
   # Registers ORM at generator scope.
...
99
100
101
102
 
103
104
105
106
107
108
 
109
110
111
 
112
113
114
...
99
100
101
 
102
103
104
105
106
107
 
108
109
110
 
111
112
113
114
0
@@ -99,16 +99,16 @@ end
0
 
0
 # #326
0
 describe Kernel, "#registred_orm?" do
0
- it "returns true if Merb.generator scope has orm alias and has not defaults flag" do
0
+ it "returns true if Merb.generator scope has orm alias" do
0
     Merb.generator_scope = [:rspec, :datamapper]
0
 
0
     registred_orm?(:datamapper).should be(true)
0
   end
0
 
0
- it "returns false if Merb.generator scope has defaults flag" do
0
+ it "returns false if Merb.generator scope has no ORM alias" do
0
     Merb.generator_scope = [:merb_default, :rspec, :datamapper]
0
 
0
- registred_orm?(:datamapper).should be(false)
0
+ registred_orm?(:sequel).should be(false)
0
   end
0
 end
0
 

Comments

    No one has commented yet.