eastwood 0.3.8 → 0.4.0

data/app/assets/javascripts/eastwood.js.coffee.erb

@@ -16,12 +16,12 @@ app.exports =
 ###*
  * Routes
 ###
-<% if routes.any? or hashes.any? %>
+<% if server_routes.any? or client_routes.any? %>
 app.routes =
-<% routes.each do |key, route| %>
+<% server_routes.each do |key, route| %>
   <%= route.coffee_name %> : ( <%= route.coffee_args %> ) -> "<%= route.coffee_path %>"
 <% end %>
-<% hashes.each do |key, route| %>
+<% client_routes.each do |key, route| %>
   <%= route.coffee_name %> : ( <%= route.coffee_args %> ) -> "<%= route.coffee_path %>"
 <% end %>
 <% end %>

data/gemfiles/rails-3.1.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/jeremyruppel/Git/eastwood
   specs:
-    eastwood (0.3.7)
+    eastwood (0.3.8)
       coffee-rails
       rails (>= 3.1.0)
 

data/gemfiles/rails-3.2.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/jeremyruppel/Git/eastwood
   specs:
-    eastwood (0.3.7)
+    eastwood (0.3.8)
       coffee-rails
       rails (>= 3.1.0)
 

data/lib/eastwood/config.rb

@@ -9,11 +9,19 @@ module Eastwood
     module ClassMethods
 
       def hash( name, route )
-        hashes[ name ] = route
+        hashes[ name ] = [ route, 'hash' ]
       end
 
-      def hashes
-        @@hashes ||= Hash.new
+      def path( name, route )
+        paths[ name ] = [ route, 'path' ]
+      end
+
+      def url( name, route )
+        urls[ name ] = [ route, 'url' ]
+      end
+
+      def custom_routes
+        hashes.merge paths.merge urls
       end
 
       def export( *args )
@@ -33,6 +41,20 @@ module Eastwood
         @@javascript_route_style = :underscore
         @@javascript_namespace   = nil
       end
+
+      protected
+
+      def hashes
+        @@hashes ||= Hash.new
+      end
+
+      def paths
+        @@paths ||= Hash.new
+      end
+
+      def urls
+        @@urls ||= Hash.new
+      end
     end
   end
 end

data/lib/eastwood/context/{hash_route.rb → client_route.rb}

@@ -1,6 +1,6 @@
 module Eastwood
   module Context
-    class HashRoute < Struct.new( :key, :hash )
+    class ClientRoute < Struct.new( :key, :route, :suffix )
       include RouteHelpers
 
       def name
@@ -8,15 +8,15 @@ module Eastwood
       end
 
       def parts
-        hash.scan( /:(\w+)/ ).flatten.map &:to_sym
+        route.scan( /:(\w+)/ ).flatten.map &:to_sym
       end
 
       def path
-        hash
+        route
       end
 
       def coffee_name
-        style_for_javascript "#{name}_hash"
+        style_for_javascript "#{name}_#{suffix}"
       end
 
       def coffee_args

data/lib/eastwood/context.rb

@@ -13,18 +13,18 @@ module Eastwood
       env === 'test' ? '( @window = { } )' : 'window'
     end
 
-    def routes
+    def server_routes
       # TODO would kind of like to find a better way to transform
       # these values into my routes, but keep as a hash
       # http://www.ruby-forum.com/topic/185611
       named_routes.merge( named_routes ) { |key, route| route_class.new route, route_format }
     end
 
-    def hashes
+    def client_routes
       # TODO would kind of like to find a better way to transform
       # these values into my routes, but keep as a hash
       # http://www.ruby-forum.com/topic/185611
-      named_hashes.merge( named_hashes ){ |key, hash| HashRoute.new key, hash }
+      custom_routes.merge( custom_routes ){ |key, (route, suffix)| ClientRoute.new key, route, suffix }
     end
 
     def exports
@@ -45,8 +45,8 @@ module Eastwood
       [ '', false ].include? Eastwood.default_route_format
     end
 
-    def named_hashes
-      Eastwood.hashes
+    def custom_routes
+      Eastwood.custom_routes
     end
 
     def named_routes

data/lib/eastwood/version.rb

@@ -1,3 +1,3 @@
 module Eastwood
-  VERSION = "0.3.8"
+  VERSION = "0.4.0"
 end

data/lib/eastwood.rb

@@ -7,7 +7,7 @@ module Eastwood
   module Context
     autoload :ActionRoute,  'eastwood/context/action_route'
     autoload :JourneyRoute, 'eastwood/context/journey_route'
-    autoload :HashRoute,    'eastwood/context/hash_route'
+    autoload :ClientRoute,  'eastwood/context/client_route'
     autoload :RouteHelpers, 'eastwood/context/route_helpers'
   end
 

data/spec/requests/eastwood_spec.rb

@@ -78,6 +78,24 @@ describe 'eastwood.js' do
     end
   end
 
+  describe 'about_path' do
+    it 'should be defined' do
+      context.eval( "typeof #{routes}.about_path" ).should eq( 'function' )
+    end
+    it 'should return the correct path' do
+      context.call( "#{routes}.about_path", 'foo' ).should eq( '/about/foo' )
+    end
+  end
+
+  describe 'google_url' do
+    it 'should be defined' do
+      context.eval( "typeof #{routes}.google_url" ).should eq( 'function' )
+    end
+    it 'should return the correct url' do
+      context.call( "#{routes}.google_url" ).should eq( 'http://www.google.com/search' )
+    end
+  end
+
   describe 'exports' do
     it 'should be defined' do
       context.eval( "typeof #{exports}" ).should eq( 'object' )

data/spec/support/rails_template.rb

@@ -21,6 +21,10 @@ Eastwood.configure do |config|
   config.hash :user, '#/users/:id'
   config.hash :post, '#/users/:id/posts/:slug'
 
+  config.path :about, '/about/:topic'
+
+  config.url :google, 'http://www.google.com/search'
+
   config.export :string  => 'foo',
                 :float   => 123.45,
                 :boolean => true

data/spec/unit/config_spec.rb

@@ -29,12 +29,40 @@ describe Eastwood do
 
     describe 'adding a hash' do
       before do
-        Eastwood.hash :foo, '#/bar'
+        Eastwood.hash :myhash, '#/bar'
       end
 
-      subject { Eastwood.hashes }
+      subject { Eastwood.custom_routes }
 
-      it { should include( :foo => '#/bar' ) }
+      it { should include( :myhash => [ '#/bar', 'hash' ] ) }
+    end
+  end
+
+  describe '#path' do
+    it { should respond_to( :path ) }
+
+    describe 'adding a path' do
+      before do
+        Eastwood.path :mypath, '/foo/bar'
+      end
+
+      subject { Eastwood.custom_routes }
+
+      it { should include( :mypath => [ '/foo/bar', 'path' ] ) }
+    end
+  end
+
+  describe '#url' do
+    it { should respond_to( :url ) }
+
+    describe 'adding a url' do
+      before do
+        Eastwood.url :myurl, 'http://www.foo.com'
+      end
+
+      subject { Eastwood.custom_routes }
+
+      it { should include( :myurl => [ 'http://www.foo.com', 'url' ] ) }
     end
   end
 

data/spec/unit/context_spec.rb

@@ -25,14 +25,14 @@ describe 'the Sprockets context class' do
     it { should delegate( :env ).to( Eastwood, :env ) }
   end
 
-  describe '#routes' do
-    it { should respond_to( :routes ) }
-    its( :routes ){ should be_a( Hash ) }
+  describe '#server_routes' do
+    it { should respond_to( :server_routes ) }
+    its( :server_routes ){ should be_a( Hash ) }
   end
 
-  describe '#hashes' do
-    it { should respond_to( :hashes ) }
-    its( :hashes ){ should be_a( Hash ) }
+  describe '#client_routes' do
+    it { should respond_to( :client_routes ) }
+    its( :client_routes ){ should be_a( Hash ) }
   end
 
   describe '#exports' do
@@ -70,11 +70,11 @@ describe 'the Sprockets context class' do
   end
 end
 
-describe 'routes' do
+describe 'sever routes' do
   let( :context ){ ::Rails.application.assets.context_class.new nil, nil, nil }
 
   describe 'eastwood_engine' do
-    subject { context.routes[ :eastwood_engine ] }
+    subject { context.server_routes[ :eastwood_engine ] }
 
     its( :name  ){ should eq( 'eastwood_engine' ) }
     its( :path  ){ should eq( '/eastwood' ) }
@@ -86,7 +86,7 @@ describe 'routes' do
   end
 
   describe 'match' do
-    subject { context.routes[ :match ] }
+    subject { context.server_routes[ :match ] }
 
     its( :name  ){ should eq( 'match' ) }
     its( :path  ){ should eq( '/foo.:format' ) }
@@ -98,7 +98,7 @@ describe 'routes' do
   end
 
   describe 'match with segment' do
-    subject { context.routes[ :match_with_segment ] }
+    subject { context.server_routes[ :match_with_segment ] }
 
     its( :name  ){ should eq( 'match_with_segment' ) }
     its( :path  ){ should eq( '/foo/:id.:format' ) }
@@ -110,11 +110,11 @@ describe 'routes' do
   end
 end
 
-describe 'hashes' do
+describe 'client routes' do
   let( :context ){ ::Rails.application.assets.context_class.new nil, nil, nil }
 
   describe 'home' do
-    subject { context.hashes[ :home ] }
+    subject { context.client_routes[ :home ] }
 
     its( :name  ){ should eq( 'home' ) }
     its( :path  ){ should eq( '#/home' ) }
@@ -126,7 +126,7 @@ describe 'hashes' do
   end
 
   describe 'user' do
-    subject { context.hashes[ :user ] }
+    subject { context.client_routes[ :user ] }
 
     its( :name  ){ should eq( 'user' ) }
     its( :path  ){ should eq( '#/users/:id' ) }
@@ -138,7 +138,7 @@ describe 'hashes' do
   end
 
   describe 'post' do
-    subject { context.hashes[ :post ] }
+    subject { context.client_routes[ :post ] }
 
     its( :name  ){ should eq( 'post' ) }
     its( :path  ){ should eq( '#/users/:id/posts/:slug' ) }

data/spec/unit/format_spec.rb

@@ -46,7 +46,7 @@ describe 'route formatting' do
 
   describe 'including the format in routes' do
     let( :context ){ ::Rails.application.assets.context_class.new nil, nil, nil }
-    subject { context.routes[ :match ] }
+    subject { context.server_routes[ :match ] }
 
     context 'default format' do
       its( :coffee_args ){ should eq( "format='.json'" ) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eastwood
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &120640 !ruby/object:Gem::Requirement
+  requirement: &120730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *120640
+  version_requirements: *120730
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &120330 !ruby/object:Gem::Requirement
+  requirement: &120430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *120330
+  version_requirements: *120430
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &120090 !ruby/object:Gem::Requirement
+  requirement: &120180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *120090
+  version_requirements: *120180
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &119730 !ruby/object:Gem::Requirement
+  requirement: &119830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *119730
+  version_requirements: *119830
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &119370 !ruby/object:Gem::Requirement
+  requirement: &119480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *119370
+  version_requirements: *119480
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &118820 !ruby/object:Gem::Requirement
+  requirement: &119100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *118820
+  version_requirements: *119100
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &117720 !ruby/object:Gem::Requirement
+  requirement: &118100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *117720
+  version_requirements: *118100
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &116710 !ruby/object:Gem::Requirement
+  requirement: &116830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,7 +98,7 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *116710
+  version_requirements: *116830
 description: Start your client side out right
 email:
 - jeremy.ruppel@gmail.com
@@ -125,7 +125,7 @@ files:
 - lib/eastwood/config.rb
 - lib/eastwood/context.rb
 - lib/eastwood/context/action_route.rb
-- lib/eastwood/context/hash_route.rb
+- lib/eastwood/context/client_route.rb
 - lib/eastwood/context/journey_route.rb
 - lib/eastwood/context/route_helpers.rb
 - lib/eastwood/engine.rb