Use dots instead of double colons.

rockyy11 · Jun 5, 2012 · b43926f · b43926f
1 parent 400d049
commit b43926f
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/app/controllers/high_voltage/pages_controller.rb b/app/controllers/high_voltage/pages_controller.rb
@@ -1,7 +1,7 @@
 class HighVoltage::PagesController < ApplicationController
 
   unloadable
-  layout Proc.new { |_| HighVoltage::layout }
+  layout Proc.new { |_| HighVoltage.layout }
 
   rescue_from ActionView::MissingTemplate do |exception|
     if exception.message =~ %r{Missing template #{content_path}}
@@ -27,7 +27,7 @@ def clean_path
     end
 
     def content_path
-      HighVoltage::content_path
+      HighVoltage.content_path
     end
 
 end
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,4 +1,4 @@
 Rails.application.routes.draw do
-  match "/#{HighVoltage::content_path}*id" => 'high_voltage/pages#show', :as => :page, :format => false
+  match "/#{HighVoltage.content_path}*id" => 'high_voltage/pages#show', :as => :page, :format => false
 
 end
diff --git a/gemfiles/rails-3.0.13.gemfile.lock b/gemfiles/rails-3.0.13.gemfile.lock
@@ -1,5 +1,5 @@
 PATH
-  remote: /Users/mjankowski/Development/opensource/high_voltage
+  remote: /Users/gabe/thoughtbot/open-source/high_voltage
   specs:
     high_voltage (1.1.1)
 

diff --git a/gemfiles/rails-3.1.5.gemfile.lock b/gemfiles/rails-3.1.5.gemfile.lock
@@ -1,5 +1,5 @@
 PATH
-  remote: /Users/mjankowski/Development/opensource/high_voltage
+  remote: /Users/gabe/thoughtbot/open-source/high_voltage
   specs:
     high_voltage (1.1.1)
 

diff --git a/gemfiles/rails-3.2.5.gemfile.lock b/gemfiles/rails-3.2.5.gemfile.lock
@@ -1,5 +1,5 @@
 PATH
-  remote: /Users/mjankowski/Development/opensource/high_voltage
+  remote: /Users/gabe/thoughtbot/open-source/high_voltage
   specs:
     high_voltage (1.1.1)
 

diff --git a/spec/controllers/pages_controller_spec.rb b/spec/controllers/pages_controller_spec.rb
@@ -43,12 +43,12 @@
 
   context "using custom layout" do
     before(:all) do
-      @original_layout = HighVoltage::layout
-      HighVoltage::layout = "alternate"
+      @original_layout = HighVoltage.layout
+      HighVoltage.layout = "alternate"
     end
 
     after(:all) do
-      HighVoltage::layout = @original_layout
+      HighVoltage.layout = @original_layout
     end
 
     describe "on GET to /pages/exists" do
@@ -63,12 +63,12 @@
 
   context "using custom content path" do
     before(:all) do
-      @original_content_path = HighVoltage::content_path
-      HighVoltage::content_path = "other_pages/"
+      @original_content_path = HighVoltage.content_path
+      HighVoltage.content_path = "other_pages/"
     end
 
     after(:all) do
-      HighVoltage::content_path = @original_content_path
+      HighVoltage.content_path = @original_content_path
     end
 
     describe "on GET to /other_pages/also_exists" do

diff --git a/spec/routing/routes_spec.rb b/spec/routing/routes_spec.rb
@@ -30,13 +30,13 @@
   context "using a custom content_path" do
 
     before(:all) do
-      @original_content_path = HighVoltage::content_path
-      HighVoltage::content_path = "other_pages/"
+      @original_content_path = HighVoltage.content_path
+      HighVoltage.content_path = "other_pages/"
       Rails.application.reload_routes!
     end
 
     after(:all) do
-      HighVoltage::content_path = @original_content_path
+      HighVoltage.content_path = @original_content_path
       Rails.application.reload_routes!
     end