happy 0.1.0.pre11 → 0.1.0.pre12

data/.watchr

@@ -5,11 +5,11 @@ def run(cmd, msg = nil)
   puts "\n"
 end
 
-watch("spec/.*_spec\.rb") { |m| run("bundle exec rspec %s" % m[0]) }
-watch("lib/happy/(.*)\.rb") { |m| run("bundle exec rspec spec/%s_spec.rb" % m[1]) }
-watch('^spec/(spec_helper|factories)\.rb') { |f| run "bundle exec rake spec", "%s.rb has been modified" % f }
+watch("spec/.*_spec\.rb") { |m| run("rspec %s" % m[0]) }
+watch("lib/happy/(.*)\.rb") { |m| run("rspec spec/%s_spec.rb" % m[1]) }
+watch('^spec/(spec_helper|factories)\.rb') { |f| run "rake spec", "%s.rb has been modified" % f }
 
 # Ctrl-\
-Signal.trap('QUIT')   { run("bundle exec rake spec") }
+Signal.trap('QUIT')   { run("rake spec") }
 # Ctrl-C
 Signal.trap('INT')    { abort("\nQuitting.") }

data/happy.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'activesupport', '~> 3.1'
   gem.add_dependency 'rack', '~> 1.4'
-  gem.add_dependency 'happy-helpers', '~> 0.1.0.pre8'
+  gem.add_dependency 'happy-helpers', '~> 0.1.0.pre9'
   gem.add_dependency 'allowance', '>= 0.1.1'
 
   gem.add_dependency 'happy-cli', '>= 0.1.0.pre1'

data/lib/happy/controller/actions.rb

@@ -32,6 +32,13 @@ module Happy
         halt!
       end
 
+      def serve_or_404!(*args)
+        serve!(*args)
+
+        # If we get here, #serve! decided not to serve, so let's raise a 404.
+        raise Errors::NotFound
+      end
+
       def halt!(message = :done)
         throw message
       end

data/lib/happy/controller/rackable.rb

@@ -7,10 +7,7 @@ module Happy
         @env = env
 
         catch :done do
-          serve! perform
-
-          # If we get here, #serve decided not to serve.
-          raise Errors::NotFound
+          serve_or_404! perform
         end
 
         response

data/lib/happy/controller/routing.rb

@@ -34,10 +34,7 @@ module Happy
               previous_path << remaining_path.shift
             end
 
-            serve! instance_exec(&blk)
-
-            # If we get here, #serve decided not to serve.
-            raise Errors::NotFound
+            serve_or_404! instance_exec(&blk)
           end
         end
       end

data/lib/happy/controller.rb

@@ -35,16 +35,16 @@ module Happy
 
   protected
 
-    def url(extras = nil)
-      url_for(previous_path, extras)
-    end
-
     def root_url(extras = nil)
       url_for(root_path, extras)
     end
 
   private
 
+    def url(extras = nil)
+      url_for(previous_path, extras)
+    end
+
     def context
       @env['happy.context'] ||= self.class.context_class.from_env(@env)
     end

data/lib/happy/request.rb

@@ -1,5 +1,8 @@
+# SMELL: really?
 require 'happy-helpers/utils/date_parameter_converter'
 
+# SMELL: do we really need our own request class?
+
 module Happy
   class Request < Rack::Request
   protected

data/lib/happy/utils/app_spawner.rb

@@ -1,5 +1,6 @@
 module Happy
   module Utils
+    # SMELL: this should be a controller, spawning another controller.
     class AppSpawner
       attr_reader :options
 

data/lib/happy/version.rb

@@ -1,3 +1,3 @@
 module Happy
-  VERSION = "0.1.0.pre11"
+  VERSION = "0.1.0.pre12"
 end

data/lib/happy.rb

@@ -1,5 +1,3 @@
-require 'active_support/all' # SMELL
-
 require 'rack'
 require 'happy/context'
 require 'happy/controller'

data/spec/happy_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Happy do
+  describe '#env' do
+    it "is a StringInquirer instance describing the RACK environment" do
+      Happy.env.should be_kind_of(ActiveSupport::StringInquirer)
+    end
+
+    it "provides #development?, #production? etc." do
+      ENV.should_receive(:[]).twice.with('RACK_ENV').and_return('development')
+      Happy.env.should be_development
+      Happy.env.should_not be_production
+
+      ENV.should_receive(:[]).twice.with('RACK_ENV').and_return('production')
+      Happy.env.should be_production
+      Happy.env.should_not be_development
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ lib_path = File.expand_path("#{SPEC_DIR}/../lib")
 $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
 
 require 'rubygems'
-require 'bundler/setup'
 require 'rack/test'
 
 require 'happy'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happy
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre11
+  version: 0.1.0.pre12
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-02 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70286029076720 !ruby/object:Gem::Requirement
+  requirement: &70295340567400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70286029076720
+  version_requirements: *70295340567400
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70286029074940 !ruby/object:Gem::Requirement
+  requirement: &70295340555820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70286029074940
+  version_requirements: *70295340555820
 - !ruby/object:Gem::Dependency
   name: happy-helpers
-  requirement: &70286029066200 !ruby/object:Gem::Requirement
+  requirement: &70295340539140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre8
+        version: 0.1.0.pre9
   type: :runtime
   prerelease: false
-  version_requirements: *70286029066200
+  version_requirements: *70295340539140
 - !ruby/object:Gem::Dependency
   name: allowance
-  requirement: &70286029063180 !ruby/object:Gem::Requirement
+  requirement: &70295340535640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70286029063180
+  version_requirements: *70295340535640
 - !ruby/object:Gem::Dependency
   name: happy-cli
-  requirement: &70286029062500 !ruby/object:Gem::Requirement
+  requirement: &70295340526260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.0.pre1
   type: :runtime
   prerelease: false
-  version_requirements: *70286029062500
+  version_requirements: *70295340526260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70286029061860 !ruby/object:Gem::Requirement
+  requirement: &70295340518680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70286029061860
+  version_requirements: *70295340518680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70286029061160 !ruby/object:Gem::Requirement
+  requirement: &70295340505940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70286029061160
+  version_requirements: *70295340505940
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
-  requirement: &70286029059920 !ruby/object:Gem::Requirement
+  requirement: &70295340498580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70286029059920
+  version_requirements: *70295340498580
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70286029058420 !ruby/object:Gem::Requirement
+  requirement: &70295340485280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70286029058420
+  version_requirements: *70295340485280
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70286029053960 !ruby/object:Gem::Requirement
+  requirement: &70295340465380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70286029053960
+  version_requirements: *70295340465380
 description: A happy little toolkit for writing web applications.
 email:
 - hendrik@mans.de
@@ -151,9 +151,10 @@ files:
 - lib/happy/request.rb
 - lib/happy/utils/app_spawner.rb
 - lib/happy/version.rb
-- spec/controller_ext/actions_spec.rb
-- spec/controller_ext/routing_spec.rb
+- spec/controller/actions_spec.rb
+- spec/controller/routing_spec.rb
 - spec/controller_spec.rb
+- spec/happy_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/hmans/happy
 licenses: []
@@ -180,8 +181,9 @@ signing_key:
 specification_version: 3
 summary: A happy little toolkit for writing web applications.
 test_files:
-- spec/controller_ext/actions_spec.rb
-- spec/controller_ext/routing_spec.rb
+- spec/controller/actions_spec.rb
+- spec/controller/routing_spec.rb
 - spec/controller_spec.rb
+- spec/happy_spec.rb
 - spec/spec_helper.rb
 has_rdoc: