kaui 0.2.6 → 0.3.0

data/kaui.gemspec

@@ -22,18 +22,21 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = %w(lib)
 
-  s.add_dependency 'rails', '~> 3.2.3'
-  s.add_dependency 'jquery-rails', '~> 2.0'
+  s.add_dependency 'rails', '~> 3.2.14'
+  s.add_dependency 'jquery-rails', '~> 3.0.4'
   s.add_dependency 'rest-client', '~> 1.6.7'
-  s.add_dependency 'money-rails', '~> 0.5.0'
-  s.add_dependency 'd3_rails', '~> 2.10.3'
-  s.add_dependency 'killbill-client', '~> 0.1.3'
+  s.add_dependency 'money-rails', '~> 0.8.1'
+  s.add_dependency 'd3_rails', '~> 3.2.8'
+  s.add_dependency 'killbill-client', '~> 0.2.0'
+  s.add_dependency 'devise', '~> 3.0.2'
+  s.add_dependency 'cancan', '~> 1.6.10'
 
   if defined?(JRUBY_VERSION)
     s.add_development_dependency 'activerecord-jdbc-adapter', '~> 1.2.2'
     s.add_development_dependency 'activerecord-jdbcmysql-adapter', '~> 1.2.2'
     #s.add_development_dependency 'jdbc-mysql', :require => false
   else
+    s.add_development_dependency 'sqlite3'
     s.add_development_dependency 'mysql2'
   end
 end

data/lib/generators/kaui/install/templates/app/assets/javascripts/kaui/all.js

@@ -6,7 +6,7 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require d3.v2
+//= require d3
 //= require js/bootstrap.v2.2.1.min
 //= require js/bootstrap-datepicker.cd46d38
 //= require js/jquery.dataTables.v1.9.3.min

data/lib/kaui/engine.rb

@@ -10,6 +10,8 @@ require 'json'
 require 'money-rails'
 require 'rest_client'
 require 'killbill_client'
+require 'devise'
+require 'cancan'
 
 module Kaui
   class Engine < ::Rails::Engine

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.2.6"
+  VERSION = "0.3.0"
 end

data/script/sandbox

@@ -16,10 +16,15 @@ puts "Deleting old sandbox #{SANDBOX_ROOT_PATH}"
 FileUtils.rm_rf SANDBOX_ROOT_PATH
 
 puts 'Creating the new Rails app'
-ARGV = [SANDBOX_ROOT_PATH, '--skip-bundle', '--skip-active-record']
+ARGV = [SANDBOX_ROOT_PATH, '--skip-bundle']
 Rails::Generators::AppGenerator.start
 
 puts 'Setting up Kaui'
 ARGV = [SANDBOX_ROOT_PATH, "--path=#{KAUI_ROOT_PATH}", '--skip-bundle']
 KauiCmd::Installer.start
 FileUtils.rm_f "#{SANDBOX_ROOT_PATH}/public/index.html"
+
+puts 'Running migrations'
+Dir.chdir SANDBOX_ROOT_PATH
+system 'rake kaui:install:migrations'
+system 'rake db:migrate'

data/test/dummy/app/assets/javascripts/application.js

@@ -12,7 +12,7 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require d3.v2
+//= require d3
 //= require js/bootstrap.v2.0.4.min
 //= require js/jquery.dataTables.v1.9.3.min
 //= require kaui/bootstrap-tweaks

data/test/dummy/app/controllers/application_controller.rb

@@ -6,8 +6,4 @@ class ApplicationController < ActionController::Base
   def set_locale
     I18n.locale = params[:locale] || I18n.default_locale
   end
-
-  def current_user
-    "dummy"
-  end
 end

data/test/dummy/config/database.yml

@@ -1,43 +1,8 @@
-# MySQL.  Versions 4.1 and 5.0 are recommended.
-#
-# Install the MYSQL driver
-#   gem install mysql2
-#
-# Ensure the MySQL gem is defined in your Gemfile
-#   gem 'mysql2'
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-development:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
-  database: dummy_development
-  pool: 5
-  username: root
-  password: root
-#  socket: /tmp/mysql.sock
-  host: 127.0.0.1
-
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: mysql2
-  host: 127.0.0.1
-  encoding: utf8
-  reconnect: false
-  database: kaui_test
-  pool: 5
-  username: root
-  password: <%= ENV['MYSQL_PASSWORD'] || 'root' %>
-
-production:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
-  database: dummy_production
+  adapter: sqlite3
+  database: db/test.sqlite3
   pool: 5
-  username: root
-  password:
-  socket: /tmp/mysql.sock
+  timeout: 5000

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

@@ -0,0 +1,15 @@
+# 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_tenant_id, :null => true
+      t.string :kb_username,  :null => false
+      t.string :kb_session_id,  :null => true
+
+      t.timestamps
+    end
+
+    add_index :kaui_users, [:kb_tenant_id, :kb_username], :unique => true
+  end
+end

data/test/dummy/db/schema.rb

@@ -0,0 +1,26 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# 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.
+
+ActiveRecord::Schema.define(:version => 20130819152643) do
+
+  create_table "kaui_users", :force => true do |t|
+    t.string   "kb_tenant_id"
+    t.string   "kb_username",   :null => false
+    t.string   "kb_session_id"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
+  end
+
+  add_index "kaui_users", ["kb_tenant_id", "kb_username"], :name => "index_kaui_users_on_kb_tenant_id_and_kb_username", :unique => true
+
+end

data/test/test_helper.rb

@@ -13,76 +13,101 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 # Load helpers
 Dir["#{File.dirname(__FILE__)}/unit/helpers/kaui/*.rb"].each { |f| require f }
 
+# Include Devise helpers
+class ActionController::TestCase
+  include Devise::TestHelpers
+
+  setup do
+    @user = Kaui::User.create!({
+                                 :kb_tenant_id => "tenant_id_test",
+                                 :kb_username => "username_test",
+                                 :kb_session_id => "session_id_test"
+                               })
+    sign_in @user
+  end
+end
+
+module Kaui
+  class User < ActiveRecord::Base
+
+    private
+
+    def self.do_find_permissions(options = {})
+      ["*:*"]
+    end
+  end
+end
+
 # Mock killbill-server and serve data from the fixtures
 module Kaui::KillbillHelper
   @@fixtures ||= {}
 
-  def self.get_account_by_key_with_balance_and_cba(key)
-    self.get_account_by_key(key, false, true)
+  def self.get_account_by_key_with_balance_and_cba(key, options = {})
+    self.get_account_by_key(key, false, true, options)
   end
 
-  def self.get_account(account_id, with_balance = false, with_balance_and_cba = false)
+  def self.get_account(account_id, with_balance = false, with_balance_and_cba = false, options = {})
     find_among_fixtures(Kaui::Account, account_id)
   end
 
-  def self.get_account_emails(account_id)
+  def self.get_account_emails(account_id, options = {})
     []
   end
 
-  def self.get_account_by_external_key(account_id, with_balance = false, with_balance_and_cba = false)
+  def self.get_account_by_external_key(account_id, with_balance = false, with_balance_and_cba = false, options = {})
     find_among_fixtures(Kaui::Account, account_id)
   end
 
-  def self.get_overdue_state_for_bundle(bundle_id)
+  def self.get_overdue_state_for_bundle(bundle_id, options = {})
     find_among_fixtures(Kaui::OverdueState, bundle_id)
   end
 
-  def self.get_invoice(invoice_id)
+  def self.get_invoice(invoice_id, with_items = true, options = {})
     find_among_fixtures(Kaui::Invoice, invoice_id)
   end
 
-  def self.get_invoice_item(invoice_id, invoice_item_id)
+  def self.get_invoice_item(invoice_id, invoice_item_id, options = {})
     find_among_fixtures(Kaui::InvoiceItem, invoice_item_id)
   end
 
-  def self.get_bundle(bundle_id)
+  def self.get_bundle(bundle_id, options = {})
     find_among_fixtures(Kaui::Bundle, bundle_id)
   end
 
-  def self.get_payments(invoice_id)
+  def self.get_payments(invoice_id, options = {})
     []
   end
 
-  def self.get_payment_methods(account_id)
+  def self.get_payment_methods(account_id, options = {})
     []
   end
 
-  def self.get_bundles(account_id)
+  def self.get_bundles(account_id, options = {})
     []
   end
 
-  def self.get_subscriptions_for_bundle(bundle_id)
+  def self.get_subscriptions_for_bundle(bundle_id, options = {})
     []
   end
 
-  def self.get_tags_for_account(account_id)
+  def self.get_tags_for_account(account_id, options = {})
     []
   end
 
-  def self.get_tag_definitions
+  def self.get_tag_definitions(options = {})
     find_all_among_fixtures(Kaui::TagDefinition)
   end
 
-  def self.get_tag_definition(tag_definition_id)
+  def self.get_tag_definition(tag_definition_id, options = {})
     find_among_fixtures(Kaui::TagDefinition, tag_definition_id, 'id')
   end
 
-  def self.create_tag_definition(tag_definition)
+  def self.create_tag_definition(tag_definition, options = {})
     tag_definition.id = SecureRandom.uuid
     add_fixture(tag_definition, Kaui::TagDefinition)
   end
 
-  def self.delete_tag_definition(tag_definition_id)
+  def self.delete_tag_definition(tag_definition_id, options = {})
     delete_fixture(Kaui::TagDefinition, tag_definition_id, 'id')
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.14
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.4
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -58,42 +58,84 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: d3_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.3
+        version: 3.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.3
+        version: 3.2.8
 - !ruby/object:Gem::Dependency
   name: killbill-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+- !ruby/object:Gem::Dependency
+  name: cancan
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.10
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -144,12 +186,14 @@ files:
 - app/controllers/kaui/payment_methods_controller.rb
 - app/controllers/kaui/payments_controller.rb
 - app/controllers/kaui/refunds_controller.rb
+- app/controllers/kaui/sessions_controller.rb
 - app/controllers/kaui/subscriptions_controller.rb
 - app/controllers/kaui/tag_definitions_controller.rb
 - app/helpers/kaui/application_helper.rb
 - app/helpers/kaui/date_helper.rb
 - app/helpers/kaui/home_helper.rb
 - app/helpers/kaui/killbill_helper.rb
+- app/models/kaui/ability.rb
 - app/models/kaui/account.rb
 - app/models/kaui/account_email.rb
 - app/models/kaui/account_timeline.rb
@@ -171,10 +215,12 @@ files:
 - app/models/kaui/chargeback.rb
 - app/models/kaui/credit.rb
 - app/models/kaui/custom_field.rb
+- app/models/kaui/entitlement.rb
 - app/models/kaui/event.rb
 - app/models/kaui/external_payment.rb
 - app/models/kaui/invoice.rb
 - app/models/kaui/invoice_item.rb
+- app/models/kaui/killbill_authenticatable.rb
 - app/models/kaui/overdue_state.rb
 - app/models/kaui/payment.rb
 - app/models/kaui/payment_attempt.rb
@@ -184,6 +230,7 @@ files:
 - app/models/kaui/tag.rb
 - app/models/kaui/tag_definition.rb
 - app/models/kaui/time_series_data.rb
+- app/models/kaui/user.rb
 - app/views/kaui/account_emails/_account_emails_table.html.erb
 - app/views/kaui/account_emails/_form.html.erb
 - app/views/kaui/account_emails/new.html.erb
@@ -229,6 +276,7 @@ files:
 - app/views/kaui/refunds/index.html.erb
 - app/views/kaui/refunds/new.html.erb
 - app/views/kaui/refunds/show.html.erb
+- app/views/kaui/sessions/new.html.erb
 - app/views/kaui/subscriptions/_subscriptions_table.html.erb
 - app/views/kaui/subscriptions/edit.html.erb
 - app/views/kaui/subscriptions/index.html.erb
@@ -241,10 +289,14 @@ files:
 - app/views/kaui/tag_definitions/show.html.erb
 - app/views/kaui/tags/_tags_table.html.erb
 - bin/kaui
+- config/initializers/devise.rb
+- config/initializers/killbill_authenticatable.rb
 - config/initializers/time_formats.rb
+- config/locales/devise.en.yml
 - config/locales/en.yml
 - config/locales/fr.yml
 - config/routes.rb
+- db/migrate/20130812155313_devise_create_kaui_users.rb
 - db/schema.rb
 - kaui.gemspec
 - lib/generators/kaui/install/install_generator.rb
@@ -253,7 +305,6 @@ files:
 - lib/generators/kaui/install/templates/config/initializers/kaui.rb
 - lib/kaui.rb
 - lib/kaui/engine.rb
-- lib/kaui/error_helper.rb
 - lib/kaui/installer/installer.rb
 - lib/kaui/version.rb
 - lib/tasks/kaui_tasks.rake
@@ -284,6 +335,8 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
+- test/dummy/db/migrate/20130819152643_devise_create_kaui_users.kaui.rb
+- test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep
 - test/dummy/public/404.html
@@ -390,6 +443,8 @@ test_files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
+- test/dummy/db/migrate/20130819152643_devise_create_kaui_users.kaui.rb
+- test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep
 - test/dummy/public/404.html