spree_api 1.2.0.rc2 → 1.2.0

data/app/controllers/spree/api/v1/base_controller.rb

@@ -6,6 +6,7 @@ module Spree
 
         attr_accessor :current_api_user
 
+        before_filter :set_content_type
         before_filter :check_for_api_key
         before_filter :authenticate_user
 
@@ -25,6 +26,16 @@ module Spree
 
         private
 
+        def set_content_type
+          content_type = case params[:format]
+          when "json"
+            "application/json"
+          when "xml"
+            "text/xml"
+          end
+          headers["Content-Type"] = content_type
+        end
+
         def check_for_api_key
           render "spree/api/v1/errors/must_specify_api_key", :status => 401 and return if api_key.blank?
         end

data/spec/controllers/spree/api/v1/images_controller_spec.rb

@@ -13,21 +13,10 @@ module Spree
       stub_authentication!
     end
 
-    it "can upload a new image for a product" do
-      lambda do
-        api_post :create,
-                 :image => { :attachment => upload_image("thinking-cat.jpg"),
-                             :viewable_type => 'Spree::Product',
-                             :viewable_id => product.id  }
-        response.status.should == 201
-        json_response.should have_attributes(attributes)
-      end.should change(Image, :count).by(1)
-    end
-
     it "can upload a new image for a variant" do
       lambda do
         api_post :create,
-                 :image => { :attachment => upload_image("thinking-cat.jpg"),
+                 :image => { :attachment => upload_image('thinking-cat.jpg'),
                              :viewable_type => 'Spree::Variant',
                              :viewable_id => product.master.to_param  }
         response.status.should == 201
@@ -36,7 +25,7 @@ module Spree
     end
 
     context "working with an existing image" do
-      let!(:product_image) { product.master.images.create!(:attachment => image("thinking-cat.jpg")) }
+      let!(:product_image) { product.master.images.create!(:attachment => image('thinking-cat.jpg')) }
 
       it "can update image data" do
         product_image.position.should == 1

metadata

@@ -1,67 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc2
-  prerelease: 6
+  version: 1.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70196103586700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.2.0.rc2
+        version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0.rc2
+  version_requirements: *70196103586700
 - !ruby/object:Gem::Dependency
   name: rabl
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70196103585920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.6.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.5
+  version_requirements: *70196103585920
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70196103585220 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.9.0
+  version_requirements: *70196103585220
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70196103584480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,12 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70196103584480
 description: Spree's API
 email:
 - ryan@spreecommerce.com
@@ -200,16 +180,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1367432474032072536
+      hash: 1643031983782340233
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 1643031983782340233
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Spree's API