amountable 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf7b66be3e1186c7b72fd732ecd1f25a844b77de
-  data.tar.gz: a943ca2bce6a88e5b58b872c6dab8965920e9a34
+  metadata.gz: 18e0c969e86b2011d96f0c829de6aa1ce588a29b
+  data.tar.gz: 38d69abcf37a7789e0d72396aceb122b72d23824
 SHA512:
-  metadata.gz: 18685fdf6a7637727d4aa3361e02ffda2dc7352aad0474887bc2f3d851947d80543539db38a438aaca0239733d11b693f9e7c9985460116cca82b968a28c0ae5
-  data.tar.gz: 17e9b14deeab1ec9e6e6905e7ac3c7a098a62a32e2b39dc4b99aedfe748323bcc8f30b224de54482cbb8683037fed6b461bb07e6abb57d6706ad5fe7e4fd0c07
+  metadata.gz: 8ccb174724df2e606d57df8a53f904a00ad6f322ade69f2f9f341a246e01211f8ae819099f888573e8421ed603d58b88e992ab5f8850d8cd6ae8a9844a412738
+  data.tar.gz: 87c7982c3af2ebbdf9509d1243eccd7235cbce196a9d8511dac8ab40f6615971b33eff08635b5b889e92fa932982a0fa06ec6cbcc7fe7d69d929d7319c43705f

data/lib/amountable.rb

@@ -108,7 +108,7 @@ module Amountable
           amounts.delete(amount)
           all_amounts.delete(amount)
           @amounts_by_name.delete(name)
-          amount.destroy
+          amount.destroy if amount.persisted?
         else
           all_amounts << amount if amount.new_record?
           (@amounts_by_name ||= {})[name.to_sym] = amount

data/lib/amountable/version.rb

@@ -1,5 +1,5 @@
 # Copyright 2015, Instacart
 
 module Amountable
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/internal/db/schema.rb

@@ -1,20 +1,19 @@
 # Copyright 2015, Instacart
 
-ActiveRecord::Schema.define version: 1 do
+ActiveRecord::Schema.define do
 
   create_table "amounts", force: :cascade do |t|
-  t.integer  "amountable_id",                   null: false
-  t.string   "amountable_type",                 null: false
-  t.datetime "created_at"
-  t.string   "name",                            null: false
-  t.datetime "updated_at"
-  t.integer  "value_cents",     default: 0,     null: false
-  t.string   "value_currency",  default: "USD", null: false
-end
-
-add_index "amounts", ["amountable_id", "amountable_type"], name: "index_amounts_on_amountable_id_and_amountable_type", using: :btree
+    t.integer  "amountable_id",                   null: false
+    t.string   "amountable_type",                 null: false
+    t.datetime "created_at"
+    t.string   "name",                            null: false
+    t.datetime "updated_at"
+    t.integer  "value_cents",     default: 0,     null: false
+    t.string   "value_currency",  default: "USD", null: false
+  end
+  add_index "amounts", ["amountable_id", "amountable_type"], name: "index_amounts_on_amountable_id_and_amountable_type", using: :btree
 
-  create_table "orders" do |t|
+  create_table "orders", force: :cascade do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
   end

data/spec/support/database.rb

@@ -1,36 +1,34 @@
 # Copyright 2015, Instacart
 
 db_name = ENV['DB'] || 'postgresql'
-database_yml = File.expand_path('../../internal/config/database.yml', __FILE__)
+spec_dir = Pathname.new(File.dirname(__FILE__)) / '..'
+database_yml = spec_dir.join('internal/config/database.yml')
 
-if File.exist?(database_yml)
+fail "Please create #{database_yml} first to configure your database. Take a look at: #{database_yml}.sample" unless File.exist?(database_yml)
 
-  ActiveRecord::Migration.verbose = false
-  ActiveRecord::Base.default_timezone = :utc
-  ActiveRecord::Base.configurations = YAML.load_file(database_yml)
-  ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), '../debug.log'))
-  ActiveRecord::Base.logger.level = ENV['TRAVIS'] ? ::Logger::ERROR : ::Logger::DEBUG
-  config = ActiveRecord::Base.configurations[db_name]
+ActiveRecord::Migration.verbose = false
+ActiveRecord::Base.default_timezone = :utc
+ActiveRecord::Base.configurations = YAML.load_file(database_yml)
+ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), '../debug.log'))
+ActiveRecord::Base.logger.level = ENV['TRAVIS'] ? ::Logger::ERROR : ::Logger::DEBUG
+config = ActiveRecord::Base.configurations[db_name]
 
-  begin
-    ActiveRecord::Base.establish_connection(db_name.to_sym)
-    ActiveRecord::Base.connection
-  rescue
-    case db_name
-      when /mysql/
-        ActiveRecord::Base.establish_connection(config.merge('database' => nil))
-        ActiveRecord::Base.connection.create_database(config['database'], {charset: 'utf8', collation: 'utf8_unicode_ci'})
-      when 'postgresql'
-        ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
-        ActiveRecord::Base.connection.create_database(config['database'], config.merge('encoding' => 'utf8'))
-    end
-
-    ActiveRecord::Base.establish_connection(config)
+begin
+  ActiveRecord::Base.establish_connection(db_name.to_sym)
+  ActiveRecord::Base.connection
+rescue
+  case db_name
+  when /mysql/
+    ActiveRecord::Base.establish_connection(config.merge('database' => nil))
+    ActiveRecord::Base.connection.create_database(config['database'], {charset: 'utf8', collation: 'utf8_unicode_ci'})
+  when 'postgresql'
+    ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+    ActiveRecord::Base.connection.create_database(config['database'], config.merge('encoding' => 'utf8'))
   end
 
-  load(File.dirname(__FILE__) + '/../internal/db/schema.rb')
-  load(File.dirname(__FILE__) + '/../internal/app/models/order.rb')
-
-else
-  fail "Please create #{database_yml} first to configure your database. Take a look at: #{database_yml}.sample"
+  ActiveRecord::Base.establish_connection(config)
 end
+
+require_relative '../internal/db/schema'
+
+Dir[spec_dir.join('internal/app/models/*.rb')].each { |file| require_relative file }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amountable
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Emmanuel Turlay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord