graphite_builder 0.0.2 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/graphite_builder.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{graphite_builder}
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Edward Muller}]

data/lib/graphite_builder.rb

@@ -17,10 +17,9 @@ module Graphite
 
     # args are optional arguments for constructing the url
     # opts are data to retrieve
-    def initialize(args={}, opts=nil, &block)
+    def initialize(args={}, &block)
       @args = args
       @targets = []
-      data opts
       if block
         self.instance_eval(&block)
       end
@@ -30,19 +29,6 @@ module Graphite
       @targets << value
     end
 
-    def data(opts=nil)
-      case opts
-      when Hash, Array
-        @data = opts
-      when String, Symbol, Fixnum
-        @data[opts]
-      when NilClass
-        @data
-      else
-        raise RuntimeError.new("Unknown options: #{opts}")
-      end
-    end
-
     def sumSeries(*args)
       array_argument_wrapper('sumSeries', args)
     end

data/test/test_graphite_builder.rb

@@ -9,7 +9,7 @@ describe Graphite::Builder do
       describe 'when no targets are defined' do
         it 'should raise a NoTargetsDefined error' do
           Proc.new do
-            Graphite::Builder.new(base_url: 'http://foo.bar/render', foo: :bar) do
+            Graphite::Builder.new(base_url: 'http://foo.bar/render') do
               width 800
             end.render
           end.must_raise Graphite::Builder::NoTargetsDefined
@@ -20,7 +20,7 @@ describe Graphite::Builder do
 
         describe 'whithout using data' do
           it 'should render the correct <img/> tag' do
-            Graphite::Builder.new({base_url: 'http://localhost/render'}, {foo: :bar}) do
+            Graphite::Builder.new(base_url: 'http://localhost/render') do
               target '1.2.3'
             end.render.must_equal '<img src="http://localhost/render?target=1.2.3"/>'
           end
@@ -28,16 +28,17 @@ describe Graphite::Builder do
 
         describe 'using data' do
           it 'should render the correct <img/> tag' do
-            Graphite::Builder.new({base_url: 'http://localhost/render'}, {foo: :bar}) do
-              target data :foo
-              target "#{data :foo}.stuff"
+            foo = :bar
+            Graphite::Builder.new(base_url: 'http://localhost/render') do
+              target foo
+              target "#{foo}.stuff"
             end.render.must_equal '<img src="http://localhost/render?target=bar&target=bar.stuff"/>'
           end
 
           describe 'setting params' do
 
             it 'should render the correct <img/> tag' do
-              Graphite::Builder.new({base_url: 'http://localhost/render'}, {foo: :bar}) do
+              Graphite::Builder.new(base_url: 'http://localhost/render') do
                 width 800
                 height 200
                 target 'a.b.c'
@@ -47,18 +48,20 @@ describe Graphite::Builder do
 
           describe 'and applying a "function"' do
             it 'should render the correct <img/> tag' do
-              Graphite::Builder.new({base_url: 'http://localhost/render'}, {foo: :bar}) do
-                target data :foo
-                target color("#{data :foo}.stuff", 'red')
+              foo = :bar
+              Graphite::Builder.new(base_url: 'http://localhost/render') do
+                target foo
+                target color("#{foo}.stuff", 'red')
               end.render.must_equal "<img src=\"http://localhost/render?target=bar&target=color(bar.stuff,'red')\"/>"
             end
           end
 
           describe 'and nesting functions' do
             it 'should render the correct <img/> tag' do
-              Graphite::Builder.new({base_url: 'http://localhost/render'}, {foo: :bar}) do
-                target data :foo
-                target legend(color("#{data :foo}.stuff", 'red'), 'foozle')
+              foo = :bar
+              Graphite::Builder.new(base_url: 'http://localhost/render') do
+                target foo
+                target legend(color("#{foo}.stuff", 'red'), 'foozle')
               end.render.must_equal "<img src=\"http://localhost/render?target=bar&target=alias(color(bar.stuff,'red'),'foozle')\"/>"
             end
           end
@@ -73,7 +76,7 @@ describe Graphite::Builder do
 
           describe 'with a single data point' do
             it 'should render the correct <img/> tag' do
-              Graphite::Builder.new({base_url: 'http://localhost/render'}, {foo: :bar}) do
+              Graphite::Builder.new(base_url: 'http://localhost/render') do
                 target sumSeries('a.b.*')
               end.render.must_equal "<img src=\"http://localhost/render?target=sumSeries(a.b.*)\"/>"
             end
@@ -81,7 +84,7 @@ describe Graphite::Builder do
 
           describe 'with multiple data points' do
             it 'should render the correct <img/> tag' do
-              Graphite::Builder.new({base_url: 'http://localhost/render'}, {foo: :bar}) do
+              Graphite::Builder.new(base_url: 'http://localhost/render') do
                 target sumSeries('a.b.*','a.c.*','a.d.*')
               end.render.must_equal "<img src=\"http://localhost/render?target=sumSeries(a.b.*,a.c.*,a.d.*)\"/>"
             end
@@ -93,7 +96,7 @@ describe Graphite::Builder do
           describe 'with a single argument' do
             it 'should raise an ArgumentError' do
               Proc.new do
-                Graphite::Builder.new({base_url: 'http://localhost/render'}, {foo: :bar}) do
+                Graphite::Builder.new(base_url: 'http://localhost/render') do
                   target asPercent(1)
                 end.render
               end.must_raise ArgumentError
@@ -102,7 +105,7 @@ describe Graphite::Builder do
 
           describe 'with two arguments' do
             it 'should render the correct <img/> tag' do
-              Graphite::Builder.new({base_url: 'http://localhost/render'}, {foo: :bar}) do
+              Graphite::Builder.new(base_url: 'http://localhost/render') do
                 target asPercent('a.b.c','a.c.b')
               end.render.must_equal "<img src=\"http://localhost/render?target=asPercent(a.b.c,a.c.b)\"/>"
             end
@@ -113,7 +116,7 @@ describe Graphite::Builder do
 
           describe 'with a single argument' do
             it 'should render the correct <img/> tag' do
-              Graphite::Builder.new({base_url: 'http://localhost/render'}, {foo: :bar}) do
+              Graphite::Builder.new(base_url: 'http://localhost/render') do
                 target secondYAxis('a.b.c')
               end.render.must_equal "<img src=\"http://localhost/render?target=secondYAxis(a.b.c)\"/>"
             end
@@ -125,7 +128,7 @@ describe Graphite::Builder do
 
           describe 'with a single argument' do
             it 'should render the correct <img/> tag' do
-              Graphite::Builder.new({base_url: 'http://localhost/render'}, {foo: :bar}) do
+              Graphite::Builder.new(base_url: 'http://localhost/render') do
                 target stacked('a.b.c')
               end.render.must_equal "<img src=\"http://localhost/render?target=stacked(a.b.c)\"/>"
             end
@@ -137,7 +140,7 @@ describe Graphite::Builder do
 
           describe 'with a single argument' do
             it 'should render the correct <img/> tag' do
-              Graphite::Builder.new({base_url: 'http://localhost/render'}, {foo: :bar}) do
+              Graphite::Builder.new(base_url: 'http://localhost/render') do
                 target legend('a.b.c','A B C')
               end.render.must_equal "<img src=\"http://localhost/render?target=alias(a.b.c,'A+B+C')\"/>"
             end
@@ -149,7 +152,7 @@ describe Graphite::Builder do
 
           it 'should raise an UnknownFunctionSignature exception' do
             Proc.new do
-              Graphite::Builder.new({base_url: 'http://localhost/render'}, {foo: :bar}) do
+              Graphite::Builder.new(base_url: 'http://localhost/render') do
                 target blargen(1,2,3)
               end.render
             end.must_raise Graphite::Builder::UnknownFunctionSignature
@@ -162,14 +165,15 @@ describe Graphite::Builder do
       describe "some complex graphs" do
 
         it "should render the correct <img/> tag" do
-          Graphite::Builder.new({},:hostname => 'foo') do
+          hostname = :foo
+          Graphite::Builder.new do
             base_url 'http://my_graphite.host/render/'
             width 800
             height 200
             areaMode :stacked
             from '-2hours'
-            target(legend(color(sumSeries("#{data :hostname}.cpu-*.cpu-steal.value"), :red), 'Steal'))
-            target(legend(color(sumSeries("#{data :hostname}.cpu-*.cpu-steal.value"), :green), 'Idle'))
+            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
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphite_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70335347140140 !ruby/object:Gem::Requirement
+  requirement: &70327317279080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335347140140
+  version_requirements: *70327317279080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70335347139460 !ruby/object:Gem::Requirement
+  requirement: &70327317277340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70335347139460
+  version_requirements: *70327317277340
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70335347138720 !ruby/object:Gem::Requirement
+  requirement: &70327317275200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70335347138720
+  version_requirements: *70327317275200
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70335347137940 !ruby/object:Gem::Requirement
+  requirement: &70327317271980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335347137940
+  version_requirements: *70327317271980
 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: 3608623686595645941
+      hash: -883896666523440853
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: