Update to work with ruby 1.9.3

.gitignore

@@ -2,5 +2,5 @@ pkg
 .DS_Store
 log
 doc
-rmixr-*.gem
+remixr-*.gem
 rdoc

History

@@ -1 +1,2 @@
+0.0.2 - updated for ruby 1.9.3
 0.0.1 - initial release

Rakefile

@@ -14,7 +14,7 @@ begin
     gem.files             = FileList["[A-Z]*", "{examples,lib,test}/**/*"]
 
     gem.add_dependency('mash', '0.0.3')
-    gem.add_dependency('httparty', '0.4.3')
+    gem.add_dependency('httparty', '0.9')
 
     gem.add_development_dependency('thoughtbot-shoulda')
     gem.add_development_dependency('jeremymcanally-matchy')

VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :patch: 0
 :major: 0
-:minor: 1
+:minor: 2

lib/remixr.rb

@@ -4,7 +4,7 @@
 gem 'mash', '0.0.3'
 require 'mash'
 
-gem 'httparty', '0.4.3'
+gem 'httparty', '0.9'
 require 'httparty'
 
 class APIKeyNotSet   < StandardError; end

remixr.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remixr}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wynn Netherland", "Jim Mulholland"]
@@ -61,26 +61,26 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mash>, ["= 0.0.3"])
-      s.add_runtime_dependency(%q<httparty>, ["= 0.4.3"])
+      s.add_runtime_dependency(%q<httparty>, ["= 0.9"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_development_dependency(%q<jeremymcanally-matchy>, [">= 0"])
+      s.add_development_dependency(%q<mcmire-matchy>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<fakeweb>, [">= 0"])
       s.add_development_dependency(%q<mash>, [">= 0"])
     else
       s.add_dependency(%q<mash>, ["= 0.0.3"])
-      s.add_dependency(%q<httparty>, ["= 0.4.3"])
+      s.add_dependency(%q<httparty>, ["= 0.9"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_dependency(%q<jeremymcanally-matchy>, [">= 0"])
+      s.add_dependency(%q<mcmire-matchy>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<fakeweb>, [">= 0"])
       s.add_dependency(%q<mash>, [">= 0"])
     end
   else
     s.add_dependency(%q<mash>, ["= 0.0.3"])
-    s.add_dependency(%q<httparty>, ["= 0.4.3"])
+    s.add_dependency(%q<httparty>, ["= 0.9"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    s.add_dependency(%q<jeremymcanally-matchy>, [">= 0"])
+    s.add_dependency(%q<mcmire-matchy>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<fakeweb>, [">= 0"])
     s.add_dependency(%q<mash>, [">= 0"])

test/remixr/client_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper.rb'
 
 class ClientTest < Test::Unit::TestCase
   include Remixr

test/test_helper.rb

@@ -5,6 +5,15 @@
 require 'mocha'
 require 'fakeweb'
 
+# need rails for our tests to run
+gem 'actionpack', '>= 3.0.0'
+gem 'activesupport', '>= 3.0.0'
+gem 'activemodel', '>= 3.0.0'
+gem 'railties', '>= 3.0.0'
+
+require 'action_controller/railtie'
+
+
 FakeWeb.allow_net_connect = false
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))