graphite_builder 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/graphite_builder.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{graphite_builder}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   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

@@ -15,11 +15,12 @@ module Graphite
     # specific function signature
     class UnknownFunctionSignature < RuntimeError; end
 
-    def initialize(opts=nil, &block)
-      @args = {}
+    # args are optional arguments for constructing the url
+    # opts are data to retrieve
+    def initialize(args={}, opts=nil, &block)
+      @args = args
       @targets = []
       data opts
-      @args[:base_url] = @data.delete(:base_url) if @data[:base_url]
       if block
         self.instance_eval(&block)
       end

data/test/test_graphite_builder.rb

@@ -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'}, {foo: :bar}) do
               target '1.2.3'
             end.render.must_equal '<img src="http://localhost/render?target=1.2.3"/>'
           end
@@ -28,7 +28,7 @@ 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
+            Graphite::Builder.new({base_url: 'http://localhost/render'}, {foo: :bar}) do
               target data :foo
               target "#{data :foo}.stuff"
             end.render.must_equal '<img src="http://localhost/render?target=bar&target=bar.stuff"/>'
@@ -37,7 +37,7 @@ describe Graphite::Builder do
           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'}, {foo: :bar}) do
                 width 800
                 height 200
                 target 'a.b.c'
@@ -47,7 +47,7 @@ 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
+              Graphite::Builder.new({base_url: 'http://localhost/render'}, {foo: :bar}) do
                 target data :foo
                 target color("#{data :foo}.stuff", 'red')
               end.render.must_equal "<img src=\"http://localhost/render?target=bar&target=color(bar.stuff,'red')\"/>"
@@ -56,7 +56,7 @@ describe Graphite::Builder do
 
           describe 'and nesting functions' 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'}, {foo: :bar}) do
                 target data :foo
                 target legend(color("#{data :foo}.stuff", 'red'), 'foozle')
               end.render.must_equal "<img src=\"http://localhost/render?target=bar&target=alias(color(bar.stuff,'red'),'foozle')\"/>"
@@ -73,7 +73,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'}, {foo: :bar}) do
                 target sumSeries('a.b.*')
               end.render.must_equal "<img src=\"http://localhost/render?target=sumSeries(a.b.*)\"/>"
             end
@@ -81,7 +81,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'}, {foo: :bar}) 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 +93,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'}, {foo: :bar}) do
                   target asPercent(1)
                 end.render
               end.must_raise ArgumentError
@@ -102,7 +102,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'}, {foo: :bar}) 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 +113,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'}, {foo: :bar}) do
                 target secondYAxis('a.b.c')
               end.render.must_equal "<img src=\"http://localhost/render?target=secondYAxis(a.b.c)\"/>"
             end
@@ -125,7 +125,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'}, {foo: :bar}) do
                 target stacked('a.b.c')
               end.render.must_equal "<img src=\"http://localhost/render?target=stacked(a.b.c)\"/>"
             end
@@ -137,7 +137,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'}, {foo: :bar}) 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 +149,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'}, {foo: :bar}) do
                 target blargen(1,2,3)
               end.render
             end.must_raise Graphite::Builder::UnknownFunctionSignature
@@ -162,8 +162,7 @@ describe Graphite::Builder do
       describe "some complex graphs" do
 
         it "should render the correct <img/> tag" do
-
-          Graphite::Builder.new(:hostname => 'foo') do
+          Graphite::Builder.new({},:hostname => 'foo') do
             base_url 'http://my_graphite.host/render/'
             width 800
             height 200

metadata

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