freddie 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-19mode
+script: bundle exec rake

data/freddie.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activesupport', '~> 3.2.3'
   gem.add_dependency 'tilt', '~> 1.3.3'
 
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'minitest-reporters'
 end

data/lib/freddie.rb

@@ -14,7 +14,5 @@ module Freddie
 end
 
 def Freddie(&block)
-  app = Class.new(Freddie::Application)
-  app.block = block
-  app
+  Freddie::Application.new(&block)
 end

data/lib/freddie/application.rb

@@ -1,13 +1,7 @@
 module Freddie
   class Application < Handlers::Base
-    class << self
-      def block=(block)
-        @@block = block
-      end
-    end
-
     def perform
-      instance_exec &@@block if @@block
+      perform_freddie_block
     end
   end
 end

data/lib/freddie/handlers.rb

@@ -4,7 +4,7 @@ module Freddie
     # Base class for all handlers.
     #
     class Base
-      attr_reader :block, :env
+      attr_reader :block, :env, :args
 
       class << self
         def call(env)
@@ -20,7 +20,7 @@ module Freddie
       def call(env)
         @env = env
         before_perform
-        perform(*@args)
+        perform
         after_perform
         response
       end
@@ -61,6 +61,17 @@ module Freddie
         env['freddie.finished']
       end
 
+      def perform_freddie_block
+        if block
+          # cater for different DSL styles
+          if block.arity == 1
+            block.call(self)
+          else
+            instance_exec &block
+          end
+        end
+      end
+
       def method_missing(name, *args, &block)
         klass_name = "Freddie::Handlers::#{name.to_s.classify}"
 
@@ -84,23 +95,16 @@ module Freddie
     end
 
     class Path < Base
-      def perform(path)
+      def perform
+        path = args.shift
+
         if match_data = self.class.path_to_regexp(path).match(context.path.first)
           # write parameter matches into params
           match_data.names.each { |k| params[k] = match_data[k] }
 
           # execute block
           el = context.path.shift
-
-          if block
-            # cater for different DSL styles
-            if block.arity == 1
-              block.call(self)
-            else
-              instance_exec &block
-            end
-          end
-
+          perform_freddie_block
           context.path.unshift(el)
         end
       end
@@ -116,25 +120,31 @@ module Freddie
     class Render < Base
       include Endpoint
 
-      def perform(data)
-        response.body << data
+      def perform
+        response.body << args.shift
       end
     end
 
     class Template < Base
       include Endpoint
 
-      def perform(name, variables = {})
-        html = Tilt.new("views/%s" % name).render(self, variables)
+      def perform
+        name = args.shift
+        variables = args.shift || {}
+
+        html = Tilt.new("views/%s" % name).render(context, variables)
         if env['freddie.layout'].present?
-          html = Tilt.new("views/#{env['freddie.layout']}").render(self) { html }
+          html = Tilt.new("views/#{env['freddie.layout']}").render(context) { html }
         end
         response.body << html
       end
     end
 
     class Resource < Base
-      def perform(name, options = {})
+      def perform
+        name = args.shift
+        options = args.shift || {}
+
         options = {
           name: name.to_s,
           singular_name: name.to_s.singularize,
@@ -143,9 +153,21 @@ module Freddie
         }.merge(options)
 
         path(options[:name]) do |n|
+          n.path('new') do
+            n.template "#{options[:plural_name]}/new.html.haml",
+              options[:singular_name] => options[:klass].new
+          end
+
           n.path(:id) do |n|
+            resource = options[:klass].find(params[:id])
+
+            n.path('edit') do |n|
+              n.template "#{options[:plural_name]}/edit.html.haml",
+                options[:singular_name] => resource
+            end
+
             n.template "#{options[:plural_name]}/show.html.haml",
-              options[:singular_name] => options[:klass].find(params[:id])
+              options[:singular_name] => resource
           end
 
           n.template "#{options[:plural_name]}/index.html.haml",
@@ -157,8 +179,8 @@ module Freddie
     class RedirectTo < Base
       include Endpoint
 
-      def perform(destination)
-        response.headers['Location'] = destination
+      def perform
+        response.headers['Location'] = args.shift
         response.status = 302
       end
     end
@@ -166,7 +188,8 @@ module Freddie
     class Run < Base
       include Endpoint
 
-      def perform(app)
+      def perform
+        app = args.shift
         context.response = Rack::Response.new(app.call(env))
       end
     end
@@ -174,7 +197,9 @@ module Freddie
     class Stylesheet < Base
       include Endpoint
 
-      def perform(name)
+      def perform
+        name = args.shift
+
         response.headers['Content-type'] = 'text/css'
         layout nil
         template name
@@ -184,7 +209,8 @@ module Freddie
     class SendFile < Base
       include Endpoint
 
-      def perform(name)
+      def perform
+        name = args.shift
         response.body << File.read(name)
       end
     end
@@ -192,16 +218,19 @@ module Freddie
     class Javascript < Base
       include Endpoint
 
-      def perform(name)
-        response.headers['Content-type'] = 'text/javascript'
+      def perform
+        name = args.shift
 
+        response.headers['Content-type'] = 'text/javascript'
         # insert crazy javascript packing code here... :)
         response.body << File.read("views/#{name}")
       end
     end
 
     class OmniAuth < Base
-      def perform(options = {})
+      def perform
+        options = args.shift || {}
+
         options = {
           session_key: :omniauth_user,
           redirect_to: '/'

data/lib/freddie/version.rb

@@ -1,3 +1,3 @@
 module Freddie
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freddie
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-06 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70194826049540 !ruby/object:Gem::Requirement
+  requirement: &70124346343220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70194826049540
+  version_requirements: *70124346343220
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70194826048660 !ruby/object:Gem::Requirement
+  requirement: &70124346341560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70194826048660
+  version_requirements: *70124346341560
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70194826047820 !ruby/object:Gem::Requirement
+  requirement: &70124346340540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,21 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70194826047820
+  version_requirements: *70124346340540
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70124346339580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70124346339580
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70194826047100 !ruby/object:Gem::Requirement
+  requirement: &70124346338260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194826047100
+  version_requirements: *70124346338260
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
-  requirement: &70194826046180 !ruby/object:Gem::Requirement
+  requirement: &70124355046360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194826046180
+  version_requirements: *70124355046360
 description: Expressive, Rack-loving web application DSL.
 email:
 - hendrik@mans.de
@@ -74,6 +85,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - .yardopt
 - Gemfile
 - LICENSE