rename

Lee Richmond · Lee Richmond · commit 8741f4e98410 · 2016-09-20T17:40:55.000-04:00
diff --git a/lib/jsonapi_compliable.rb b/lib/jsonapi_compliable.rb
@@ -16,7 +16,7 @@
 require "jsonapi_compliable/util/include_params"
 require "jsonapi_compliable/util/field_params"
 
-module JSONAPICompliable
+module JsonapiCompliable
   autoload :Base,           'jsonapi_compliable/base'
   autoload :Deserializable, 'jsonapi_compliable/deserializable'
 
diff --git a/lib/jsonapi_compliable/base.rb b/lib/jsonapi_compliable/base.rb
@@ -1,4 +1,4 @@
-module JSONAPICompliable
+module JsonapiCompliable
   module Base
     extend ActiveSupport::Concern
     include Deserializable
@@ -25,12 +25,12 @@ def jsonapi_scope(scope,
                       paginate: true,
                       extra_fields: true,
                       sort: true)
-      scope = JSONAPICompliable::Scope::DefaultFilter.new(self, scope).apply
-      scope = JSONAPICompliable::Scope::Filter.new(self, scope).apply if filter
-      scope = JSONAPICompliable::Scope::ExtraFields.new(self, scope).apply if extra_fields
-      scope = JSONAPICompliable::Scope::Sideload.new(self, scope).apply if includes
-      scope = JSONAPICompliable::Scope::Sort.new(self, scope).apply if sort
-      scope = JSONAPICompliable::Scope::Paginate.new(self, scope).apply if paginate
+      scope = JsonapiCompliable::Scope::DefaultFilter.new(self, scope).apply
+      scope = JsonapiCompliable::Scope::Filter.new(self, scope).apply if filter
+      scope = JsonapiCompliable::Scope::ExtraFields.new(self, scope).apply if extra_fields
+      scope = JsonapiCompliable::Scope::Sideload.new(self, scope).apply if includes
+      scope = JsonapiCompliable::Scope::Sort.new(self, scope).apply if sort
+      scope = JsonapiCompliable::Scope::Paginate.new(self, scope).apply if paginate
       @_jsonapi_scoped = true
       scope
     end
diff --git a/lib/jsonapi_compliable/deserializable.rb b/lib/jsonapi_compliable/deserializable.rb
@@ -43,7 +43,7 @@
 #
 # before_action :deserialize_jsonapi!, only: [:my_action]
 
-module JSONAPICompliable
+module JsonapiCompliable
   module Deserializable
     extend ActiveSupport::Concern
 
diff --git a/lib/jsonapi_compliable/errors.rb b/lib/jsonapi_compliable/errors.rb
@@ -1,4 +1,4 @@
-module JSONAPICompliable
+module JsonapiCompliable
   module Errors
     class BadFilter < StandardError; end
 
diff --git a/lib/jsonapi_compliable/scope/base.rb b/lib/jsonapi_compliable/scope/base.rb
@@ -1,4 +1,4 @@
-module JSONAPICompliable
+module JsonapiCompliable
   module Scope
     class Base
       attr_reader :controller, :dsl, :params, :scope
diff --git a/lib/jsonapi_compliable/scope/default_filter.rb b/lib/jsonapi_compliable/scope/default_filter.rb
@@ -1,4 +1,4 @@
-module JSONAPICompliable
+module JsonapiCompliable
   class Scope::DefaultFilter < Scope::Base
     include Scope::Filterable
 
diff --git a/lib/jsonapi_compliable/scope/extra_fields.rb b/lib/jsonapi_compliable/scope/extra_fields.rb
@@ -1,4 +1,4 @@
-module JSONAPICompliable
+module JsonapiCompliable
   class Scope::ExtraFields < Scope::Base
     def apply
       each_extra_field do |extra_field|
diff --git a/lib/jsonapi_compliable/scope/filter.rb b/lib/jsonapi_compliable/scope/filter.rb
@@ -1,4 +1,4 @@
-module JSONAPICompliable
+module JsonapiCompliable
   class Scope::Filter < Scope::Base
     include Scope::Filterable
 
diff --git a/lib/jsonapi_compliable/scope/filterable.rb b/lib/jsonapi_compliable/scope/filterable.rb
@@ -1,17 +1,17 @@
-module JSONAPICompliable
+module JsonapiCompliable
   module Scope::Filterable
     def find_filter(name)
       find_filter!(name)
-    rescue JSONAPICompliable::Errors::BadFilter
+    rescue JsonapiCompliable::Errors::BadFilter
       nil
     end
 
     def find_filter!(name)
       filter_name, filter_value = \
         dsl.filters.find { |_name, opts| opts[:aliases].include?(name.to_sym) }
-      raise JSONAPICompliable::Errors::BadFilter unless filter_name
+      raise JsonapiCompliable::Errors::BadFilter unless filter_name
       if guard = filter_value[:if]
-        raise JSONAPICompliable::Errors::BadFilter if controller.send(guard) == false
+        raise JsonapiCompliable::Errors::BadFilter if controller.send(guard) == false
       end
       { filter_name => filter_value }
     end
diff --git a/lib/jsonapi_compliable/scope/paginate.rb b/lib/jsonapi_compliable/scope/paginate.rb
@@ -1,10 +1,10 @@
-module JSONAPICompliable
+module JsonapiCompliable
   class Scope::Paginate < Scope::Base
     MAX_PAGE_SIZE = 1_000
 
     def apply
       if size > MAX_PAGE_SIZE
-        raise JSONAPICompliable::Errors::UnsupportedPageSize
+        raise JsonapiCompliable::Errors::UnsupportedPageSize
           .new(size, MAX_PAGE_SIZE)
       else
         super
diff --git a/lib/jsonapi_compliable/scope/sideload.rb b/lib/jsonapi_compliable/scope/sideload.rb
@@ -1,4 +1,4 @@
-module JSONAPICompliable
+module JsonapiCompliable
   class Scope::Sideload < Scope::Base
     def apply
       params[:include] ? super : @scope
diff --git a/lib/jsonapi_compliable/scope/sort.rb b/lib/jsonapi_compliable/scope/sort.rb
@@ -1,4 +1,4 @@
-module JSONAPICompliable
+module JsonapiCompliable
   class Scope::Sort < Scope::Base
     def custom_scope
       dsl.sorting
diff --git a/lib/jsonapi_compliable/util/field_params.rb b/lib/jsonapi_compliable/util/field_params.rb
@@ -1,4 +1,4 @@
-module JSONAPICompliable
+module JsonapiCompliable
   module Util
     class FieldParams
       def self.parse!(params, name)
diff --git a/lib/jsonapi_compliable/util/include_params.rb b/lib/jsonapi_compliable/util/include_params.rb
@@ -1,4 +1,4 @@
-module JSONAPICompliable
+module JsonapiCompliable
   module Util
     class IncludeParams
       def self.compare(includes, whitelist)
diff --git a/spec/filtering_spec.rb b/spec/filtering_spec.rb
@@ -86,15 +86,15 @@ def can_filter_first_name?
     it 'raises an error' do
       expect {
         get :index, params: { filter: { first_name: 'Stephen' } }
-      }.to raise_error(JSONAPICompliable::Errors::BadFilter)
+      }.to raise_error(JsonapiCompliable::Errors::BadFilter)
     end
   end
 
   context 'when the filter is not whitelisted' do
     it 'raises an error' do
       expect {
         get :index, params: { filter: { foo: 'bar' } }
-      }.to raise_error(JSONAPICompliable::Errors::BadFilter)
+      }.to raise_error(JsonapiCompliable::Errors::BadFilter)
     end
   end
 end
diff --git a/spec/jsonapi_compliable_spec.rb b/spec/jsonapi_compliable_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe JSONAPICompliable, type: :controller do
+RSpec.describe JsonapiCompliable, type: :controller do
   controller(ApplicationController) do
     jsonapi { }
 
diff --git a/spec/pagination_spec.rb b/spec/pagination_spec.rb
@@ -23,7 +23,7 @@ def index
   it 'raises error when size > 1000' do
     expect {
       get :index, params: { page: { number: 1, size: 1001 } }
-    }.to raise_error(JSONAPICompliable::Errors::UnsupportedPageSize)
+    }.to raise_error(JsonapiCompliable::Errors::UnsupportedPageSize)
   end
 
   it 'limits by size, offsets by number' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -142,7 +142,7 @@ class BookSerializer < ApplicationSerializer
 end
 
 class ApplicationController < ActionController::Base
-  include JSONAPICompliable
+  include JsonapiCompliable
 
   prepend_before_action :fix_params!
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`#`
`44`	`44`	`# before_action :deserialize_jsonapi!, only: [:my_action]`
`45`	`45`
`46`		`-module JSONAPICompliable`
	`46`	`+module JsonapiCompliable`
`47`	`47`	`module Deserializable`
`48`	`48`	`extend ActiveSupport::Concern`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module JSONAPICompliable`
	`1`	`+module JsonapiCompliable`
`2`	`2`	`module Errors`
`3`	`3`	`class BadFilter < StandardError; end`
`4`	`4`