orange 0.1.4 → 0.1.7

data/lib/orange-core/application.rb

@@ -107,10 +107,11 @@ module Orange
     #
     # Usually, you'll call this in the rackup file: `run MyApplication.app`
     def self.app
+      @core ||= Orange::Core.new
       if @app.instance_of?(Proc)
-        Orange::Stack.new &@app   # turn saved proc into a block arg
+        Orange::Stack.new self, @core, &@app   # turn saved proc into a block arg
       else
-        Orange::Stack.new self
+        Orange::Stack.new self, @core
       end
     end
     
@@ -118,7 +119,8 @@ module Orange
     # is called
     # 
     # Each call to stack overrides the previous one.
-    def self.stack(&block)
+    def self.stack(core = false, &block)
+      @core = core
       @app = Proc.new           # pulls in the block and makes it a proc
     end
   end

data/lib/orange-core/middleware/globals.rb

@@ -5,7 +5,7 @@ module Orange::Middleware
     def init(*args)
       opts = args.extract_options!.with_defaults(:file => "__ORANGE__/config.yml")
       @file = opts[:file].gsub('__ORANGE__', orange.app_dir)
-      @globals = orange[:parser].yaml(@file)
+      @globals = orange[:parser].yaml(@file) || {}
       @globals.each{|k,v| orange.options[k] = v }
     end
     def packet_call(packet)

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

@@ -13,7 +13,8 @@ module Orange
     end
     
     def yaml(file)
-      string = File.read(file)
+      return nil unless File.exists?(file)
+      string = File.read(file) 
       string.gsub!('__ORANGE__', orange.app_dir)
       out = YAML::load(string)
     end

data/lib/orange-core/stack.rb

@@ -24,8 +24,9 @@ module Orange
     # other stacks that can be used.
     #
     # @param [Orange::Application] app_class the class of the main application
+    # @param [Orange::Core] core the orange core
     # @param [Symbol] prebuilt the optional prebuilt stack, if one isn't passed as block
-    def initialize(app_class = nil, prebuilt = :none, &block)
+    def initialize(app_class = nil, core = false, prebuilt = :none, &block)
       @build = Rack::Builder.new
       @core = Orange::Core.new
       @auto_reload = false

data/lib/orange-more/administration/plugin.rb

@@ -1,3 +1,4 @@
+require (File.join(File.dirname(__FILE__), 'cartons', 'site.rb'))
 Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
 Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
 Dir.glob(File.join(File.dirname(__FILE__), 'middleware', '*.rb')).each {|f| require f }

data/lib/orange-more/cloud/resources/cloud_resource.rb

@@ -6,7 +6,7 @@ module Orange
     call_me :cloud
     def afterLoad
       orange.register(:stack_loaded) do |stack|
-        options[:ping_fm_key] = orange.options[:ping_fm_key] || false
+        options[:ping_fm_key] = orange.options['ping_fm_key'] || false
       end
     end
     

data/lib/orange-more/debugger/middleware/debugger.rb

@@ -24,7 +24,7 @@ module Orange::Middleware
 end
 
 module Orange::Pulp::DebuggerHelpers
-  def h(obj)                  # :nodoc:
+  def h_debug(obj)                  # :nodoc:
     case obj
     when String
       Rack::Utils.escape_html(obj)

data/lib/orange-more/debugger/views/debug_bar.haml

@@ -33,9 +33,9 @@
         - packet.env.sort_by { |k, v| k.to_s }.each do |key, val|
           - unless key =~ /^orange\./ 
             %tr
-              %td #{h key}
+              %td #{h_debug key}
               %td.code
-                %div #{h val}
+                %div #{h_debug val}
     %h3#orange-info Orange ENV
     %table.req
       %thead
@@ -46,9 +46,9 @@
         - packet.env['orange.env'].sort_by { |k, v| k.to_s }.each do |key, val|
           - if(![:request, :headers, :content].include?(key)) 
             %tr
-              %td #{h key}
+              %td #{h_debug key}
               %td.code
-                %div #{h val}
+                %div #{h_debug val}
     %h3#orange-info= 'Orange<br /> Response'
     %table.req
       %thead
@@ -59,6 +59,6 @@
         - packet.env['orange.env'].sort_by { |k, v| k.to_s }.each do |key, val|
           - if([:headers, :content].include?(key)) 
             %tr
-              %td #{h key}
+              %td #{h_debug key}
               %td.code
-                %div #{h val}
+                %div #{h_debug val}

data/spec/orange-core/stack_spec.rb

@@ -128,7 +128,7 @@ describe Orange::Stack do
     end
     x.middlewarez.should have(1).middlewares
     x.prerouting
-    x.middlewarez.should have(6).middlewares
+    x.middlewarez.should have(9).middlewares
     x.middlewarez.select{|y| y.instance_of?(Rack::AbstractFormat)}.should_not be_empty
     x.middlewarez.select{|y| y.instance_of?(Orange::Middleware::RouteSite)}.should_not be_empty
   end
@@ -140,23 +140,11 @@ describe Orange::Stack do
     end
     x.middlewarez.should have(1).middlewares
     x.prerouting(:no_abstract_format => true)
-    x.middlewarez.should have(5).middlewares
+    x.middlewarez.should have(8).middlewares
     x.middlewarez.select{|y| y.instance_of?(Rack::AbstractFormat)}.should be_empty
     x.middlewarez.select{|y| y.instance_of?(Orange::Middleware::RouteSite)}.should_not be_empty
   end
   
-  it "should add middleware when calling restful_routing" do
-    x= Orange::Stack.new do
-      no_recapture
-      run MockExitware.new
-    end
-    x.middlewarez.should have(1).middlewares
-    x.restful_routing
-    x.middlewarez.should have(2).middlewares
-    restfuls = x.middlewarez.select{|y| y.instance_of?(Orange::Middleware::RestfulRouter)}
-    restfuls.should_not be_empty
-    restfuls.should have(1).items
-  end
   
   it "should have not have extra middleware for a default stack" do
     x= Orange::Stack.new MockApplication

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: orange
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - David Haslem
@@ -9,49 +14,61 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 -05:00
+date: 2010-03-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 13
         version: 2.2.13
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 description: Orange is a Ruby framework for building managed websites with code as simple as Sinatra
 email: therabidbanana@gmail.com
 executables: []
@@ -210,18 +227,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Middle ground between Sinatra and Rails