Skip to content
This repository
Browse code

Remove stuff that was deprecated in 2-1-stable

  • Loading branch information...
commit a5cdb7a813515fa0cbee23101d2f911b4017ed90 1 parent 6fae0a0
Pratik authored October 21, 2008
26  actionpack/lib/action_controller/caching/fragments.rb
@@ -26,32 +26,6 @@ module Caching
26 26
     # 
27 27
     #   expire_fragment(:controller => "topics", :action => "list", :action_suffix => "all_topics")
28 28
     module Fragments
29  
-      def self.included(base) #:nodoc:
30  
-        base.class_eval do
31  
-          class << self
32  
-            def fragment_cache_store=(store_option) #:nodoc:
33  
-              ActiveSupport::Deprecation.warn('The fragment_cache_store= method is now use cache_store=')
34  
-              self.cache_store = store_option
35  
-            end
36  
-          
37  
-            def fragment_cache_store #:nodoc:
38  
-              ActiveSupport::Deprecation.warn('The fragment_cache_store method is now use cache_store')
39  
-              cache_store
40  
-            end
41  
-          end
42  
-
43  
-          def fragment_cache_store=(store_option) #:nodoc:
44  
-            ActiveSupport::Deprecation.warn('The fragment_cache_store= method is now use cache_store=')
45  
-            self.cache_store = store_option
46  
-          end
47  
-        
48  
-          def fragment_cache_store #:nodoc:
49  
-            ActiveSupport::Deprecation.warn('The fragment_cache_store method is now use cache_store')
50  
-            cache_store
51  
-          end
52  
-        end
53  
-      end
54  
-
55 29
       # Given a key (as described in <tt>expire_fragment</tt>), returns a key suitable for use in reading, 
56 30
       # writing, or expiring a cached fragment. If the key is a hash, the generated key is the return
57 31
       # value of url_for on that hash (without the protocol). All keys are prefixed with "views/" and uses
16  actionpack/lib/action_view/base.rb
@@ -172,18 +172,6 @@ class << self
172 172
       delegate :logger, :to => 'ActionController::Base'
173 173
     end
174 174
 
175  
-    def self.cache_template_loading=(*args)
176  
-      ActiveSupport::Deprecation.warn(
177  
-        "config.action_view.cache_template_loading option has been deprecated" +
178  
-        "and has no effect. Please remove it from your config files.", caller)
179  
-    end
180  
-
181  
-    def self.cache_template_extensions=(*args)
182  
-      ActiveSupport::Deprecation.warn(
183  
-        "config.action_view.cache_template_extensions option has been" +
184  
-        "deprecated and has no effect. Please remove it from your config files.", caller)
185  
-    end
186  
-
187 175
     # Templates that are exempt from layouts
188 176
     @@exempt_from_layout = Set.new([/\.rjs$/])
189 177
 
@@ -259,10 +247,6 @@ def render(options = {}, local_assigns = {}, &block) #:nodoc:
259 247
         if options[:layout]
260 248
           _render_with_layout(options, local_assigns, &block)
261 249
         elsif options[:file]
262  
-          if options[:use_full_path]
263  
-            ActiveSupport::Deprecation.warn("use_full_path option has been deprecated and has no affect.", caller)
264  
-          end
265  
-
266 250
           _pick_template(options[:file]).render_template(self, options[:locals])
267 251
         elsif options[:partial]
268 252
           render_partial(options)
4  activesupport/lib/active_support.rb
@@ -59,7 +59,3 @@
59 59
 require 'active_support/rescuable'
60 60
 
61 61
 I18n.load_path << File.dirname(__FILE__) + '/active_support/locale/en-US.yml'
62  
-
63  
-Inflector = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Inflector', 'ActiveSupport::Inflector')
64  
-Dependencies = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Dependencies', 'ActiveSupport::Dependencies')
65  
-TimeZone = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('TimeZone', 'ActiveSupport::TimeZone')
1  activesupport/test/dependencies_test.rb
@@ -279,7 +279,6 @@ def test_qualified_const_defined
279 279
     assert ActiveSupport::Dependencies.qualified_const_defined?("Object")
280 280
     assert ActiveSupport::Dependencies.qualified_const_defined?("::Object")
281 281
     assert ActiveSupport::Dependencies.qualified_const_defined?("::Object::Kernel")
282  
-    assert ActiveSupport::Dependencies.qualified_const_defined?("::Object::Dependencies")
283 282
     assert ActiveSupport::Dependencies.qualified_const_defined?("::Test::Unit::TestCase")
284 283
   end
285 284
 

0 notes on commit a5cdb7a

Please sign in to comment.
Something went wrong with that request. Please try again.