RubyGems - lunetas - Versions diffs - 0.1.2 → 0.1.3 - Mend

lunetas 0.1.2 → 0.1.3

Files changed (18) hide show

data/README.md +3 -0
data/Rakefile +3 -9
data/VERSION +1 -1
data/examples/stand_alone_app/app.rb +12 -0
data/examples/stand_alone_app/config.ru +3 -0
data/examples/stand_alone_app/public/lunetas.jpg +0 -0
data/examples/stand_alone_app/templates/index.erb +12 -0
data/lib/lunetas.rb +1 -0
data/lib/lunetas/bag.rb +24 -2
data/lib/lunetas/candy.rb +2 -0
data/lib/lunetas/candy/response_handler.rb +7 -14
data/lib/lunetas/candy/template_parsing.rb +17 -0
data/lib/lunetas/error.rb +3 -0
data/spec/lunetas/bag_spec.rb +21 -0
data/spec/spec_helper.rb +2 -3
data/spec/support/image.png +1 -0
metadata +16 -10
data/.gitignore +0 -24

data/README.md CHANGED

@@ -25,6 +25,9 @@ running, you just need to add `run Lunetas::Bag` in your config.ru file.
 If you are going to use Lunetas behind a framework like Rails. You just need to add
 the gem, `require 'lunetas'` in your metal, and you are ready to go.
+Now with support for public assets, and templates. Check out the example under
+/examples/stand_alone_app, to see how it works!
 Examples
 --------

data/Rakefile CHANGED

@@ -21,16 +21,10 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
   spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
 end
 task :spec => :check_dependencies

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 0.1.2
1	+ 0.1.3

data/examples/stand_alone_app/app.rb ADDED

@@ -0,0 +1,12 @@
+require 'lunetas'
+class App
+  include Lunetas::Candy
+  matches '/(\w+)$', :path
+  def get
+    @message = "So, were you looking for #{@path}?"
+    erb :index
+  end
+end

data/examples/stand_alone_app/config.ru ADDED

@@ -0,0 +1,3 @@
+require 'app'
+run Lunetas::Bag

data/examples/stand_alone_app/public/lunetas.jpg ADDED

Binary file

data/examples/stand_alone_app/templates/index.erb ADDED

@@ -0,0 +1,12 @@
+<html>
+  <head>
+    <title><%= @path %></title>
+  </head>
+  <body>
+    <center>
+      <h1>Hello from Lunetas!</h1>
+      <h4><%= @message %></h4>
+      <img src="/lunetas.jpg" alt="lunetas" />
+    </center>
+  </body>
+</html>

data/lib/lunetas.rb CHANGED

@@ -1,6 +1,7 @@
 require 'rubygems'
 gem 'rack'
 require 'rack'
+require 'erb'
 module Lunetas
   base_dir = File.dirname(__FILE__) + '/lunetas/'

data/lib/lunetas/bag.rb CHANGED

@@ -13,6 +13,22 @@ module Lunetas::Bag
     @@candies[regex] = candy
   end
+  # Specifies where the public assets are located.
+  # @param [String] directory where the assets are located.
+  # @raise [Lunetas::Error::NoSuchDirectory] if the directory does not exists.
+  def self.set_public_directory(directory)
+    unless File.directory? File.expand_path(directory)
+      raise Lunetas::Error::NoSuchDirectory
+    end
+    @@public_directory = File.expand_path(directory)
+  end
+  # Gets the public directory of assets.
+  # @return [String] the location, if not set public/
+  def self.public_directory
+    @@public_directory ||= File.expand_path("public")
+  end
   # Rack's call method. Will be called with the env, from rack. If it matches
   # a regular expression, it will start a new instance of the propiertary class.
   # If there's no matching class, it will return a 404.
@@ -21,11 +37,17 @@ module Lunetas::Bag
   # @return [Array] the rack response.
   def self.call(env)
     @url_match = nil
-    match_regex = @@candies.keys.find do |regex|
+    match_regex = @@candies.keys.find do |regex|
       @url_match = env['PATH_INFO'].match(regex)
     end
     unless match_regex
-      return [404, {"Content-Type" => "text/html", "X-Cascade" => "pass"}, ["Not Found"]]
+      if File.exists? public_directory + env['PATH_INFO']
+        file = public_directory + env['PATH_INFO']
+        content_type = Rack::Mime.mime_type(File.extname(file))
+        return [200, {"Content-Type" => content_type}, [File.read(file)]]
+      else
+        return [404, {"Content-Type" => "text/html", "X-Cascade" => "pass"}, ["Not Found"]]
+      end
     end
     candy = @@candies[match_regex].new(env, @url_match.to_a)
     candy.bite

data/lib/lunetas/candy.rb CHANGED

@@ -16,6 +16,7 @@ module Lunetas::Candy
   autoload :MethodStrategy,  base_dir + 'method_strategy.rb'
   autoload :RequestWrapper,  base_dir + 'request_wrapper.rb'
   autoload :ResponseHandler, base_dir + 'response_handler.rb'
+  autoload :TemplateParsing, base_dir + 'template_parsing.rb'
   # @private
   def self.included(receiver)
@@ -25,5 +26,6 @@ module Lunetas::Candy
     receiver.send :include, RequestWrapper::InstanceMethods
     receiver.send :include, ResponseHandler::InstanceMethods
     receiver.send :extend,  ResponseHandler::ClassMethods
+    receiver.send :include, TemplateParsing::InstanceMethods
   end
 end

data/lib/lunetas/candy/response_handler.rb CHANGED

@@ -7,20 +7,13 @@ module Lunetas::Candy::ResponseHandler
     # @return [Array] a Rack::Request response.
     def handle_call
       case @req.request_method
-      when 'GET'
-        get
-      when 'POST'
-        post
-      when 'PUT'
-        put
-      when 'DELETE'
-        delete
-      when 'HEAD'
-        head
-      when 'TRACE'
-        trace
-      when 'OPTIONS'
-        options
+      when 'GET'     then get
+      when 'POST'    then post
+      when 'PUT'     then put
+      when 'DELETE'  then delete
+      when 'HEAD'    then head
+      when 'TRACE'   then trace
+      when 'OPTIONS' then options
       else
         response = other_verb(@req.request_method)
         raise Lunetas::Error::APIError unless response

data/lib/lunetas/candy/template_parsing.rb ADDED

@@ -0,0 +1,17 @@
+module Lunetas::Candy::TemplateParsing
+  module InstanceMethods
+    # Parses the given file, located in templates/[template_name].erb.
+    # @param filename the file located in the templates directory.
+    # @return [String] the erb parsed template.
+    def erb(filename)
+      file = File.expand_path("templates/#{filename}.erb")
+      ERB.new(File.read(file)).result(get_binding)
+    end
+    private
+      # @private
+      def get_binding
+        binding
+      end
+  end
+end

data/lib/lunetas/error.rb CHANGED

@@ -39,4 +39,7 @@ module Lunetas::Error
       "API route error"
     end
   end
+  class NoSuchDirectory < StandardError
+  end
 end

data/spec/lunetas/bag_spec.rb CHANGED

@@ -36,5 +36,26 @@ describe Lunetas::Bag do
       @luneta_class.should_receive(:new).with(env, ['bacon/bbacon', 'bbacon'])
       Lunetas::Bag.call(env)
     end
+    it 'should serve an external file' do
+      Lunetas::Bag.set_public_directory "spec/support"
+      env = mock_env('/image.png')
+      response = [200, {"Content-Type" => "image/png"}, ["test\n"]]
+      Lunetas::Bag.call(env).should == response
+    end
+  end
+  describe 'set_public_directory' do
+    it 'should raise an exception if the directory is not found' do
+      lambda {
+        Lunetas::Bag.set_public_directory "blah"
+      }.should raise_error
+    end
+    it 'should change the value if the directory is found' do
+      lambda {
+        Lunetas::Bag.set_public_directory "examples"
+      }.should change(Lunetas::Bag, :public_directory)
+    end
   end
 end

data/spec/spec_helper.rb CHANGED

@@ -1,10 +1,9 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'lunetas'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 end

data/spec/support/image.png ADDED

	@@ -0,0 +1 @@
1	+ test

metadata CHANGED

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: lunetas
 version: !ruby/object:Gem::Version
-  hash: 31
+  hash: 29
   prerelease: false
   segments:
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors:
 - "Iv\xC3\xA1n Vald\xC3\xA9s (@ivanvc)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-08-27 00:00:00 -05:00
+date: 2010-12-02 00:00:00 -06:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -87,7 +87,6 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
-- .gitignore
 - LICENSE
 - README.md
 - Rakefile
@@ -96,6 +95,10 @@ files:
 - examples/content_types.rb
 - examples/jay_son.rb
 - examples/redirect.rb
+- examples/stand_alone_app/app.rb
+- examples/stand_alone_app/config.ru
+- examples/stand_alone_app/public/lunetas.jpg
+- examples/stand_alone_app/templates/index.erb
 - examples/testing.rb
 - lib/lunetas.rb
 - lib/lunetas/bag.rb
@@ -104,18 +107,20 @@ files:
 - lib/lunetas/candy/method_strategy.rb
 - lib/lunetas/candy/request_wrapper.rb
 - lib/lunetas/candy/response_handler.rb
+- lib/lunetas/candy/template_parsing.rb
 - lib/lunetas/error.rb
 - spec/lunetas/bag_spec.rb
 - spec/lunetas/candy_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/image.png
 has_rdoc: true
 homepage: http://github.com/ivanvc/lunetas
 licenses: []
 post_install_message:
-rdoc_options:
-- --charset=UTF-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -144,10 +149,11 @@ signing_key:
 specification_version: 3
 summary: Rack micro framework intended for APIs
 test_files:
-- spec/lunetas/bag_spec.rb
-- spec/lunetas/candy_spec.rb
-- spec/spec_helper.rb
 - examples/content_types.rb
 - examples/jay_son.rb
 - examples/redirect.rb
+- examples/stand_alone_app/app.rb
 - examples/testing.rb
+- spec/lunetas/bag_spec.rb
+- spec/lunetas/candy_spec.rb
+- spec/spec_helper.rb

data/.gitignore DELETED

@@ -1,24 +0,0 @@
-## MAC OS
-.DS_Store
-## TEXTMATE
-*.tmproj
-tmtags
-## EMACS
-*~
-\#*
-.\#*
-## VIM
-*.swp
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-*.gemspec
-doc/**
-## PROJECT::SPECIFIC