diff --git a/Gemfile b/Gemfile index e33a208..5ce2b03 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'active_model_serializers' -gem 'active_api', github: 'blairanderson/active_api' +# gem 'active_api', github: 'blairanderson/active_api' gem 'jquery-rails' gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index 711f1a6..9616bf3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: git://github.com/blairanderson/active_api.git - revision: ab992dbe74d4568736efb8b8d2abe797c675655c - specs: - active_api (0.0.1) - active_model_serializers - grape-swagger-rails - rails (~> 4.2.0) - will_paginate - GEM remote: https://rubygems.org/ specs: @@ -50,10 +40,6 @@ GEM tzinfo (~> 1.1) addressable (2.3.7) arel (6.0.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) bcrypt (3.1.10) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) @@ -62,8 +48,6 @@ GEM columnize (~> 0.8) debugger-linecache (~> 1.2) slop (~> 3.6) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) @@ -74,10 +58,7 @@ GEM columnize (0.9.0) debug_inspector (0.0.2) debugger-linecache (1.2.0) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) diff-lcs (1.2.5) - equalizer (0.0.9) erubis (2.7.0) execjs (2.3.0) factory_girl (4.5.0) @@ -91,29 +72,8 @@ GEM multipart-post (>= 1.2, < 3) globalid (0.3.3) activesupport (>= 4.1.0) - grape (0.11.0) - activesupport - builder - hashie (>= 2.1.0) - multi_json (>= 1.3.2) - multi_xml (>= 0.5.2) - rack (>= 1.3.0) - rack-accept - rack-mount - virtus (>= 1.0.0) - grape-entity (0.4.4) - activesupport - multi_json (>= 1.3.2) - grape-swagger (0.9.0) - grape (>= 0.8.0) - grape-entity - grape-swagger-rails (0.1.0) - grape-swagger (>= 0.7.2) - railties (>= 3.2.12) - hashie (3.4.0) hike (1.2.3) i18n (0.7.0) - ice_nine (0.11.1) jquery-rails (4.0.3) rails-dom-testing (~> 1.0) railties (>= 4.2.0) @@ -142,10 +102,6 @@ GEM rack (~> 1.2) pg (0.18.1) rack (1.6.0) - rack-accept (0.4.5) - rack (>= 0.4) - rack-mount (0.8.3) - rack (>= 1.0.0) rack-test (0.6.3) rack (>= 1.0) rails (4.2.0) @@ -239,23 +195,16 @@ GEM validate_url (1.0.0) activemodel (>= 3.0.0) addressable - virtus (1.0.4) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) web-console (2.0.0) activemodel (~> 4.0) binding_of_caller (>= 0.7.2) railties (~> 4.0) sprockets-rails (>= 2.0, < 4.0) - will_paginate (3.0.7) PLATFORMS ruby DEPENDENCIES - active_api! active_model_serializers byebug factory_girl_rails diff --git a/config/initializers/active_api.rb b/config/initializers/active_api.rb index c6d31b5..8d57948 100644 --- a/config/initializers/active_api.rb +++ b/config/initializers/active_api.rb @@ -1,23 +1,23 @@ -ActiveApi::Engine.config.route_config = [ - { - resources: 'items', - do: [ - { - resources: 'item_comments', - } - ] - }, - { - resources: 'users', - serializer: 'human' - } -] - -ActiveApi::Engine.config.documentation = { - title: "Rails HackerNews-Reddit-ProductHunt Clone.", - description: "StarterKit for a social news/product site.", - termsOfServiceUrl: "http://github.com/blairanderson/active_api", - # contact: "issues@someawesomeapi.com", - license: "MIT", - licenseUrl: "http://github.com/blairanderson/active_api/tree/master/LICENSE.md" -} +# ActiveApi::Engine.config.route_config = [ +# { +# resources: 'items', +# do: [ +# { +# resources: 'item_comments', +# } +# ] +# }, +# { +# resources: 'users', +# serializer: 'human' +# } +# ] +# +# ActiveApi::Engine.config.documentation = { +# title: "Rails HackerNews-Reddit-ProductHunt Clone.", +# description: "StarterKit for a social news/product site.", +# termsOfServiceUrl: "http://github.com/blairanderson/active_api", +# # contact: "issues@someawesomeapi.com", +# license: "MIT", +# licenseUrl: "http://github.com/blairanderson/active_api/tree/master/LICENSE.md" +# } diff --git a/config/routes.rb b/config/routes.rb index 04ff4b4..e7e73d0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -18,5 +18,5 @@ get 'login' => 'user_sessions#new', as: :login post 'logout' => 'user_sessions#destroy', as: :logout - mount ActiveApi::Engine => '/api' + # mount ActiveApi::Engine => '/api' end