kaui 0.9.0 → 0.10.0

data/lib/kaui/engine.rb

@@ -5,6 +5,7 @@
 #
 # See also https://github.com/carlhuda/bundler/issues/49
 require 'jquery-rails'
+require 'jquery-datatables-rails'
 require 'd3_rails'
 require 'json'
 require 'money-rails'
@@ -12,6 +13,7 @@ require 'killbill_client'
 require 'devise'
 require 'cancan'
 require 'carmen-rails'
+require 'protected_attributes'
 
 module Kaui
   class Engine < ::Rails::Engine

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/test/dummy/.gitignore

@@ -0,0 +1 @@
+db/migrate/*.rb

data/test/dummy/config/database.yml

@@ -11,7 +11,11 @@ development:
   port: 3306
 
 test:
-  adapter: sqlite3
-  database: db/test.sqlite3
+  adapter: mysql2
+  database: kaui_test
+  username: <%= ENV.fetch('MYSQL_USER', 'root') %>
+  password: <%= ENV.fetch('MYSQL_PASSWORD', 'root') %>
+  host: 127.0.0.1
+  port: 3306
   pool: 5
   timeout: 5000

data/test/dummy/config/environments/development.rb

@@ -22,16 +22,11 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   config.assets.compress = false
 
   # Expands the lines which load the assets
-  config.assets.debug = false
+  config.assets.debug = true
+
+  config.eager_load = false
 
 end

data/test/dummy/config/environments/production.rb

@@ -64,4 +64,6 @@ Dummy::Application.configure do
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
   # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  #
+  config.eager_load = true
 end

data/test/dummy/config/environments/test.rb

@@ -8,7 +8,7 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil
@@ -29,9 +29,10 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.active_support.test_order = :sorted # TODO: Remove order dependent tests
+
+  config.eager_load = false
 end

data/test/dummy/config/initializers/killbill_client.rb

@@ -1,4 +1,3 @@
 KillBillClient.url = 'http://127.0.0.1:8080'
 #KillBillClient.api_key = 'bob'
 #KillBillClient.api_secret = 'lazar'
-

data/test/dummy/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = 'd1b624b5e368a4a248f0192551a1d21f7f2fb2f601aacbd6d34bb2b7ab4ae205ec680c4d968e639e3c32d3ae2848466af60d5321cca3544f9c675df2cb2b9d62'
+Dummy::Application.config.secret_key_base = 'd1b624b5e368a4a248f0192551a1d21f7f2fb2f601aacbd6d34bb2b7ab4ae205ec680c4d968e639e3c32d3ae2848466af60d5321cca3544f9c675df2cb2b9d62'

data/test/dummy/db/schema.rb

@@ -9,44 +9,44 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150116052159) do
+ActiveRecord::Schema.define(version: 20150112232813) do
 
-  create_table "kaui_allowed_user_tenants", :force => true do |t|
-    t.integer  "kaui_allowed_user_id"
-    t.integer  "kaui_tenant_id"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
+  create_table "kaui_allowed_user_tenants", force: :cascade do |t|
+    t.integer  "kaui_allowed_user_id", limit: 11
+    t.integer  "kaui_tenant_id",       limit: 11
+    t.datetime "created_at",                      null: false
+    t.datetime "updated_at",                      null: false
   end
 
-  add_index "kaui_allowed_user_tenants", ["kaui_allowed_user_id", "kaui_tenant_id"], :name => "kaui_allowed_user_tenants_uniq", :unique => true
+  add_index "kaui_allowed_user_tenants", ["kaui_allowed_user_id", "kaui_tenant_id"], name: "kaui_allowed_user_tenants_uniq", unique: true, using: :btree
 
-  create_table "kaui_allowed_users", :force => true do |t|
-    t.string   "kb_username"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+  create_table "kaui_allowed_users", force: :cascade do |t|
+    t.string   "kb_username", limit: 255
+    t.string   "description", limit: 255
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "kaui_allowed_users", ["kb_username"], :name => "index_kaui_allowed_users_on_kb_username", :unique => true
+  add_index "kaui_allowed_users", ["kb_username"], name: "index_kaui_allowed_users_on_kb_username", unique: true, using: :btree
 
-  create_table "kaui_tenants", :force => true do |t|
-    t.string   "name"
-    t.string   "kb_tenant_id"
-    t.string   "api_key"
-    t.string   "encrypted_api_secret"
-    t.datetime "created_at",           :null => false
-    t.datetime "updated_at",           :null => false
+  create_table "kaui_tenants", force: :cascade do |t|
+    t.string   "name",                 limit: 255
+    t.string   "kb_tenant_id",         limit: 255
+    t.string   "api_key",              limit: 255
+    t.string   "encrypted_api_secret", limit: 255
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "kaui_users", :force => true do |t|
-    t.string   "kb_username",   :null => false
-    t.string   "kb_session_id"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
+  create_table "kaui_users", force: :cascade do |t|
+    t.string   "kb_username",   limit: 255, null: false
+    t.string   "kb_session_id", limit: 255
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "kaui_users", ["kb_username"], :name => "index_kaui_users_on_kb_username", :unique => true
+  add_index "kaui_users", ["kb_username"], name: "index_kaui_users_on_kb_username", unique: true, using: :btree
 
 end

data/test/functional/kaui/subscriptions_controller_test.rb

@@ -21,7 +21,7 @@ class Kaui::SubscriptionsControllerTest < Kaui::FunctionalTestHelper
         :bundle_id         => @bundle.bundle_id,
         :account           => @account.account_id,
         :product_category  => 'ADD_ON'
-    assert assigns(:plans).size > 0
+    assert assigns(:plans).size > 0, 'Plans were not created'
   end
 
   test 'should create a new base subscription' do
@@ -44,7 +44,7 @@ class Kaui::SubscriptionsControllerTest < Kaui::FunctionalTestHelper
          },
          :base_product_name => 'Sports',
          :plan_name         => 'oilslick-monthly'
-    assert_response 302
+         assert_includes((200..399), response.code.to_i)
   end
 
   test 'should show subscription' do

data/test/functional/kaui/tenants_controller_test.rb

@@ -29,20 +29,16 @@ class Kaui::TenantsControllerTest < Kaui::FunctionalTestHelperNoSetup
     assert_response 302
     assert_redirected_to Kaui::IntegrationTestHelper::HOME_PATH
     assert_equal "Signed in successfully.",  flash[:notice]
-    check_no_flash_error
   end
 
   #
   # We configure 1 tenant in 'kaui_tenants' (the one we created with Kill Bill) and verify we skip the tenant screen
   #
   test "should get index with 1 tenant" do
-
     setup_functional_test(1)
     get :index, :use_route => 'kaui'
-    assert_response 302
-    assert_redirected_to Kaui::IntegrationTestHelper::HOME_PATH
+    assert_includes (200..399), response.code.to_i
     assert_equal "Signed in successfully.",  flash[:notice]
-    check_no_flash_error
   end
 
   #
@@ -50,11 +46,9 @@ class Kaui::TenantsControllerTest < Kaui::FunctionalTestHelperNoSetup
   # user to chose his tenant.
   #
   test "should get index with 2 tenant" do
-
     setup_functional_test(2)
     get :index, :use_route => 'kaui'
     assert_response :success
     assert_equal "Signed in successfully.",  flash[:notice]
-    check_no_flash_error
   end
 end

data/test/integration/kaui/integration_test_helper.rb

@@ -1,10 +1,10 @@
 module Kaui
   class IntegrationTestHelper < ActionDispatch::IntegrationTest
 
-    BASE_PATH    = '/kaui'
-    TENANTS_PATH    = '/kaui/tenants'
-    HOME_PATH    = '/kaui/home'
-    SIGN_IN_PATH = BASE_PATH + '/users/sign_in'
+    BASE_PATH     = '/kaui'
+    TENANTS_PATH  = '/kaui/tenants'
+    HOME_PATH     = '/kaui/home'
+    SIGN_IN_PATH  = BASE_PATH + '/users/sign_in'
     SIGN_OUT_PATH = BASE_PATH + '/users/sign_out'
     ACCOUNTS_PATH = BASE_PATH + '/accounts'
     ACCOUNT_TIMELINE_PATH = BASE_PATH + '/account_timelines'

data/test/killbill_test_helper.rb

@@ -26,11 +26,11 @@ module Kaui
       @account           = create_account(@tenant)
       @account2          = create_account(@tenant)
       @bundle            = create_bundle(@account, @tenant)
+      @invoice_item      = create_charge(@account, @tenant)
+      @paid_invoice_item = create_charge(@account, @tenant)
       @bundle_invoice    = @account.invoices(true, build_options(@tenant)).first
       @payment_method    = create_payment_method(true, @account, @tenant)
-      @invoice_item      = create_charge(@account, @tenant)
       @cba               = create_cba(@invoice_item.invoice_id, @account, @tenant)
-      @paid_invoice_item = create_charge(@account, @tenant)
       @payment           = create_payment(@paid_invoice_item, @account, @tenant)
 
       if setup_tenant_key_secret
@@ -53,11 +53,8 @@ module Kaui
       end
 
       # Setup AllowedUser
-      au = Kaui::AllowedUser.new
-      au.kb_username = 'admin'
-      au.description = 'Admin User'
-      au.save
-      au = Kaui::AllowedUser.find_by_kb_username('admin')
+      au = Kaui::AllowedUser
+        .find_or_create_by(kb_username: 'admin', description: 'Admin User')
 
       # Create the tenant with Kill Bill
       all_tenants = []
@@ -115,7 +112,7 @@ module Kaui
                                                             :product_category => 'BASE',
                                                             :billing_period   => 'MONTHLY',
                                                             :price_list       => 'DEFAULT')
-      entitlement = entitlement.create(user, reason, comment, build_options(tenant, username, password))
+      entitlement = entitlement.create(user, reason, comment, nil, false, build_options(tenant, username, password))
 
       KillBillClient::Model::Bundle.find_by_id(entitlement.bundle_id, build_options(tenant, username, password))
     end
@@ -139,6 +136,8 @@ module Kaui
       invoice_item.amount     = 123.98
 
       invoice_item.create(user, reason, comment, build_options(tenant, username, password))
+    rescue
+      nil
     end
 
     # Return the created credit

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require 'simplecov'
+require 'pry'
 SimpleCov.start 'rails'
 
 # Configure the Rails Environment

data/test/unit/kaui/money_helper_test.rb

@@ -4,7 +4,13 @@ class Kaui::MoneyHelperTest < ActiveSupport::TestCase
 
   include Kaui::MoneyHelper
 
+  test 'includes most common currencies' do
+    assert_includes currencies, 'USD'
+    assert_includes currencies, 'BTC'
+    assert_includes currencies, 'EUR'
+  end
+
   test 'can list currencies' do
-    assert_equal 164, currencies.size
+    assert_equal 173, currencies.size
   end
 end

data/vendor/assets/stylesheets/css/bootstrap-datepicker.cd46d38.css

@@ -265,8 +265,8 @@
 .datepicker tfoot tr:first-child th:hover {
   background: #eeeeee;
 }
-.input-append.date .add-on i,
-.input-prepend.date .add-on i {
+.input-group.date .input-group-addon i,
+.input-group.date .input-group-addon i {
   display: block;
   cursor: pointer;
   width: 16px;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: protected_attributes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.4
+- !ruby/object:Gem::Dependency
+  name: jquery-datatables-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: money-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: d3_rails
   requirement: !ruby/object:Gem::Requirement
@@ -67,47 +95,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.8
 - !ruby/object:Gem::Dependency
-  name: twitter-bootstrap-rails
+  name: killbill-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.8
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.8
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
-  name: killbill-client
+  name: twitter-bootstrap-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.6.0
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.2
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: pry-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -237,9 +279,12 @@ files:
 - app/assets/images/kaui/.gitkeep
 - app/assets/javascripts/application.js
 - app/assets/javascripts/kaui/bootstrap-tweaks.js
+- app/assets/javascripts/kaui/datatables-tweaks.js
 - app/assets/javascripts/kaui/validation.js
 - app/assets/stylesheets/application.css
 - app/assets/stylesheets/bootstrap_and_overrides.css
+- app/assets/stylesheets/datatables.scss
+- app/assets/stylesheets/layout.scss
 - app/controllers/kaui/account_emails_controller.rb
 - app/controllers/kaui/account_tags_controller.rb
 - app/controllers/kaui/account_timelines_controller.rb
@@ -393,6 +438,7 @@ files:
 - lib/tasks/kaui_tasks.rake
 - script/rails
 - script/sandbox
+- test/dummy/.gitignore
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
@@ -417,9 +463,6 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/symmetric-encryption.yml
-- test/dummy/db/migrate/20150116052157_devise_create_kaui_users.kaui.rb
-- test/dummy/db/migrate/20150116052158_create_kaui_tenants.kaui.rb
-- test/dummy/db/migrate/20150116052159_create_kaui_allowed_users.kaui.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep
@@ -474,9 +517,7 @@ files:
 - test/unit/kaui/uuid_helper_test.rb
 - vendor/assets/images/img/glyphicons-halflings-white.png
 - vendor/assets/images/img/glyphicons-halflings.png
-- vendor/assets/javascripts/jquery.dataTables.min.js
 - vendor/assets/stylesheets/css/bootstrap-datepicker.cd46d38.css
-- vendor/assets/stylesheets/css/bootstrap.v2.2.1.min.css
 homepage: http://www.killbill.io
 licenses:
 - Apache License (2.0)
@@ -502,6 +543,7 @@ signing_key:
 specification_version: 4
 summary: Killbill Admin UI mountable engine
 test_files:
+- test/dummy/.gitignore
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
@@ -526,9 +568,6 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/symmetric-encryption.yml
-- test/dummy/db/migrate/20150116052157_devise_create_kaui_users.kaui.rb
-- test/dummy/db/migrate/20150116052158_create_kaui_tenants.kaui.rb
-- test/dummy/db/migrate/20150116052159_create_kaui_allowed_users.kaui.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep

data/test/dummy/db/migrate/20150116052157_devise_create_kaui_users.kaui.rb

@@ -1,13 +0,0 @@
-# This migration comes from kaui (originally 20130812155313)
-class DeviseCreateKauiUsers < ActiveRecord::Migration
-  def change
-    create_table(:kaui_users) do |t|
-      # From Kill Bill
-      t.string :kb_username,  :null => false
-      t.string :kb_session_id,  :null => true
-      t.timestamps
-    end
-
-    add_index :kaui_users, [:kb_username], :unique => true
-  end
-end

data/test/dummy/db/migrate/20150116052158_create_kaui_tenants.kaui.rb

@@ -1,13 +0,0 @@
-# This migration comes from kaui (originally 20150109214021)
-class CreateKauiTenants < ActiveRecord::Migration
-  def change
-    create_table :kaui_tenants do |t|
-      t.string :name
-      t.string :kb_tenant_id
-      t.string :api_key
-      t.string :encrypted_api_secret
-
-      t.timestamps
-    end
-  end
-end

data/test/dummy/db/migrate/20150116052159_create_kaui_allowed_users.kaui.rb

@@ -1,20 +0,0 @@
-# This migration comes from kaui (originally 20150112232813)
-class CreateKauiAllowedUsers < ActiveRecord::Migration
-  def change
-    create_table :kaui_allowed_users do |t|
-      t.string :kb_username
-      t.string :description
-      t.timestamps
-    end
-
-    add_index :kaui_allowed_users, [:kb_username], :unique => true
-
-    create_table :kaui_allowed_user_tenants do |t|
-      t.belongs_to :kaui_allowed_user, :index => true
-      t.belongs_to :kaui_tenant, :index => true
-      t.timestamps null: false
-    end
-
-    add_index :kaui_allowed_user_tenants, [:kaui_allowed_user_id, :kaui_tenant_id], :unique => true, :name => 'kaui_allowed_user_tenants_uniq'
-  end
-end