uservoice 0.3.0 → 0.3.1

data/.gitignore

@@ -2,3 +2,5 @@
 rdoc/
 coverage/
 pkg/
+.rvmrc
+*.rbc

data/README.rdoc

@@ -24,7 +24,8 @@ Find both settings in widgets section of the admin interface of Uservoice.
 Your API key <api_key> can be found in the API section of the admin documentation.
 
 Default properties are stored in a file named uservoice.yml in the config
-directory of your Rails application. Make it fitting to your needs.
+directory of your Rails application. Make it fitting to your needs. Feel free to
+use erb expressions.
 
 Add javascript function and configuration to HTML HEAD section of your template file:
   <%= uservoice_config_javascript %>

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = 'alexxx@iltempo.de'
     gem.homepage = 'http://github.com/iltempo/uservoice'
     gem.authors = ['Alexander Greim']
-    gem.version = '0.3.0'
+    gem.version = '0.3.1'
     gem.add_dependency('ezcrypto', '>= 0.7.2')
     gem.add_dependency('activesupport', '>= 2.1')
     gem.add_dependency('actionpack', '>= 2.1')

data/lib/uservoice/instance_methods.rb

@@ -6,6 +6,8 @@
 # Copyright:: Copyright (c) 2010 il tempo
 # License::   Distributes under the same terms as Ruby
 
+require "erb"
+
 module Uservoice
   module InstanceMethods
 
@@ -28,7 +30,8 @@ module Uservoice
     #
     def uservoice_configuration
       @@uservoice_configuration ||= begin
-        configuration = YAML::load(IO.read(uservoice_configuration_file))
+        config = ERB.new(IO.read(uservoice_configuration_file)).result
+        configuration = YAML::load(config)
         HashWithIndifferentAccess.new(configuration)
       end
     end

data/test/test_uservoice.rb

@@ -21,6 +21,10 @@ class MyUservoiceController < ActionController::Base
   def config_js_custom_alignment
     render :inline => "<%= uservoice_config_javascript(:alignment => 'right') %>"
   end
+
+  def config_js_erb
+    render :inline => "<%= uservoice_config_javascript %>"
+  end
 end
 
 
@@ -37,6 +41,7 @@ class UservoiceControllerTest < ActionController::TestCase
       map.connect 'config_js_default', :controller => 'my_uservoice', :action => :config_js_default
       map.connect 'config_js_custom_forum', :controller => 'my_uservoice', :action => :config_js_custom_forum
       map.connect 'config_js_custom_alignment', :controller => 'my_uservoice', :action => :config_js_custom_alignment
+      map.connect 'config_js_erb', :controller => 'my_uservoice', :action => :config_js_erb
     end
   end
 
@@ -59,5 +64,10 @@ class UservoiceControllerTest < ActionController::TestCase
     assert_match /"forum":12345/, @response.body
     assert_match /"alignment":"right"/, @response.body
   end
+
+  def test_config_erb
+    get :config_js_erb
+    assert_match /"erb_value":"testing 1 2 3"/, @response.body
+  end
 end
 

data/test/uservoice_test.yml

@@ -1,3 +1,4 @@
+<% test_value = "testing 1 2 3" %>
 uservoice_options:
   key: test
   host: test.uservoice.com
@@ -8,6 +9,7 @@ uservoice_options:
   text_color: white
   hover_color: "#06C"
   lang: en
+  erb_value: <%= test_value %>
 
 uservoice_api:
   api_key: testapikey

data/uservoice.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uservoice}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Greim"]
-  s.date = %q{2010-06-09}
+  s.date = %q{2010-07-02}
   s.description = %q{This adds Uservoice support to your Rails application
       including single sign-on.}
   s.email = %q{alexxx@iltempo.de}
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/iltempo/uservoice}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Uservoice for your Rails application}
   s.test_files = [
     "test/helper.rb",
@@ -57,7 +57,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ezcrypto>, [">= 0.7.2"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.1"])
       s.add_runtime_dependency(%q<actionpack>, [">= 2.1"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: uservoice
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Alexander Greim
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 +02:00
+date: 2010-07-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Uservoice for your Rails application