graphite_builder 0.1.1 → 0.2.0

data/Gemfile

@@ -7,7 +7,7 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "minitest", ">= 0"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", "~> 1.1.rc"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -14,7 +14,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler (~> 1.1.rc)
   jeweler (~> 1.6.4)
   minitest
   rcov

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/graphite_builder.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{graphite_builder}
-  s.version = "0.1.1"
+  s.name = "graphite_builder"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Edward Muller}]
-  s.date = %q{2011-10-11}
-  s.description = %q{A DSL for generating graphite graph urls. Meant to enable copy-and-paste from the graphite UI + simple substitution.}
-  s.email = %q{edward@heroku.com}
+  s.authors = ["Edward Muller"]
+  s.date = "2011-11-18"
+  s.description = "A DSL for generating graphite graph urls. Meant to enable copy-and-paste from the graphite UI + simple substitution."
+  s.email = "edward@heroku.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -29,29 +29,29 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_graphite_builder.rb"
   ]
-  s.homepage = %q{http://github.com/freeformz/graphite_builder}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{A DSL: for generating graphite graph urls.}
+  s.homepage = "http://github.com/freeformz/graphite_builder"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "A DSL: for generating graphite graph urls."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<minitest>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1.rc"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<minitest>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.1.rc"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<minitest>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.1.rc"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end

data/lib/graphite_builder.rb

@@ -60,7 +60,10 @@ module Graphite
 
     def render
       raise ::Graphite::Builder::NoTargetsDefined.new if @targets.empty?
-      '<img src="' <<
+      '<img ' <<
+      (@args.has_key?(:height) ? "height=\"#{@args[:height]}\" " : '') <<
+      (@args.has_key?(:width) ? "width=\"#{@args[:width]}\" " : '') <<
+      'src="' <<
       @args.delete(:base_url) << '?' <<
         (@args.map do |k ,v|
           if v.is_a?(Array)

data/test/test_graphite_builder.rb

@@ -42,7 +42,7 @@ describe Graphite::Builder do
                 width 800
                 height 200
                 target 'a.b.c'
-              end.render.must_equal "<img src=\"http://localhost/render?width=800&height=200&target=a.b.c\"/>"
+              end.render.must_equal "<img height=\"200\" width=\"800\" src=\"http://localhost/render?width=800&height=200&target=a.b.c\"/>"
             end
           end
 
@@ -174,7 +174,7 @@ describe Graphite::Builder do
             from '-2hours'
             target(legend(color(sumSeries("#{hostname}.cpu-*.cpu-steal.value"), :red), 'Steal'))
             target(legend(color(sumSeries("#{hostname}.cpu-*.cpu-steal.value"), :green), 'Idle'))
-          end.render.must_equal "<img src=\"http://my_graphite.host/render/?width=800&height=200&areaMode=stacked&from=-2hours&target=alias(color(sumSeries(foo.cpu-*.cpu-steal.value),'red'),'Steal')&target=alias(color(sumSeries(foo.cpu-*.cpu-steal.value),'green'),'Idle')\"/>"
+          end.render.must_equal "<img height=\"200\" width=\"800\" src=\"http://my_graphite.host/render/?width=800&height=200&areaMode=stacked&from=-2hours&target=alias(color(sumSeries(foo.cpu-*.cpu-steal.value),'red'),'Steal')&target=alias(color(sumSeries(foo.cpu-*.cpu-steal.value),'green'),'Idle')\"/>"
         end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphite_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000Z
+date: 2011-11-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70275549525960 !ruby/object:Gem::Requirement
+  requirement: &70132731132300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275549525960
+  version_requirements: *70132731132300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70275549525440 !ruby/object:Gem::Requirement
+  requirement: &70132731131460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70275549525440
+  version_requirements: *70132731131460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70275549524840 !ruby/object:Gem::Requirement
+  requirement: &70132731105220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70275549524840
+  version_requirements: *70132731105220
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70275549524180 !ruby/object:Gem::Requirement
+  requirement: &70132731096200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275549524180
+  version_requirements: *70132731096200
 description: A DSL for generating graphite graph urls. Meant to enable copy-and-paste
   from the graphite UI + simple substitution.
 email: edward@heroku.com
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2850823588853505122
+      hash: -854690039685430798
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ! 'A DSL: for generating graphite graph urls.'