effective_orders 6.7.3 → 6.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa1ddb69cee5eeb8fb020d877fb24ee95d8cce527fa01222eeaeca7ccb31d8e
-  data.tar.gz: 3ec6df985d1a939b7780551a41badcd06ee4eacb88e2ad97c3bcd9d9da20700e
+  metadata.gz: b17d6da43052c30b3dc2e8b4ed1cb60722737444cdbc9246ebe8c1649500d9b7
+  data.tar.gz: 15463f7b06e80a2c4af84951338cedbc11f1f235e83daae1ca440f89d6ed6f7e
 SHA512:
-  metadata.gz: 74f7ea6712882bfaf3c7f8ef643f2e951a5dd355197a7f167e6fae092625fe20a76691cb16b730d926876c958f6e8e26024af8a1580b4ea260a6227f1d301ef8
-  data.tar.gz: b80bdb5f15eb7ff86739e9a0994ff54727fac1075bdc48f432ae13d6b65c6b1eaab77d532409a80fdd7f3c8f107be5e3a6214e0bd52ae75f534d38f84e0ba6ba
+  metadata.gz: 74c5371ed6996eb16b848fb534da9f65671467e8c163ab6bf4802c9c8485c44782991401ba089f69db8494b3b315e6aab42f919920af1c2f1a4b5b9d2104b062
+  data.tar.gz: be68655d47cc0efb3ea00fce27fe750e4a5d862e0be4ebfc2e734c607cd476a3184533369410328361602e7ca4f65396ce31b890debdc290f2ea1e825e124296

data/app/models/effective/cart.rb

@@ -1,6 +1,6 @@
 module Effective
   class Cart < ActiveRecord::Base
-    self.table_name = EffectiveOrders.carts_table_name.to_s
+    self.table_name = (EffectiveOrders.carts_table_name || :carts).to_s
 
     belongs_to :user, polymorphic: true, optional: true  # Optional. We want non-logged-in users to have carts too.
 

data/app/models/effective/cart_item.rb

@@ -1,6 +1,6 @@
 module Effective
   class CartItem < ActiveRecord::Base
-    self.table_name = EffectiveOrders.cart_items_table_name.to_s
+    self.table_name = (EffectiveOrders.cart_items_table_name || :cart_items).to_s
 
     belongs_to :cart, counter_cache: true
     belongs_to :purchasable, polymorphic: true

data/app/models/effective/customer.rb

@@ -1,6 +1,6 @@
 module Effective
   class Customer < ActiveRecord::Base
-    self.table_name = EffectiveOrders.customers_table_name.to_s
+    self.table_name = (EffectiveOrders.customers_table_name || :customers).to_s
 
     attr_accessor :stripe_customer
 

data/app/models/effective/order.rb

@@ -9,7 +9,7 @@
 
 module Effective
   class Order < ActiveRecord::Base
-    self.table_name = EffectiveOrders.orders_table_name.to_s
+    self.table_name = (EffectiveOrders.orders_table_name || :orders).to_s
 
     # Effective Resources
     acts_as_statused(

data/app/models/effective/order_item.rb

@@ -3,7 +3,7 @@
 module Effective
   # An Order Item
   class OrderItem < ActiveRecord::Base
-    self.table_name = EffectiveOrders.order_items_table_name.to_s
+    self.table_name = (EffectiveOrders.order_items_table_name || :order_items).to_s
 
     belongs_to :order
 

data/app/models/effective/product.rb

@@ -1,6 +1,6 @@
 module Effective
   class Product < ActiveRecord::Base
-    self.table_name = EffectiveOrders.products_table_name.to_s
+    self.table_name = (EffectiveOrders.products_table_name || :products).to_s
 
     acts_as_purchasable
     log_changes if respond_to?(:log_changes)

data/app/models/effective/subscription.rb

@@ -1,6 +1,6 @@
 module Effective
   class Subscription < ActiveRecord::Base
-    self.table_name = EffectiveOrders.subscriptions_table_name.to_s
+    self.table_name = (EffectiveOrders.subscriptions_table_name || :subscriptions).to_s
 
     attr_accessor :stripe_subscription
 

data/config/effective_orders.rb

@@ -1,15 +1,6 @@
 # EffectiveOrders Rails Engine
 
 EffectiveOrders.setup do |config|
-  # Configure Database Tables
-  config.orders_table_name = :orders
-  config.order_items_table_name = :order_items
-  config.carts_table_name = :carts
-  config.cart_items_table_name = :cart_items
-  config.customers_table_name = :customers
-  config.subscriptions_table_name = :subscriptions
-  config.products_table_name = :products
-
   # Layout Settings
   # config.layout = { application: 'application', admin: 'admin' }
 

data/db/migrate/{01_create_effective_orders.rb.erb → 101_create_effective_orders.rb}

@@ -1,6 +1,6 @@
-class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
-  def self.up
-    create_table <%= @orders_table_name %> do |t|
+class CreateEffectiveOrders < ActiveRecord::Migration[6.0]
+  def change
+    create_table :orders do |t|
       t.integer   :user_id
       t.string    :user_type
 
@@ -43,10 +43,9 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.timestamps
     end
 
-    add_index <%= @orders_table_name %>, :user_id
+    add_index :orders, :user_id
 
-
-    create_table <%= @order_items_table_name %> do |t|
+    create_table :order_items do |t|
       t.integer   :order_id
       t.string    :purchasable_type
       t.integer   :purchasable_id
@@ -59,12 +58,11 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.timestamps
     end
 
-    add_index <%= @order_items_table_name %>, :order_id
-    add_index <%= @order_items_table_name %>, :purchasable_id
-    add_index <%= @order_items_table_name %>, [:purchasable_type, :purchasable_id]
-
+    add_index :order_items, :order_id
+    add_index :order_items, :purchasable_id
+    add_index :order_items, [:purchasable_type, :purchasable_id]
 
-    create_table <%= @carts_table_name %> do |t|
+    create_table :carts do |t|
       t.integer   :user_id
       t.string    :user_type
 
@@ -72,9 +70,9 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.timestamps
     end
 
-    add_index <%= @carts_table_name %>, :user_id
+    add_index :carts, :user_id
 
-    create_table <%= @cart_items_table_name %> do |t|
+    create_table :cart_items do |t|
       t.integer   :cart_id
       t.string    :purchasable_type
       t.integer   :purchasable_id
@@ -85,11 +83,11 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.timestamps
     end
 
-    add_index <%= @cart_items_table_name %>, :cart_id
-    add_index <%= @cart_items_table_name %>, :purchasable_id
-    add_index <%= @cart_items_table_name %>, [:purchasable_type, :purchasable_id]
+    add_index :cart_items, :cart_id
+    add_index :cart_items, :purchasable_id
+    add_index :cart_items, [:purchasable_type, :purchasable_id]
 
-    create_table <%= @customers_table_name %> do |t|
+    create_table :customers do |t|
       t.integer   :user_id
       t.string    :user_type
 
@@ -103,9 +101,9 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.timestamps
     end
 
-    add_index <%= @customers_table_name %>, :user_id
+    add_index :customers, :user_id
 
-    create_table <%= @subscriptions_table_name %> do |t|
+    create_table :subscriptions do |t|
       t.integer   :customer_id
 
       t.integer   :subscribable_id
@@ -123,11 +121,11 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.timestamps
     end
 
-    add_index <%= @subscriptions_table_name %>, :customer_id
-    add_index <%= @subscriptions_table_name %>, :subscribable_id
-    add_index <%= @subscriptions_table_name %>, [:subscribable_type, :subscribable_id]
+    add_index :subscriptions, :customer_id
+    add_index :subscriptions, :subscribable_id
+    add_index :subscriptions, [:subscribable_type, :subscribable_id]
 
-    create_table <%= @products_table_name %> do |t|
+    create_table :products do |t|
       t.integer   :purchased_order_id
 
       t.string    :name
@@ -140,14 +138,4 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
     end
 
   end
-
-  def self.down
-    drop_table <%= @orders_table_name %>
-    drop_table <%= @order_items_table_name %>
-    drop_table <%= @carts_table_name %>
-    drop_table <%= @cart_items_table_name %>
-    drop_table <%= @customers_table_name %>
-    drop_table <%= @subscriptions_table_name %>
-    drop_table <%= @products_table_name %>
-  end
 end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.7.3'.freeze
+  VERSION = '6.8.1'.freeze
 end

data/lib/generators/effective_orders/install_generator.rb

@@ -47,15 +47,7 @@ module EffectiveOrders
       end
 
       def create_migration_file
-        @orders_table_name = ':' + EffectiveOrders.orders_table_name.to_s
-        @order_items_table_name = ':' + EffectiveOrders.order_items_table_name.to_s
-        @carts_table_name = ':' + EffectiveOrders.carts_table_name.to_s
-        @cart_items_table_name = ':' + EffectiveOrders.cart_items_table_name.to_s
-        @customers_table_name = ':' + EffectiveOrders.customers_table_name.to_s
-        @subscriptions_table_name = ':' + EffectiveOrders.subscriptions_table_name.to_s
-        @products_table_name = ':' + EffectiveOrders.products_table_name.to_s
-
-        migration_template ('../' * 3) + 'db/migrate/01_create_effective_orders.rb.erb', 'db/migrate/create_effective_orders.rb'
+        migration_template ('../' * 3) + 'db/migrate/101_create_effective_orders.rb', 'db/migrate/create_effective_orders.rb'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.7.3
+  version: 6.8.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-16 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -328,7 +328,7 @@ files:
 - config/effective_orders.rb
 - config/locales/effective_orders.en.yml
 - config/routes.rb
-- db/migrate/01_create_effective_orders.rb.erb
+- db/migrate/101_create_effective_orders.rb
 - lib/effective_orders.rb
 - lib/effective_orders/engine.rb
 - lib/effective_orders/version.rb