monoriel 0.1.1 → 0.1.2

data/README.md

@@ -10,7 +10,7 @@ MonoRiel is an attempt to fork from mini-rail
 which is in itself a fork from another rack project(rack-golem) into
 super simplistic but useful web mini-framework (MonoRiel (spanish) = monorail (english))
 
-there's no gem for now, but somewhere in time you will:
+gem updated and uploaded, now you can:
 
     sudo gem install monoriel
 
@@ -111,3 +111,4 @@ Now save this into app.rb
 - You need to provide the class Page in your models.
 - You can use slim, haml, scss and erb templates with Monoriel
 - Please use App in Samples for testing and documentation
+- You can see my monoblog project for a real app sample code

data/Rakefile

@@ -0,0 +1,11 @@
+task :default => [:test]
+
+desc "Run testing unit (default)"
+task :test do
+	ruby "test/monoriel-test.rb"
+end
+
+desc "Create distribution package"
+task :build do
+  sh "gem build monoriel.gemspec"
+end

data/lib/monoriel.rb

@@ -78,7 +78,7 @@ module Monoriel
       "ERROR 500"
     end
     
-    def tpl(template, extention)
+    def tpl(template, extention,&block)
 			key = (template.to_s + extention.gsub(/[.]/,"_")).to_sym
       @@tilt_cache ||= {}
       if @@tilt_cache.has_key?(key)
@@ -90,23 +90,33 @@ module Monoriel
         @@tilt_cache.store(key,template_obj) if ENV['RACK_ENV']=='production'
       end
       @res['Content-Type'] = "text/html;charset=utf-8"
-      template_obj.render(self)
+      template_obj.render(self) do
+		yield if block_given?
+      end
     end
     
-	def erb(template)
-		tpl(template,'.erb')
+	def erb(template,&block)
+		tpl(template,'.erb') do 
+			yield if block_given?
+		end
 	end
 	
-	def slim(template)
-		tpl(template,'.slim')
+	def slim(template,&block)
+		tpl(template,'.slim') do
+			yield if block_given?
+		end
 	end
 	
-	def haml(template)
-		tpl(template,'.haml')
+	def haml(template,&block)
+		tpl(template,'.haml',block) do
+			yield if block_given?
+		end
 	end
 
-	def scss(template)
-		tpl(template,'.scss')
+	def scss(template,&block)
+		tpl(template,'.scss',block) do
+			yield if block_given?
+		end
 	end
   end
   

data/monoriel.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s| 
   s.name = 'monoriel'
-  s.version = "0.1.1"
+  s.version = "0.1.2"
   s.platform = Gem::Platform::RUBY
   s.summary = "A rack based web framework forked from mini-train"
-  s.description = "This is a super simplistic but useful web framework"
+  s.description = "A super simplistic but useful web framework with layout support"
   s.files = `git ls-files`.split("\n").sort
   s.require_path = './lib'
   s.author = "Carlos Esquer"

data/sample/app.rb

@@ -22,15 +22,15 @@ class App
 			"<b>Always generate BOLD</b>"
 		end
 
-    def json_response(data=nil)
-			@res['Content-Type'] = "text/plain;charset=utf-8"
-			data.nil? ? "{}" : JSON.generate(data)
-    end
-    
-    def yaml_response(data=nil)
-			@res['Content-Type'] = "text/plain;charset=utf-8"
-			data.to_yaml
-    end
+		def json_response(data=nil)
+				@res['Content-Type'] = "text/plain;charset=utf-8"
+				data.nil? ? "{}" : JSON.generate(data)
+		end
+		
+		def yaml_response(data=nil)
+				@res['Content-Type'] = "text/plain;charset=utf-8"
+				data.to_yaml
+		end
     
 	end
 
@@ -120,7 +120,6 @@ class App
 	def not_found(*args)
 		# This one is defined by mini-train but here we decided to override it
 		# Like :index this method receives the arguments in order to make something with it
-		#Email.alert('Too many people are looking for porn here') if args.includes?("porn")
 		super(args)
 	end
 

data/test/Rakefile

@@ -0,0 +1,5 @@
+task :default => [:test]
+
+task :test do
+	ruby "test/monoriel-test.rb"
+end

data/test/monoriel-test.rb

@@ -1,7 +1,9 @@
 require 'minitest/autorun'
 require 'rack/lobster'
+require 'slim'
 require_relative '../lib/monoriel'
 
+
 # =========
 # = Basic =
 # =========
@@ -95,6 +97,37 @@ class UsingPostPutAndDelete
 end
 UsingPostPutAndDeleteR = ::Rack::MockRequest.new(::Rack::Lint.new(Rack::MethodOverride.new(UsingPostPutAndDelete.new)))
 
+# =======================
+# = Templates with Blocks =
+# =========
+
+class UsingTemplatesWithBlocks
+	include Monoriel
+	helpers do
+		def render template
+			slim :layout do
+				slim template.to_sym
+			end
+		end
+	end
+	def index
+		render 'test'
+	end
+end
+UsingTemplatesWithBlocksR = ::Rack::MockRequest.new(::Rack::Lint.new(Rack::MethodOverride.new(UsingTemplatesWithBlocks.new)))
+
+# =======================
+# = Templates with Blocks =
+# =========
+
+class UsingTemplatesWithoutBlocks
+	include Monoriel
+	def index
+		slim :layout
+	end
+end
+UsingTemplatesWithoutBlocksR = ::Rack::MockRequest.new(::Rack::Lint.new(Rack::MethodOverride.new(UsingTemplatesWithoutBlocks.new)))
+
 # =========
 # = Specs =
 # =========
@@ -200,4 +233,11 @@ describe "Monoriel" do
 		assert_equal "PUT",UsingPostPutAndDeleteR.put("/data").body
 		assert_equal "DELETE",UsingPostPutAndDeleteR.delete("/data").body
 	end	
+	it "Should respond with Page in a Layout" do
+		assert_equal "<h1><p>Carlitos</p></h1>",UsingTemplatesWithBlocksR.get("/").body
+	end
+	it "Should respond with only the Layout content" do
+		assert_equal "<h1></h1>",UsingTemplatesWithoutBlocksR.get("/").body
+	end
+	
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monoriel
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &81927660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,20 +21,18 @@ dependencies:
         version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-description: This is a super simplistic but useful web framework
+  version_requirements: *81927660
+description: A super simplistic but useful web framework with layout support
 email: carlosesquer@zinlim.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- Rakefile
 - lib/monoriel.rb
+- monoriel-0.1.0.gem
+- monoriel-0.1.1.gem
 - monoriel.gemspec
 - sample/app.rb
 - sample/config.ru
@@ -44,6 +42,7 @@ files:
 - sample/views/index.haml
 - sample/views/index.slim
 - sample/views/index.slim~
+- test/Rakefile
 - test/monoriel-test.rb
 homepage: http://monoriel.zinlim.com
 licenses: []
@@ -65,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A rack based web framework forked from mini-train