racket-mvc 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2780584b9d4ab769bd0e1aef25544d15aee4eab
-  data.tar.gz: 391cf9ae48c6ed99634b0d224f3351c0b0b9c1a9
+  metadata.gz: 297c59402186821841ac8b3d9ec1585ebd19a9d4
+  data.tar.gz: acd9b707fa7aa9d7e249e818454fb2045367b5ef
 SHA512:
-  metadata.gz: 97cacd90e6986b5a0946cfbcb018c993521696aa54e654dc2d593eaf01129554e446ad9c3e4b4709c1186a7443f8ab24c7d9ef209e8c6f760561132b0131d01f
-  data.tar.gz: dd360e6ff448e1216008453962ccb8b091dee5c0c01804263b4e7495bd48802d39d546978aa64ee40a269fe6da23afa4083245f3c166316ac6a7053c3b1f00e4
+  metadata.gz: a0a346641c4c8f09872051634660c1270edaa0c6ca34ee4f9fd13e69736d24c58bb976b45df94cbc4208443204ad0198ab0ef7d1cfbb57b47d9c27995ac81a01
+  data.tar.gz: 0cfa26fb63e2750dd4b3ab3bb1472fefbbc589f24d29fcacfbeb13ea55b787cd46f0b249b57b5f0fa5706786dc6b72cfd67da64e2feff86a40eb11ba18e1728c

data/README.md

@@ -20,18 +20,27 @@ Yes. Writing Rack frameworks is easy! And since I am able to decide exactly what
 need to adopt to a large ecosystem of concepts I do not like.
 
 ## So, is it any good?
-Probably not. At the moment it is good _enough_ for my needs, but I plan to add more features/make stuff faster
-as I start porting more of my old apps from Ramaze.
+Let us just say it is good _enough_ for my needs at the moment. I plan to add more features/make stuff faster
+whenever I am finished porting most of my old apps from Ramaze.
 
 ## Where are the tests?
-Have a look in the `spec` directory. The code base have tests covering 100 per cent of the code and I am planning on keeping it that way. At the moment the code is tested using ruby 2.0, ruby 2.1.6 and 2.2.2, but more versions might be added later.
+Have a look in the `spec` directory. The code base have tests covering 100 per cent of the code and I am planning on keeping it that way. At the moment the code is tested on the following platforms (using [Travis CI](https://travis-ci.org/)):
 
-I am using [bacon](https://github.com/chneukirchen/bacon) and [rack-test](https://github.com/brynary/rack-test) for testing. Run the tests by typing `bacon spec/racket.rb`in the root directory. Code coverage reports are provided by [simplecov](https://rubygems.org/gems/simplecov). After the tests have run the an HTML report can be found in the `coverage` directory. If you are not interested in running the tests yourself you could also have a look at the test status at [Travis CI](https://travis-ci.org/lasso/racket) and the code coverage at [Codecov](https://codecov.io/github/lasso/racket). Their stats get updated on every commit.
+- ruby 1.9.3
+- ruby 2.0
+- ruby 2.1.6
+- ruby 2.2.2
+- jruby (latest version, 1.9 mode only)
+- rbx-2 (latest version)
+
+I am using [bacon](https://github.com/chneukirchen/bacon) and [rack-test](https://github.com/brynary/rack-test) for testing. Run the tests by typing `rake test`in the root directory. Code coverage reports are provided by [simplecov](https://rubygems.org/gems/simplecov). After the tests have run the an HTML report can be found in the `coverage` directory.
+
+If you are not interested in running the tests yourself you could have a look at the test status at [Travis CI](https://travis-ci.org/lasso/racket) and the code coverage at [Codecov](https://codecov.io/github/lasso/racket). Their stats get updated on every commit.
 
 ## Alright, I want to try using this stuff. Where are the docs?
-Unfortunately there aren't any docs yet. The main reason is that most things are not finished yet, I am still
-moving stuff around like crazy. There **will** be a wiki later and I also plan on documenting the code itself heavily
-(using [Yard](http://yardoc.org/)).
+At the moment there is not much documentation available, but I have started working on the [wiki](https://github.com/lasso/racket/wiki).
+
+The code itself is documented using [Yard](http://yardoc.org/). The docs are not generated automatically, you need to run `rake doc` in the root directory to generate them. After running the rake task the documentation will be available in the `doc` directory.
 
 ## Why is the code licenced under the GNU Affero General Public License? I want a more liberal licence!
 Because I think it is a Good Thing™ to share code. The

data/lib/racket/application.rb

@@ -38,11 +38,7 @@ module Racket
         instance.options[:middleware].each do |middleware|
           klass, opts = middleware
           instance.inform_dev("Loading middleware #{klass} with options #{opts}.")
-          if opts
-            use klass, opts
-          else
-            use klass
-          end
+          use *middleware
         end
         run lambda { |env|
           static_result = instance.serve_static_file(env)

data/lib/racket/router.rb

@@ -41,8 +41,7 @@ module Racket
         actions.merge(current.instance_methods(false))
         current = current.superclass
       end
-      @actions_by_controller[controller] = actions.to_a
-      nil
+      (@actions_by_controller[controller] = actions.to_a) && nil
     end
 
     # Returns a route to the specified controller/action/parameter combination.
@@ -71,8 +70,7 @@ module Racket
       Application.inform_dev("Mapping #{controller} to #{controller_base_path}.")
       @router.add("#{path}(/*params)").to(controller)
       @routes_by_controller[controller] = controller_base_path
-      cache_actions(controller)
-      nil
+      cache_actions(controller) && nil
     end
 
     # @todo: Allow the user to set custom handlers for different errors
@@ -105,12 +103,13 @@ module Racket
             # Check if action is available on target
             return render_error(404) unless @actions_by_controller[target_klass].include?(action)
 
-            # Initialize target
+            # Rewrite PATH_INFO to reflect that we split out the parameters
+            env['PATH_INFO'] = env['PATH_INFO']
+                                 .split('/')[0...-params.count]
+                                 .join('/') unless params.empty?
+
+            # Initialize and render target
             target = target_klass.new
-            # @fixme: File.dirname should not be used on urls!
-            1.upto(params.count) do
-              env['PATH_INFO'] = File.dirname(env['PATH_INFO'])
-            end
             target.extend(Current.init(env, action, params))
             target.render(action)
           else
@@ -121,6 +120,5 @@ module Racket
         render_error(500, err)
       end
     end
-
   end
 end

data/lib/racket/utils.rb

@@ -1,3 +1,23 @@
+=begin
+Racket - The noisy Rack MVC framework
+Copyright (C) 2015  Lars Olsson <lasso@lassoweb.se>
+
+This file is part of Racket.
+
+Racket is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Racket is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with Racket.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
 module Racket
   # Collects utilities needed by different objects in Racket.
   class Utils

data/lib/racket/version.rb

@@ -25,15 +25,18 @@ module Racket
     # Major version
     MAJOR = 0
     # Minor version
-    MINOR = 0
+    MINOR = 1
     # Teeny version
-    TEENY = 5
+    TEENY = 0
+    # Prerelease ?
+    PRERELEASE = false
 
     # Returns the current version of Racket as a string.
     #
     # @return [String]
     def current
-      [MAJOR, MINOR, TEENY].join('.')
+      current = [MAJOR, MINOR, TEENY]
+      ((current.push('pre') if PRERELEASE) || current).join('.')
     end
 
     module_function :current

data/spec/racket.rb

@@ -1,5 +1,6 @@
 require 'simplecov'
 require 'stringio'
+require 'tilt/erb'
 
 SimpleCov.start do
   add_filter 'spec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: racket-mvc
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Lars Olsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_router
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Racket is a small MVC framework built atop of rack.
+description: Racket is a small MVC framework built on top of rack.
 email: lasso@lassoweb.se
 executables: []
 extensions: []
@@ -186,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="