Merge branch 'release/v0.9.6'

bogdanRada · Dec 11, 2013 · 99bdae6 · 99bdae6
2 parents 47f020b + 27dff76
commit 99bdae6
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 6 deletions.
diff --git a/README.rdoc b/README.rdoc
@@ -21,8 +21,7 @@ The way WashOut is used is not modified, it just extends its functionality by ge
 1. {Ruby 1.9.x or Ruby 2.0.x}[http://www.ruby-lang.org]
 2. {Ruby on Rails}[http://rubyonrails.org].
 3. {WashOut Gem version >= 0.10.0.beta.1}[https://github.com/inossidabile/wash_out]
-4. {Nori Gem}[https://github.com/savonrb/nori]
-5. {Virtus Gem}[https://github.com/solnic/virtus]
+4. {Virtus Gem}[https://github.com/solnic/virtus]
 
 = Compatibility
 

diff --git a/app/helpers/washout_builder_helper.rb b/app/helpers/washout_builder_helper.rb
@@ -1,5 +1,4 @@
 module WashoutBuilderHelper
-  include WashOutHelper
 
   def get_complex_class_name(p, defined = [])
     complex_class =  p.struct? ? p.basic_type : nil

diff --git a/lib/washout_builder/dispatcher.rb b/lib/washout_builder/dispatcher.rb
@@ -1,4 +1,3 @@
-require 'nori'
 
 module WashoutBuilder
   # The WashoutBuilder::Dispatcher module should be included in a controller acting

diff --git a/lib/washout_builder/version.rb b/lib/washout_builder/version.rb
@@ -1,3 +1,3 @@
 module WashoutBuilder
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end
diff --git a/washout_builder.gemspec b/washout_builder.gemspec
@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.test_files = s.files.grep(/^(spec)/)
   s.require_paths = ["lib"]
-  s.add_dependency("nori", ">= 2.0.0")
   s.add_dependency("wash_out", ">= 0.10.0.beta.1")
   s.add_dependency("virtus", ">= 1.0.0")
 end