strawberry_cough 0.2.0 → 0.3.0

data/Gemfile

@@ -4,8 +4,8 @@ gemspec
 
 gem 'rake'
 
-gem 'activesupport', '~> 3.1'
-gem 'railties', '~> 3.1'
+gem 'activesupport', '~> 3.2'
+gem 'railties', '~> 3.2'
 gem 'tilt'
 gem 'sprockets-rails'
 

data/Gemfile.lock

@@ -6,74 +6,74 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.2)
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
+    activesupport (3.2.8)
       i18n (~> 0.6)
-    activesupport (3.1.1)
       multi_json (~> 1.0)
-    builder (3.0.0)
+    builder (3.0.4)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     hike (1.2.1)
-    i18n (0.6.0)
-    json (1.6.1)
-    multi_json (1.0.3)
-    rack (1.3.5)
-    rack-cache (1.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
+    libv8 (3.3.10.4)
+    multi_json (1.3.6)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    railties (3.1.1)
-      actionpack (= 3.1.1)
-      activesupport (= 3.1.1)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    sprockets (2.0.3)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sprockets-rails (0.0.1)
       sprockets (>= 1.0.2)
-    therubyracer (0.8.1)
-    thor (0.14.6)
+    therubyracer (0.10.2)
+      libv8 (~> 3.3.10)
+    thor (0.16.0)
     tilt (1.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 3.1)
+  activesupport (~> 3.2)
   bundler (>= 1.0.0)
-  railties (~> 3.1)
+  railties (~> 3.2)
   rake
   rspec
   sprockets-rails

data/README.md

@@ -26,6 +26,10 @@ Installation
 
 To install, just add the following line to your Gemfile.
 
+    For Rails 3.1:
+    gem 'strawberry_cough', "= 0.2.0"
+
+    For Rails 3.2+:
     gem 'strawberry_cough'
 
 Then `//= require routes` in the JavaScript manifest file.

data/lib/strawberry_cough.rb

@@ -2,5 +2,5 @@ require 'strawberry_cough/version'
 require 'strawberry_cough/path_compiler'
 require 'strawberry_cough/path_parser'
 require 'strawberry_cough/routes_compiler'
-require 'strawberry_cough/rails/engine'
-require 'strawberry_cough/routes_js_template'
+require 'strawberry_cough/rails/railtie'
+require 'strawberry_cough/routes_js_template'

data/lib/strawberry_cough/rails/{engine.rb → railtie.rb}

@@ -1,9 +1,14 @@
 require 'strawberry_cough/routes_compiler'
-require 'rails/engine'
+require 'sprockets'
+begin
+ require 'sprockets/railtie'
+rescue LoadError
+ require 'sprockets/rails/railtie'
+end
 
 module StrawberryCough
   module Rails
-    class Engine < ::Rails::Engine
+    class Railtie < ::Rails::Engine
       config.before_initialize do
         if defined?(Sprockets::Engines)
           Sprockets::Engines
@@ -12,4 +17,4 @@ module StrawberryCough
       end
     end
   end
-end
+end

data/lib/strawberry_cough/routes_compiler.rb

@@ -14,7 +14,7 @@ module StrawberryCough
     def self.compile(route_set)
       functions = named_routes(route_set).inject(Set.new) do |memo, route|
         name = route.name.camelize(:lower) + "Path"
-        memo << "#{name} : " + PathCompiler.compile(route.path)
+        memo << "#{name} : " + PathCompiler.compile(route.path.spec.to_s)
       end.to_a.join(',')
 
       <<-COMPILED

data/lib/strawberry_cough/version.rb

@@ -1,4 +1,4 @@
 module StrawberryCough
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end
 

data/spec/routes_compiler_spec.rb

@@ -13,7 +13,11 @@ describe StrawberryCough::RoutesCompiler do
 
   it "makes a Routes JavaScript object when given an array of routes" do
     route = double('route')
-    route.stub(:path) { "/parent/:id/edit(.:format)" }
+    path = Object.new
+    spec = "/parent/:id/edit(.:format)"
+    path.stub(:spec) { spec }
+    route.stub(:path) { path }
+
     route.stub(:name) { "edit_parent" }
     routes_object = compiler.compile([route])
     interpreter.eval(routes_object)

data/spec/spec_helper.rb

@@ -4,6 +4,4 @@ $:.unshift lib_dir unless $:.include?(lib_dir)
 require 'rspec'
 require 'v8'
 
-require 'strawberry_cough'
-
-alias :context :describe
+require 'strawberry_cough'

data/strawberry_cough.gemspec

@@ -17,4 +17,4 @@ Gem::Specification.new do |s|
 
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strawberry_cough
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -54,7 +54,7 @@ files:
 - lib/strawberry_cough.rb
 - lib/strawberry_cough/path_compiler.rb
 - lib/strawberry_cough/path_parser.rb
-- lib/strawberry_cough/rails/engine.rb
+- lib/strawberry_cough/rails/railtie.rb
 - lib/strawberry_cough/routes_compiler.rb
 - lib/strawberry_cough/routes_js_template.rb
 - lib/strawberry_cough/version.rb