happy 0.1.0.pre15 → 0.1.0.pre16

data/README.md

@@ -98,26 +98,14 @@ Controllers are the magic behind Happy; they're essentially **re-useable, self-c
 
 ### More Happy Features
 
-In addition to its fun and flexible approach to writing web applications, Happy boasts the following features, and more:
+In addition to its fun and flexible approach to writing web applications, Happy boasts the following features, among others:
 
-* Run-time permission management provided by [Allowance](https://github.com/hmans/allowance).
+* Optional run-time permission management provided by [Allowance](https://github.com/hmans/allowance).
 * A set of Happy Controllers making you super-productive, from serving static files to minifying JavaScript assets or even serving complete RESTful resources.
 * A set of view helpers including [simple_form](https://github.com/plataformatec/simple_form) inspired forms on auto-pilot, with full support for translations and localization through [I18n](https://github.com/svenfuchs/i18n).
 * Happy _loves_ Rack. You can mount Rack Middleware as well as pass control to another Rack application, just like that. Or use Happy Controllers from within other applications -- they're just Rack apps. And, of course, serve your Happy application through any Rack-compliant Rack server.
 
 
-### Happy is Opinionated Software
-
-Happy is opinionated software. Its design and functionality follow a certain set of opinions, a few of which are:
-
-* **The core framework should be very simple**. As described above, the entire framework revolves around two important classes (Happy::Controller and Happy::Context). Everything that's not directly related to the core framework should be provided by additional gems. (For example, anything that is view helper related has been moved to the [HappyHelpers](https://github.com/hmans/happy-helpers) gem, and the permission management code has been extracted to the [Allowance](https://github.com/hmans/allowance) gem.) Happy isn't trying to be a kitchen sink framework.
-* **Full-stack is boring**. Sure, it's nice if your framework of choice is holding your hands almost every step you go, but it's when you get to that point where you want to do something _differently_ from what your framework provides to you that you'll start hitting walls. For example, Happy doesn't generate data layer code for you; you're expected (and free to) simply use any ORM (or whatever) you desire, if any. For example, adding [Mongoid](http://mongoid.org/) to your Happy project is just two lines of code. Don't worry, we'll provide recipes; you don't need generators for that kind of stuff.
-* **Routing sucks**. Pretty much all other Ruby web application frameworks go to great lengths to map incoming requests to code through regular expressions (or DSLs allowing you to specify routes that are then compiled to regular expressions behind the scenes.) It's a very fast, but somewhat inflexible approach.
-* **Objects are awesome**. Frameworks like Rails are, technically speaking, object-oriented, but really only use classes mostly as containers for code. Requests are mapped (through the aforementioned routes) to controller classes, which are then instantiated and passed control to. It works, but it's also really boring. Objects are fun! Happy uses the request URL as a roadmap through your application's object graph. It allows you to think of your application as a nested tree of _things_.
-
-If you find that you agree with these, you're going to _love_ building Happy web applications.
-
-
 ## Current Status
 
 Happy is being extracted from a web application that I've been working on. I'm trying to get a first, hopefully somewhat stable release out of the door some time during June 2012.

data/lib/happy/controller/routing.rb

@@ -39,24 +39,11 @@ module Happy
         end
       end
 
-      def get(*args, &blk)
-        args.last.is_a?(Hash) ? args.last.merge(:method => :get) : args.push(:method => :get)
-        path(*args, &blk)
-      end
-
-      def post(*args, &blk)
-        args.last.is_a?(Hash) ? args.last.merge(:method => :post) : args.push(:method => :post)
-        path(*args, &blk)
-      end
-
-      def put(*args, &blk)
-        args.last.is_a?(Hash) ? args.last.merge(:method => :put) : args.push(:method => :put)
-        path(*args, &blk)
-      end
-
-      def delete(*args, &blk)
-        args.last.is_a?(Hash) ? args.last.merge(:method => :delete) : args.push(:method => :delete)
-        path(*args, &blk)
+      [:get, :post, :put, :delete].each do |method|
+        define_method(method) do |*args, &blk|
+          args.last.is_a?(Hash) ? args.last.merge(:method => method) : args.push(:method => method)
+          path(*args, &blk)
+        end
       end
     end
   end

data/lib/happy/extras/scriptable.rb

@@ -0,0 +1,37 @@
+require 'happy/extras/permissions'
+
+module Happy
+  module Extras
+    class Scriptable < Happy::Controller
+      def route
+        Happy::Context.class_eval(load_script 'context.rb')
+        run_script 'permissions.rb'
+        run_script 'route.rb'
+      end
+
+      def run_script(name)
+        instance_exec &get_proc_for_script(name)
+      end
+
+      def get_proc_for_script(name)
+        if reload_script?(name)
+          procs[name] = eval "lambda { %s }" % load_script(name)
+        end
+        procs[name]
+      end
+
+      def reload_script?(name)
+        !procs[name] || Happy.env.development?
+      end
+
+      def load_script(name)
+        file_name = File.expand_path(File.join(options[:directory], name))
+        File.read(file_name)
+      end
+
+      def procs
+        @procs ||= {}
+      end
+    end
+  end
+end

data/lib/happy/version.rb

@@ -1,3 +1,3 @@
 module Happy
-  VERSION = "0.1.0.pre15"
+  VERSION = "0.1.0.pre16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happy
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre15
+  version: 0.1.0.pre16
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70267629187180 !ruby/object:Gem::Requirement
+  requirement: &70251874709220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70267629187180
+  version_requirements: *70251874709220
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70267629185900 !ruby/object:Gem::Requirement
+  requirement: &70251874706120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70267629185900
+  version_requirements: *70251874706120
 - !ruby/object:Gem::Dependency
   name: happy-helpers
-  requirement: &70267629184380 !ruby/object:Gem::Requirement
+  requirement: &70251874722540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.0.pre9
   type: :runtime
   prerelease: false
-  version_requirements: *70267629184380
+  version_requirements: *70251874722540
 - !ruby/object:Gem::Dependency
   name: allowance
-  requirement: &70267629199080 !ruby/object:Gem::Requirement
+  requirement: &70251874720680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70267629199080
+  version_requirements: *70251874720680
 - !ruby/object:Gem::Dependency
   name: happy-cli
-  requirement: &70267629195280 !ruby/object:Gem::Requirement
+  requirement: &70251874719340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.0.pre1
   type: :runtime
   prerelease: false
-  version_requirements: *70267629195280
+  version_requirements: *70251874719340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70267629191760 !ruby/object:Gem::Requirement
+  requirement: &70251874718000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267629191760
+  version_requirements: *70251874718000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70267629213020 !ruby/object:Gem::Requirement
+  requirement: &70251874735320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70267629213020
+  version_requirements: *70251874735320
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
-  requirement: &70267629211400 !ruby/object:Gem::Requirement
+  requirement: &70251874732880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267629211400
+  version_requirements: *70251874732880
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70267629210420 !ruby/object:Gem::Requirement
+  requirement: &70251874731140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267629210420
+  version_requirements: *70251874731140
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70267629209340 !ruby/object:Gem::Requirement
+  requirement: &70251874727440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267629209340
+  version_requirements: *70251874727440
 description: A happy little toolkit for writing web applications.
 email:
 - hendrik@mans.de
@@ -147,9 +147,9 @@ files:
 - lib/happy/controller/routing.rb
 - lib/happy/extras/permissions.rb
 - lib/happy/extras/resources.rb
+- lib/happy/extras/scriptable.rb
 - lib/happy/extras/static.rb
 - lib/happy/request.rb
-- lib/happy/utils/app_spawner.rb
 - lib/happy/version.rb
 - spec/controller/actions_spec.rb
 - spec/controller/routing_spec.rb

data/lib/happy/utils/app_spawner.rb

@@ -1,35 +0,0 @@
-module Happy
-  module Utils
-    # SMELL: this should be a controller, spawning another controller.
-    class AppSpawner
-      attr_reader :options
-
-      def initialize(options = {})
-        @app = nil
-        @options = {
-          :scripts => './app/*.rb'
-        }.merge(options)
-      end
-
-      def call(env)
-        app.call(env)
-      end
-
-      def app
-        @app = reload_app? ? load_app : @app
-      end
-
-      def load_app
-        Happy::Controller.build.tap do |klass|
-          Dir[options[:scripts]].each do |file|
-            klass.instance_eval File.read(file)
-          end
-        end
-      end
-
-      def reload_app?
-        !Happy.env.production? || @app.nil?
-      end
-    end
-  end
-end