spree_api 2.2.0 → 2.2.1

data/spec/controllers/spree/api/products_controller_spec.rb

@@ -31,6 +31,24 @@ module Spree
     end
 
     context "as a normal user" do
+      context "with caching enabled" do
+        let!(:product_2) { create(:product) }
+
+        before do
+          ActionController::Base.perform_caching = true
+        end
+
+        it "returns unique products" do
+          api_get :index
+          product_ids = json_response["products"].map { |p| p["id"] }
+          expect(product_ids.uniq.count).to eq(product_ids.count)
+        end
+
+        after do
+          ActionController::Base.perform_caching = false
+        end
+      end
+
       it "retrieves a list of products" do
         api_get :index
         json_response["products"].first.should have_attributes(show_attributes)

data/spec/controllers/spree/api/users_controller_spec.rb

@@ -12,8 +12,7 @@ module Spree
 
     context "as a normal user" do
       before do
-        Spree::LegacyUser.stub(:find_by).with(hash_including(:spree_api_key)) { user }
-        Spree::LegacyUser.stub :find_by_spree_api_key => user
+        controller.stub :try_spree_current_user => user
       end
 
       it "can get own details" do
@@ -120,7 +119,7 @@ module Spree
       it "cannot destroy user with orders" do
         create(:completed_order_with_totals, :user => user)
         api_delete :destroy, :id => user.id
-        json_response["exception"].should eq "Spree::LegacyUser::DestroyWithOrdersError"
+        json_response["exception"].should eq "Spree::Core::DestroyWithOrdersError"
         response.status.should == 422
       end
 

data/spec/controllers/spree/api/variants_controller_spec.rb

@@ -59,6 +59,15 @@ module Spree
       api_get :index
 
       json_response["variants"].last.should have_attributes([:images])
+      json_response['variants'].first['images'].first.should have_attributes([:attachment_file_name,
+                                                                               :attachment_width,
+                                                                               :attachment_height,
+                                                                               :attachment_content_type,
+                                                                               :mini_url,
+                                                                               :small_url,
+                                                                               :product_url,
+                                                                               :large_url])
+
     end
 
     # Regression test for #2141

data/spec/requests/rabl_cache_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe "Rabl Cache", :caching => true do
+  let!(:user)  { create(:admin_user) }
+
+  before do
+    create(:variant) 
+    user.generate_spree_api_key!
+    Spree::Product.count.should == 1
+  end
+  
+  it "doesn't create a cache key collision for models with different rabl templates" do
+    get "/api/variants", :token => user.spree_api_key
+    response.status.should == 200
+
+    # Make sure we get a non master variant
+    variant_a = JSON.parse(response.body)['variants'].last
+    variant_a['is_master'].should be_false
+    variant_a['stock_items'].should_not be_nil
+
+    get "/api/products/#{Spree::Product.first.id}", :token => user.spree_api_key
+    response.status.should == 200
+    variant_b = JSON.parse(response.body)['variants'].last
+    variant_b['is_master'].should be_false
+
+    variant_a['id'].should == variant_b['id']
+    variant_b['stock_items'].should be_nil
+  end
+end

data/spec/spec_helper.rb

@@ -32,6 +32,7 @@ Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 require 'spree/testing_support/factories'
 require 'spree/testing_support/preferences'
 
+require 'spree/api/testing_support/caching'
 require 'spree/api/testing_support/helpers'
 require 'spree/api/testing_support/setup'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -94,10 +94,6 @@ files:
 - app/helpers/spree/api/api_helpers.rb
 - app/models/spree/api_configuration.rb
 - app/models/spree/option_value_decorator.rb
-- app/models/spree/order_decorator.rb
-- app/models/spree/user_decorator.rb
-- app/overrides/api_admin_user_edit_form.rb
-- app/views/spree/admin/users/_api_fields.html.erb
 - app/views/spree/api/addresses/show.v1.rabl
 - app/views/spree/api/adjustments/show.v1.rabl
 - app/views/spree/api/config/money.v1.rabl
@@ -176,11 +172,11 @@ files:
 - app/views/spree/api/users/index.v1.rabl
 - app/views/spree/api/users/new.v1.rabl
 - app/views/spree/api/users/show.v1.rabl
+- app/views/spree/api/variants/big.v1.rabl
 - app/views/spree/api/variants/index.v1.rabl
 - app/views/spree/api/variants/new.v1.rabl
 - app/views/spree/api/variants/show.v1.rabl
-- app/views/spree/api/variants/variant.v1.rabl
-- app/views/spree/api/variants/variant_full.v1.rabl
+- app/views/spree/api/variants/small.v1.rabl
 - app/views/spree/api/zones/index.v1.rabl
 - app/views/spree/api/zones/show.v1.rabl
 - config/initializers/metal_load_paths.rb
@@ -195,6 +191,7 @@ files:
 - lib/spree/api/engine.rb
 - lib/spree/api/responders.rb
 - lib/spree/api/responders/rabl_template.rb
+- lib/spree/api/testing_support/caching.rb
 - lib/spree/api/testing_support/helpers.rb
 - lib/spree/api/testing_support/setup.rb
 - lib/spree/api/version.rb
@@ -231,7 +228,7 @@ files:
 - spec/controllers/spree/api/zones_controller_spec.rb
 - spec/fixtures/thinking-cat.jpg
 - spec/models/spree/legacy_user_spec.rb
-- spec/models/spree/order_spec.rb
+- spec/requests/rabl_cache_spec.rb
 - spec/shared_examples/protect_product_actions.rb
 - spec/spec_helper.rb
 - spec/support/controller_hacks.rb
@@ -257,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Spree's API
@@ -293,7 +290,7 @@ test_files:
 - spec/controllers/spree/api/zones_controller_spec.rb
 - spec/fixtures/thinking-cat.jpg
 - spec/models/spree/legacy_user_spec.rb
-- spec/models/spree/order_spec.rb
+- spec/requests/rabl_cache_spec.rb
 - spec/shared_examples/protect_product_actions.rb
 - spec/spec_helper.rb
 - spec/support/controller_hacks.rb

data/app/models/spree/order_decorator.rb

@@ -1,171 +0,0 @@
-Spree::Order.class_eval do
-  def self.build_from_api(user, params)
-    begin
-      ensure_country_id_from_api params[:ship_address_attributes]
-      ensure_state_id_from_api params[:ship_address_attributes]
-      ensure_country_id_from_api params[:bill_address_attributes]
-      ensure_state_id_from_api params[:bill_address_attributes]
-
-      order = create!
-      order.associate_user!(user)
-
-      order.create_shipments_from_api params.delete(:shipments_attributes) || []
-      order.create_line_items_from_api params.delete(:line_items_attributes) || {}
-      order.create_adjustments_from_api params.delete(:adjustments_attributes) || []
-      order.create_payments_from_api params.delete(:payments_attributes) || []
-      order.complete_from_api params.delete(:completed_at)
-
-      order.update_attributes!(params)
-      order.reload
-    rescue Exception => e
-      order.destroy if order && order.persisted?
-      raise e.message
-    end
-  end
-
-  def complete_from_api(completed_at)
-    if completed_at
-      self.completed_at = completed_at
-      self.state = 'complete'
-    end
-  end
-
-  def create_shipments_from_api(shipments_hash)
-    shipments_hash.each do |s|
-      begin
-        shipment = shipments.build
-        shipment.tracking = s[:tracking]
-        shipment.stock_location = Spree::StockLocation.find_by_name!(s[:stock_location])
-
-        inventory_units = s[:inventory_units] || []
-        inventory_units.each do |iu|
-          self.class.ensure_variant_id_from_api(iu)
-
-          unit = shipment.inventory_units.build
-          unit.order = self
-          unit.variant_id = iu[:variant_id]
-        end
-
-        shipment.save!
-
-        shipping_method = Spree::ShippingMethod.find_by_name!(s[:shipping_method])
-        shipment.shipping_rates.create!(:shipping_method => shipping_method,
-                                        :cost => s[:cost])
-      rescue Exception => e
-        raise "Order import shipments: #{e.message} #{s}"
-      end
-    end
-  end
-
-  def create_payments_from_api(payments_hash)
-    payments_hash.each do |p|
-      begin
-        payment = payments.build
-        payment.amount = p[:amount].to_f
-        payment.state = p.fetch(:state, 'completed')
-        payment.payment_method = Spree::PaymentMethod.find_by_name!(p[:payment_method])
-        payment.save!
-      rescue Exception => e
-        raise "Order import payments: #{e.message} #{p}"
-      end
-    end
-  end
-
-  def create_line_items_from_api(line_items_hash)
-    line_items_hash.each_key do |k|
-      begin
-        line_item = line_items_hash[k]
-        self.class.ensure_variant_id_from_api(line_item)
-
-        extra_params = line_item.except(:variant_id, :quantity)
-        line_item = self.contents.add(Spree::Variant.find(line_item[:variant_id]), line_item[:quantity])
-        line_item.update_attributes(extra_params) unless extra_params.empty?
-      rescue Exception => e
-        raise "Order import line items: #{e.message} #{line_item}"
-      end
-    end
-  end
-
-  def create_adjustments_from_api(adjustments)
-    adjustments.each do |a|
-      begin
-        adjustment = self.adjustments.build(:amount => a[:amount].to_f,
-                                            :label => a[:label])
-        adjustment.save!
-        adjustment.close!
-      rescue Exception => e
-        raise "Order import adjustments: #{e.message} #{a}"
-      end
-    end
-  end
-
-  def self.ensure_variant_id_from_api(hash)
-    begin
-      unless hash[:variant_id].present?
-        hash[:variant_id] = Spree::Variant.active.find_by_sku!(hash[:sku]).id
-        hash.delete(:sku)
-      end
-    rescue Exception => e
-      raise "Ensure order import variant: #{e.message} #{hash}"
-    end
-  end
-
-  def self.ensure_country_id_from_api(address)
-    return if address.nil? or address[:country_id].present? or address[:country].nil?
-
-    begin
-      search = {}
-      if name = address[:country]['name']
-        search[:name] = name
-      elsif iso_name = address[:country]['iso_name']
-        search[:iso_name] = iso_name.upcase
-      elsif iso = address[:country]['iso']
-        search[:iso] = iso.upcase
-      elsif iso3 = address[:country]['iso3']
-        search[:iso3] = iso3.upcase
-      end
-
-      address.delete(:country)
-      address[:country_id] = Spree::Country.where(search).first!.id
-
-    rescue Exception => e
-      raise "Ensure order import address country: #{e.message} #{search}"
-    end
-  end
-
-  def self.ensure_state_id_from_api(address)
-    return if address.nil? or address[:state_id].present? or address[:state].nil?
-
-    begin
-      search = {}
-      if name = address[:state]['name']
-        search[:name] = name
-      elsif abbr = address[:state]['abbr']
-        search[:abbr] = abbr.upcase
-      end
-
-      address.delete(:state)
-      search[:country_id] = address[:country_id]
-
-      if state = Spree::State.where(search).first
-        address[:state_id] = state.id
-      else
-        address[:state_name] = search[:name] || search[:abbr]
-      end
-    rescue Exception => e
-      raise "Ensure order import address state: #{e.message} #{search}"
-    end
-  end
-
-  def update_line_items(line_item_params)
-    return if line_item_params.blank?
-    line_item_params.each_value do |attributes|
-      if attributes[:id].present?
-        self.line_items.find(attributes[:id]).update_attributes!(attributes)
-      else
-        self.line_items.create!(attributes)
-      end
-    end
-    self.ensure_updated_shipments
-  end
-end

data/app/models/spree/user_decorator.rb

@@ -1,13 +0,0 @@
-if Spree.user_class
-  Spree.user_class.class_eval do
-    def generate_spree_api_key!
-      self.spree_api_key = SecureRandom.hex(24)
-      save!
-    end
-
-    def clear_spree_api_key!
-      self.spree_api_key = nil
-      save!
-    end
-  end
-end

data/app/overrides/api_admin_user_edit_form.rb

@@ -1,7 +0,0 @@
-if defined?(Deface)
-  Deface::Override.new(:virtual_path => "spree/admin/users/edit",
-                       :name => "api_admin_user_edit_form",
-                       :insert_after => "[data-hook='admin_user_edit_general_settings']",
-                       :partial => "spree/admin/users/api_fields",
-                       :disabled => false)
-end

data/app/views/spree/admin/users/_api_fields.html.erb

@@ -1,31 +0,0 @@
-<fieldset data-hook="admin_user_api_key" class="omega six columns">
-  <legend><%= Spree.t('access', :scope => 'api') %></legend>
-
-  <% if @user.spree_api_key.present? %>
-    <div class="field">
-      <%= label_tag Spree.t('key', :scope => 'api') %>:
-      <%= @user.spree_api_key %>
-    </div>
-    <div class="filter-actions actions">
-      <%= form_tag spree.clear_api_key_admin_user_path(@user), :method => :put do %>
-        <%= button Spree.t('clear_key', :scope => 'api'), 'icon-trash' %>
-      <% end %>
-
-      <span class="or"><%= Spree.t(:or)%></span>
-
-      <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
-        <%= button Spree.t('regenerate_key', :scope => 'api'), 'icon-refresh' %>
-      <% end %>
-    </div>
-
-  <% else %>
-
-    <div class="no-objects-found"><%= Spree.t('no_key', :scope => 'api') %></div>
-
-    <div class="filter-actions actions">
-      <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
-        <%= button Spree.t('generate_key', :scope => 'api'), 'icon-key' %>
-      <% end %>
-    </div>
-  <% end %>
-</fieldset>