Skip to content

Commit 8b2c018

Browse files
author
Lee Richmond
committed
Cleanup
* Correctly separate gem dependencies and Gemfile * Omit unneeded dependencies * Remove dependency on nested_attribute_reassignable * Remove dummy rails app, replace with better test structure
1 parent 4d62185 commit 8b2c018

File tree

73 files changed

+148
-1053
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+148
-1053
lines changed

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.3.0

Gemfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1-
source "http://artprod.dev.bloomberg.com/artifactory/api/gems/bb-ruby-repos/"
1+
source "http://artprod.dev.bloomberg.com/artifactory/api/gems/rubygems/"
22

33
# Specify your gem's dependencies in jsonapi_compliable.gemspec
44
gemspec
55
gem 'active_model_serializers', git: 'https://github.com/richmolj/active_model_serializers.git'
6+
7+
group :test do
8+
gem 'guard'
9+
gem 'guard-rspec'
10+
gem 'pry'
11+
gem 'pry-byebug'
12+
end

jsonapi_compliable.gemspec

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ require 'jsonapi_compliable/version'
66
Gem::Specification.new do |spec|
77
spec.name = "jsonapi_compliable"
88
spec.version = JsonapiCompliable::VERSION
9-
spec.authors = ["Venkata Pasupuleti"]
10-
spec.email = ["[email protected]"]
9+
spec.authors = ["Lee Richmond", "Venkata Pasupuleti"]
10+
1111

1212
spec.summary = %q{JSON Compliable serializer for action controller}
1313
spec.license = "MIT"
@@ -17,23 +17,17 @@ Gem::Specification.new do |spec|
1717
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
1818
spec.require_paths = ["lib"]
1919

20-
spec.add_dependency "rails"
21-
spec.add_dependency "jsonapi"
22-
spec.add_development_dependency "pry"
23-
spec.add_development_dependency "pry-byebug"
20+
spec.add_dependency "rails", ['>= 4.1', '< 6']
21+
spec.add_dependency "jsonapi", '~> 0.1.1.beta2'
22+
spec.add_dependency "active_model_serializers", "~> 0.10"
23+
spec.add_dependency "jsonapi_ams_extensions", "~> 0.1"
24+
2425
spec.add_development_dependency "kaminari"
2526
spec.add_development_dependency "active_model_serializers"
26-
spec.add_development_dependency "nested_attribute_reassignable"
2727
spec.add_development_dependency "jsonapi_spec_helpers"
2828
spec.add_development_dependency "bundler", "~> 1.12"
2929
spec.add_development_dependency "rake", "~> 10.0"
30-
spec.add_development_dependency "rspec"
3130
spec.add_development_dependency "rspec-rails"
32-
spec.add_development_dependency "byebug"
33-
spec.add_development_dependency "guard"
3431
spec.add_development_dependency "sqlite3"
35-
spec.add_development_dependency "pg"
36-
spec.add_development_dependency "factory_girl"
37-
spec.add_development_dependency "guard-rspec"
3832
spec.add_development_dependency "database_cleaner"
3933
end

lib/jsonapi_compliable.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1+
require 'active_model_serializers'
2+
require 'jsonapi'
3+
require 'jsonapi_ams_extensions'
4+
15
require "jsonapi_compliable/version"
26

37
module JSONAPICompliable
48
autoload :Base, 'jsonapi_compliable/base'
59
autoload :Deserializable, 'jsonapi_compliable/deserializable'
10+
611
def self.included(klass)
712
klass.instance_eval do
813
include Base

lib/jsonapi_compliable/deserializable.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def parse_has_many(payloads)
114114
def deserialize_jsonapi!
115115
self.raw_params = self.params.deep_dup
116116
self.params = ActionController::Parameters
117-
.new(Deserialization.new(params.to_unsafe_h).deserialize)
117+
.new(Deserialization.new(params.to_unsafe_h).deserialize)
118118
end
119119
end
120120
end

spec/dummy/Rakefile

Lines changed: 0 additions & 6 deletions
This file was deleted.

spec/dummy/app/assets/config/manifest.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

spec/dummy/app/assets/images/.keep

Whitespace-only changes.

spec/dummy/app/assets/javascripts/application.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

spec/dummy/app/assets/javascripts/cable.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)