diff --git a/Gemfile b/Gemfile index 4d97071..fa75df1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,18 +1,3 @@ source 'https://rubygems.org' gemspec - -group :test do - gem "rspec", "~> 2.12.0" - gem "rack-test" - gem "rake" - gem "activerecord-nulldb-adapter" -end - -group :development, :test do - gem "pry" - gem "pry-debugger" - gem "pry-rescue" - gem "pry-stack_explorer" - gem 'plymouth' -end diff --git a/Gemfile.lock b/Gemfile.lock index 77c2a79..b46a29c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,16 +2,12 @@ PATH remote: . specs: grape-active_model_serializers (0.1.0) - active_model_serializers - activerecord grape (~> 0.3) - i18n - tilt GEM remote: https://rubygems.org/ specs: - active_model_serializers (0.7.0) + active_model_serializers (0.8.1) activemodel (>= 3.0) activemodel (3.2.13) activesupport (= 3.2.13) @@ -28,18 +24,7 @@ GEM multi_json (~> 1.0) arel (3.0.2) backports (2.6.7) - binding_of_caller (0.7.1) - debug_inspector (>= 0.0.1) builder (3.0.4) - coderay (1.0.9) - columnize (0.3.6) - debug_inspector (0.0.2) - debugger (1.5.0) - columnize (>= 0.3.1) - debugger-linecache (~> 1.2.0) - debugger-ruby_core_source (~> 1.2.0) - debugger-linecache (1.2.0) - debugger-ruby_core_source (1.2.0) descendants_tracker (0.0.1) diff-lcs (1.1.3) grape (0.4.1) @@ -52,29 +37,10 @@ GEM rack-accept rack-mount virtus - hashie (2.0.3) + hashie (2.0.5) i18n (0.6.1) - interception (0.3) - method_source (0.8.1) - multi_json (1.7.2) + multi_json (1.7.3) multi_xml (0.5.3) - plymouth (0.3.3) - pry-exception_explorer (~> 0.1.7) - pry (0.9.12) - coderay (~> 1.0.5) - method_source (~> 0.8) - slop (~> 3.4) - pry-debugger (0.2.2) - debugger (~> 1.3) - pry (~> 0.9.10) - pry-exception_explorer (0.1.9) - pry-stack_explorer (>= 0.3.9) - pry-rescue (1.1.0) - interception (>= 0.3) - pry - pry-stack_explorer (0.4.9) - binding_of_caller (>= 0.7) - pry (~> 0.9.11) rack (1.5.2) rack-accept (0.4.5) rack (>= 0.4) @@ -91,8 +57,6 @@ GEM rspec-expectations (2.12.1) diff-lcs (~> 1.1.3) rspec-mocks (2.12.2) - slop (3.4.4) - tilt (1.3.6) tzinfo (0.3.37) virtus (0.5.4) backports (~> 2.6.1) @@ -102,13 +66,10 @@ PLATFORMS ruby DEPENDENCIES + active_model_serializers + activerecord activerecord-nulldb-adapter grape-active_model_serializers! - plymouth - pry - pry-debugger - pry-rescue - pry-stack_explorer rack-test rake rspec (~> 2.12.0) diff --git a/grape-active_model_serializers.gemspec b/grape-active_model_serializers.gemspec index 21021b2..b5ab1bb 100644 --- a/grape-active_model_serializers.gemspec +++ b/grape-active_model_serializers.gemspec @@ -16,8 +16,11 @@ Gem::Specification.new do |gem| gem.version = Grape::ActiveModelSerializers::VERSION gem.add_dependency "grape", "~> 0.3" - gem.add_dependency "activerecord" - gem.add_dependency "active_model_serializers" - gem.add_dependency "tilt" - gem.add_dependency "i18n" + + gem.add_development_dependency "activerecord" + gem.add_development_dependency "active_model_serializers" + gem.add_development_dependency "rspec", "~> 2.12.0" + gem.add_development_dependency "rack-test" + gem.add_development_dependency "rake" + gem.add_development_dependency "activerecord-nulldb-adapter" end diff --git a/lib/grape-active_model_serializers.rb b/lib/grape-active_model_serializers.rb index f26ef11..1c1e1d4 100644 --- a/lib/grape-active_model_serializers.rb +++ b/lib/grape-active_model_serializers.rb @@ -1,5 +1,4 @@ require 'active_model_serializers' require 'grape' -require 'hashie/hash' require "grape-active_model_serializers/version" -require "grape-active_model_serializers/formatter" \ No newline at end of file +require "grape-active_model_serializers/formatter" diff --git a/lib/grape/active_model_serializers.rb b/lib/grape/active_model_serializers.rb deleted file mode 100644 index 3d0dcd5..0000000 --- a/lib/grape/active_model_serializers.rb +++ /dev/null @@ -1 +0,0 @@ -require 'grape-active_model_serializers' \ No newline at end of file diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 32a1f2b..d92f000 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -8,12 +8,9 @@ require 'active_support/core_ext/hash/conversions' require 'active_model' require "active_model_serializers" require "active_support/json" -require 'grape/active_model_serializers' require 'rspec' require 'rack/test' -require "pry" require 'nulldb_rspec' -# require 'plymouth' include NullDB::RSpec::NullifiedDatabase