padrino-core 0.10.5 → 0.10.6.a

data/lib/padrino-core.rb

@@ -112,21 +112,6 @@ module Padrino
       nil
     end
 
-    ##
-    # Determines whether the dependencies are locked by Bundler.
-    # otherwise return nil
-    #
-    # @return [:locked, :unlocked, nil]
-    #   Returns +:locked+ if the +Gemfile.lock+ file exists, or +:unlocked+
-    #   if only the +Gemfile+ exists.
-    #
-    # @deprecated Will be removed in 1.0.0
-    #
-    def bundle
-      return :locked   if File.exist?(root('Gemfile.lock'))
-      return :unlocked if File.exist?(root("Gemfile"))
-    end
-
     ##
     # A Rack::Builder object that allows to add middlewares in front of all
     # Padrino applications.

data/lib/padrino-core/application/routing.rb

@@ -519,24 +519,24 @@ module Padrino
         # Rewrite default routes.
         #
         # @example
-        #   get :index                                    # => "/"
-        #   get :index, "/"                               # => "/"
-        #   get :index, :map => "/"                       # => "/"
-        #   get :show, "/show-me"                         # => "/show-me"
-        #   get :show,  :map => "/show-me"                # => "/show-me"
-        #   get "/foo/bar"                                # => "/show"
-        #   get :index, :parent => :user                  # => "/user/:user_id/index"
-        #   get :show, :with => :id, :parent => :user     # => "/user/:user_id/show/:id"
-        #   get :show, :with => :id                       # => "/show/:id"
-        #   get [:show, :id]                              # => "/show/:id"
-        #   get :show, :with => [:id, :name]              # => "/show/:id/:name"
-        #   get [:show, :id, :name]                       # => "/show/:id/:name"
-        #   get :list, :provides => :js                   # => "/list.{:format,js)"
-        #   get :list, :provides => :any                  # => "/list(.:format)"
-        #   get :list, :provides => [:js, :json]          # => "/list.{!format,js|json}"
-        #   get :list, :provides => [:html, :js, :json]   # => "/list(.{!format,js|json})"
-        #   get :list, :priority => :low                  # Defers route to be last
-        #
+        #   get :index                                             # => "/"
+        #   get :index, "/"                                        # => "/"
+        #   get :index, :map => "/"                                # => "/"
+        #   get :show, "/show-me"                                  # => "/show-me"
+        #   get :show,  :map => "/show-me"                         # => "/show-me"
+        #   get "/foo/bar"                                         # => "/show"
+        #   get :index, :parent => :user                           # => "/user/:user_id/index"
+        #   get :show, :with => :id, :parent => :user              # => "/user/:user_id/show/:id"
+        #   get :show, :with => :id                                # => "/show/:id"
+        #   get [:show, :id]                                       # => "/show/:id"
+        #   get :show, :with => [:id, :name]                       # => "/show/:id/:name"
+        #   get [:show, :id, :name]                                # => "/show/:id/:name"
+        #   get :list, :provides => :js                            # => "/list.{:format,js)"
+        #   get :list, :provides => :any                           # => "/list(.:format)"
+        #   get :list, :provides => [:js, :json]                   # => "/list.{!format,js|json}"
+        #   get :list, :provides => [:html, :js, :json]            # => "/list(.{!format,js|json})"
+        #   get :list, :priority => :low                           # Defers route to be last
+        #   get /pattern/, :name => :foo, :generate_with => '/foo' # Generates :foo as /foo
         def route(verb, path, *args, &block)
           options = case args.size
             when 2
@@ -557,7 +557,7 @@ module Padrino
           route_options = options.dup
           route_options[:provides] = @_provides if @_provides
           path, *route_options[:with] = path if path.is_a?(Array)
-          path, name, options = *parse_route(path, route_options, verb)
+          path, name, options, route_options = *parse_route(path, route_options, verb)
           options.reverse_merge!(@_conditions) if @_conditions
 
           # Sinatra defaults
@@ -571,7 +571,7 @@ module Padrino
           invoke_hook(:route_added, verb, path, block)
 
           # HTTPRouter route construction
-          route = router.add(path)
+          route = router.add(path, route_options)
           route.name(name) if name
           priority_name = options.delete(:priority) || :normal
           priority = ROUTE_PRIORITY[priority_name] or raise("Priority #{priority_name} not recognized, try #{ROUTE_PRIORITY.keys.join(', ')}")
@@ -620,6 +620,9 @@ module Padrino
           # We need save our originals path/options so we can perform correctly cache.
           original = [path, options.dup]
 
+          # options for the route directly
+          route_options = {}
+
           # We need check if path is a symbol, if that it's a named route
           map = options.delete(:map)
 
@@ -628,7 +631,11 @@ module Padrino
             path = map ? map.dup : (path == :index ? '/' : path.to_s)  # The route path
           end
 
-          if path.kind_of?(String) # path i.e "/index" or "/show"
+          # Build our controller
+          controller = Array(@_controller).map { |c| c.to_s }
+
+          case path
+          when String # path i.e "/index" or "/show"
             # Now we need to parse our 'with' params
             if with_params = options.delete(:with)
               path = process_path_for_with_params(path, with_params)
@@ -643,9 +650,6 @@ module Padrino
               options[:matching][:format] = /[^\.]+/
             end
 
-            # Build our controller
-            controller = Array(@_controller).map { |c| c.to_s }
-
             absolute_map = map && map[0] == ?/
 
             unless controller.empty?
@@ -656,10 +660,6 @@ module Padrino
                 path = File.join(controller_path, path)
               end
               # Here we build the correct name route
-              if name
-                controller_name = controller.join("_")
-                name = "#{controller_name}_#{name}".to_sym unless controller_name.blank?
-              end
             end
 
             # Now we need to parse our 'parent' params and parent scope
@@ -678,12 +678,21 @@ module Padrino
             path.sub!(%r{/(\))?$}, '\\1') if path != "/" # Remove latest trailing delimiter
             path.gsub!(/\/(\(\.|$)/, '\\1')              # Remove trailing slashes
             path.squeeze!('/')
+          when Regexp
+            route_options[:path_for_generation] = options.delete(:generate_with) if options.key?(:generate_with)
+          end
+
+          name = options.delete(:route_name) if name.nil? && options.key?(:route_name)
+          name = options.delete(:name) if name.nil? && options.key?(:name)
+          if name
+            controller_name = controller.join("_")
+            name = "#{controller_name}_#{name}".to_sym unless controller_name.blank?
           end
 
           # Merge in option defaults
           options.reverse_merge!(:default_values => @_defaults)
 
-          [path, name, options]
+          [path, name, options, route_options]
         end
 
         ##

data/lib/padrino-core/cli/base.rb

@@ -41,7 +41,6 @@ module Padrino
       method_option :environment, :type => :string,  :aliases => "-e", :required => true, :default => :development
       method_option :list,        :type => :string,  :aliases => "-T", :desc => "Display the tasks (matching optional PATTERN) with descriptions, then exit."
       method_option :trace,       :type => :boolean, :aliases => "-t", :desc => "Turn on invoke/execute tracing, enable full backtrace."
-      method_option :verbose,     :type => :boolean, :aliases => "-v", :desc => "Log message to standard output."
       def rake(*args)
         prepare :rake
         args << "-T" if options[:list]
@@ -51,9 +50,8 @@ module Padrino
         ARGV.clear
         ARGV.concat(args)
         puts "=> Executing Rake #{ARGV.join(' ')} ..."
-        ENV['PADRINO_LOG_LEVEL'] ||= "test"
         load File.expand_path('../rake.rb', __FILE__)
-        silence(:stdout) { require File.expand_path('config/boot.rb') }
+        require File.expand_path('config/boot.rb')
         PadrinoTasks.init(true)
       end
 
@@ -80,7 +78,7 @@ module Padrino
           require 'padrino-core/command'
           require 'padrino-gen/command'
           ARGV.shift
-          Padrino.bin_gen(ARGV)
+          Padrino.bin_gen(*ARGV)
         rescue
           puts "<= You need padrino-gen! Run: gem install padrino-gen"
         end

data/lib/padrino-core/locale/lv.yml

@@ -4,7 +4,7 @@ lv:
       # Use the strftime parameters for formats.
       # When no format has been given, it uses default.
       # You can provide other formats here if you like!
-      default: "%d.%m.%Y."
+      default: "%d.%m.%Y"
       short: "%e. %B"
       long: "%Y. gada %e. %B"
       only_day: "%e"
@@ -21,7 +21,7 @@ lv:
   time:
     formats:
       default: "%Y. gada %e. %B, %H:%M"
-      short: "%d.%m.%Y., %H:%M"
+      short: "%d.%m.%Y, %H:%M"
       long: "%Y. gada %e. %B, %H:%M:%S"
     am: "priekšpusdiena"
     pm: "pēcpusdiena"

data/lib/padrino-core/server.rb

@@ -44,7 +44,7 @@ module Padrino
       [:INT, :TERM].each { |sig| trap(sig) { exit } }
       super
     ensure
-      puts "<= Padrino has ended his set (crowd applauds)" unless options[:daemonize]
+      puts "<= Padrino leaves the gun, takes the cannoli" unless options[:daemonize]
     end
 
     # The application the server will run.

data/lib/padrino-core/version.rb

@@ -6,7 +6,7 @@
 #
 module Padrino
   # The version constant for the current version of Padrino.
-  VERSION = '0.10.5' unless defined?(Padrino::VERSION)
+  VERSION = '0.10.6.a' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

data/padrino-core.gemspec

@@ -34,5 +34,5 @@ Gem::Specification.new do |s|
   s.add_dependency("sinatra", "~> 1.3.1")
   s.add_dependency("http_router", "~> 0.10.2")
   s.add_dependency("thor", "~> 0.14.3")
-  s.add_dependency("activesupport", "~> 3.1.0")
+  s.add_dependency("activesupport", "~> 3.2.0")
 end

data/test/helper.rb

@@ -44,6 +44,8 @@ class MiniTest::Spec
     else
       super(name, *args, &block)
     end
+  rescue Rack::Test::Error # no response yet
+    super(name, *args, &block)
   end
 
   alias :response :last_response

data/test/test_core.rb

@@ -15,7 +15,6 @@ describe "Core" do
       assert_respond_to Padrino, :load!
       assert_respond_to Padrino, :reload!
       assert_respond_to Padrino, :version
-      assert_respond_to Padrino, :bundle
       assert_respond_to Padrino, :configure_apps
     end
 
@@ -23,7 +22,6 @@ describe "Core" do
     should 'validate global helpers' do
       assert_equal :test, Padrino.env
       assert_match /\/test/, Padrino.root
-      assert_equal nil, Padrino.bundle
       assert_not_nil Padrino.version
     end
 

data/test/test_routing.rb

@@ -78,6 +78,13 @@ describe "Routing" do
     assert_equal "My lucky number: 99 99", body
   end
 
+  should 'accept regexp routes with generate with :generate_with' do
+    mock_app do
+      get(%r{/fob|/baz}, :name => :foo, :generate_with => '/fob') { "regexp" }
+    end
+    assert_equal "/fob", @app.url(:foo)
+  end
+
   should "parse routes with question marks" do
     mock_app do
       get("/foo/?"){ "okey" }

metadata

@@ -1,8 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.10.5
+  hash: 98
+  prerelease: 7
+  segments: 
+  - 0
+  - 10
+  - 6
+  - a
+  version: 0.10.6.a
 platform: ruby
 authors: 
 - Padrino Team
@@ -13,8 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-12 00:00:00 -07:00
-default_executable: 
+date: 2012-01-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tilt
@@ -24,6 +29,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
   type: :runtime
   version_requirements: *id001
@@ -35,6 +45,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
         version: 1.3.1
   type: :runtime
   version_requirements: *id002
@@ -46,6 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 10
+        - 2
         version: 0.10.2
   type: :runtime
   version_requirements: *id003
@@ -57,6 +77,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 33
+        segments: 
+        - 0
+        - 14
+        - 3
         version: 0.14.3
   type: :runtime
   version_requirements: *id004
@@ -68,7 +93,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.0
+        hash: 15
+        segments: 
+        - 3
+        - 2
+        - 0
+        version: 3.2.0
   type: :runtime
   version_requirements: *id005
 description: The Padrino core gem required for use of this framework
@@ -156,7 +186,6 @@ files:
 - test/test_restful_routing.rb
 - test/test_router.rb
 - test/test_routing.rb
-has_rdoc: true
 homepage: http://www.padrinorb.com
 licenses: []
 
@@ -170,17 +199,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: 1.3.6
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: padrino-core
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: The required Padrino core gem
@@ -211,3 +248,4 @@ test_files:
 - test/test_restful_routing.rb
 - test/test_router.rb
 - test/test_routing.rb
+has_rdoc: