spree_api 1.2.5 → 1.3.0.rc1

data/app/views/spree/api/{v1/products/index.rabl → products/index.v1.rabl}

@@ -4,6 +4,5 @@ node(:total_count) { @products.total_count }
 node(:current_page) { params[:page] ? params[:page].to_i : 1 }
 node(:pages) { @products.num_pages }
 child(@products) do
-  extends "spree/api/v1/products/show"
+  extends "spree/api/products/show"
 end
-

data/app/views/spree/api/{v1/products/show.rabl → products/show.v1.rabl}

@@ -9,7 +9,7 @@ child :variants_including_master => :variants do
 end
 
 child :images => :images do
-  extends "spree/api/v1/images/show"
+  extends "spree/api/images/show"
 end
 
 child :option_types => :option_types do

data/app/views/spree/api/{v1/taxonomies/index.rabl → taxonomies/index.v1.rabl}

@@ -1,6 +1,6 @@
 object false
 child(@taxonomies => :taxonomies) do
-  extends "spree/api/v1/taxonomies/show"
+  extends "spree/api/taxonomies/show"
 end
 node(:count) { @taxonomies.count }
 node(:current_page) { params[:page] || 1 }

data/app/views/spree/api/{v1/taxonomies/nested.rabl → taxonomies/nested.v1.rabl}

@@ -6,6 +6,6 @@ child :root => :root do
   child :children => :taxons do
     attributes *taxon_attributes
 
-    extends "spree/api/v1/taxons/taxons"
+    extends "spree/api/taxons/taxons"
   end
 end

data/app/views/spree/api/{v1/taxonomies/show.rabl → taxonomies/show.v1.rabl}

@@ -1,7 +1,7 @@
 object @taxonomy
 
 if set = params[:set]
-  extends "spree/api/v1/taxonomies/#{set}"
+  extends "spree/api/taxonomies/#{set}"
 else
   attributes *taxonomy_attributes
 

data/app/views/spree/api/{v1/taxons/index.rabl → taxons/index.v1.rabl}

@@ -1,4 +1,4 @@
 collection @taxons
 attributes *taxon_attributes
 
-extends "spree/api/v1/taxons/taxons"
+extends "spree/api/taxons/taxons"

data/app/views/spree/api/{v1/taxons/taxons.rabl → taxons/taxons.v1.rabl}

@@ -2,6 +2,6 @@ node do |t|
   child t.children => :taxons do
     attributes *taxon_attributes
 
-    extends "spree/api/v1/taxons/taxons"
+    extends "spree/api/taxons/taxons"
   end
 end

data/app/views/spree/api/{v1/variants/show.rabl → variants/show.v1.rabl}

@@ -1,3 +1,3 @@
 object @variant
-extends "spree/api/v1/variants/variant"
+extends "spree/api/variants/variant"
 child(:option_values => :option_values) { attributes *option_value_attributes }

data/app/views/spree/api/{v1/zones/index.rabl → zones/index.v1.rabl}

@@ -1,6 +1,6 @@
 object false
 child(@zones => :zones) do
-  extends 'spree/api/v1/zones/show'
+  extends 'spree/api/zones/show'
 end
 node(:count) { @zones.count }
 node(:current_page) { params[:page] || 1 }

data/config/initializers/metal_load_paths.rb

@@ -1 +1 @@
-Spree::Api::V1::BaseController.append_view_path(ApplicationController.view_paths)
+Spree::Api::BaseController.append_view_path(ApplicationController.view_paths)

data/config/routes.rb

@@ -1,4 +1,4 @@
-Spree::Core::Engine.routes.draw do
+Spree::Core::Engine.routes.prepend do
   namespace :admin do
     resources :users do
       member do
@@ -9,51 +9,48 @@ Spree::Core::Engine.routes.draw do
   end
 
   namespace :api do
-    scope :module => :v1 do
-      resources :products do
-        resources :variants
-        resources :product_properties
-      end
+    resources :products do
+      resources :variants
+      resources :product_properties
+    end
+
+    resources :images
+    resources :variants, :only => [:index] do
+    end
 
-      resources :images
-      resources :variants, :only => [:index] do
+    resources :orders do
+      resources :return_authorizations
+      member do
+        put :address
+        put :delivery
+        put :cancel
+        put :empty
       end
 
-      resources :orders do
-        resources :return_authorizations
+      resources :line_items
+      resources :payments do
         member do
-          put :address
-          put :delivery
-          put :cancel
-          put :empty
-        end
-
-        resources :line_items
-        resources :payments do
-          member do
-            put :authorize
-            put :capture
-            put :purchase
-            put :void
-            put :credit
-          end
+          put :authorize
+          put :capture
+          put :purchase
+          put :void
+          put :credit
         end
+      end
 
-        resources :shipments do
-          member do
-            put :ready
-            put :ship
-          end
+      resources :shipments do
+        member do
+          put :ready
+          put :ship
         end
       end
+    end
 
-      resources :zones
-      resources :countries, :only => [:index, :show]
-      resources :addresses, :only => [:show, :update]
-      resources :taxonomies do
-        resources :taxons
-      end
-      resources :inventory_units, :only => [:show, :update]
+    resources :zones
+    resources :countries, :only => [:index, :show]
+    resources :addresses, :only => [:show, :update]
+    resources :taxonomies do
+      resources :taxons
     end
   end
 end

data/db/migrate/20120411123334_resize_api_key_field.rb

@@ -1,6 +1,6 @@
 class ResizeApiKeyField < ActiveRecord::Migration
   def change
-    unless defined?(User)    
+    unless defined?(User)
       change_column :spree_users, :api_key, :string, :limit => 48
     end
   end

data/lib/spree/api/engine.rb

@@ -6,6 +6,14 @@ module Spree
       isolate_namespace Spree
       engine_name 'spree_api'
 
+      Rabl.configure do |config|
+        config.include_json_root = false
+        config.include_child_root = false
+      end
+
+      config.view_versions = [1]
+      config.view_version_extraction_strategy = :http_header
+
       initializer "spree.api.environment", :before => :load_config_initializers do |app|
         Spree::Api::Config = Spree::ApiConfiguration.new
       end
@@ -20,7 +28,6 @@ module Spree
       def self.root
         @root ||= Pathname.new(File.expand_path('../../../../', __FILE__))
       end
-
     end
   end
 end

data/lib/spree_api.rb

@@ -1 +1,2 @@
 require 'spree/api'
+require 'versioncake'

data/spec/controllers/spree/api/{v1/addresses_controller_spec.rb → addresses_controller_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::V1::AddressesController do
+  describe Api::AddressesController do
     render_views
 
     before do
@@ -16,13 +16,13 @@ module Spree
 
       it "gets an address" do
         api_get :show, :id => @address.id
-        json_response['address']['address1'].should eq @address.address1
+        json_response['address1'].should eq @address.address1
       end
 
       it "updates an address" do
         api_put :update, :id => @address.id,
                          :address => { :address1 => "123 Test Lane" }
-        json_response['address']['address1'].should eq '123 Test Lane'
+        json_response['address1'].should eq '123 Test Lane'
       end
     end
 

data/spec/controllers/spree/api/{v1/base_controller_spec.rb → base_controller_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Spree::Api::V1::BaseController do
+describe Spree::Api::BaseController do
   render_views
-  controller(Spree::Api::V1::BaseController) do
+  controller(Spree::Api::BaseController) do
     def index
       render :json => { "products" => [] }
     end
@@ -28,13 +28,6 @@ describe Spree::Api::V1::BaseController do
     end
   end
 
-  it 'handles exceptions' do
-    subject.should_receive(:authenticate_user).and_return(true)
-    subject.should_receive(:index).and_raise(Exception.new("no joy"))
-    get :index, :token => "fake_key"
-    json_response.should == { "exception" => "no joy" }
-  end
-
   it "maps symantec keys to nested_attributes keys" do
     klass = stub(:nested_attributes_options => { :line_items => {},
                                                   :bill_address => {} })

data/spec/controllers/spree/api/{v1/countries_controller_spec.rb → countries_controller_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::V1::CountriesController do
+  describe Api::CountriesController do
     render_views
 
     before do
@@ -12,7 +12,7 @@ module Spree
 
     it "gets all countries" do
       api_get :index
-      json_response["countries"].first['country']['iso3'].should eq @country.iso3
+      json_response['countries'].first['iso3'].should eq @country.iso3
     end
 
     context "with two countries" do
@@ -28,7 +28,7 @@ module Spree
       it 'can query the results through a paramter' do
         api_get :index, :q => { :name_cont => 'zam' }
         json_response['count'].should == 1
-        json_response['countries'].first['country']['name'].should eq @zambia.name
+        json_response['countries'].first['name'].should eq @zambia.name
       end
 
       it 'can control the page size through a parameter' do
@@ -41,8 +41,8 @@ module Spree
 
     it "includes states" do
       api_get :show, :id => @country.id
-      states = json_response['country']['states']
-      states.first['state']['name'].should eq @state.name
+      states = json_response['states']
+      states.first['name'].should eq @state.name
     end
   end
 end

data/spec/controllers/spree/api/{v1/images_controller_spec.rb → images_controller_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Spree::Api::V1::ImagesController do
+  describe Spree::Api::ImagesController do
     render_views
 
     let!(:product) { create(:product) }

data/spec/controllers/spree/api/{v1/line_items_controller_spec.rb → line_items_controller_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::V1::LineItemsController do
+  describe Api::LineItemsController do
     render_views
 
     let!(:order) do
@@ -34,7 +34,7 @@ module Spree
         api_post :create, :line_item => { :variant_id => product.master.to_param, :quantity => 1 }
         response.status.should == 201
         json_response.should have_attributes(attributes)
-        json_response["line_item"]["variant"]["name"].should_not be_blank
+        json_response["variant"]["name"].should_not be_blank
       end
 
       it "can update a line item on the order" do

data/spec/controllers/spree/api/{v1/orders_controller_spec.rb → orders_controller_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::V1::OrdersController do
+  describe Api::OrdersController do
     render_views
 
     let!(:order) { create(:order) }
@@ -66,14 +66,14 @@ module Spree
       order.line_items.count.should == 1
       order.line_items.first.variant.should == variant
       order.line_items.first.quantity.should == 5
-      json_response["order"]["state"].should == "address"
+      json_response["state"].should == "address"
     end
 
     it "can create an order without any parameters" do
       lambda { api_post :create }.should_not raise_error(NoMethodError)
       response.status.should == 201
       order = Order.last
-      json_response["order"]["state"].should == "address"
+      json_response["state"].should == "address"
     end
 
     context "working with an order" do
@@ -108,7 +108,7 @@ module Spree
         order.shipping_address.firstname.should == shipping_address[:firstname]
         order.billing_address.firstname.should == billing_address[:firstname]
         order.state.should == "delivery"
-        json_response["order"]["shipping_methods"].should_not be_empty
+        json_response["shipping_methods"].should_not be_empty
       end
 
       it "can add just shipping address information to an order" do
@@ -147,7 +147,7 @@ module Spree
         api_put :update, :id => order.to_param, :order => { :line_items => [{:variant_id => create(:variant).id, :quantity => 2}] }
 
         response.status.should == 200
-        json_response['order']['item_total'].to_f.should_not == order.item_total.to_f
+        json_response['item_total'].to_f.should_not == order.item_total.to_f
       end
 
       context "with a line item" do
@@ -230,7 +230,7 @@ module Spree
           api_get :index, :q => { :email_cont => 'spree' }
           json_response["orders"].count.should == 1
           json_response["orders"].first.should have_attributes(attributes)
-          json_response["orders"].first["order"]["email"].should == expected_result.email
+          json_response["orders"].first["email"].should == expected_result.email
           json_response["count"].should == 1
           json_response["current_page"].should == 1
           json_response["pages"].should == 1
@@ -239,11 +239,6 @@ module Spree
 
       context "can cancel an order" do
         before do
-          Spree::MailMethod.create!(
-            :environment => Rails.env,
-            :preferred_mails_from => "spree@example.com"
-          )
-
           order.completed_at = Time.now
           order.state = 'complete'
           order.shipment_state = 'ready'
@@ -252,7 +247,7 @@ module Spree
 
         specify do
           api_put :cancel, :id => order.to_param
-          json_response["order"]["state"].should == "canceled"
+          json_response["state"].should == "canceled"
         end
       end
     end

data/spec/controllers/spree/api/{v1/payments_controller_spec.rb → payments_controller_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Spree::Api::V1::PaymentsController do
+  describe Spree::Api::PaymentsController do
     render_views
     let!(:order) { create(:order) }
     let!(:payment) { create(:payment, :order => order) }
@@ -88,7 +88,7 @@ module Spree
         it 'can query the results through a paramter' do
           api_get :index, :q => { :response_code_cont => '999' }
           json_response['count'].should == 1
-          json_response['payments'].first['payment']['response_code'].should eq @payment.response_code
+          json_response['payments'].first['response_code'].should eq @payment.response_code
         end
       end