cosm-rb 0.0.10 → 0.1.00

data/lib/cosm-rb.rb

@@ -18,7 +18,6 @@ require 'cosm-rb/exceptions'
 require 'cosm-rb/string_extensions'
 require 'cosm-rb/array_extensions'
 require 'cosm-rb/hash_extensions'
-require 'cosm-rb/template'
 require 'cosm-rb/templates/defaults'
 require 'cosm-rb/parsers/defaults'
 require 'cosm-rb/feed'

data/lib/cosm-rb/helpers.rb

@@ -6,15 +6,14 @@ module Cosm
       tags = []
       quoted_mode = false
       tags << string.chars.reduce("") do |buffer, char|
-        case char
-        when ','
+        if char == ','
           if !quoted_mode
             tags << buffer
             buffer = ""
           else
             buffer << char
           end
-        when '"'
+        elsif char == '"'
           if buffer.length > 0 && buffer[-1,1] == '\\'
             buffer[-1] = char
           else

data/lib/cosm-rb/search_result.rb

@@ -44,6 +44,11 @@ module Cosm
       end
     end
 
+    def results
+      return [] if @results.nil?
+      @results
+    end
+
     def as_json(options = {})
       options[:version] ||= "1.0.0"
       generate_json(options[:version])

data/lib/cosm-rb/templates/json/datapoint_defaults.rb

@@ -3,10 +3,10 @@ module Cosm
     module JSON
       module DatapointDefaults
         def generate_json(version = nil)
-          template = Template.new(self, :json)
-          template.at {at.iso8601(6)}
-          template.value
-          template.output!
+          {
+            :at => at.iso8601(6),
+            :value => value
+          }.delete_if_nil_value
         end
       end
     end

data/lib/cosm-rb/templates/json/datastream_defaults.rb

@@ -2,61 +2,56 @@ module Cosm
   module Templates
     module JSON
       module DatastreamDefaults
+
         def generate_json(version, options={})
-          case version
-          when "1.0.0"
-            json_1_0_0 options
-          when "0.6-alpha"
-            json_0_6_alpha options
+          if version == "1.0.0"
+            output = json_100(options)
+          elsif version == "0.6-alpha"
+            output = json_06alpha(options)
           end
+          output[:version] = version unless options[:hide_version]
+          !options[:include_blank] ? output.delete_if_nil_value : output
         end
 
         private
 
         # As used by http://cosm.com/api/v2/FEED_ID/datastreams/DATASTREAM_ID.json
-        def json_1_0_0(options={})
-          template = Template.new(self, :json)
-          template.id
-          template.version {"1.0.0"}
-          template.at {updated.iso8601(6)}
-          template.current_value
-          template.max_value {max_value.to_s}
-          template.min_value {min_value.to_s}
-          template.tags {parse_tag_string(tags)}
-          template.unit {unit_hash(options)}
-          template.datapoints_function
-          template.datapoints do
-            datapoints.collect do |datapoint|
-              {
-                :at => datapoint.at.iso8601(6),
-                :value => datapoint.value
-              }
-            end
-          end if datapoints.any?
-          template.output! options
+        def json_100(options = {})
+          datapoints = self.datapoints.map {|dp| {:value => dp.value, :at => dp.at.iso8601(6)}}
+          {
+            :id => self.id,
+            :current_value => self.current_value,
+            :at => self.updated.iso8601(6),
+            :max_value => self.max_value.to_s,
+            :min_value => self.min_value.to_s,
+            :tags => parse_tag_string(self.tags),
+            :unit => unit_hash(options),
+            :datapoints_function => datapoints_function,
+            :datapoints => datapoints
+          }
         end
 
         # As used by http://cosm.com/api/v1/FEED_ID/datastreams/DATASTREAM_ID.json
-        def json_0_6_alpha(options={})
-          template = Template.new(self, :json)
-          template.id
-          template.version {"0.6-alpha"}
-          template.values {
-            [{ :recorded_at => updated.iso8601,
+        def json_06alpha(options = {})
+          {
+            :id => self.id,
+            :values =>
+            [{
+              :recorded_at => updated.iso8601,
               :value => current_value,
               :max_value => max_value.to_s,
-              :min_value => min_value.to_s }.delete_if_nil_value]
+              :min_value => min_value.to_s
+            }.delete_if_nil_value],
+            :tags => parse_tag_string(self.tags),
+            :unit => unit_hash(options),
           }
-          template.tags {parse_tag_string(tags)}
-          template.unit {unit_hash(options)}
-          template.output! options
         end
 
         def unit_hash(options={})
           hash = { :type => unit_type,
                    :symbol => unit_symbol,
                    :label => unit_label }
-          !options[:include_blank] ? hash.delete_if_nil_value : hash
+          !options[:include_blank] ? (hash.delete_if_nil_value if unit_type || unit_label || unit_symbol) : hash
         end
 
       end

data/lib/cosm-rb/templates/json/feed_defaults.rb

@@ -6,96 +6,57 @@ module Cosm
         include Cosm::Helpers
 
         def generate_json(version, options = {})
-          case version
-          when "1.0.0"
-            json_1_0_0 options
-          when "0.6-alpha"
-            json_0_6_alpha options
+          if version == "1.0.0"
+            output = json_100(options)
+          elsif version == "0.6-alpha"
+            output = json_06alpha(options)
           end
+          !options[:include_blank] ? output.delete_if_nil_value : output
         end
 
         private
 
         # As used by http://cosm.com/api/v2/FEED_ID.json
-        def json_1_0_0(options = {})
-          template = Template.new(self, :json)
-          template.id
-          template.title
-          template.private {private.to_s}
-          template.icon
-          template.website
-          template.tags {parse_tag_string(tags)} if tags
-          template.description
-          template.feed {feed.blank? ? "" : "#{feed}.json"}
-          template.auto_feed_url
-          template.status
-          template.updated {updated.iso8601(6)}
-          template.created {created.iso8601(6)}
-          template.email
-          template.creator
-          if owner_login
-            template.user do |user|
-              {
-                :login => owner_login
-              }
-            end
-          end
-          template.version {"1.0.0"}
-          if datastreams
-            template.datastreams do
-              datastreams.collect do |ds|
-                if ds.datapoints.any?
-                  datapoints = ds.datapoints.collect {|dp| {:value => dp.value, :at => dp.at.iso8601(6)}}
-                end
-                {
-                  :id => ds.id,
-                  :at => ds.updated.iso8601(6),
-                  :max_value => ds.max_value.to_s,
-                  :min_value => ds.min_value.to_s,
-                  :current_value => ds.current_value,
-                  :tags => parse_tag_string(ds.tags),
-                  :unit => unit_hash(ds, options),
-                  :datapoints => datapoints
-                }.delete_if_nil_value
-              end
-            end
-          end
-          template.location {location_hash(options)}
-          template.output! options
+        def json_100(options = {})
+          {
+            :id => self.id,
+            :title => self.title,
+            :private => self.private.to_s,
+            :icon => icon,
+            :website => website,
+            :tags => parse_tag_string(tags),
+            :description => self.description,
+            :feed  => (feed.blank? ? "" : "#{feed}.json"),
+            :auto_feed_url => auto_feed_url,
+            :status => status,
+            :updated => updated.iso8601(6),
+            :created => created.iso8601(6),
+            :email => email,
+            :creator => creator,
+            :user => ({ :login => owner_login } if owner_login),
+            :version => "1.0.0",
+            :datastreams => datastreams.map {|ds| ds.generate_json("1.0.0", options.merge({:hide_version => true}))},
+            :location => location_hash(options)
+          }
         end
 
+
         # As used by http://cosm.com/api/v1/FEED_ID.json
-        def json_0_6_alpha(options={})
-          template = Template.new(self, :json)
-          template.id
-          template.title
-          template.icon
-          template.website
-          template.description
-          template.feed {"#{feed}.json"}
-          template.status
-          template.updated {updated.iso8601(6)}
-          template.email
-          template.version {"0.6-alpha"}
-          if datastreams
-            template.datastreams do
-              datastreams.collect do |ds|
-                {
-                  :id => ds.id,
-                  :values => [{
-                  :max_value => ds.max_value.to_s,
-                  :min_value => ds.min_value.to_s,
-                  :value => ds.current_value,
-                  :recorded_at => ds.updated.iso8601
-                }.delete_if_nil_value],
-                  :tags => parse_tag_string(ds.tags),
-                  :unit => unit_hash(ds, options)
-                }.delete_if_nil_value
-              end
-            end
-          end
-          template.location {location_hash(options)}
-          template.output! options
+        def json_06alpha(options = {})
+          {
+            :id => self.id,
+            :title => self.title,
+            :icon => icon,
+            :website => website,
+            :description => self.description,
+            :feed  => (feed.blank? ? "" : "#{feed}.json"),
+            :status => status,
+            :updated => updated.iso8601(6),
+            :email => email,
+            :version => "0.6-alpha",
+            :datastreams => datastreams.map {|ds| ds.generate_json("0.6-alpha", options.merge({:hide_version => true}))},
+            :location => location_hash(options)
+          }
         end
 
         private
@@ -111,7 +72,7 @@ module Cosm
           hash[:waypoints] = format_location_waypoints if location_waypoints
           !options[:include_blank] ? (hash.delete_if_nil_value if location_disposition || location_name || location_exposure || location_domain || location_ele || location_lat || location_lon) : hash
         end
-        
+
         def format_location_waypoints
           output = []
           location_waypoints.each{ |item|
@@ -120,13 +81,6 @@ module Cosm
           }
           output
         end
-        
-        def unit_hash(datastream, options={})
-          hash = { :type => datastream.unit_type,
-            :symbol => datastream.unit_symbol,
-            :label => datastream.unit_label }
-          !options[:include_blank] ? (hash.delete_if_nil_value if datastream.unit_type || datastream.unit_label || datastream.unit_symbol) : hash
-        end
       end
     end
   end

data/lib/cosm-rb/templates/json/key_defaults.rb

@@ -3,26 +3,24 @@ module Cosm
     module JSON
       module KeyDefaults
         def generate_json(options={})
-          template = Template.new(self, :json)
-          template.key do |k|
-            if self.permissions
-              s = self.permissions.collect { |s|
-                if s.resources
-                  res = s.resources.collect { |r| { :feed_id => r.feed_id, :datastream_id => r.datastream_id, :datastream_trigger_id => r.datastream_trigger_id }.delete_if_nil_value
-                  }
-                end
-                {
-                  :referer => s.referer,
-                  :source_ip => s.source_ip,
-                  :label => s.label,
-                  :minimum_interval => s.minimum_interval,
-                  :access_methods => s.access_methods.collect { |a| a.to_s.downcase },
-                  :resources => res
+          if self.permissions
+            s = self.permissions.collect { |s|
+              if s.resources
+                res = s.resources.collect { |r| { :feed_id => r.feed_id, :datastream_id => r.datastream_id, :datastream_trigger_id => r.datastream_trigger_id }.delete_if_nil_value
                 }
+              end
+              {
+                :referer => s.referer,
+                :source_ip => s.source_ip,
+                :label => s.label,
+                :minimum_interval => s.minimum_interval,
+                :access_methods => s.access_methods.collect { |a| a.to_s.downcase },
+                :resources => res
               }
-            end
-
-            {
+            }
+          end
+          output = {
+            :key => {
               :id => id,
               :expires_at => expires_at.respond_to?(:iso8601) ? expires_at.iso8601(6) : expires_at,
               :api_key => key,
@@ -31,8 +29,8 @@ module Cosm
               :private_access => private_access,
               :permissions => s
             }
-          end
-          template.output! options
+          }
+          !options[:include_blank] ? output.delete_if_nil_value : output
         end
       end
     end

data/lib/cosm-rb/templates/json/search_result_defaults.rb

@@ -6,38 +6,33 @@ module Cosm
         include Helpers
 
         def generate_json(version)
-          case version
-          when "1.0.0"
-            json_1_0_0
-          when "0.6-alpha"
-            json_0_6_alpha
+          if version == "1.0.0"
+            json_100.delete_if_nil_value
+          elsif version == "0.6-alpha"
+            json_06alpha.delete_if_nil_value
           end
         end
 
         private
 
         # As used by http://cosm.com/api/v2/feeds.json
-        def json_1_0_0
-          template = Template.new(self, :json)
-          template.totalResults
-          template.startIndex
-          template.itemsPerPage
-          if results
-            template.results {results.collect{|f| f.generate_json("1.0.0")}}
-          end
-          template.output!
+        def json_100
+          {
+            :totalResults => totalResults,
+            :startIndex => startIndex,
+            :itemsPerPage => itemsPerPage,
+            :results => results.collect{|f| f.generate_json("1.0.0")}
+          }
         end
 
         # As used by http://cosm.com/api/v1/feeds.json
-        def json_0_6_alpha
-          template = Template.new(self, :json)
-          template.totalResults
-          template.startIndex
-          template.itemsPerPage
-          if results
-            template.results {results.collect{|f| f.generate_json("0.6-alpha")}}
-          end
-          template.output!
+        def json_06alpha
+          {
+            :totalResults => totalResults,
+            :startIndex => startIndex,
+            :itemsPerPage => itemsPerPage,
+            :results => results.collect{|f| f.generate_json("0.6-alpha")}
+          }
         end
 
       end

data/lib/cosm-rb/templates/json/trigger_defaults.rb

@@ -3,16 +3,16 @@ module Cosm
     module JSON
       module TriggerDefaults
         def generate_json(version = nil)
-          template = Template.new(self, :json)
-          template.id
-          template.threshold_value
-          template.notified_at
-          template.url
-          template.trigger_type
-          template.stream_id
-          template.environment_id
-          template.user
-          template.output!
+          {
+            :id => self.id,
+            :threshold_value => self.threshold_value,
+            :notified_at => self.notified_at,
+            :url => self.url,
+            :trigger_type => self.trigger_type,
+            :stream_id => self.stream_id,
+            :environment_id => self.environment_id,
+            :user => self.user,
+          }.delete_if_nil_value
         end
       end
     end

data/lib/cosm-rb/version.rb

@@ -1,3 +1,3 @@
 module Cosm #:nodoc:
-  VERSION = '0.0.10'
+  VERSION = '0.1.00'
 end

data/spec/cosm-rb/datapoint_spec.rb

@@ -102,9 +102,9 @@ describe Cosm::Datapoint do
   # Provided by Cosm::Templates::DatapointDefaults
   describe "#generate_json" do
     it "should take a version and generate the appropriate template" do
-      datapoint = Cosm::Datapoint.new({})
-      Cosm::Template.should_receive(:new).with(datapoint, :json)
-      lambda {datapoint.generate_json}.should raise_error(NoMethodError)
+      now = Time.now
+      datapoint = Cosm::Datapoint.new({:at => now, :value => 123})
+      datapoint.generate_json.should == {:at => now.iso8601(6), :value => 123}
     end
   end
 

data/spec/cosm-rb/datastream_spec.rb

@@ -260,8 +260,7 @@ describe Cosm::Datastream do
   describe "#generate_json" do
     it "should take a version and generate the appropriate template" do
       datastream = Cosm::Datastream.new({})
-      Cosm::Template.should_receive(:new).with(datastream, :json)
-      lambda {datastream.generate_json("1.0.0")}.should raise_error(NoMethodError)
+      datastream.generate_json("1.0.0").should == {:version => "1.0.0"}
     end
   end
 

data/spec/cosm-rb/feed_spec.rb

@@ -252,8 +252,7 @@ describe Cosm::Feed do
   describe "#generate_json" do
     it "should take a version and generate the appropriate template" do
       feed = Cosm::Feed.new({})
-      Cosm::Template.should_receive(:new).with(feed, :json)
-      lambda {feed.generate_json("1.0.0", {})}.should raise_error(NoMethodError)
+      feed.generate_json("1.0.0").should == {:version => "1.0.0"}
     end
   end
 

data/spec/cosm-rb/search_result_spec.rb

@@ -149,9 +149,9 @@ describe Cosm::SearchResult do
         @search_result = Cosm::SearchResult.new({})
       end
 
-      it "should return nil if not an array" do
+      it "should return [] if not an array" do
         @search_result.results = "kittens"
-        @search_result.results.should be_nil
+        @search_result.results.should be_empty
       end
 
       it "should accept an array of feeds and hashes and store an array of datastreams" do
@@ -187,9 +187,8 @@ describe Cosm::SearchResult do
   # Provided by Cosm::Templates::SearchResultDefaults
   describe "#generate_json" do
     it "should take a version and generate the appropriate template" do
-      search_result = Cosm::SearchResult.new({})
-      Cosm::Template.should_receive(:new).with(search_result, :json)
-      lambda {search_result.generate_json("1.0.0")}.should raise_error(NoMethodError)
+      search_result = Cosm::SearchResult.new({"totalResults" => 100, "itemsPerPage" => 12, :results => []})
+      search_result.generate_json("1.0.0").should == {:totalResults => 100, :itemsPerPage => 12}
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cosm-rb
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 10
-  version: 0.0.10
+  version: 0.1.00
 platform: ruby
 authors: 
 - Paul Bellamy
@@ -17,11 +17,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-07 00:00:00 +00:00
+date: 2012-09-01 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +34,12 @@ dependencies:
         - 8
         - 1
         version: 0.8.1
-  requirement: *id001
   type: :runtime
-  name: yajl-ruby
-  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: nokogiri
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +50,12 @@ dependencies:
         - 4
         - 4
         version: 1.4.4
-  requirement: *id002
   type: :runtime
-  name: nokogiri
-  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: httparty
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,12 +66,12 @@ dependencies:
         - 8
         - 3
         version: 0.8.3
-  requirement: *id003
   type: :runtime
-  name: httparty
-  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: fastercsv
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,12 +82,12 @@ dependencies:
         - 5
         - x
         version: 1.5.x
-  requirement: *id004
   type: :runtime
-  name: fastercsv
-  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -94,12 +96,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
   type: :development
-  name: ruby-debug
-  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: rcov
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,12 +112,12 @@ dependencies:
         - 9
         - 9
         version: 0.9.9
-  requirement: *id006
   type: :development
-  name: rcov
-  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -126,12 +128,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  requirement: *id007
   type: :development
-  name: rake
-  prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -142,10 +144,8 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  requirement: *id008
   type: :development
-  name: rspec
-  prerelease: false
+  version_requirements: *id008
 description: A library for communicating with the Cosm REST API, parsing and rendering Cosm feed formats
 email: 
 - paul.a.bellamy@gmail.com
@@ -205,7 +205,6 @@ files:
 - lib/cosm-rb/resource.rb
 - lib/cosm-rb/search_result.rb
 - lib/cosm-rb/string_extensions.rb
-- lib/cosm-rb/template.rb
 - lib/cosm-rb/templates/csv/datapoint_defaults.rb
 - lib/cosm-rb/templates/csv/datastream_defaults.rb
 - lib/cosm-rb/templates/csv/feed_defaults.rb
@@ -249,7 +248,6 @@ files:
 - spec/cosm-rb/parsers/xml/trigger_defaults_spec.rb
 - spec/cosm-rb/search_result_spec.rb
 - spec/cosm-rb/string_extensions_spec.rb
-- spec/cosm-rb/template_spec.rb
 - spec/cosm-rb/templates/csv/datapoint_defaults_spec.rb
 - spec/cosm-rb/templates/csv/datastream_defaults_spec.rb
 - spec/cosm-rb/templates/csv/feed_defaults_spec.rb

data/lib/cosm-rb/template.rb

@@ -1,32 +0,0 @@
-module Cosm
-  class Template
-    attr_accessor :subject
-    attr_accessor :presentation
-    attr_accessor :output
-
-    def initialize(subject, presentation, &block)
-      @subject = subject
-      @presentation = presentation
-      @output = {}
-    end
-
-    def method_missing(sym, *args, &block)
-      if block_given?
-        @output[sym] = @subject.instance_eval &block
-      else
-        @output[sym] = @subject.send(sym)
-      end
-    rescue NameError, NoMethodError => e
-      @output[sym] = nil
-    end
-
-    def id
-      method_missing(:id)
-    end
-
-    def output!(options = {})
-      !options[:include_blank] ? @output.reject {|k,v| v.nil? || v.blank?} : @output
-    end
-  end
-end
-

data/spec/cosm-rb/template_spec.rb

@@ -1,74 +0,0 @@
-require 'spec_helper'
-
-describe Cosm::Template do
-  describe "initialisation" do
-    it "should accept an object and format" do
-      template = Cosm::Template.new(@feed, :json)
-      template.subject.should == @feed
-      template.presentation.should == :json
-    end
-  end
-
-  describe "presenting json" do
-    before(:each) do
-      @feed = Cosm::Feed.new(feed_as_(:hash))
-      @template = Cosm::Template.new(@feed, :json)
-    end
-
-    it "should allow describing :title => @feed.title" do
-      @template.title
-      @template.output!.should == {:title => @feed.title}
-    end
-
-    it "should allow describing :name => @feed.title" do
-      @template.name {title}
-      @template.output!.should == {:name => @feed.title}
-    end
-
-    it "should allow describing :tags => @feed.tags.map(&:strip).sort" do
-      @template.tags { [*tags].map(&:strip).sort }
-      @template.output!.should == {:tags => [*@feed.tags].map(&:strip).sort}
-    end
-
-    it "should allow describing datastreams" do
-      @template.title
-      @template.datastreams do |f|
-        f.datastreams.collect do |ds|
-          {
-            :id => ds.id,
-            :current_value => ds.current_value
-          }
-        end
-      end
-      datastreams = @feed.datastreams.collect {|ds| {:id => ds.id, :current_value => ds.current_value}}
-      @template.output!.should == {
-        :title => @feed.title,
-        :datastreams => datastreams
-      }
-    end
-
-    it "should ignore nils" do
-      @feed.title = nil
-      @template.title
-      @template.output!.should == {}
-    end
-
-    it "should return nils for NameErrors" do
-      @template.title {litter}
-      @template.output!.should == {}
-    end
-
-    it "should return nils for NoMethodErrors" do
-      @feed.should_not respond_to(:rubbish)
-      @template.rubbish.should == nil
-    end
-
-    it "should include blanks if we pass :include_blank" do
-      @feed.title = ''
-      @template.title
-      @template.output!(:include_blank => true).should == {:title => ''}
-    end
-
-  end
-end
-