Stops messing with load paths, fixed inconsistencies and fixed whites…

…pace.
refinery · Aug 30, 2012 · ee52cdd · ee52cdd
1 parent c8a01a4
commit ee52cdd
Show file tree

Hide file tree

Showing 28 changed files with 44 additions and 53 deletions.
diff --git a/authentication/app/views/refinery/admin/users/_user.html.erb b/authentication/app/views/refinery/admin/users/_user.html.erb
@@ -17,7 +17,7 @@
                 :title => t('delete', :scope => 'refinery.admin.users'),
                 :method => :delete,
                 :data => {
-                  :confirm => t('message', :scope => 'refinery.admin.delete', :title => user.username) 
+                  :confirm => t('message', :scope => 'refinery.admin.delete', :title => user.username)
                 } if current_refinery_user.can_delete?(user) %>
   </span>
 </li>
diff --git a/authentication/refinerycms-authentication.gemspec b/authentication/refinerycms-authentication.gemspec
@@ -1,6 +1,5 @@
 # Encoding: UTF-8
-$:.push File.expand_path('../../core/lib', __FILE__)
-require 'refinery/version'
+require File.expand_path('../../core/lib/refinery/version', __FILE__)
 
 version = Refinery::Version.to_s
 rails_version = ['>= 3.1.3', '< 3.3']
@@ -14,7 +13,7 @@ Gem::Specification.new do |s|
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'David Jones', 'Steven Heidel']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
 

diff --git a/core/app/views/refinery/admin/_form_advanced_options_menu.html.erb b/core/app/views/refinery/admin/_form_advanced_options_menu.html.erb
@@ -9,4 +9,4 @@
     <%= f.label :draft, t('.save_as_draft'),
                 :class => 'stripped' %>
   </span>
-</div>
+</div>
diff --git a/...y/engine/templates/app/views/refinery/namespace/admin/plural_name/_singular_name.html.erb b/...y/engine/templates/app/views/refinery/namespace/admin/plural_name/_singular_name.html.erb
@@ -30,4 +30,4 @@
         :confirm => t('message', :scope => 'refinery.admin.delete', :title => <%= singular_name %>.<%= title_attribute %>),
         :method => :delete %>
   </span>
-</li>
+</li>
diff --git a/core/lib/generators/refinery/engine/templates/db/seeds.rb.erb b/core/lib/generators/refinery/engine/templates/db/seeds.rb.erb
@@ -1,6 +1,6 @@
 Refinery::I18n.frontend_locales.each do |lang|
   I18n.locale = lang
-  
+
   if defined?(Refinery::User)
     Refinery::User.all.each do |user|
       if user.plugins.where(:name => 'refinerycms-<%= namespacing.underscore %>').blank?

diff --git a/...ery/form/templates/app/controllers/refinery/namespace/admin/plural_name_controller.rb.erb b/...ery/form/templates/app/controllers/refinery/namespace/admin/plural_name_controller.rb.erb
@@ -7,7 +7,7 @@ module Refinery
                 :title_attribute => "<%= title.name %>", <% end %>
                 :order => "created_at DESC"
 <% if @includes_spam -%>
-  
+
         before_filter :get_spam_count, :only => [:index, :spam]
 
         def index

diff --git a/...lib/generators/refinery/form/templates/app/models/refinery/namespace/singular_name.rb.erb b/...lib/generators/refinery/form/templates/app/models/refinery/namespace/singular_name.rb.erb
@@ -7,22 +7,22 @@ module Refinery
 
       attr_accessible <%= names_for_attr_accessible.map { |a| ":#{a}" }.join(', ') %>, :position
 <% if string_attributes.any? -%>
-  
+
       acts_as_indexed :fields => [<%= string_attributes.map { |a| ":#{a.name}" }.join(", ") %>]
 <% end -%>
 <% if (text_fields = attributes.map { |a| a.name if a.type == :text }.compact.uniq).any? && text_fields.detect{ |a| a.to_s == 'message' }.nil? -%>
-  
+
       alias_attribute :message, :<%= text_fields.first %>
 <% elsif text_fields.empty? -%>
-  
+
       # def message was created automatically because you didn't specify a text field
       # when you ran the refinery:form generator. <3 <3 Refinery CMS.
       def message
         "Override def message in vendor/extensions/<%= namespacing.underscore %>/app/models/refinery/<%= namespacing.underscore %>/<%= singular_name %>.rb"
       end
 <% end -%>
 <% unless (string_fields = attributes.map { |a| a.name if a.type == :string }.compact.uniq).empty? || string_fields.detect { |f| f.to_s == 'name' } -%>
-  
+
       alias_attribute :name, :<%= string_fields.first %>
 <% end -%>
 

diff --git a/core/lib/refinery/i18n.rb b/core/lib/refinery/i18n.rb
@@ -19,4 +19,4 @@ def frontend_locales
       end
     end
   end
-end
+end
diff --git a/core/refinerycms-core.gemspec b/core/refinerycms-core.gemspec
@@ -1,6 +1,5 @@
 # Encoding: UTF-8
-$:.push File.expand_path('../../core/lib', __FILE__)
-require 'refinery/version'
+require File.expand_path('../../core/lib/refinery/version', __FILE__)
 
 version = Refinery::Version.to_s
 rails_version = ['>= 3.1.3', '< 3.3']
@@ -14,7 +13,7 @@ Gem::Specification.new do |s|
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'David Jones', 'Steven Heidel']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
 

diff --git a/core/spec/controllers/refinery/admin/dummy_controller_spec.rb b/core/spec/controllers/refinery/admin/dummy_controller_spec.rb
@@ -34,4 +34,4 @@ module Admin
       end
     end
   end
-end
+end
diff --git a/core/spec/lib/refinery/application_controller_spec.rb b/core/spec/lib/refinery/application_controller_spec.rb
@@ -5,7 +5,7 @@ module Refinery
     before do
       Rails.application.routes.draw { get "anonymous/index" }
     end
-    
+
     after do
       Rails.application.reload_routes!
     end
@@ -64,7 +64,7 @@ def index
 
       it "is true so HTTPS is used" do
         Refinery::Core.stub(:force_ssl).and_return(true)
-        
+
         get :index
 
         response.should be_redirect

diff --git a/core/spec/lib/refinery/crud_spec.rb b/core/spec/lib/refinery/crud_spec.rb
@@ -101,7 +101,7 @@ module Refinery
       it "sorts numerically rather than by string key" do
         dummy, dummy_params = [], {}
 
-        # When we have 11 entries, the 11th index will be #10, which will be 
+        # When we have 11 entries, the 11th index will be #10, which will be
         # sorted above #2 if we are sorting by strings.
         11.times do |n|
           dummy << Refinery::CrudDummy.create!

diff --git a/core/spec/requests/refinery/core_spec.rb b/core/spec/requests/refinery/core_spec.rb
@@ -11,4 +11,4 @@ module Core
       end
     end
   end
-end
+end
diff --git a/dashboard/refinerycms-dashboard.gemspec b/dashboard/refinerycms-dashboard.gemspec
@@ -1,6 +1,5 @@
 # Encoding: UTF-8
-$:.push File.expand_path('../../core/lib', __FILE__)
-require 'refinery/version'
+require File.expand_path('../../core/lib/refinery/version', __FILE__)
 
 version = Refinery::Version.to_s
 
@@ -13,10 +12,10 @@ Gem::Specification.new do |s|
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'David Jones', 'Steven Heidel']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
-  
+
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 

diff --git a/images/app/controllers/refinery/admin/images_controller.rb b/images/app/controllers/refinery/admin/images_controller.rb
@@ -55,7 +55,7 @@ def create
         unless params[:insert]
           if @images.all?(&:valid?)
             flash.notice = t('uploaded_successfully', :scope => 'refinery.admin.images.form')
-            
+
             @dialog_successful = true if from_dialog?
 
             render :nothing => true, :layout => true

diff --git a/images/app/views/refinery/admin/images/insert.html.erb b/images/app/views/refinery/admin/images/insert.html.erb
@@ -39,7 +39,7 @@
   <script>
     $(document).ready(function(){
       new ImageDialog({
-        callback: <%= @callback.present? ? "self.parent.#{h @callback}" : "null" %>, 
+        callback: <%= @callback.present? ? "self.parent.#{h @callback}" : "null" %>,
         multiple: <%= @multiple == 'true' %>
       }).create();
     });

diff --git a/images/db/migrate/20120625093918_remove_image_ext_from_refinery_images.rb b/images/db/migrate/20120625093918_remove_image_ext_from_refinery_images.rb
@@ -6,4 +6,4 @@ def up
   def down
     add_column :refinery_images, :image_ext, :string
   end
-end
+end
diff --git a/images/lib/refinery/images/configuration.rb b/images/lib/refinery/images/configuration.rb
@@ -53,11 +53,11 @@ def s3_access_key_id
       def s3_secret_access_key
         config.s3_secret_access_key.nil? ? Refinery::Core.s3_secret_access_key : config.s3_secret_access_key
       end
-      
+
       def s3_region
         config.s3_region.nil? ? Refinery::Core.s3_region : config.s3_region
       end
-      
+
     end
   end
 end
diff --git a/images/refinerycms-images.gemspec b/images/refinerycms-images.gemspec
@@ -1,6 +1,5 @@
 # Encoding: UTF-8
-$:.push File.expand_path('../../core/lib', __FILE__)
-require 'refinery/version'
+require File.expand_path('../../core/lib/refinery/version', __FILE__)
 
 version = Refinery::Version.to_s
 
@@ -13,7 +12,7 @@ Gem::Specification.new do |s|
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'David Jones', 'Steven Heidel']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
 

diff --git a/images/spec/factories/image.rb b/images/spec/factories/image.rb
@@ -2,8 +2,8 @@
   factory :image, :class => ::Refinery::Image do
     image Refinery.roots(:'refinery/images').join("spec/fixtures/beach.jpeg")
   end
-  
+
   factory :alternate_image, :class => ::Refinery::Image do
     image Refinery.roots(:'refinery/images').join("spec/fixtures/beach-alternate.jpeg")
-  end      
+  end
 end
diff --git a/pages/refinerycms-pages.gemspec b/pages/refinerycms-pages.gemspec
@@ -1,6 +1,5 @@
 # Encoding: UTF-8
-$:.push File.expand_path('../../core/lib', __FILE__)
-require 'refinery/version'
+require File.expand_path('../../core/lib/refinery/version', __FILE__)
 
 version = Refinery::Version.to_s
 
@@ -10,11 +9,10 @@ Gem::Specification.new do |s|
   s.version           = version
   s.summary           = %q{Pages extension for Refinery CMS}
   s.description       = %q{The default content extension of Refinery CMS. This extension handles the administration and display of user-editable pages.}
-  s.date              = %q{2011-10-12}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'David Jones', 'Steven Heidel']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
 

diff --git a/pages/spec/helpers/refinery/pages/admin/pages_helper_spec.rb b/pages/spec/helpers/refinery/pages/admin/pages_helper_spec.rb
@@ -100,4 +100,4 @@ module Admin
       end
     end
   end
-end 
+end
diff --git a/refinerycms.gemspec b/refinerycms.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'David Jones', 'Steven Heidel']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
   s.license           = %q{MIT}
   s.bindir            = 'bin'
   s.executables       = %w(refinerycms)

diff --git a/...lib/generators/refinery/resources/templates/config/initializers/refinery/resources.rb.erb b/...lib/generators/refinery/resources/templates/config/initializers/refinery/resources.rb.erb
@@ -22,6 +22,6 @@ Refinery::Resources.configure do |config|
   # config.dragonfly_secret = <%= Refinery::Resources.dragonfly_secret.inspect %>
   # config.dragonfly_url_format = <%= Refinery::Resources.dragonfly_url_format.inspect %>
   # config.datastore_root_path = <%= Refinery::Resources.datastore_root_path.inspect %>
-	# config.content_disposition = <%= Refinery::Resources.content_disposition.inspect %>
+  # config.content_disposition = <%= Refinery::Resources.content_disposition.inspect %>
 
 end
diff --git a/resources/lib/refinery/resources/configuration.rb b/resources/lib/refinery/resources/configuration.rb
@@ -11,7 +11,7 @@ module Resources
     self.dragonfly_insert_before = 'ActionDispatch::Callbacks'
     self.dragonfly_secret = Refinery::Core.dragonfly_secret
     self.dragonfly_url_format = '/system/resources/:job/:basename.:format'
-    
+
     self.content_disposition = :attachment
     self.max_file_size = 52428800
     self.pages_per_dialog = 12
@@ -39,11 +39,11 @@ def s3_access_key_id
       def s3_secret_access_key
         config.s3_secret_access_key.nil? ? Refinery::Core.s3_secret_access_key : config.s3_secret_access_key
       end
-      
+
       def s3_region
         config.s3_region.nil? ? Refinery::Core.s3_region : config.s3_region
       end
-      
+
     end
   end
 end
diff --git a/resources/refinerycms-resources.gemspec b/resources/refinerycms-resources.gemspec
@@ -1,6 +1,5 @@
 # Encoding: UTF-8
-$:.push File.expand_path('../../core/lib', __FILE__)
-require 'refinery/version'
+require File.expand_path('../../core/lib/refinery/version', __FILE__)
 
 version = Refinery::Version.to_s
 
@@ -10,11 +9,10 @@ Gem::Specification.new do |s|
   s.version           = version
   s.summary           = %q{Resources extension for Refinery CMS}
   s.description       = %q{Handles all file upload and processing functionality in Refinery CMS.}
-  s.date              = %q{2011-10-12}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'David Jones', 'Steven Heidel']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
 

diff --git a/resources/spec/requests/refinery/admin/resources_spec.rb b/resources/spec/requests/refinery/admin/resources_spec.rb
@@ -61,7 +61,7 @@ module Admin
             before do
               Refinery::I18n.stub(:current_locale).and_return(:da)
             end
-              
+
             it "is shown" do
               visit refinery.admin_resources_path
 

diff --git a/testing/refinerycms-testing.gemspec b/testing/refinerycms-testing.gemspec
@@ -1,6 +1,5 @@
 # Encoding: UTF-8
-$:.push File.expand_path('../../core/lib', __FILE__)
-require 'refinery/version'
+require File.expand_path('../../core/lib/refinery/version', __FILE__)
 
 version = Refinery::Version.to_s
 
@@ -13,7 +12,7 @@ Gem::Specification.new do |s|
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Philip Arndt', 'Jamie Winsor']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)