Merge 7c66bb0 into 00a98af

.envrc

@@ -0,0 +1 @@
+export PATH=./bin:$PATH

CHANGELOG.md

@@ -1,4 +1,10 @@
 # Not Released
-
+## Fixed
 - Fix loading of jquery-ui files (Fixes https://github.com/mbulat/plutus/issues/58)
+
+## Added
 - Add `Account#amounts` and `Account#entries` to get all amounts and entries, respectively
+
+## Changed
+- Required jquery-ui version
+- How migrations are done, which may be a breaking change from older versions of Plutus

README.markdown

@@ -16,9 +16,7 @@ Installation
 ============
 
 - Add the gem to your Gemfile `gem "plutus"`
-
-- generate migration files `rails g plutus`
-
+- generate migration files `rake plutus:install:migrations`
 - run migrations `rake db:migrate`
 
 Overview

bin/rails

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/plutus/engine', __FILE__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

lib/generators/plutus/templates/migration.rb → db/migrate/20160422010135_create_plutus_tables.rb

@@ -1,5 +1,5 @@
 class CreatePlutusTables < ActiveRecord::Migration[4.2]
-  def self.up
+  def change
     create_table :plutus_accounts do |t|
       t.string :name
       t.string :type
@@ -30,10 +30,4 @@ def self.up
     add_index :plutus_amounts, [:account_id, :entry_id]
     add_index :plutus_amounts, [:entry_id, :account_id]
   end
-
-  def self.down
-    drop_table :plutus_accounts
-    drop_table :plutus_entries
-    drop_table :plutus_amounts
-  end
 end

fixture_rails_root/Gemfile

@@ -52,4 +52,4 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
-gem "plutus", path: "~/repos/plutus"
+gem "plutus", path: "../"

fixture_rails_root/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    plutus (0.12.2)
+    plutus (0.13)
       jquery-rails (>= 3.0)
       jquery-ui-rails (>= 4.2.2)
       kaminari (~> 1.0)
@@ -74,18 +74,18 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    kaminari (1.0.1)
+    kaminari (1.1.1)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.0.1)
-      kaminari-activerecord (= 1.0.1)
-      kaminari-core (= 1.0.1)
-    kaminari-actionview (1.0.1)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
       actionview
-      kaminari-core (= 1.0.1)
-    kaminari-activerecord (1.0.1)
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
       activerecord
-      kaminari-core (= 1.0.1)
-    kaminari-core (1.0.1)
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -195,4 +195,4 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 BUNDLED WITH
-   1.15.1
+   1.16.2

fixture_rails_root/db/migrate/20170710173916_create_plutus_tables.rb

@@ -1,5 +1,5 @@
 class CreatePlutusTables < ActiveRecord::Migration[4.2]
-  def self.up
+  def change
     create_table :plutus_accounts do |t|
       t.string :name
       t.string :type
@@ -30,10 +30,4 @@ def self.up
     add_index :plutus_amounts, [:account_id, :entry_id]
     add_index :plutus_amounts, [:entry_id, :account_id]
   end
-
-  def self.down
-    drop_table :plutus_accounts
-    drop_table :plutus_entries
-    drop_table :plutus_amounts
-  end
 end

fixture_rails_root/db/migrate/20180709074548_update_migration.plutus.rb

@@ -0,0 +1,18 @@
+# This migration comes from plutus (originally 20170611000000)
+class UpdatePlutusTables < ActiveRecord::Migration[4.2]
+  def change
+    # we have to remove these indexes because the temporary
+    # table index name is too long
+    remove_index :plutus_amounts, [:account_id, :transaction_id]
+    remove_index :plutus_amounts, [:transaction_id, :account_id]
+    remove_index :plutus_transactions, column: [:commercial_document_id, :commercial_document_type], :name => "index_transactions_on_commercial_doc"
+
+    rename_table :plutus_transactions, :plutus_entries
+    rename_column :plutus_amounts, :transaction_id, :entry_id
+
+    # adding the indexes back
+    add_index :plutus_amounts, [:account_id, :entry_id]
+    add_index :plutus_amounts, [:entry_id, :account_id]
+    add_index :plutus_entries, [:commercial_document_id, :commercial_document_type], :name => "index_entries_on_commercial_doc"
+  end
+end

lib/plutus.rb

@@ -2,11 +2,6 @@
 require "rails"
 
 module Plutus
-  class Engine < Rails::Engine
-    isolate_namespace Plutus
-  end
-
-
   # ------------------------------ tenancy ------------------------------
   # configuration to enable or disable tenancy
   mattr_accessor :enable_tenancy
@@ -21,3 +16,5 @@ def self.config
     yield(self)
   end
 end
+
+require "plutus/engine"

lib/plutus/engine.rb

@@ -0,0 +1,5 @@
+module Plutus
+  class Engine < Rails::Engine
+    isolate_namespace Plutus
+  end
+end