orange-core 0.5.8 → 0.5.9

data/lib/orange-core/resources/parser.rb

@@ -29,6 +29,7 @@ module Orange
           opts[:resource] && opts[:resource].respond_to?(:orange_name)
       resource = (opts[:resource_name] || '').downcase
       
+      opts.merge :orange => orange
       if packet_binding.is_a? Orange::Packet
         context = packet_binding['route.context'].to_s
         unless temp
@@ -37,12 +38,11 @@ module Orange
         end
       end
       unless haml_engine
-        opts.merge :orange => orange
       
         string = false
         if temp
           string ||= read_if_exists('templates', file) 
-          @template_dirs.each do |templates_dir|
+          @template_dirs.reverse_each do |templates_dir|
             string ||= read_if_exists(templates_dir, file)
           end unless string
         end
@@ -50,24 +50,24 @@ module Orange
         if context
           #Check for context specific overrides
           string ||= read_if_exists('views', resource, context+"."+file) if resource
-          string ||= read_if_exists('views', context+"."+file)
-          @view_dirs.each do |views_dir|
+          string ||= read_if_exists('views', context+"."+file) unless resource
+          @view_dirs.reverse_each do |views_dir|
             string ||= read_if_exists(views_dir, resource, context+"."+file) if resource
-            string ||= read_if_exists(views_dir, context+"."+file)
+            string ||= read_if_exists(views_dir, context+"."+file) unless resource
           end unless string
         end
       
         # Check for standard views
         string ||= read_if_exists('views', resource, file) if resource
-        string ||= read_if_exists('views', file)
-        @view_dirs.each do |views_dir|
+        string ||= read_if_exists('views', file) unless resource
+        @view_dirs.reverse_each do |views_dir|
           string ||= read_if_exists(views_dir, resource, file) if resource
-          string ||= read_if_exists(views_dir, file)
+          string ||= read_if_exists(views_dir, file) unless resource
         end unless string
       
         # Check for default resource views
         string ||= read_if_exists('views', 'default_resource', file)
-        @view_dirs.each do |views_dir|
+        @view_dirs.reverse_each do |views_dir|
           string ||= read_if_exists(views_dir, 'default_resource', file) if resource
         end unless string
         raise LoadError, "Couldn't find haml file '#{file}'" unless string

data/lib/orange-core/stack.rb

@@ -1,5 +1,7 @@
 require 'orange-core/core'
 require 'rack/builder'
+require 'rack/abstract_format'
+
 module Orange
   # Builds an orange stack of middleware
   # Use in the rackup file as follows:

data/spec/orange-core/mock/mock_app.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-require 'rack/abstract_format'
 
 class MockApplication < Orange::Application
   

data/spec/orange-core/resources/model_resource_spec.rb

@@ -169,6 +169,7 @@ describe Orange::ModelResource do
   
   it "should call carton's destroy! on DELETE delete and reroute" do
     a= MockModelResourceTwo.new
+    a.set_orange(Orange::Core.new, :mock_resource)
     m= mock("carton", :null_object => true)
     m.should_receive(:destroy)
     a.stub!(:model_class).and_return(m)

data/spec/orange-core/spec_helper.rb

@@ -1,8 +1,8 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'orange-core'
 require 'rubygems'
+require 'orange-core'
 
 require 'mock/mock_app'
 require 'mock/mock_pulp'

data/spec/orange-core/stack_spec.rb

@@ -127,7 +127,7 @@ describe Orange::Stack do
     x.app
     x.app
     c2.should_receive(:fire).with(:stack_loaded, anything()).exactly(3).times
-    c2.should_receive(:fire).with(:stack_reloading, anything()).twice
+    c2.should_receive(:fire).with(:stack_reloading, anything()).exactly(3).times
     x2.app
     x2.app
     x2.app

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: orange-core
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 5
-  - 8
-  version: 0.5.8
+  - 9
+  version: 0.5.9
 platform: ruby
 authors: 
 - David Haslem
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 -04:00
+date: 2010-07-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,7 +97,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rack-abstract-format
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -108,10 +108,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: rspec
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -124,6 +124,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
 description: Orange is a Ruby framework for building managed websites with code as simple as Sinatra
 email: therabidbanana@gmail.com
 executables: []
@@ -208,7 +222,22 @@ has_rdoc: true
 homepage: http://github.com/therabidbanana/orange-core
 licenses: []
 
-post_install_message: 
+post_install_message: |
+  ===========================================
+  Note: 
+  orange-core requires DataMapper to function. dm-core has been installed,
+  but please make sure you also have installed the 
+  the appropriate DataMapper adapter for your system:
+  
+  $ gem install [dm-adapter]
+  
+  Mysql:    dm-mysql-adapter
+  Sqlite:   dm-sqlite-adapter
+  Postgres: dm-postgres-adapter
+  
+  orange-core install complete.
+  ===========================================
+
 rdoc_options: 
 - --charset=UTF-8
 require_paths: