roda-route_list 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22860ddac7c2f5805445a274c59217bfd1b829f1
-  data.tar.gz: 75976d49b266e7f6a4783ba4a4e8376ce7807873
+  metadata.gz: 745db7ba79ed2650b068c20e5665ab0c7b96e78b
+  data.tar.gz: 963dbb5cf8bc7da828ebd287522f7e562e05a4e3
 SHA512:
-  metadata.gz: 676bb12a6726a91ea0c782e18bcb7f0d4c925748129e706abec2ae0e3d3a4b19c14c1aa52125b11c10fbd01a3240dbc3899a93fb29caec8de6370f2f15f46cdf
-  data.tar.gz: f026084da9cd254125f26abd4e3efe7b45703cdbd1ed0436669c9ef10aac413a0c8f57a727630fab3b4f2ba0561d45d53cbd6a2869fdfe228ceab45406e68c1e
+  metadata.gz: ec654b9fa1c3e65b62b238870e15b4d3824f4017d35f21d5a034e91cc23a74be5af3ea53a42d8c13e0ef1e4d69fb45b46b0681f37a5c40b4b5827f6b269393a5
+  data.tar.gz: 9c689b0166f9a48b417d3906ae4b15e9da3ba292a94a50ece93289f996532c316d4fe16a524f53846699330169072c62635078b42250f16878bfa1f36b5f4f8e

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 2.0.0 (2016-02-24)
+
+* Use Roda.listed_route instead of Road.named_route to not conflict with multi_route plugin (jeremyevans) (#1)
+
 = 1.0.0 (2015-03-08)
 
 * Initial public release

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Jeremy Evans
+Copyright (c) 2015-2016 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -49,15 +49,15 @@ get route information:
   route_list # => [{:path=>'/path/to/foo', :methods=>['GET', 'POST']}]
 
   # path for the route with the given name
-  named_route(:route_name) # => '/path/to/foo'
+  listed_route(:route_name) # => '/path/to/foo'
 
   # path for the route with the given name, supplying hash for placeholders
-  named_route(:foo, :foo_id=>3) # => '/path/to/foo/3'
+  listed_route(:foo, :foo_id=>3) # => '/path/to/foo/3'
 
   # path for the route with the given name, supplying array for placeholders
-  named_route(:foo, [3]) # => '/path/to/foo/3'
+  listed_route(:foo, [3]) # => '/path/to/foo/3'
 
-The +named_route+ method is also available at the instance level to make it
+The +listed_route+ method is also available at the instance level to make it
 easier to use inside the route block.
 
 === Automatically Updating the Routes Metadata

data/Rakefile

@@ -10,36 +10,14 @@ end
 
 ### Specs
 
-begin
-  begin
-    # RSpec 1
-    require "spec/rake/spectask"
-    spec_class = Spec::Rake::SpecTask
-    spec_files_meth = :spec_files=
-  rescue LoadError
-    # RSpec 2
-    require "rspec/core/rake_task"
-    spec_class = RSpec::Core::RakeTask
-    spec_files_meth = :pattern=
-  end
-
-  spec = lambda do |name, files, d|
-    lib_dir = File.join(File.dirname(File.expand_path(__FILE__)), 'lib')
-    ENV['RUBYLIB'] ? (ENV['RUBYLIB'] += ":#{lib_dir}") : (ENV['RUBYLIB'] = lib_dir)
-    desc d
-    spec_class.new(name) do |t|
-      ENV['RUBY'] = FileUtils::RUBY
-      t.send(spec_files_meth, files)
-    end
-  end
-
-  task :default => [:spec]
-  spec.call("spec", Dir["spec/*_spec.rb"], "Run specs")
-rescue LoadError
-  task :default do
-    puts "Must install rspec to run the default task (which runs specs)"
-  end
+desc "Build roda-route_list gem"
+task :spec do |p|
+  ENV['RUBY'] = FileUtils::RUBY
+  ENV['RUBYLIB'] = "ENV['RUBYLIB']:lib"
+  ENV['RUBYOPT'] = "-rubygems"
+  sh %{#{FileUtils::RUBY} spec/roda-route_list_spec.rb }
 end
+task :default=>:spec
 
 ### RDoc
 

data/lib/roda/plugins/route_list.rb

@@ -41,15 +41,15 @@ class Roda
     #   route_list # => [{:path=>'/path/to/foo', :methods=>['GET', 'POST']}]
     #
     #   # path for the route with the given name
-    #   named_route(:route_name) # => '/path/to/foo'
+    #   listed_route(:route_name) # => '/path/to/foo'
     #
     #   # path for the route with the given name, supplying hash for placeholders
-    #   named_route(:foo, :foo_id=>3) # => '/path/to/foo/3'
+    #   listed_route(:foo, :foo_id=>3) # => '/path/to/foo/3'
     #
     #   # path for the route with the given name, supplying array for placeholders
-    #   named_route(:foo, [3]) # => '/path/to/foo/3'
+    #   listed_route(:foo, [3]) # => '/path/to/foo/3'
     #
-    # The +named_route+ method is also available at the instance level to make it
+    # The +listed_route+ method is also available at the instance level to make it
     # easier to use inside the route block.
     module RouteList
       # Set the file to load the routes metadata from.  Options:
@@ -68,7 +68,7 @@ class Roda
         # values in the path are replaced with the matching values in args.
         # If args is an array, placeholder values are taken from the array
         # in order.
-        def named_route(name, args=nil)
+        def listed_route(name, args=nil)
           unless path = @route_list_names[name]
             raise RodaError, "no route exists with the name: #{name.inspect}"
           end
@@ -112,7 +112,7 @@ class Roda
             route = {:path=>path}
 
             if methods = r['methods']
-              route[:methods] = methods.map{|x| x.to_sym}
+              route[:methods] = methods.map(&:to_sym)
             end
 
             if name = r['name']
@@ -131,11 +131,11 @@ class Roda
       end
       
       module InstanceMethods
-        # Calls the app's named_route method.  If the app's :add_script_name option
+        # Calls the app's listed_route method.  If the app's :add_script_name option
         # has been setting, prefixes the resulting path with the script name.
-        def named_route(name, args=nil)
+        def listed_route(name, args=nil)
           app = self.class
-          path = app.named_route(name, args)
+          path = app.listed_route(name, args)
           path = request.script_name.to_s + path if app.opts[:add_script_name]
           path
         end

data/spec/roda-route_list_spec.rb

@@ -1,16 +1,6 @@
 require 'roda'
 require 'json'
-
-if defined?(RSpec)
-  require 'rspec/version'
-  if RSpec::Version::STRING >= '2.11.0'
-    RSpec.configure do |config|
-      config.expect_with :rspec do |c|
-        c.syntax = :should
-      end
-    end
-  end
-end
+require 'minitest/autorun'
 
 describe 'roda-route_list plugin' do
   def req(path='/', env={})
@@ -36,7 +26,7 @@ describe 'roda-route_list plugin' do
     @app = Class.new(Roda)
     @app.plugin :route_list, :file=>'spec/routes.json'
     @app.route do |r|
-      named_route(env['PATH_INFO'].to_sym)
+      listed_route(env['PATH_INFO'].to_sym)
     end
     @app
   end
@@ -46,7 +36,7 @@ describe 'roda-route_list plugin' do
   end
 
   it "should correctly parse the routes from the json file" do
-    @app.route_list.should == [
+    @app.route_list.must_equal [
       {:path=>'/foo'},
       {:path=>'/foo/bar', :name=>:bar},
       {:path=>'/foo/baz', :methods=>[:GET]},
@@ -58,51 +48,51 @@ describe 'roda-route_list plugin' do
     @app = Class.new(Roda)
     @app.opts[:root] = 'spec'
     @app.plugin :route_list, :file=>'routes2.json'
-    @app.route_list.should == [{:path=>'/foo'}]
+    @app.route_list.must_equal [{:path=>'/foo'}]
   end
 
-  it ".named_route should return path for route" do
-    @app.named_route(:bar).should == '/foo/bar'
-    @app.named_route(:quux).should == '/foo/baz/quux/:quux_id'
+  it ".listed_route should return path for route" do
+    @app.listed_route(:bar).must_equal '/foo/bar'
+    @app.listed_route(:quux).must_equal '/foo/baz/quux/:quux_id'
   end
 
-  it ".named_route should return path for route when given a values hash" do
-    @app.named_route(:quux, :quux_id=>3).should == '/foo/baz/quux/3'
+  it ".listed_route should return path for route when given a values hash" do
+    @app.listed_route(:quux, :quux_id=>3).must_equal '/foo/baz/quux/3'
   end
 
-  it ".named_route should return path for route when given a values array" do
-    @app.named_route(:quux, [3]).should == '/foo/baz/quux/3'
+  it ".listed_route should return path for route when given a values array" do
+    @app.listed_route(:quux, [3]).must_equal '/foo/baz/quux/3'
   end
 
-  it ".named_route should raise RodaError if there is no matching route" do
-    proc{@app.named_route(:foo)}.should raise_error(Roda::RodaError)
+  it ".listed_route should raise RodaError if there is no matching route" do
+    proc{@app.listed_route(:foo)}.must_raise(Roda::RodaError)
   end
 
-  it ".named_route should raise RodaError if there is no matching value when using a values hash" do
-    proc{@app.named_route(:quux, {})}.should raise_error(Roda::RodaError)
+  it ".listed_route should raise RodaError if there is no matching value when using a values hash" do
+    proc{@app.listed_route(:quux, {})}.must_raise(Roda::RodaError)
   end
 
-  it ".named_route should raise RodaError if there is no matching value when using a values array" do
-    proc{@app.named_route(:quux, [])}.should raise_error(Roda::RodaError)
+  it ".listed_route should raise RodaError if there is no matching value when using a values array" do
+    proc{@app.listed_route(:quux, [])}.must_raise(Roda::RodaError)
   end
 
-  it ".named_route should raise RodaError if there are too many values when using a values array" do
-    proc{@app.named_route(:quux, [3, 1])}.should raise_error(Roda::RodaError)
+  it ".listed_route should raise RodaError if there are too many values when using a values array" do
+    proc{@app.listed_route(:quux, [3, 1])}.must_raise(Roda::RodaError)
   end
 
   it "should allow parsing routes from a separate file" do
     @app.plugin :route_list, :file=>'spec/routes2.json'
-    @app.route_list.should == [{:path=>'/foo'}]
+    @app.route_list.must_equal [{:path=>'/foo'}]
   end
 
-  it "#named_route should work" do
-    body('bar').should == '/foo/bar'
+  it "#listed_route should work" do
+    body('bar').must_equal '/foo/bar'
   end
 
-  it "#named_route should respect :add_script_name option" do
+  it "#listed_route should respect :add_script_name option" do
     @app.opts[:add_script_name] = true
-    body('bar').should == '/foo/bar'
-    body('bar', 'SCRIPT_NAME'=>'/a').should == '/a/foo/bar'
+    body('bar').must_equal '/foo/bar'
+    body('bar', 'SCRIPT_NAME'=>'/a').must_equal '/a/foo/bar'
   end
 end
 
@@ -112,8 +102,8 @@ describe 'roda-route_parser executable' do
   end
 
   it "should correctly parse the routes" do
-    system(ENV['RUBY'], "bin/roda-parse_routes", "-f", "spec/routes-example.json", "spec/routes.example")
-    File.file?("spec/routes-example.json").should == true
-    JSON.parse(File.read('spec/routes-example.json')).should == JSON.parse(File.read('spec/routes.json'))
+    system(ENV['RUBY'] || 'ruby', "bin/roda-parse_routes", "-f", "spec/routes-example.json", "spec/routes.example")
+    File.file?("spec/routes-example.json").must_equal true
+    JSON.parse(File.read('spec/routes-example.json')).must_equal JSON.parse(File.read('spec/routes.json'))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda-route_list
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 description: |
   Roda, like other routing tree web frameworks, doesn't have the ability
   to introspect routes.  roda-route_list offers a way to specify a json
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: List routes when using Roda