Adjust the field path to fit Ruby conventions

Problem: File paths within the `lib` folder have inconsistent pluralization. According to ruby convention, each class should be stored in a file where the parent directories correspond to the namespaces of the class. For us, our `Administrate::Field` classes are stored in `administrate/fields`. The incorrect pluralization breaks Ruby's convention. Solution: Move `lib/administrate/fields` -> `lib/administrate/field`.
thoughtbot · Feb 20, 2016 · 12699c9 · 12699c9
1 parent 765d3ff
commit 12699c9
Show file tree

Hide file tree

Showing 31 changed files with 30 additions and 30 deletions.
diff --git a/lib/administrate/base_dashboard.rb b/lib/administrate/base_dashboard.rb
@@ -1,14 +1,14 @@
-require "administrate/fields/belongs_to"
-require "administrate/fields/boolean"
-require "administrate/fields/date_time"
-require "administrate/fields/email"
-require "administrate/fields/has_many"
-require "administrate/fields/has_one"
-require "administrate/fields/image"
-require "administrate/fields/number"
-require "administrate/fields/polymorphic"
-require "administrate/fields/string"
-require "administrate/fields/text"
+require "administrate/field/belongs_to"
+require "administrate/field/boolean"
+require "administrate/field/date_time"
+require "administrate/field/email"
+require "administrate/field/has_many"
+require "administrate/field/has_one"
+require "administrate/field/image"
+require "administrate/field/number"
+require "administrate/field/polymorphic"
+require "administrate/field/string"
+require "administrate/field/text"
 
 module Administrate
   class BaseDashboard

diff --git a/lib/administrate/fields/associative.rb → lib/administrate/field/associative.rb b/lib/administrate/fields/associative.rb → lib/administrate/field/associative.rb
diff --git a/lib/administrate/fields/base.rb → lib/administrate/field/base.rb b/lib/administrate/fields/base.rb → lib/administrate/field/base.rb
diff --git a/lib/administrate/fields/belongs_to.rb → lib/administrate/field/belongs_to.rb b/lib/administrate/fields/belongs_to.rb → lib/administrate/field/belongs_to.rb
diff --git a/lib/administrate/fields/boolean.rb → lib/administrate/field/boolean.rb b/lib/administrate/fields/boolean.rb → lib/administrate/field/boolean.rb
diff --git a/lib/administrate/fields/date_time.rb → lib/administrate/field/date_time.rb b/lib/administrate/fields/date_time.rb → lib/administrate/field/date_time.rb
diff --git a/lib/administrate/fields/deferred.rb → lib/administrate/field/deferred.rb b/lib/administrate/fields/deferred.rb → lib/administrate/field/deferred.rb
diff --git a/lib/administrate/fields/email.rb → lib/administrate/field/email.rb b/lib/administrate/fields/email.rb → lib/administrate/field/email.rb
diff --git a/lib/administrate/fields/has_many.rb → lib/administrate/field/has_many.rb b/lib/administrate/fields/has_many.rb → lib/administrate/field/has_many.rb
diff --git a/lib/administrate/fields/has_one.rb → lib/administrate/field/has_one.rb b/lib/administrate/fields/has_one.rb → lib/administrate/field/has_one.rb
diff --git a/lib/administrate/fields/image.rb → lib/administrate/field/image.rb b/lib/administrate/fields/image.rb → lib/administrate/field/image.rb
diff --git a/lib/administrate/fields/number.rb → lib/administrate/field/number.rb b/lib/administrate/fields/number.rb → lib/administrate/field/number.rb
diff --git a/lib/administrate/fields/polymorphic.rb → lib/administrate/field/polymorphic.rb b/lib/administrate/fields/polymorphic.rb → lib/administrate/field/polymorphic.rb
diff --git a/lib/administrate/fields/string.rb → lib/administrate/field/string.rb b/lib/administrate/fields/string.rb → lib/administrate/field/string.rb
diff --git a/lib/administrate/fields/text.rb → lib/administrate/field/text.rb b/lib/administrate/fields/text.rb → lib/administrate/field/text.rb
diff --git a/lib/generators/administrate/field/templates/field_object.rb.erb b/lib/generators/administrate/field/templates/field_object.rb.erb
@@ -1,4 +1,4 @@
-require "administrate/fields/base"
+require "administrate/field/base"
 
 class <%= class_name %>Field < Administrate::Field::Base
   def to_s

diff --git a/spec/administrate/views/fields/has_one/_form_spec.rb b/spec/administrate/views/fields/has_one/_form_spec.rb
@@ -1,5 +1,5 @@
 require "rails_helper"
-require "administrate/fields/has_one"
+require "administrate/field/has_one"
 
 describe "fields/has_one/_form", type: :view do
   it "displays the field name" do

diff --git a/spec/administrate/views/fields/has_one/_show_spec.rb b/spec/administrate/views/fields/has_one/_show_spec.rb
@@ -1,5 +1,5 @@
 require "rails_helper"
-require "administrate/fields/has_one"
+require "administrate/field/has_one"
 
 describe "fields/has_one/_show", type: :view do
   context "without an associated record" do

diff --git a/spec/administrate/views/fields/polymorphic/_show_spec.rb b/spec/administrate/views/fields/polymorphic/_show_spec.rb
@@ -1,5 +1,5 @@
 require "rails_helper"
-require "administrate/fields/polymorphic"
+require "administrate/field/polymorphic"
 
 describe "fields/polymorphic/_show", type: :view do
   context "without an associated records" do

diff --git a/spec/lib/administrate/search_spec.rb b/spec/lib/administrate/search_spec.rb
@@ -1,8 +1,8 @@
 require "spec_helper"
 require "support/constant_helpers"
-require "administrate/fields/string"
-require "administrate/fields/email"
-require "administrate/fields/number"
+require "administrate/field/string"
+require "administrate/field/email"
+require "administrate/field/number"
 require "administrate/search"
 
 class MockDashboard

diff --git a/spec/lib/fields/belongs_to_spec.rb b/spec/lib/fields/belongs_to_spec.rb
@@ -1,4 +1,4 @@
-require "administrate/fields/belongs_to"
+require "administrate/field/belongs_to"
 require "support/constant_helpers"
 require "support/field_matchers"
 

diff --git a/spec/lib/fields/boolean_spec.rb b/spec/lib/fields/boolean_spec.rb
@@ -1,5 +1,5 @@
 require "spec_helper"
-require "administrate/fields/boolean"
+require "administrate/field/boolean"
 require "support/field_matchers"
 
 describe Administrate::Field::Boolean do

diff --git a/spec/lib/fields/date_time_spec.rb b/spec/lib/fields/date_time_spec.rb
@@ -1,5 +1,5 @@
 require "spec_helper"
-require "administrate/fields/date_time"
+require "administrate/field/date_time"
 require "support/field_matchers"
 
 describe Administrate::Field::DateTime do

diff --git a/spec/lib/fields/deferred_spec.rb b/spec/lib/fields/deferred_spec.rb
@@ -1,5 +1,5 @@
-require "administrate/fields/deferred"
-require "administrate/fields/string"
+require "administrate/field/deferred"
+require "administrate/field/string"
 
 describe Administrate::Field::Deferred do
   describe "#permitted_attribute" do

diff --git a/spec/lib/fields/email_spec.rb b/spec/lib/fields/email_spec.rb
@@ -1,4 +1,4 @@
-require "administrate/fields/email"
+require "administrate/field/email"
 
 describe Administrate::Field::Email do
   describe "#to_partial_path" do

diff --git a/spec/lib/fields/has_many_spec.rb b/spec/lib/fields/has_many_spec.rb
@@ -1,4 +1,4 @@
-require "administrate/fields/has_many"
+require "administrate/field/has_many"
 require "support/constant_helpers"
 require "support/mock_relation"
 

diff --git a/spec/lib/fields/has_one_spec.rb b/spec/lib/fields/has_one_spec.rb
@@ -1,4 +1,4 @@
-require "administrate/fields/has_one"
+require "administrate/field/has_one"
 require "support/constant_helpers"
 
 describe Administrate::Field::HasOne do

diff --git a/spec/lib/fields/image_spec.rb b/spec/lib/fields/image_spec.rb
@@ -1,4 +1,4 @@
-require "administrate/fields/image"
+require "administrate/field/image"
 
 describe Administrate::Field::Image do
   describe "#to_partial_path" do

diff --git a/spec/lib/fields/number_spec.rb b/spec/lib/fields/number_spec.rb
@@ -1,4 +1,4 @@
-require "administrate/fields/number"
+require "administrate/field/number"
 require "support/field_matchers"
 
 describe Administrate::Field::Number do

diff --git a/spec/lib/fields/polymorphic_spec.rb b/spec/lib/fields/polymorphic_spec.rb
@@ -1,4 +1,4 @@
-require "administrate/fields/polymorphic"
+require "administrate/field/polymorphic"
 require "support/constant_helpers"
 require "support/field_matchers"
 

diff --git a/spec/lib/fields/string_spec.rb b/spec/lib/fields/string_spec.rb
@@ -1,4 +1,4 @@
-require "administrate/fields/string"
+require "administrate/field/string"
 require "support/field_matchers"
 
 describe Administrate::Field::String do