easy_as_pie 0.1.0 → 0.1.2

data/Gemfile

@@ -1,5 +1,7 @@
 source "http://rubygems.org"
 
+gem 'rails', '>= 3.0'
+
 group :development do
   gem "rspec",    ">= 2.8.0"
   gem "rdoc",     ">= 3.12"

data/Gemfile.lock

@@ -1,15 +1,76 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
     diff-lcs (1.1.3)
+    erubis (2.7.0)
     git (1.2.5)
+    hike (1.2.1)
+    i18n (0.6.0)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
+    journey (1.0.4)
     json (1.7.5)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
     multi_json (1.3.6)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
+      bundler (~> 1.0)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -25,6 +86,16 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
@@ -32,6 +103,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.0.0)
   jeweler (>= 1.8.4)
+  rails (>= 3.0)
   rdoc (>= 3.12)
   rspec (>= 2.8.0)
   simplecov (>= 0.5)

data/README.md

@@ -48,23 +48,32 @@ Get started
 
 Follow Configuration instructions above and also include jQuery 1.7+.
 
-The second step is to add a element to your site to represent chart and add the `data-percent` attribute with the percent number the pie chart should have:
+Add the pie-chart element to your site to represent chart and add the `data-percent` attribute with the percent number the pie chart should have:
 
     <div class="chart" data-percent="73">73%</div>
 
 The engine adds a view helper `easy_as_pie(percent, label = nil)` to all Rails views ;)
+Use as follows
+
+Simple HAML example:
 
 ```haml
 = easy_as_pie 73
 ```
 
+ERB examples:
+
 Or with a custom label:
 
 ```erb
 <%= easy_as_pie (6/24.0 * 100), '6 done' %>
 ```
 
-6 out of 24 done is 25% :)
+Customize `div` options, fx css `class`:
+
+```erb
+<%= easy_as_pie (6/24.0 * 100), '6 done', :class => 'pie-chart' %>
+```
 
 Finally you have to initialize the plugin with your desired configuration:
 
@@ -90,7 +99,7 @@ You can pass a set of these options to the initialize function to set a custom b
     <tr>
         <td><strong>barColor</strong></td>
         <td>#ef1e25</td>
-        <td>The color of the curcular bar. You can pass either a css valid color string like rgb, rgba hex or string colors. But you can also pass a function that accepts the current percentage as a value to return a dynamically generated color.</td>
+        <td>The color of the circular bar. You can pass either a css valid color string like rgb, rgba hex or string colors. But you can also pass a function that accepts the current percentage as a value to return a dynamically generated color.</td>
     </tr>
     <tr>
         <td><strong>trackColor</strong></td>
@@ -139,7 +148,7 @@ Public plugin methods
 
 If you want to update the current percentage of the a pie chart, you can call the `update method. The instance of the plugin is saved in the jQuery-data.
 
-<script type="text/javascript">
+```javascript
 $(function() {
     //create instance
     $('.chart').easyPieChart({
@@ -150,7 +159,7 @@ $(function() {
         $('.chart').data('easyPieChart').update(40);
     }, 5000);
 });
-</script>
+``
 
 ## Contributing to easy_as_pie
  

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/easy_as_pie.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "easy_as_pie"
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-08-22"
+  s.date = "2012-08-31"
   s.description = "Makes it easy to add Pie charts to Rails 3+ apps"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     "lib/easy_as_pie.rb",
     "lib/easy_as_pie/engine.rb",
     "lib/easy_as_pie/view_helper.rb",
-    "spec/easy_as_pie_spec.rb",
+    "spec/easy_as_pie/view_helper_spec.rb",
     "spec/spec_helper.rb",
     "vendor/assets/javascripts/excanvas.js",
     "vendor/assets/javascripts/jquery.easy-pie-chart.js",
@@ -46,12 +46,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rails>, [">= 3.0"])
       s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_development_dependency(%q<rdoc>, [">= 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
       s.add_development_dependency(%q<simplecov>, [">= 0.5"])
     else
+      s.add_dependency(%q<rails>, [">= 3.0"])
       s.add_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_dependency(%q<rdoc>, [">= 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -59,6 +61,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0.5"])
     end
   else
+    s.add_dependency(%q<rails>, [">= 3.0"])
     s.add_dependency(%q<rspec>, [">= 2.8.0"])
     s.add_dependency(%q<rdoc>, [">= 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

data/lib/easy_as_pie/view_helper.rb

@@ -2,10 +2,15 @@ module EasyAsPie
   module ViewHelper
 
     # <div class="chart" data-percent="73">73%</div>
-    def easy_as_pie percent, label = nil
+    def easy_as_pie percent, *args
       raise ArgumentError, "Must take a percent argument" unless percent
-      pie_options = {:"data-percent" => percent}
-      label ||= "#{percent}%"
+      pie_options = {:"data-percent" => percent, :class => 'chart'}
+      
+      options = args.extract_options!
+      pie_options.merge!(options || {})
+
+      label = args.first || "#{percent}%"
+
       content_tag :div, label, pie_options
     end
   end

data/spec/easy_as_pie/view_helper_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe EasyAsPie::ViewHelper do
+  include ControllerTestHelpers,  
+          EasyAsPie::ViewHelper
+
+  # <div class="chart" data-percent="73">73%</div>
+  describe '.easy_as_pie percent, *args' do
+    context 'no arguments' do
+      specify do
+        expect { easy_as_pie }.to raise_error(ArgumentError)
+      end
+    end
+
+    context '50%' do
+      specify do
+        easy_as_pie(50).should == "<div class=\"chart\" data-percent=\"50\">50%</div>"
+      end
+    end
+
+    context "50%, 'of rooms'" do
+      specify do
+        easy_as_pie(50, '50 rooms').should == "<div class=\"chart\" data-percent=\"50\">50 rooms</div>"
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,12 +1,46 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+# coding: utf-8
+require 'rubygems'
+require 'rails'
+require 'json'
+require 'active_support'
+require 'action_pack'
+require 'action_view'
+require 'action_controller'
+require 'action_view/template'
+
 require 'rspec'
 require 'easy_as_pie'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+# WorldFlags::Rails::Engine.add_view_ext
+
+SPEC_DIR = File.dirname(__FILE__)
+
+module ControllerTestHelpers
 
-RSpec.configure do |config|
+  def self.included(base)
+    base.class_eval do
+      
+      include ActionView::Helpers,
+              ActionView::Helpers::CaptureHelper,
+              ActionView::Helpers::JavaScriptHelper,
+              ActionView::Helpers::AssetTagHelper
   
+      # allow tabs.create to run by stubbing an output_buffer
+      attr_accessor :output_buffer
+      @output_buffer = ""
+  
+      # stub content_for for testing
+      def content_for(name, content = nil, &block)
+        # this doesn't exist, and causes errors
+        @_content_for = {} unless defined? @_content_for
+        # we've got to initialize this, so we can concat to it
+        @_content_for[name] = '' if @_content_for[name].nil?
+        # now the rest is the same as in rails
+        content = capture(&block) if block_given?
+        @_content_for[name] << content if content
+        @_content_for[name] unless content
+      end    
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_as_pie
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +127,7 @@ files:
 - lib/easy_as_pie.rb
 - lib/easy_as_pie/engine.rb
 - lib/easy_as_pie/view_helper.rb
-- spec/easy_as_pie_spec.rb
+- spec/easy_as_pie/view_helper_spec.rb
 - spec/spec_helper.rb
 - vendor/assets/javascripts/excanvas.js
 - vendor/assets/javascripts/jquery.easy-pie-chart.js
@@ -132,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 169199517746559933
+      hash: -4327613926852780385
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/easy_as_pie_spec.rb

@@ -1,7 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "EasyAsPie" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
-end