saucy 0.3.2 → 0.3.3

data/README.md

@@ -90,6 +90,11 @@ To extend the ProjectsController:
       end
     end
 
+To define additional limit meters, or override existing limit meters, create the
+partials:
+
+    app/views/limits/_#{limitname}_meter.html.erb
+
 ## Gotchas
 
 Make sure you don't do this in ApplicationController:

data/app/helpers/limits_helper.rb

@@ -0,0 +1,13 @@
+module LimitsHelper
+  def current_percentage(limit, account)
+    number_to_percentage((limit.current_count(account).to_f / limit.value) * 100)
+  end
+
+  def render_limit_meter(limit)
+    if FileTest.exist?(File.join(Rails.root, 'app', 'views', 'limits' , "_#{limit.name}_meter.html.erb"))
+      render "limits/#{limit.name}_meter", :limit => limit
+    else
+      render "limits/meter", :limit => limit
+    end
+  end
+end

data/app/models/limit.rb

@@ -36,10 +36,14 @@ class Limit < ActiveRecord::Base
   end
 
   def within?(account)
-    account.send(:"#{name}_count") <= value
+    current_count(account) <= value
   end
 
   def can_add_one?(account)
-    (account.send(:"#{name}_count") + 1) <= value
+    (current_count(account) + 1) <= value
+  end
+
+  def current_count(account)
+    account.send(:"#{name}_count")
   end
 end

data/app/views/accounts/edit.html.erb

@@ -8,6 +8,10 @@
   <h3>Your Plan</h3>
   <%= render @account.plan %>
   <%= link_to "Upgrade", edit_account_plan_path(current_account), :id => "upgrade-account" %>
+
+  <% @account.plan.limits.numbered.each do |limit| -%>
+    <%= render_limit_meter(limit) %>
+  <% end -%>
 </div>
 
 <%= content_tag_for :div, @account do -%>

data/app/views/limits/_meter.html.erb

@@ -0,0 +1,13 @@
+<%= content_tag_for :div, limit, :class => "#{limit.name} meter" do %>
+  <span class="numbers">
+    <em><%= limit.current_count(current_account) %></em><span>/<%= limit.value %></span>
+  </span>
+  <span class="label">
+    <%= limit.name %>
+  </span>
+  <div class="bar">
+    <span style="width: <%= current_percentage(limit, current_account) %>;">
+      <%= current_percentage(limit, current_account) %>
+    </span>
+  </div>
+<% end %>

data/lib/generators/saucy/features/templates/features/manage_plan.feature

@@ -123,3 +123,21 @@ Feature: Manage Plan
     And I should see "5 projects" within ".basic"
     And I should see "ssl" within ".basic"
     And I should not see "ssl" within ".free"
+
+  Scenario: Viewing current usage
+    Given a paid plan exists with a name of "Basic"
+    And the following account exists:
+      | name | keyword | plan        | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
+      | Test | test    | name: Basic | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
+    And the following limits exist:
+      | plan        | name     | value | value_type |
+      | name: Basic | users    | 1     | number     |
+      | name: Basic | projects | 5     | number     |
+      | name: Basic | ssl      | 1     | boolean    |
+    And I have signed in with "joe@example.com/test"
+    And "joe@example.com" is an admin of the "Test" account
+    When I go to the settings page for the "Test" account
+    Then I should see "1/1" within ".users.meter"
+    And I should see "100.000%" within ".users.meter"
+    And I should see "0/5" within ".projects.meter"
+    And I should see "0.000%" within ".projects.meter"

data/lib/generators/saucy/install/templates/create_saucy_tables.rb

@@ -81,7 +81,7 @@ class CreateSaucyTables < ActiveRecord::Migration
     create_table :limits do |t|
       t.belongs_to :plan
       t.string :name
-      t.integer :value, :null => false, :default => 0
+      t.column :value, 'BIGINT UNSIGNED', :null => false, :default => 0
       t.string  :value_type, :null => false, :default => "number"
 
       t.timestamps

data/lib/saucy/engine.rb

@@ -19,6 +19,9 @@ module Saucy
                                                 :expiration_year]
     end
 
+    initializer 'limits.helper' do |app|
+      ActionView::Base.send :include, LimitsHelper
+    end
 
     {:short_date => "%x"}.each do |k, v|
       Time::DATE_FORMATS[k] = v

data/spec/models/limit_spec.rb

@@ -45,6 +45,11 @@ describe Limit, "with account and limits" do
     subject.within?(@account)
   end
 
+  it "gives the current count for the account of the limit" do
+    @account.stubs(:users_count => 99)
+    subject.current_count(@account).should == 99
+  end
+
   it "can query whether the given account is below the specified limit" do
     Limit.within?("users", @account)
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -04:00
+date: 2011-03-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,6 +137,7 @@ files:
 - app/controllers/memberships_controller.rb
 - app/controllers/plans_controller.rb
 - app/controllers/profiles_controller.rb
+- app/helpers/limits_helper.rb
 - app/mailers/billing_mailer.rb
 - app/mailers/invitation_mailer.rb
 - app/models/invitation.rb
@@ -164,6 +165,7 @@ files:
 - app/views/invitations/new.html.erb
 - app/views/invitations/show.html.erb
 - app/views/layouts/saucy.html.erb
+- app/views/limits/_meter.html.erb
 - app/views/memberships/edit.html.erb
 - app/views/memberships/index.html.erb
 - app/views/plans/_plan.html.erb