orange 0.1.10 → 0.2.3

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

@@ -20,7 +20,7 @@ module Orange::Middleware
       path = packet['route.path'] || packet.request.path_info
       if @options[:migration_url] && @options[:migration_url] == path
         orange.migrate_db!
-        after = packet.session['flash.redirect_to'] ? packet.session['flash.redirect_to'] : '/'
+        after = packet.flash('redirect_to') || '/'
         packet.reroute(after)
       end
       pass packet

data/lib/orange-core/packet.rb

@@ -87,9 +87,23 @@ module Orange
     # Access to the rack session
     # @return [Hash] the session information made available by Rack
     def session
+      env['rack.session']["flash"] ||= {}
       env['rack.session']
     end
     
+    # Access to the rack session flash
+    # @return [String] the string stored in the flash
+    def flash(key = nil, val = nil)
+      env['rack.session']["flash"] ||= {}
+      if key.nil? && val.nil?
+        env['rack.session']["flash"]
+      elsif val.nil?
+        env['rack.session']["flash"].delete(key)
+      else
+        env['rack.session']["flash"][key] = val
+      end
+    end 
+    
     # Generate headers for finalization
     # @return [Hash] the header information stored in the orange.env, combined with the defaults
     #   set as DEFAULT_HEADERS

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

@@ -20,8 +20,11 @@ module Orange
       out = YAML::load(string)
     end
     
-    def haml(file, packet, *vars, &block)
+    def haml(file, packet_binding, *vars, &block)
       opts = vars.extract_options!
+      if packet_binding.is_a? Orange::Packet
+        context = packet_binding['route.context'].to_s 
+      end
       temp = opts.delete(:template)
       opts[:resource_name] = opts[:resource].orange_name.to_s if 
           opts[:resource] && opts[:resource].respond_to?(:orange_name)
@@ -33,23 +36,36 @@ module Orange
         string ||= read_if_exists('templates', file) 
         @template_dirs.each do |templates_dir|
           string ||= read_if_exists(templates_dir, file)
-        end
+        end unless string
       end
+      
+      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_dir, resource, context+"."+file) if resource
+          string ||= read_if_exists(views_dir, context+"."+file)
+        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_dir, resource, file) if resource
         string ||= read_if_exists(views_dir, file)
-      end
+      end unless string
+      
+      # Check for default resource views
       string ||= read_if_exists('views', 'default_resource', file)
       @view_dirs.each do |views_dir|
         string ||= read_if_exists(views_dir, 'default_resource', file) if resource
-        string ||= read_if_exists(views_dir, file)
-      end
+      end unless string
       raise LoadError, "Couldn't find haml file '#{file}'" unless string
       
       haml_engine = Haml::Engine.new(string)
-      out = haml_engine.render(packet, opts, &block)
+      out = haml_engine.render(packet_binding, opts, &block)
     end
     
     def read_if_exists(*args)

data/lib/orange-more/administration/middleware/access_control.rb

@@ -38,7 +38,7 @@ module Orange::Middleware
         return ret unless ret.blank? # unless handle_openid returns false, exit immediately
       end
       unless access_allowed?(packet)
-        packet.session['user.after_login'] = packet.request.path
+        packet.flash['user.after_login'] = packet.request.path
         packet.reroute(@login)
       end
       
@@ -75,8 +75,7 @@ module Orange::Middleware
       if packet.request.path.gsub(/\/$/, '') == @logout
         packet.session['user.id'] = nil
         packet['user.id'] = nil
-        after = packet.session['user.after_login'].blank? ? 
-                '/' : packet.session['user.after_login'] 
+        after = packet.flash('user.after_login') || '/'
         packet.reroute(after)
         return false
       end
@@ -112,9 +111,7 @@ module Orange::Middleware
             end
             
             
-            after = packet.session.has_key?('user.after_login') ?
-                        packet.session['user.after_login'] : '/'
-            packet.session['user.after_login'] = false
+            after = packet.flash('user.after_login') || '/'
             
             # Save id into session if we have one.
             packet.session['user.id'] = packet['user.id']
@@ -123,7 +120,7 @@ module Orange::Middleware
             packet.reroute(after)
             false
           else
-            packet.session['flash.error'] = resp.status
+            packet.flash['error'] = resp.status
             packet.reroute(@login)
             false
           end
@@ -131,8 +128,10 @@ module Orange::Middleware
         else
           packet[:status] = 401
           packet[:headers] = {}
+          id = packet.request.params["openid_identifier"]
+          id = "http://#{id}" unless id =~ /^https?:\/\//
           packet.add_header('WWW-Authenticate', Rack::OpenID.build_header(
-                :identifier => packet.request.params["openid_identifier"],
+                :identifier => id,
                 :required => [:email, "http://axschema.org/contact/email"]
                 ) 
           )

data/lib/orange-more/administration/resources/user_resource.rb

@@ -29,7 +29,7 @@ module Orange
       sites = params.delete 'sites'
       obj.update(params)
       obj.orange_sites.destroy
-      sites.each{|k,v| s = OrangeSite.first(:id => k); m.orange_sites << s if s} if sites
+      sites.each{|k,v| s = OrangeSite.first(:id => k); obj.orange_sites << s if s} if sites
       obj.save
     end
     

data/lib/orange-more/administration/views/openid_login.haml

@@ -5,8 +5,8 @@
     %h2 Wait a minute... 
     %p You'll need to log in before you can continue. Use your OpenID.
     %p (You can use a Google account to log in. Put https://www.google.com/accounts/o8/id in the box below.)
-    - if(session['flash.error'])
-      .error= session['flash.error']
+    - if(flash['error'])
+      .error= flash('error')
     %form{:action => '', :method => 'POST'}
       %input{:type => 'text', :name => 'openid_identifier'}
       %input{:type => 'submit', :value => 'Log in'}

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

@@ -9,7 +9,7 @@ module Orange::Middleware
     # Passes packet then parses the return
     def packet_call(packet)
       if orange.options[:development_mode]
-        packet.session['flash.redirect_to'] = packet.request.path
+        packet.flash['redirect_to'] = packet.request.path
         packet.add_css('debug_bar.css', :module => '_debugger_')
       end
       pass packet

data/lib/orange-more/pages/resources/page_resource.rb

@@ -63,7 +63,7 @@ module Orange
     
     # Saves updates to an object specified by packet['route.resource_id'], then reroutes to main
     # @param [Orange::Packet] packet the packet being routed
-    def onSave(packet, params = {})
+    def onSave(packet, m, params = {})
       params[:published] = false
       m.update(params)
       m.orange_site = packet['site']

data/spec/orange-core/packet_spec.rb

@@ -55,8 +55,32 @@ describe Orange::Packet do
   end
   
   it "should give access to the rack.session env" do
-    p= Orange::Packet.new(Orange::Core.new, {'rack.session' => 'banana'})
-    p.session.should == 'banana'
+    p= Orange::Packet.new(Orange::Core.new, {'rack.session' => {'foo' => 'banana'}})
+    p.session.should have_key 'foo'
+    p.session.should have_key 'flash'
+  end
+  
+  it "should give always have a flash" do
+    p= Orange::Packet.new(Orange::Core.new, {'rack.session' => {}})
+    p.session.should have_key 'flash'
+    p.flash.should == {}
+  end
+  
+  it "should destruct a flash value upon reading" do    
+    p= Orange::Packet.new(Orange::Core.new, {'rack.session' => {}})
+    p.session.should have_key 'flash'
+    p.session["flash"]["foo"] = "bar"
+    p.flash("foo").should == "bar"
+    p.flash("foo").should be_nil
+    p.session["flash"].should_not have_key("foo")
+    p.flash("foo", "bar")
+    p.flash("foo").should == "bar"
+    p.flash("foo").should be_nil
+    p.session["flash"].should_not have_key("foo")
+    p.flash["foo"] = "bar"
+    p.flash("foo").should == "bar"
+    p.flash("foo").should be_nil
+    p.flash.should_not have_key("foo")
   end
   
   it "should give headers by combining :headers with defaults" do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 10
-  version: 0.1.10
+  - 2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - David Haslem
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -04:00
+date: 2010-05-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency