kaui 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69a715b46b207b1b61efdab90449e98406488d87
-  data.tar.gz: eba301b72bc6957f3b6d6342ea07ba89f5d8c8c1
+  metadata.gz: fcfdad169627618fcedf7f8d57019705ddbd1fad
+  data.tar.gz: ffb855fc7166ec29ff766a78b20bee6dc374011e
 SHA512:
-  metadata.gz: b5ec35de209aef18aeb38a4d13267b782a8aab0bfac3f2aca76c6dc0c9f8654286b191fd497bf1df3f9a8847838cae908d588c0ce8b7a14f4931adc23157aebc
-  data.tar.gz: 1a3ae67d11058beaa7b49f401e7763a4e0e31996e178393f36ff4a833f4fbff77ec57c583cd09beb84b29862741a1b53687b12044eff5cb34b5fcd46c3d39024
+  metadata.gz: 22c1fc01244a91e541c9037d314d0047e074ec2746931614094c8eb8b0ea4f09cb37b619255204a191c59c1dbf89bdf79d62e46d23c66f987f3de4120bd45343
+  data.tar.gz: 775ec5703c332ca338732047d06b77e3be2cf964b5efbb50fd4d3b6eb272cd2d1aa719cc0f281cb326bb21e568f7db887208c30637a0a8dbba688c617be6853c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kaui (0.7.1)
+    kaui (0.7.2)
       cancan (~> 1.6.10)
       carmen-rails (~> 1.0.0)
       d3_rails (~> 3.2.8)

data/README.md

@@ -7,10 +7,8 @@ Getting started
 Running Kaui
 ------------
 
-You can run Kaui locally using the sandbox script:
+You can run Kaui locally by using the sandbox script:
 
-    # Point to your killbill installation
-    export KILLBILL_URL="http://killbill.company.com:8080"
     # Run the sandbox script
     bundle exec script/sandbox
     # Start the Rails app
@@ -24,19 +22,18 @@ Mounting Kaui into your own Rails app
 The Kaui gem comes with a `kaui` script to mount it in your existing Rails app.
 
 Kaui expects the container app to define the <tt>current_user</tt> method, which returns the
-name of the logged-in user. This is used by Killbill for auditing purposes.
+name of the logged-in user. This is used by Kill Bill for auditing purposes.
 
-Finally, Killbill server needs to be running for Kaui to fetch its information. Set the `KILLBILL_URL`
-variable to point to your existing Killbill installation (e.g. http://killbill.company.com:8080).
+Finally, a Kill Bill server needs to be running for Kaui to fetch its information (see the Configuration section below).
 The default login credentials are admin/password.  Users, Credentials, Roles and Permissions are 
 passed through to Kill Bill. It uses Basic Auth by default, but the backend is pluggable (LDAP, 
 ActiveDirectory, etc.).
 
 
-Multi-Tenancy
+Configuration
 -------------
 
-If you are using Kaui against a single tenant, specify your api key and secret in ```config/initializers/killbill_client.rb```:
+Specify your Kill Bill server url, api key and secret in ```config/initializers/killbill_client.rb```:
 
 ```
 KillBillClient.url = 'http://127.0.0.1:8080/'

data/app/models/kaui/user.rb

@@ -28,7 +28,6 @@ module Kaui
 
     # Verify the Kill Bill session hasn't timed-out
     def authenticated_with_killbill?(api_key=KillBillClient.api_key, api_secret=KillBillClient.api_secret)
-      KillBillClient.url = Kaui.killbill_finder.call
       subject = KillBillClient::Model::Security.find_subject :session_id => kb_session_id,
                                                              :api_key => api_key,
                                                              :api_secret => api_secret
@@ -40,7 +39,6 @@ module Kaui
     private
 
     def self.do_find_permissions(options = {})
-      KillBillClient.url = Kaui.killbill_finder.call
       KillBillClient::Model::Security.find_permissions options
     end
   end

data/app/views/kaui/home/index.html.erb

@@ -1,10 +1,10 @@
 <header class='hero-unit'>
   <h1>Welcome to Kaui!</h1>
-  <p class='lead'>Online documentation can be found at <a href='http://killbilling.org/' target='_blank'>http://kill-bill.org/</a></p>
+  <p class='lead'>Online documentation can be found at <a href='http://kill-bill.org/' target='_blank'>http://kill-bill.org/</a></p>
 
   <p>About your application&rsquo;s environment:
     <ul>
-      <li>Kill Bill url: <%= Kaui.killbill_finder.call %></li>
+      <li>Kill Bill url: <%= KillBillClient.url %></li>
     </ul>
   </p>
 </header>

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/lib/kaui.rb

@@ -4,16 +4,13 @@
 require "kaui/engine"
 
 module Kaui
-  mattr_accessor :killbill_finder
   mattr_accessor :account_home_path
   mattr_accessor :bundle_home_path
   mattr_accessor :invoice_home_path
   mattr_accessor :bundle_key_display_string
   mattr_accessor :creditcard_plugin_name
   mattr_accessor :layout
-  mattr_accessor :killbill_url
 
-  self.killbill_finder = lambda { self.config[:killbill_url] }
   self.account_home_path = lambda {|account_id| Kaui::Engine.routes.url_helpers.account_path(account_id) }
   self.bundle_home_path = lambda {|bundle_id| Kaui::Engine.routes.url_helpers.bundle_path(:id => bundle_id) }
   self.invoice_home_path = lambda {|invoice_id| Kaui::Engine.routes.url_helpers.invoice_path(:id => invoice_id) }
@@ -24,11 +21,8 @@ module Kaui
     # TODO
     {
       :layout => layout || 'kaui/layouts/kaui_application',
-      :killbill_url => killbill_url || ENV['KILLBILL_URL'] || 'http://127.0.0.1:8080'
     }
   end
-
-  KillBillClient.url = Kaui.killbill_finder.call
 end
 
 # ruby-1.8 compatibility

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

@@ -1,8 +1,6 @@
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
-  config.killbill_url = ENV["KILLBILL_URL"] || "http://127.0.0.1:8080"
-
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Killbill core team