RubyGems - rhr - Versions diffs - 0.1.3 → 0.1.4 - Mend

rhr 0.1.3 → 0.1.4

Files changed (9) hide show

data/.gitignore ADDED

	@@ -0,0 +1 @@
1	+ .DS_Store

data/Gemfile.lock CHANGED

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhr (0.1.3)
+    rhr (0.1.4)
       rack
       tilt

data/Readme.md CHANGED

@@ -27,10 +27,26 @@ Layouting
       <body><%= yield %></body>
     </html>
+Helpers
+=======
+Put a `helpers.rb` file into the project root:
+    module Helpers
+      def foo
+        'bar'
+      end
+    end
+You can now use the `foo` method in the view:
+    <div><%= foo %></div>
 TODO (fork!)
 ====
  - do not use layout if view does something like `no_layout`
  - add helpers like link_to / tag / form
+ - move params and request to the View
  - escape html in params <-> xss
 Author

data/lib/rhr/server.rb CHANGED

@@ -1,10 +1,12 @@
+require 'rhr/view'
 require 'rhr/core_ext/object'
 module RHR
   class Server
     def initialize
-      @files = Dir["**/*"] - ['Gemfile','Gemfile.lock','Rakefile']
-      @files -= @files.grep(/(^|\/)_/)
+      @files = Dir["**/*"]
+      @servable_files = @files - %w[Gemfile Gemfile.lock Rakefile helpers.rb]
+      @servable_files -= @servable_files.grep(/(^|\/)_/)
     end
     def call(env)
@@ -14,10 +16,11 @@ module RHR
           request = Rack::Request.new(env)
           params = request.GET.merge(request.POST)
-          body = renderer.new(template).render(nil, :request => request, :params => params)
+          view = build_view
+          body = renderer.new(template).render(view, :request => request, :params => params)
           if layout = find_layout
-            body = renderer.new(layout).render(nil, :request => request, :params => params) { body }
+            body = renderer.new(layout).render(view, :request => request, :params => params) { body }
           end
           [200, {}, [body]]
@@ -31,8 +34,17 @@ module RHR
   private
+    def build_view
+      view = View.new
+      if @files.include?('helpers.rb')
+        require './helpers'
+        view.send(:extend, Helpers)
+      end
+      view
+    end
     def find_layout
-      Dir['*'].grep(/^_layout(\.|$)/).first
+      @files.grep(/^_layout(\.|$)/).first
     end
     memoize :find_layout
@@ -42,12 +54,12 @@ module RHR
       file.sub!(/\/$/,'')
       is_root = (file == '')
-      return if not is_root and not @files.index(file)
+      return if not is_root and not @servable_files.index(file)
       if is_root or File.directory?(file)
         # folder -> find an index file
         file << '/' unless is_root
-        @files.grep(/^#{Regexp.escape file}index\.[^\/]+$/).first
+        @servable_files.grep(/^#{Regexp.escape file}index\.[^\/]+$/).first
       else
         # just another normal template
         file

data/lib/rhr/version.rb CHANGED

@@ -1,3 +1,3 @@
 module RHR
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/rhr/view.rb ADDED

@@ -0,0 +1,4 @@
+module RHR
+  class View
+  end
+end

data/spec/rhr_spec.rb CHANGED

@@ -79,6 +79,14 @@ describe RHR do
       last_response.content_type.should == 'image/jpeg'
     end
+    %w[Rakefile Gemfile Gemfile.lock helpers.rb].each do |file|
+      it "ignores #{file}" do
+        write file, 'Foo'
+        get "/#{file}"
+        last_response.status.should == 404
+      end
+    end
     it "ignores common ruby files" do
       get "/Gemfile"
       last_response.status.should == 404
@@ -132,5 +140,23 @@ describe RHR do
         last_response.body.should == "TEST"
       end
     end
+    describe 'with helpers' do
+      before do
+        write 'helpers.erb', '<%= foo %>'
+        write 'helpers.rb', 'module Helpers; def foo; "hello"; end; end'
+      end
+      it 'passes helpers into the view' do
+        get "/helpers.erb"
+        last_response.body.should == 'hello'
+      end
+      it 'passes helpers into the layout view' do
+        write '_layout.erb', '<%= foo %>|<%= yield %>'
+        get "/helpers.erb"
+        last_response.body.should == 'hello|hello'
+      end
+    end
   end
 end

metadata CHANGED

@@ -1,60 +1,46 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: rhr
-version: !ruby/object:Gem::Version
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.1.4
   prerelease:
-  segments:
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
 platform: ruby
-authors:
+authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-11-04 00:00:00 -07:00
-default_executable:
-dependencies:
-- !ruby/object:Gem::Dependency
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        hash: 3
-        segments:
-        - 0
-        version: "0"
+date: 2011-11-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  version_requirements: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement
+  requirement: &71381800 !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        hash: 3
-        segments:
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *71381800
+- !ruby/object:Gem::Dependency
   name: tilt
-  version_requirements: *id002
+  requirement: &71381480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: *71381480
 description:
 email: michael@grosser.it
-executables:
+executables:
 - rhr
 extensions: []
 extra_rdoc_files: []
-files:
+files:
+- .gitignore
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -65,10 +51,10 @@ files:
 - lib/rhr/core_ext/object.rb
 - lib/rhr/server.rb
 - lib/rhr/version.rb
+- lib/rhr/view.rb
 - rhr.gemspec
 - spec/rhr_spec.rb
 - spec/site/.hidden.html
-- spec/site/Gemfile
 - spec/site/_hidden.html
 - spec/site/_hidden/xxx.html
 - spec/site/index.erb
@@ -81,39 +67,34 @@ files:
 - spec/site/xxx/params.erb
 - spec/site/yyy/index.html
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/grosser/rhr
 licenses: []
 post_install_message:
 rdoc_options: []
-require_paths:
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: -943244397
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -943244397
 requirements: []
 rubyforge_project:
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key:
 specification_version: 3
 summary: Ruby Hypertext Refinement -- the ease of PHP with the elegance of Ruby
 test_files: []

data/spec/site/Gemfile DELETED

	@@ -1 +0,0 @@
1	- xxx