bodega 0.4.0 → 0.4.1

data/Rakefile

@@ -24,6 +24,7 @@ Jeweler::Tasks.new do |gem|
   gem.email = "flip@x451.com"
   gem.authors = ["Flip Sasser"]
   # dependencies defined in Gemfile
+  gem.files.exclude "spec/**/*", ".rvmrc", ".rspec"
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/app/controllers/bodega/orders_controller.rb

@@ -21,7 +21,7 @@ class Bodega::OrdersController < ApplicationController
 
   def create
     if current_order.update_attributes(params[:order])
-      if params[:checkout]
+      if !current_order.new_shipping_rates? && params[:checkout]
         redirect_to current_order.payment_method.checkout_url(complete_order_url, new_order_url)
       else
         redirect_to new_order_path

data/app/models/bodega/order.rb

@@ -44,6 +44,10 @@ module Bodega
       end
     end
 
+    def new_shipping_rates?
+      @new_shipping_rates
+    end
+
     def payment_method
       return nil unless Bodega.config.payment_method
       @payment_method ||= "Bodega::PaymentMethod::#{Bodega.config.payment_method.to_s.camelize}".constantize.new(self)
@@ -54,7 +58,7 @@ module Bodega
     end
 
     def ready?
-      shipping_method.present? || shipping_rates.any?
+      shipping_method.nil? || shipping_rates.present?
     end
 
     def remove_product(item)
@@ -136,6 +140,7 @@ module Bodega
 
     def set_shipping_rates
       self.shipping_rates = postal_code.present? ? shipping_method.rates : nil
+      @new_shipping_rates = true
     end
 
     def set_total

data/bodega.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "bodega"
-  s.version = "0.3.1"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
@@ -16,8 +16,6 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
-    ".rspec",
-    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
     "MIT-LICENSE",
@@ -62,18 +60,7 @@ Gem::Specification.new do |s|
     "lib/generators/bodega/productize/USAGE",
     "lib/generators/bodega/productize/productize_generator.rb",
     "lib/generators/bodega/productize/templates/migration.rb",
-    "lib/tasks/bodega_tasks.rake",
-    "script/rails",
-    "spec/lib/bodega/payment_method/base_spec.rb",
-    "spec/lib/bodega/shipping_method/base_spec.rb",
-    "spec/lib/bodega_spec.rb",
-    "spec/models/order_product_spec.rb",
-    "spec/models/order_spec.rb",
-    "spec/models/product_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/support/active_record.rb",
-    "spec/support/rails.rb",
-    "spec/support/vcr.rb"
+    "lib/tasks/bodega_tasks.rake"
   ]
   s.homepage = "http://github.com/flipsasser/bodega"
   s.licenses = ["MIT"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bodega
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -98,8 +98,6 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .rspec
-- .rvmrc
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -145,17 +143,6 @@ files:
 - lib/generators/bodega/productize/productize_generator.rb
 - lib/generators/bodega/productize/templates/migration.rb
 - lib/tasks/bodega_tasks.rake
-- script/rails
-- spec/lib/bodega/payment_method/base_spec.rb
-- spec/lib/bodega/shipping_method/base_spec.rb
-- spec/lib/bodega_spec.rb
-- spec/models/order_product_spec.rb
-- spec/models/order_spec.rb
-- spec/models/product_spec.rb
-- spec/spec_helper.rb
-- spec/support/active_record.rb
-- spec/support/rails.rb
-- spec/support/vcr.rb
 homepage: http://github.com/flipsasser/bodega
 licenses:
 - MIT
@@ -171,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2351638233694158038
+      hash: -3124905005200788522
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/.rspec

@@ -1,4 +0,0 @@
---color
--I app/controllers
--I app/helpers
--I app/models

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3@bodega --create

data/script/rails

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/bodega/engine', __FILE__)
-
-require 'rails/all'
-require 'rails/engine/commands'

data/spec/lib/bodega/payment_method/base_spec.rb

@@ -1,12 +0,0 @@
-require 'bodega'
-require 'bodega/payment_method/base'
-require 'active_support/core_ext/string/inflections'
-
-describe Bodega::PaymentMethod::Base do
-  describe ".options" do
-    it "defines options on the Bodega configuration instance" do
-      described_class.options(:a, :b, :z)
-      Bodega.config.base.should_not be_nil
-    end
-  end
-end

data/spec/lib/bodega/shipping_method/base_spec.rb

@@ -1,12 +0,0 @@
-require 'bodega'
-require 'bodega/shipping_method/base'
-require 'active_support/core_ext/string/inflections'
-
-describe Bodega::PaymentMethod::Base do
-  describe ".options" do
-    it "defines options on the Bodega configuration instance" do
-      described_class.options(:a, :b, :z)
-      Bodega.config.base.should_not be_nil
-    end
-  end
-end

data/spec/lib/bodega_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe Bodega do
-  describe ".config" do
-    describe "#payment_method" do
-      it "auto-detects Paypal" do
-        class Paypal; end
-        Bodega.config.payment_method.should == :paypal
-      end
-    end
-
-    describe "test_mode" do
-      it "auto-detects test mode" do
-        Bodega.config.test_mode.should be_true
-      end
-    end
-  end
-end

data/spec/models/order_product_spec.rb

@@ -1,72 +0,0 @@
-require 'spec_helper'
-require 'bodega/order_product'
-
-describe Bodega::OrderProduct do
-  let(:product) { TestProduct.create!(product_attrs) }
-  let(:product_attrs) { {price: 49.95} }
-  let(:order_product) { described_class.new(product: product, quantity: 1) }
-
-  describe "#identifier" do
-    it "returns a friendly identifier" do
-      order_product.identifier.should == "TestProduct.1"
-    end
-  end
-
-  describe "#name" do
-    it "defaults to a human-readable name" do
-      order_product.name.should == "Test Product #1"
-    end
-
-    it "delegates to the product" do
-      def product.name
-        "Ohai"
-      end
-      order_product.name.should == "Ohai"
-    end
-  end
-
-  describe "#quantity_and_name" do
-    it "returns the quantity and the name" do
-      order_product.quantity_and_name.should == "1 x Test Product #1"
-    end
-  end
-
-  describe "#subtotal" do
-    it "returns the subtotal for the product quantity" do
-      product.stub(:price) { 25.0 }
-      order_product.quantity = 2
-      order_product.subtotal.should == 50.0
-    end
-  end
-
-  describe "for stock-kept products" do
-    let(:product_attrs) { {price: 49.95, keep_stock: true, number_in_stock: 1} }
-
-    it "can't be saved if the product is out-of-stock" do
-      product.stub(:in_stock?) { false }
-      product.save!
-      order_product.save
-      order_product.errors[:quantity].first.should == "Sorry, this product is sold out."
-    end
-
-    it "notifies me if my quantity is higher than the number left" do
-      order_product.quantity = 2
-      order_product.save
-      order_product.errors[:quantity].first.should == "There is only one in stock!"
-    end
-
-    it "can't be saved if the quantity is too high" do
-      product.stub(:number_in_stock) { 2 }
-      order_product.quantity = 3
-      order_product.save
-      order_product.errors[:quantity].first.should == "There are only 2 in stock!"
-    end
-
-    it "reduces Product#number_in_stock when #update_stock is called" do
-      order_product.stub(:order) { OpenStruct.new }
-      order_product.save!
-      order_product.update_stock
-      product.reload.number_in_stock.should == 0
-    end
-  end
-end

data/spec/models/order_spec.rb

@@ -1,93 +0,0 @@
-require 'spec_helper'
-require 'bodega/order'
-require 'bodega/order_product'
-require 'bodega/product'
-
-describe Bodega::Order do
-  before do
-    TestProduct.send :include, Bodega::Product
-  end
-
-  let!(:product_1) { TestProduct.create!(price: 30) }
-  let!(:product_2) { TestProduct.create!(price: 25) }
-  let(:order) { Bodega::Order.new }
-
-  describe "#payment_method" do
-    require 'bodega'
-    require 'bodega/payment_method'
-    class Paypal; end
-
-    it "returns an instance of Bodega::PaymentMethod::Base" do
-      order.payment_method.should be_instance_of(Bodega::PaymentMethod::Paypal)
-    end
-
-    it "returns an instance of Bodega::PaymentMethod::Base with a reference to the order" do
-      order.payment_method.order.should == order
-    end
-  end
-
-  describe "#shipping_method" do
-    require 'bodega'
-    require 'bodega/shipping_method'
-
-    before do
-      Bodega.config { shipping_method :ups }
-      module ActiveMerchant; module Shipping; class UPS; end; end; end
-    end
-
-    it "returns an instance of Bodega::ShippingMethod::Base" do
-      order.shipping_method.should be_instance_of(Bodega::ShippingMethod::UPS)
-    end
-  end
-
-  describe "#subtotal" do
-    let(:cart) do
-      {
-        "TestProduct.1" => {
-          product_type: "TestProduct",
-          product_id: "1",
-          quantity: "1"
-        },
-        "TestProduct.2" => {
-          product_type: "TestProduct",
-          product_id: "2",
-          quantity: "2"
-        }
-      }
-    end
-
-    it "adds up the #order_products subtotals" do
-      cart.each do |identifier, item|
-        order.update_product(item)
-      end
-      order.save!
-      order.subtotal.should == 80
-    end
-  end
-
-  describe "cart management" do
-    before { order.save! }
-
-    it "defaults to quantity 1 when none given" do
-      order.update_product(product_type: "TestProduct", product_id: 1)
-      order.send(:order_product, "TestProduct.1").quantity.should == 1
-    end
-
-    it "accepts new quantities" do
-      order.update_product(product_type: "TestProduct", product_id: 1, quantity: 10)
-      order.send(:order_product, "TestProduct.1").quantity.should == 10
-    end
-
-    it "updates old quantities when no new quantity is given" do
-      order.update_product(product_type: "TestProduct", product_id: 1, quantity: 10)
-      order.update_product(product_type: "TestProduct", product_id: 1)
-      order.send(:order_product, "TestProduct.1").quantity.should == 11
-    end
-
-    it "removes products when told to" do
-      order.update_product(product_type: "TestProduct", product_id: 1, quantity: 10)
-      order.update_product(product_type: "TestProduct", product_id: 1, quantity: 30, remove: "1")
-      order.send(:order_product, "TestProduct.1").should be_nil
-    end
-  end
-end

data/spec/models/product_spec.rb

@@ -1,78 +0,0 @@
-require 'spec_helper'
-require 'bodega/product'
-
-describe Bodega::Product do
-  let(:product) { TestProduct.create!(price: 25) }
-  before do
-    TestProduct.send :include, Bodega::Product
-  end
-
-  describe "#in_stock?" do
-    it "returns true if the product is not stock-kept" do
-      product.should be_in_stock
-    end
-
-    it "returns true if the number_in_stock is greater than zero" do
-      product.keep_stock = true
-      product.number_in_stock = 1
-      product.save!
-      product.should be_in_stock
-    end
-
-    it "returns false if the number_in_stock is less than zero" do
-      product.keep_stock = true
-      product.number_in_stock = 0
-      product.save!
-      product.should_not be_in_stock
-    end
-  end
-
-  describe "#max_quantity" do
-    it "returns the Bodega configuration value if the product is not stock-kept" do
-      Bodega.stub(:config) { OpenStruct.new(max_quantity: 10) }
-      product.max_quantity.should == Bodega.config.max_quantity
-    end
-  end
-
-  describe ".for_sale" do
-    it "returns products who are for sale today or don't have a start date" do
-      product_1 = TestProduct.create!(for_sale_at: Date.today, price: 25.00)
-      product_2 = TestProduct.create!(price: 30)
-      non_product_1 = TestProduct.create!(for_sale_at: 1.day.from_now, price: 100)
-      TestProduct.for_sale.should == [product_1, product_2]
-    end
-
-    it "returns products whose not_for_sale_at are past" do
-      product_1 = TestProduct.create!(for_sale_at: Date.today, price: 25.00)
-      product_2 = TestProduct.create!(price: 30)
-      non_product_1 = TestProduct.create!(not_for_sale_at: 1.day.ago, price: 100)
-      TestProduct.for_sale.should == [product_1, product_2]
-    end
-
-    it "returns products who don't have for_sale_at anything" do
-      product_1 = TestProduct.create!(price: 25.00)
-      product_2 = TestProduct.create!(price: 30)
-      product_3 = TestProduct.create!(price: 100)
-      TestProduct.for_sale.should == [product_1, product_2, product_3]
-    end
-  end
-
-  describe ".popular" do
-    it "returns products in order of sales from high to low" do
-      require 'bodega/order_product'
-
-      product_1 = TestProduct.create!(price: 25.00)
-      3.times { Bodega::OrderProduct.create!(product: product_1, quantity: 5) }
-      product_2 = TestProduct.create!(price: 30)
-      5.times { Bodega::OrderProduct.create!(product: product_2, quantity: 5) }
-      product_3 = TestProduct.create!(price: 100)
-      4.times { Bodega::OrderProduct.create!(product: product_3, quantity: 5) }
-
-      TestProduct.popular.should == [product_2, product_3, product_1]
-
-      Bodega::OrderProduct.create!(product: product_1, quantity: 50)
-
-      TestProduct.popular.should == [product_1, product_2, product_3]
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,25 +0,0 @@
-# This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
-
-require 'simplecov'
-SimpleCov.start
-
-require 'active_record'
-require 'database_cleaner'
-require 'logger'
-require 'money-rails'
-require 'vcr'
-
-require 'bodega'
-
-Dir[File.expand_path(File.join('support', '**', '*.rb'), File.dirname(__FILE__))].each do |file|
-  require file
-end
-
-RSpec.configure do |config|
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = "random"
-end

data/spec/support/active_record.rb

@@ -1,43 +0,0 @@
-require 'bodega/product'
-
-ActiveRecord::Base.logger = Logger.new(File.open('log/test.log', 'w+'))
-ActiveRecord::Base.establish_connection({:adapter => 'sqlite3', :database => ':memory:', :pool => 5, :timeout => 5000})
-
-I18n.load_path = %w(config/locales/en.yml)
-
-MoneyRails::Hooks.init
-
-class TestProduct < ActiveRecord::Base
-  include Bodega::Product
-end
-
-RSpec.configure do |config|
-  config.around do |example|
-    DatabaseCleaner.strategy = :truncation
-    DatabaseCleaner.start
-    example.run
-    DatabaseCleaner.clean
-  end
-
-  config.before :suite do
-    migrations_path = File.expand_path(File.join("..", "..", "db", "migrate"), File.dirname(__FILE__))
-    migrations = Dir[File.join(migrations_path, '*.rb')]
-    migrations.each do |migration_file|
-      require migration_file
-      migration_name = File.basename(migration_file, '.rb')
-      migration_name[/^\d+_/] = ''
-      migration_name = migration_name.camelize
-      puts migration_name.constantize.migrate(:up)
-    end
-    ActiveRecord::Schema.define do
-      create_table :test_products, :force => true do |t|
-        t.integer :price_cents
-        t.boolean :for_sale, default: true
-        t.boolean :keep_stock, default: false
-        t.integer :number_in_stock
-        t.datetime :for_sale_at
-        t.datetime :not_for_sale_at
-      end
-    end
-  end
-end

data/spec/support/rails.rb

@@ -1,7 +0,0 @@
-module Rails
-  extend self
-
-  def env
-    OpenStruct.new(:development? => false, :test? => true)
-  end
-end