kaui 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcfdad169627618fcedf7f8d57019705ddbd1fad
-  data.tar.gz: ffb855fc7166ec29ff766a78b20bee6dc374011e
+  metadata.gz: b6a81e6e3a3619f778099f358dc74d3225cb53e8
+  data.tar.gz: 20c0ac946eeb47e2a1caf16b916b5d9541ec12ff
 SHA512:
-  metadata.gz: 22c1fc01244a91e541c9037d314d0047e074ec2746931614094c8eb8b0ea4f09cb37b619255204a191c59c1dbf89bdf79d62e46d23c66f987f3de4120bd45343
-  data.tar.gz: 775ec5703c332ca338732047d06b77e3be2cf964b5efbb50fd4d3b6eb272cd2d1aa719cc0f281cb326bb21e568f7db887208c30637a0a8dbba688c617be6853c
+  metadata.gz: 8e0c097898fc8ef1a2950043724888498061d9e4132bf0986e7060ef216098f8a575a98a84486580e2cd8039600543f793b5fa30f3fba8fe0e677feec723418b
+  data.tar.gz: d7e88959ca5f56094c30586856b3ead2d09dea34ca1620ee9029da414823950a3a03564b6d77d0426b701c2f8f0a08f6f20fe928dfc23c91da1764ea682c7107

data/.gitignore

@@ -5,6 +5,7 @@ test/dummy/db/*.sqlite3
 test/dummy/log/*.log
 test/dummy/tmp/
 test/dummy/.sass-cache
+test/dummy/public
 .idea
 sandbox
 foo

data/.travis.yml

@@ -14,7 +14,6 @@ rvm:
   - jruby-head
 
 jdk:
-  - openjdk6
   - openjdk7
   - oraclejdk7
 
@@ -23,7 +22,7 @@ before_script:
 
 script:
   - pushd test/dummy && RAILS_ENV=test bundle exec rake db:migrate --trace && RAILS_ENV=test bundle exec rake db:test:prepare && popd
-  - bundle exec rake
+  - bundle exec rake test:units
 
 matrix:
   allow_failures:

data/Gemfile.lock

@@ -1,25 +1,27 @@
 PATH
   remote: .
   specs:
-    kaui (0.7.2)
+    kaui (0.8.0)
       cancan (~> 1.6.10)
       carmen-rails (~> 1.0.0)
       d3_rails (~> 3.2.8)
       devise (~> 3.0.2)
       jquery-rails (~> 3.0.4)
-      killbill-client (~> 0.8.1)
+      killbill-client (~> 0.10.1)
       money-rails (~> 0.8.1)
       rails (~> 3.2.14)
+      symmetric-encryption (~> 3.6.0)
+      twitter-bootstrap-rails (~> 2.2.8)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.19)
-      actionpack (= 3.2.19)
+    actionmailer (3.2.21)
+      actionpack (= 3.2.21)
       mail (~> 2.5.4)
-    actionpack (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
+    actionpack (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -27,24 +29,27 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.19)
-      activesupport (= 3.2.19)
+    activemodel (3.2.21)
+      activesupport (= 3.2.21)
       builder (~> 3.0.0)
-    activerecord (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
+    activerecord (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-    activesupport (3.2.19)
+    activeresource (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
+    activesupport (3.2.21)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
-    bcrypt (3.1.7)
+    bcrypt (3.1.10)
+    bcrypt (3.1.10-java)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
+    bcrypt-ruby (3.1.5-java)
+      bcrypt (>= 3.1.3)
     builder (3.0.4)
     cancan (1.6.10)
     carmen (1.0.1)
@@ -52,8 +57,12 @@ GEM
     carmen-rails (1.0.1)
       carmen (~> 1.0.0)
       rails
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
     d3_rails (3.2.8)
       railties (>= 3.1.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     devise (3.0.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
@@ -61,6 +70,7 @@ GEM
       warden (~> 1.2.3)
     docile (1.1.5)
     erubis (2.7.0)
+    execjs (2.3.0)
     fakeweb (1.3.0)
     hike (1.2.3)
     i18n (0.6.11)
@@ -68,8 +78,9 @@ GEM
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    killbill-client (0.8.1)
+    json (1.8.2)
+    json (1.8.2-java)
+    killbill-client (0.10.3)
       json (>= 1.2.0)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -81,8 +92,8 @@ GEM
       activesupport (>= 3.0)
       money (~> 5.1.0)
       railties (>= 3.0)
-    multi_json (1.9.2)
-    mysql2 (0.3.13)
+    multi_json (1.10.1)
+    mysql2 (0.3.17)
     orm_adapter (0.5.0)
     polyglot (0.3.5)
     rack (1.4.5)
@@ -90,48 +101,58 @@ GEM
       rack (>= 0.4)
     rack-ssl (1.3.4)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.19)
-      actionmailer (= 3.2.19)
-      actionpack (= 3.2.19)
-      activerecord (= 3.2.19)
-      activeresource (= 3.2.19)
-      activesupport (= 3.2.19)
+    rails (3.2.21)
+      actionmailer (= 3.2.21)
+      actionpack (= 3.2.21)
+      activerecord (= 3.2.21)
+      activeresource (= 3.2.21)
+      activesupport (= 3.2.21)
       bundler (~> 1.0)
-      railties (= 3.2.19)
-    railties (3.2.19)
-      actionpack (= 3.2.19)
-      activesupport (= 3.2.19)
+      railties (= 3.2.21)
+    railties (3.2.21)
+      actionpack (= 3.2.21)
+      activesupport (= 3.2.21)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.1.1)
+    rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    simplecov (0.9.0)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    sprockets (2.2.2)
+    sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.8)
+    sqlite3 (1.3.10)
+    symmetric-encryption (3.6.0)
+      coercible (>= 1.0.0)
     thor (0.19.1)
+    thread_safe (0.3.4)
+    thread_safe (0.3.4-java)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.41)
+    twitter-bootstrap-rails (2.2.8)
+      actionpack (>= 3.1)
+      execjs
+      rails (>= 3.1)
+      railties (>= 3.1)
+    tzinfo (0.3.43)
     unicode_utils (1.4.0)
     warden (1.2.3)
       rack (>= 1.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/README.md

@@ -4,16 +4,19 @@
 Getting started
 ===============
 
-Running Kaui
-------------
+Running Kaui locally
+---------------------
 
-You can run Kaui locally by using the sandbox script:
-
-    # Run the sandbox script
-    bundle exec script/sandbox
-    # Start the Rails app
-    cd sandbox
-    rails s
+You can run Kaui locally by using the test/dummy app provided:
+```
+> bundle install
+> cd test/dummy
+> export RAILS_ENV=development
+> bundle install
+> rake kaui:install:migrations
+> rake db:migrate
+> rails server
+```
 
 
 Mounting Kaui into your own Rails app

data/Rakefile

@@ -19,5 +19,14 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
+namespace :test do
+  desc 'Runs all the unit tests'
+  Rake::TestTask.new(:units) do |t|
+    t.libs << 'lib'
+    t.libs << 'test'
+    t.pattern = 'test/unit/**/*_test.rb'
+    t.verbose = false
+  end
+end
 
 task :default => :test

data/{lib/generators/kaui/install/templates/app/assets/javascripts/kaui/all.js → app/assets/javascripts/application.js}

@@ -7,10 +7,7 @@
 //= require jquery
 //= require jquery_ujs
 //= require d3
-//= require js/bootstrap.v2.2.1.min
-//= require js/bootstrap-datepicker.cd46d38
-//= require js/jquery.dataTables.v1.9.3.min
+//= require twitter/bootstrap
+//= require jquery.dataTables.min
 //= require kaui/bootstrap-tweaks
 //= require kaui/validation
-//= require kaui/analytics
-//= require_tree .

data/{lib/generators/kaui/install/templates/app/assets/stylesheets/kaui/all.css → app/assets/stylesheets/application.css}

@@ -2,10 +2,6 @@
  * This is a manifest file that'll automatically include all the stylesheets available in this directory
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
- *
- *= require css/bootstrap.v2.2.1.min
- *= require css/bootstrap-datepicker.cd46d38
- *= require kaui/analytics
  *= require_self
  *= require_tree .
 */

data/app/assets/stylesheets/bootstrap_and_overrides.css

@@ -0,0 +1,7 @@
+/*
+  =require twitter-bootstrap-static/bootstrap
+
+  Use Font Awesome icons (default)
+  To use Glyphicons sprites instead of Font Awesome, replace with "require twitter-bootstrap-static/sprites"
+  =require twitter-bootstrap-static/fontawesome
+  */

data/app/controllers/kaui/admin_allowed_users_controller.rb

@@ -0,0 +1,48 @@
+module Kaui
+  class AdminAllowedUsersController < Kaui::EngineController
+
+    skip_before_filter :check_for_redirect_to_tenant_screen
+
+    def index
+      @allowed_users = Kaui::AllowedUser.all
+    end
+
+    def new
+      @allowed_user = Kaui::AllowedUser.new
+    end
+
+    def create
+
+      param_allowed_user = params[:allowed_user]
+      existing_user = Kaui::AllowedUser.find_by_kb_username(param_allowed_user[:kb_username])
+      if existing_user
+        flash[:error] = "Allowed User with name #{param_allowed_user[:kb_username]} already exists!"
+        redirect_to admin_allowed_users_path and return
+      end
+
+      new_user = Kaui::AllowedUser.new
+      new_user.kb_username = param_allowed_user[:kb_username]
+      new_user.description = param_allowed_user[:description]
+      new_user.save!
+
+      redirect_to admin_allowed_user_path(new_user[:id]), :notice => 'Allowed User was successfully configured'
+    end
+
+    def show
+      @allowed_user = Kaui::AllowedUser.find(params[:id])
+      @tenants = Kaui::Tenant.all
+      render
+    end
+
+    def add_tenant
+
+      allowed_user_id = params[:allowed_user][:id]
+      allowed_user = Kaui::AllowedUser.find(allowed_user_id)
+      tenant = Kaui::Tenant.find_by_id(params[:tenant_id])
+      # Add new tenant for that user
+      allowed_user.kaui_tenants << tenant
+
+      redirect_to admin_allowed_user_path(allowed_user_id), :notice => 'Successfully added tenant'
+    end
+  end
+end

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -0,0 +1,97 @@
+module Kaui
+  class AdminTenantsController < Kaui::EngineController
+
+    skip_before_filter :check_for_redirect_to_tenant_screen
+
+    def index
+      # Display the configured tenants in KAUI (which could be different than the existing tenants known by Kill Bill)
+      @tenants = Kaui::Tenant.all
+      render
+    end
+
+    def new
+      @tenant = Kaui::Tenant.new
+    end
+
+    def create
+      param_tenant = params[:tenant]
+      old_tenant = Kaui::Tenant.find_by_name(param_tenant[:name])
+      if old_tenant
+        flash[:error] = "Tenant with name #{param_tenant[:name]} already exists!"
+        redirect_to admin_tenants_path and return
+      end
+
+      begin
+        # Create the tenant in Kill Bill
+        new_tenant = Kaui::AdminTenant.new
+        new_tenant.external_key = param_tenant[:name]
+        new_tenant.api_key = param_tenant[:api_key]
+        new_tenant.api_secret = param_tenant[:api_secret]
+
+        options = tenant_options_for_client
+        new_tenant = new_tenant.create(options[:username], nil, comment, options)
+
+        # Transform object to Kaui model
+        tenant_model = Kaui::Tenant.new
+        tenant_model.name = new_tenant.external_key
+        tenant_model.kb_tenant_id = new_tenant.tenant_id
+        tenant_model.api_key = new_tenant.api_key
+        tenant_model.api_secret = param_tenant[:api_secret]
+
+        # Save in KAUI tables
+        tenant_model.save!
+      rescue => e
+        flash[:error] = "Failed to create the tenant : #{as_string(e)}"
+        redirect_to admin_tenants_path and return
+      end
+
+      redirect_to admin_tenant_path(tenant_model[:id]), :notice => 'Tenant was successfully configured'
+    end
+
+    def show
+      @tenant = Kaui::Tenant.find(params[:id])
+      render
+    end
+
+    def upload_catalog
+
+      current_tenant = Kaui::Tenant.find_by_id(params[:id])
+
+      options = tenant_options_for_client
+      options[:api_key] = current_tenant.api_key
+      options[:api_secret] = current_tenant.api_secret
+
+      uploaded_catalog = params[:catalog]
+      catalog_xml = uploaded_catalog.read
+
+      Kaui::AdminTenant.upload_catalog(catalog_xml, options[:username], nil, comment, options)
+
+      redirect_to admin_tenants_path, :notice => 'Catalog was successfully uploaded'
+    end
+
+
+    def remove_allowed_user
+
+      current_tenant = Kaui::Tenant.find_by_id(params[:id])
+      au = Kaui::AllowedUser.find(params[:allowed_user][:id])
+      # remove the association
+      au.kaui_tenants.delete current_tenant
+      render :json => '{}', :status => 200
+    end
+
+    private
+
+    def tenant_options_for_client
+      user = current_user
+      {
+          :username => user.kb_username,
+          :password => user.password,
+          :session_id => user.kb_session_id
+      }
+    end
+
+    def comment
+      'Multi-tenant Administrative operation'
+    end
+  end
+end