From b8ee51b4bd1590a53b3271428c376b703687b506 Mon Sep 17 00:00:00 2001 From: dilpreet92 Date: Mon, 27 Jun 2016 18:00:56 +0530 Subject: [PATCH 1/3] bump spree version to 3.1.0 --- spree_ams.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spree_ams.gemspec b/spree_ams.gemspec index 2a50be2..e6be19a 100644 --- a/spree_ams.gemspec +++ b/spree_ams.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = 'spree_ams' - s.version = '3.0.0' + s.version = '3.1.0' s.summary = 'Use Active Model Serializers with Spree.' s.description = 'This gem allows Spree to respond as per the Active Model Serializers gem, while keeping the original api intact.' s.required_ruby_version = '>= 1.9.3' @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.requirements << 'none' - s.add_dependency 'spree_core', '~> 3.0.0' + s.add_dependency 'spree_core', '~> 3.1.0' s.add_dependency 'spree_api' s.add_dependency 'active_model_serializers', '~> 0.8.2' s.add_dependency 'apitome' From 0ec519b0f99aefdb43b77580152af43f55d2fea1 Mon Sep 17 00:00:00 2001 From: dilpreet92 Date: Wed, 29 Jun 2016 11:37:02 +0530 Subject: [PATCH 2/3] add version to inherited controllers --- app/controllers/spree/api/ams/checkouts_controller.rb | 2 +- app/controllers/spree/api/ams/cors_controller.rb | 2 +- app/controllers/spree/api/ams/countries_controller.rb | 2 +- app/controllers/spree/api/ams/line_items_controller.rb | 2 +- app/controllers/spree/api/ams/orders_controller.rb | 2 +- app/controllers/spree/api/ams/products_controller.rb | 2 +- app/controllers/spree/api/ams/taxonomies_controller.rb | 2 +- app/controllers/spree/api/ams/taxons_controller.rb | 2 +- app/controllers/spree/api/ams/users_controller.rb | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/spree/api/ams/checkouts_controller.rb b/app/controllers/spree/api/ams/checkouts_controller.rb index 56feebf..deac4f3 100644 --- a/app/controllers/spree/api/ams/checkouts_controller.rb +++ b/app/controllers/spree/api/ams/checkouts_controller.rb @@ -1,7 +1,7 @@ module Spree module Api module Ams - class CheckoutsController < Spree::Api::CheckoutsController + class CheckoutsController < Spree::Api::V1::CheckoutsController include Serializable include Requestable diff --git a/app/controllers/spree/api/ams/cors_controller.rb b/app/controllers/spree/api/ams/cors_controller.rb index 9ba71aa..d3f7d9c 100644 --- a/app/controllers/spree/api/ams/cors_controller.rb +++ b/app/controllers/spree/api/ams/cors_controller.rb @@ -1,7 +1,7 @@ module Spree module Api module Ams - class CorsController < Spree::Api::BaseController + class CorsController < Spree::Api::V1::BaseController include Requestable def preflight_check diff --git a/app/controllers/spree/api/ams/countries_controller.rb b/app/controllers/spree/api/ams/countries_controller.rb index 2dfad4a..53f1061 100644 --- a/app/controllers/spree/api/ams/countries_controller.rb +++ b/app/controllers/spree/api/ams/countries_controller.rb @@ -1,7 +1,7 @@ module Spree module Api module Ams - class CountriesController < Spree::Api::CountriesController + class CountriesController < Spree::Api::V1::CountriesController include Serializable include Requestable diff --git a/app/controllers/spree/api/ams/line_items_controller.rb b/app/controllers/spree/api/ams/line_items_controller.rb index 885b5da..c301f95 100644 --- a/app/controllers/spree/api/ams/line_items_controller.rb +++ b/app/controllers/spree/api/ams/line_items_controller.rb @@ -1,7 +1,7 @@ module Spree module Api module Ams - class LineItemsController < Spree::Api::LineItemsController + class LineItemsController < Spree::Api::V1::LineItemsController include Serializable include Requestable end diff --git a/app/controllers/spree/api/ams/orders_controller.rb b/app/controllers/spree/api/ams/orders_controller.rb index d973578..cbf1015 100644 --- a/app/controllers/spree/api/ams/orders_controller.rb +++ b/app/controllers/spree/api/ams/orders_controller.rb @@ -1,7 +1,7 @@ module Spree module Api module Ams - class OrdersController < Spree::Api::OrdersController + class OrdersController < Spree::Api::V1::OrdersController include Serializable include Requestable diff --git a/app/controllers/spree/api/ams/products_controller.rb b/app/controllers/spree/api/ams/products_controller.rb index 470bb6b..2351449 100644 --- a/app/controllers/spree/api/ams/products_controller.rb +++ b/app/controllers/spree/api/ams/products_controller.rb @@ -1,7 +1,7 @@ module Spree module Api module Ams - class ProductsController < Spree::Api::ProductsController + class ProductsController < Spree::Api::V1::ProductsController include Serializable include Requestable diff --git a/app/controllers/spree/api/ams/taxonomies_controller.rb b/app/controllers/spree/api/ams/taxonomies_controller.rb index 66604c7..4aa5325 100644 --- a/app/controllers/spree/api/ams/taxonomies_controller.rb +++ b/app/controllers/spree/api/ams/taxonomies_controller.rb @@ -1,7 +1,7 @@ module Spree module Api module Ams - class TaxonomiesController < Spree::Api::TaxonomiesController + class TaxonomiesController < Spree::Api::V1::TaxonomiesController include Serializable include Requestable end diff --git a/app/controllers/spree/api/ams/taxons_controller.rb b/app/controllers/spree/api/ams/taxons_controller.rb index 16cddba..84ab55a 100644 --- a/app/controllers/spree/api/ams/taxons_controller.rb +++ b/app/controllers/spree/api/ams/taxons_controller.rb @@ -1,7 +1,7 @@ module Spree module Api module Ams - class TaxonsController < Spree::Api::TaxonsController + class TaxonsController < Spree::Api::V1::TaxonsController include Serializable include Requestable end diff --git a/app/controllers/spree/api/ams/users_controller.rb b/app/controllers/spree/api/ams/users_controller.rb index 9d2cb1b..d10c697 100644 --- a/app/controllers/spree/api/ams/users_controller.rb +++ b/app/controllers/spree/api/ams/users_controller.rb @@ -1,7 +1,7 @@ module Spree module Api module Ams - class UsersController < Spree::Api::UsersController + class UsersController < Spree::Api::V1::UsersController include Serializable include Requestable From 48cf27c4153b064a9e8f2810cce2225ba91de60c Mon Sep 17 00:00:00 2001 From: dilpreet92 Date: Wed, 29 Jun 2016 19:09:13 +0530 Subject: [PATCH 3/3] remove version from cors controller inheriting base controller --- app/controllers/spree/api/ams/cors_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/spree/api/ams/cors_controller.rb b/app/controllers/spree/api/ams/cors_controller.rb index d3f7d9c..9ba71aa 100644 --- a/app/controllers/spree/api/ams/cors_controller.rb +++ b/app/controllers/spree/api/ams/cors_controller.rb @@ -1,7 +1,7 @@ module Spree module Api module Ams - class CorsController < Spree::Api::V1::BaseController + class CorsController < Spree::Api::BaseController include Requestable def preflight_check