orange-core 0.6.0 → 0.7.0

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

@@ -6,6 +6,18 @@ module Orange
     # attribute
     cattr_accessor :model_class
     attr_accessor :model_class
+    # Defines a list of exposed actions
+    cattr_accessor :exposed_actions
+    cattr_accessor :listable_actions
+    # Allows the resource to be nested inside other resources.
+    cattr_accessor :nested_in
+    # Allows the resource to be nest other resources.
+    cattr_accessor :nests
+    
+    def self.listable(*args)
+      self.listable_actions ||= []
+      args.each{|arg| self.listable_actions << arg}
+    end
     
     # Tells the Model resource which Carton class to scaffold
     # @param [Orange::Carton] my_model_class class name of the carton class to scaffold
@@ -13,9 +25,39 @@ module Orange
       self.model_class = my_model_class
     end
     
+    # Allows the resource to nest other resources
+    def self.nests_many(*args)
+      self.nests ||= {}
+      args.each{|arg| self.nests[arg] = :many}
+    end
+    
+    # Allows the resource to nest other resources
+    def self.nests_one(*args)
+      self.nests ||= {}
+      args.each{|arg| self.nests[arg] = :one}
+    end
+    
+    def nests
+      self.class.nests
+    end
+    
+    # Allows the resource to nest inside other resources
+    def self.nests_in(*args)
+      self.nested_in ||= []
+      args.each{|arg| self.nested_in << arg}
+    end
+    
+    def nested_in
+      self.class.nested_in
+    end
+    
     # Overrides the instantiation of new Resource object to set instance model
     # class to the class-level model class defined by #use
     def self.new(*args, &block)
+      self.exposed_actions ||= {:all => [:show, :list], :admin => [:all], :orange => [:all]}
+      self.listable_actions ||= []
+      self.nested_in ||= []
+      self.nests ||= {}
       me = super(*args, &block)
       me.model_class = self.model_class 
       me
@@ -32,7 +74,24 @@ module Orange
       resource_id = opts[:id] || packet['route.resource_id', false]
       mode = opts[:mode] || packet['route.resource_action'] || 
         (resource_id ? :show : :index)
-      self.__send__(mode, packet, opts)
+      if self.respond_to?(mode)
+        self.__send__(mode, packet, opts)
+      else
+        viewable(packet, mode, opts)
+      end
+    end
+    
+    # Allows undefined methods to be viewed with the standard do_view method
+    # They must be added to the viewable or listable actions by calling
+    # #self.viewable or #self.listable with a set of functions to be viewable
+    def viewable(packet, mode, opts={})
+      if(self.class.viewable_actions.include?(mode))
+        do_view(packet, mode, opts)
+      elsif(self.class.listable_actions.include?(mode))
+        do_list_view(packet, mode, opts)
+      else
+        ''
+      end
     end
     
     # Renders a view, with all options set for haml to access.
@@ -68,7 +127,7 @@ module Orange
     # @return [Hash] hash of options to be used
     def view_opts(packet, mode, is_list, *args)
       opts = args.extract_options!.with_defaults({:path => ''})
-      props = model_class.form_props(packet['route.context'])
+      props = model_class.form_props(packet['route.context'], ((is_list || mode == :table_row) ? mode : :any))
       resource_id = opts[:id] || packet['route.resource_id'] || false
       all_opts = {:props => props, :resource => self, :model_name => @my_orange_name}.merge!(opts)
       all_opts.with_defaults! :model => find_one(packet, mode, resource_id) unless is_list
@@ -222,6 +281,29 @@ module Orange
     def index(packet, *opts)
       do_list_view(packet, :list, *opts)
     end
+    
+    # Add methods to the list of exposed actions. 
+    def self.expose(*args)
+      self.exposed_actions ||= {:all => [:show, :list], :admin => :all, :orange => :all}
+      self.exposed_actions.merge!(args.extract_options!)
+      self.exposed_actions[:all].concat(args)
+    end
+    
+    # Add an exclusive list of exposed actions. List is cleared out beforehand
+    def self.expose_only(*args)
+      self.exposed_actions = {:all => []}
+      self.exposed_actions.merge!(args.extract_options!)
+      self.exposed_actions[:all].concat(args)
+    end
+    
+    # Exposed method for helping the RestfulRouter class.
+    def exposed(packet)
+      all = self.class.exposed_actions[:all]
+      all = [all] unless all.is_a?(Array)
+      context = self.class.exposed_actions[packet['route.context']]
+      context = [context] unless context.is_a?(Array)
+      all+context
+    end
   
   end
   

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

@@ -9,8 +9,8 @@ module Orange
       orange.add_pulp Orange::Pulp::ParserPulp
       @template_dirs = [File.join(orange.core_dir, 'templates')]
       @view_dirs = [File.join(orange.core_dir, 'views')]
-      Orange.plugins.each{|p| @template_dirs << p.templates if p.has_templates? }
-      Orange.plugins.each{|p| @view_dirs << p.views if p.has_views? }
+      orange.plugins.each{|p| @template_dirs << p.templates if p.has_templates? }
+      orange.plugins.each{|p| @view_dirs << p.views if p.has_views? }
     end
     
     def yaml(file)
@@ -77,6 +77,7 @@ module Orange
           packet_binding['parser.haml-templates', {}]["#{context}-#{resource}-#{file}"] = haml_engine
         end
       end
+      opts[:opts] = opts.dup
       out = haml_engine.render(packet_binding, opts, &block)
     end
     

data/lib/orange-core/stack.rb

@@ -1,6 +1,5 @@
 require 'orange-core/core'
 require 'rack/builder'
-require 'rack/abstract_format'
 
 module Orange
   # Builds an orange stack of middleware
@@ -127,13 +126,12 @@ module Orange
       stack Orange::Middleware::Loader
       stack Orange::Middleware::Rerouter, opts.dup
       stack Orange::Middleware::Static, opts.dup
-      use Rack::AbstractFormat unless opts[:no_abstract_format] 
-          # Must be used before non-destructive route altering done by Orange,
-          # since all orange stuff is non-destructive
+      stack Orange::Middleware::AbstractFormat unless opts[:no_abstract_format] 
+      stack Orange::Middleware::RootDir, opts.dup
       stack Orange::Middleware::RouteSite, opts.dup
       stack Orange::Middleware::RouteContext, opts.dup
-      stack Orange::Middleware::Database
-      Orange.plugins.each{|p| p.middleware(:prerouting).each{|m| stack m, opts.dup} if p.has_middleware?}
+      stack Orange::Middleware::Database unless (opts[:no_datamapper] || orange.options[:no_datamapper])
+      orange.plugins.each{|p| p.middleware(:prerouting).each{|m| stack m, opts.dup} if p.has_middleware?}
     end
     
     # A shortcut for routing via Orange::Middleware::RestfulRouter and any plugins
@@ -141,17 +139,17 @@ module Orange
     # Any args are passed on to the middleware
     def routing(opts ={})
       stack Orange::Middleware::RestfulRouter, opts.dup
-      Orange.plugins.each{|p| p.middleware(:routing).each{|m| stack m, opts.dup} if p.has_middleware?}
+      orange.plugins.each{|p| p.middleware(:routing).each{|m| stack m, opts.dup} if p.has_middleware?}
     end
     
     def postrouting(opts ={})
-      Orange.plugins.each{|p| p.middleware(:postrouting).each{|m| stack m, opts.dup} if p.has_middleware?}
+      orange.plugins.each{|p| p.middleware(:postrouting).each{|m| stack m, opts.dup} if p.has_middleware?}
       stack Orange::Middleware::Template
       stack Orange::Middleware::FourOhFour, opts.dup # Last ditch, send route to 404 page.
     end
     
     def responders(opts ={})
-      Orange.plugins.each{|p| p.middleware(:responders).each{|m| stack m, opts.dup} if p.has_middleware?}
+      orange.plugins.each{|p| p.middleware(:responders).each{|m| stack m, opts.dup} if p.has_middleware?}
     end
     
     # # A shortcut to enable Rack::OpenID and Orange::Middleware::AccessControl
@@ -203,14 +201,14 @@ module Orange
         @app = false                    # Rebuild no matter what if autoload
       end
       unless @app 
-        @app = do_build            # Build if necessary
+        do_build            # Build if necessary
         orange.fire(:stack_loaded, @app)
       end
       @app
     end
     
     def do_build
-      @build.to_app
+      @app = @build.to_app
     end
     
     # Sets the core and then passes on to the stack, according to standard 
@@ -222,7 +220,7 @@ module Orange
     
     # Debug helping
     def inspect
-      "#<Orange::Stack:0x#{self.object_id.to_s(16)} @build=#{@build.inspect}, @core=#{@core.inspect}>"
+      "#<Orange::Stack:0x#{self.object_id.to_s(16)} @app=#{@app.inspect}, @core=#{@core.inspect}>"
     end
   end
 end

data/lib/orange-core/templates/500.haml

@@ -0,0 +1,2 @@
+%h1 An Error Occurred!
+%p We're sorry.

data/lib/orange-core/views/default_resource/create.haml

@@ -1,4 +1,4 @@
-%form{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post'}
+%form{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post', :"accept-charset" => "UTF-8"}
   - for prop in props
     %p= view_attribute(prop, model_name, :label => true)
   %input{:type => 'submit', :value => 'Save New Item'}

data/lib/orange-core/views/default_resource/edit.haml

@@ -1,7 +1,7 @@
 - if model
   - if resource.options[:sitemappable, false] 
     = orange[:sitemap, true].sitemap_links(packet, {:slug_me => orange[:sitemap, true].slug_for(model, props)})
-  %form{:action => packet.route_to(model_name, model[:id], 'save'), :method => 'post'}
+  %form{:action => packet.route_to(model_name, model[:id], 'save'), :method => 'post', :"accept-charset" => "UTF-8"}
     - for prop in props
       %p!= view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]), :model => model)
     %input{:type => 'submit', :value => 'Save Changes'}

data/lib/orange-core/views/not_found/404.haml

@@ -1,2 +1,2 @@
-%h1= "#{request.request_method}: #{request.path}"
+%h1= "#{request.request_method}: #{packet['route.path']}"
 %h2 The file you were looking for cannot be found

data/spec/orange-core/application_spec.rb

@@ -47,6 +47,7 @@ describe Orange::Application do
   it "should have a different app stack after using stack method" do
     lambda {
       MockApplication.stack do
+        run MockExitware.new
       end
     }.should change(MockApplication, :app)
   end

data/spec/orange-core/core_spec.rb

@@ -139,6 +139,21 @@ describe Orange::Core do
     c.options.should_not have_key(:opt_3)
   end
   
+  it "should have a mash options hash" do
+    c= Orange::Core.new(:opt_1 => true, "opt_4" => 'banana'){ opt_2 true }
+    c.options.should be_an_instance_of(Mash)
+    c.options[:opt_1].should == true
+    c.options[:opt_2].should == true
+    c.options[:opt_4].should == 'banana'
+    c.options["opt_1"].should == true
+    c.options["opt_2"].should == true
+    c.options["opt_4"].should == 'banana'
+    c.options.should have_key(:opt_1)
+    c.options.should have_key("opt_1")
+    c.options.should_not have_key(:opt_3)
+    c.options.should_not have_key("opt_3")
+  end
+  
   it "should load a resource when passed resource instance" do
     c= Orange::Core.new
     c.load(MockResource.new, :mock_one)
@@ -225,7 +240,7 @@ describe Orange::Core do
   end
   
   it "should have an options hash" do
-    Orange::Core.new.options.should be_an_instance_of(Hash)
+    Orange::Core.new.options.should be_a_kind_of(Hash)
   end
   
   it "should allow access to the resources via []" do

data/spec/orange-core/middleware/restful_router_spec.rb

@@ -1,3 +1,100 @@
 describe Orange::Middleware::RestfulRouter do
-  it "should be spec'ed"
+  before :all do
+    @router = Orange::Middleware::RestfulRouter.new(nil, Orange::Core.new)
+  end
+  before :each do
+    @index = empty_packet(@router.orange)
+    @index.orange.load(MockNestingResource.new, :products)
+    @index.orange.load(MockNestedResource.new, :photo)
+    @index.orange.load(MockCategoryResource.new, :category)
+    @index.orange.load(MockResource.new, :special)
+    @show_product_list = empty_packet(@index.orange)
+    @show_product_list['route.path'] = '/products'
+    @show_product_one = empty_packet(@index.orange)
+    @show_product_one['route.path'] = '/products/1'
+    @edit_product_two = empty_packet(@index.orange)
+    @edit_product_two['route.path'] = '/products/2/edit'
+    @edit_product_three_special = empty_packet(@index.orange)
+    @edit_product_three_special['route.path'] = '/products/3/edit/special'
+    @edit_product_three_photo = empty_packet(@index.orange)
+    @edit_product_three_photo['route.path'] = '/products/3/photo/edit'
+    @edit_product_very_nested = empty_packet(@index.orange)
+    @edit_product_very_nested['route.path'] = '/category/1/view/products/3/photo/edit'
+    @edit_product_three_photo_thumbnail = empty_packet(@index.orange)
+    @edit_product_three_photo_thumbnail['route.path'] = '/products/3/photo/1/edit/thumbnail'
+    @show_banana_list = empty_packet(@index.orange)
+    @show_banana_list['route.path'] = '/bananas'
+  end
+  it "should not route if other middleware has" do
+    @index['route.router'] = true
+    @show_product_list['route.router'].should == false
+    @router.should_receive(:pass).twice
+    @router.should_receive(:should_route?).once.and_return(true)
+    @router.packet_call(@index)
+    @router.packet_call(@show_product_list)
+    
+  end
+  it "should set router" do
+    @router.should_receive(:pass).once
+    @router.should_receive(:should_route?).once.and_return(true)
+    @show_product_list['route.router'].should == false
+    @router.packet_call(@show_product_list)
+    @show_product_list['route.router'].should == @router
+  end
+  it "should set routing vars if should_route true" do
+    @router.should_receive(:pass).at_least(:once)
+    @router.should_receive(:should_route?).at_least(:once).and_return(true)
+    @router.packet_call(@show_product_list)
+    @show_product_list['route.resource'].should == :products
+    @show_product_list['route.resource_action'].should == :list
+    @show_product_list['route.resource_id'].should == false
+    @show_product_one['route.resource_path'].should == false
+    @router.packet_call(@show_product_one)
+    @show_product_one['route.resource'].should == :products
+    @show_product_one['route.resource_action'].should == :show
+    @show_product_one['route.resource_id'].should == "1"
+    @show_product_one['route.resource_path'].should == ""
+    @router.packet_call(@edit_product_two)
+    @edit_product_two['route.resource'].should == :products
+    @edit_product_two['route.resource_action'].should == :edit
+    @edit_product_two['route.resource_id'].should == "2"
+    @show_product_one['route.resource_path'].should == ""
+    @router.packet_call(@edit_product_three_special)
+    @edit_product_three_special['route.nesting'].should == []
+    @edit_product_three_special['route.resource'].should == :products
+    @edit_product_three_special['route.resource_action'].should == :edit
+    @edit_product_three_special['route.resource_id'].should == "3"
+    @edit_product_three_special['route.resource_path'].should == "/special"
+  end
+  it "should handle nesting correctly" do
+    @router.should_receive(:pass).at_least(:once)
+    @router.should_receive(:should_route?).at_least(:once).and_return(true)
+    @router.packet_call(@edit_product_three_special)
+    @edit_product_three_special['route.nesting'].should == []
+    @edit_product_three_special['route.resource'].should == :products
+    @edit_product_three_special['route.resource_action'].should == :edit
+    @edit_product_three_special['route.resource_id'].should == "3"
+    @edit_product_three_special['route.resource_path'].should == "/special"
+    @router.packet_call(@edit_product_three_photo)
+    @edit_product_three_photo['route.nesting'].should_not == []
+    @edit_product_three_photo['route.resource'].should == :photo
+    @edit_product_three_photo['route.resource_action'].should == :edit
+    @edit_product_three_photo['route.resource_path'].should == ""
+    @router.packet_call(@edit_product_very_nested)
+    @edit_product_very_nested['route.nesting'].length.should == 2
+    @edit_product_very_nested['route.resource'].should == :photo
+    @edit_product_very_nested['route.resource_action'].should == :edit
+    @edit_product_very_nested['route.resource_path'].should == ""
+    @edit_product_very_nested['route.nesting'].first[:resource].should == :category
+    @edit_product_very_nested['route.nesting'].first[:resource_action].should == :view
+    @edit_product_very_nested['route.nesting'].first[:resource_id].should == "1"
+    @router.packet_call(@edit_product_three_photo_thumbnail)
+    @edit_product_three_photo_thumbnail['route.nesting'].should_not == []
+    @edit_product_three_photo_thumbnail['route.resource'].should == :photo
+    @edit_product_three_photo_thumbnail['route.resource_action'].should == :edit
+    @edit_product_three_photo_thumbnail['route.resource_id'].should == "1"
+    @edit_product_three_photo_thumbnail['route.resource_path'].should == "/thumbnail"
+  end
+  
+  
 end

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

@@ -16,4 +16,4 @@ end
 module MockMixinCore2
   def mixin_core_two
   end
-end
+end

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

@@ -2,6 +2,19 @@ class MockModelResource < Orange::ModelResource
   use MockCarton
 end
 
+class MockNestedResource < Orange::ModelResource
+  nests_in :products
+end
+
+class MockNestingResource < Orange::ModelResource
+  nests_many :photo
+  nests_in :category
+end
+
+class MockCategoryResource < Orange::ModelResource
+  nests_many :products
+end
+
 class MockModelResourceOne < Orange::ModelResource
   use MockCarton
   def index(packet, *args)

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

@@ -0,0 +1,7 @@
+
+class MockPlugin < Orange::Plugins::Base
+  assets_dir      File.join('assets')
+  views_dir       File.join('views')
+  templates_dir   File.join('templates')
+  resource MockResource.new
+end

data/spec/orange-core/orange_spec.rb

@@ -16,4 +16,15 @@ describe Orange do
     p.should respond_to(:pulp_orange_one)
     p2.should respond_to(:pulp_orange_one)
   end
+  it "should allow plugins" do
+    Orange.plugins.should have(0).items
+    Orange.plugin(MockPlugin.new)
+    Orange.plugins.should have(1).items
+    Orange.plugins([:foo, :bar]).should have(0).items
+    Orange.plugins([:mock_plugin]).should have(1).items
+    c= Orange::Core.new(:plugins => [:foo, :bar])
+    c.plugins.should have(0).items
+    c2= Orange::Core.new(:plugins => [:mock_plugin])
+    c2.plugins.should have(1).items
+  end
 end

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

@@ -43,12 +43,6 @@ describe Orange::ModelResource do
     }.should raise_error(RuntimeError, "I see you're using other")
   end
   
-  it "shouldn't give a shit" do
-    lambda{
-      MockModelResource.shit
-    }.should raise_error(NoMethodError)
-  end
-  
   it "should call find_one if calling view_opts with is_list false" do
     a= MockModelResourceOne.new
     lambda{
@@ -91,11 +85,26 @@ describe Orange::ModelResource do
   
   it "should call view_extras after during view_opts" do
     a= MockModelResourceThree.new
+    c = Orange::Core.new
     lambda{
-      a.view_opts(Orange::Packet.new(Orange::Core.new, {}), :list, true)
+      a.view_opts(Orange::Packet.new(c, {}), :list, true)
     }.should raise_error(RuntimeError, "calling find_extras")
   end
   
+  it "should have nesting methods" do
+    MockModelResourceOne.should respond_to(:nests_in)
+    MockModelResourceOne.nests_in :foo
+    MockModelResourceOne.new.nested_in.should include(:foo)
+    MockModelResourceTwo.should respond_to(:nests_many)
+    MockModelResourceTwo.nests_many :bar
+    MockModelResourceTwo.new.nests.should have_key(:bar)
+    MockModelResourceTwo.should respond_to(:nests_one)
+    MockModelResourceTwo.nests_one :baz
+    MockModelResourceTwo.new.nests.should have_key(:baz)
+    MockModelResourceTwo.new.nests[:bar].should == :many
+    MockModelResourceTwo.new.nests[:baz].should == :one
+  end
+  
   it "should call haml parser with opts on do_view" do
     c= Orange::Core.new
     p= Orange::Packet.new(c, {})

data/spec/orange-core/spec_helper.rb

@@ -13,7 +13,10 @@ require 'mock/mock_mixins'
 require 'mock/mock_router'
 require 'mock/mock_resource'
 require 'mock/mock_middleware'
+require 'mock/mock_plugin'
 require 'rack/test'
+require 'dm-sqlite-adapter'
+DataMapper.setup(:default, "sqlite::memory:")
 
 
 Spec::Runner.configure do |config|

data/spec/orange-core/stack_spec.rb

@@ -161,7 +161,7 @@ describe Orange::Stack do
     x.middlewarez.should have(1).middlewares
     x.prerouting
     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::AbstractFormat)}.should_not be_empty
     x.middlewarez.select{|y| y.instance_of?(Orange::Middleware::RouteSite)}.should_not be_empty
   end
   
@@ -189,7 +189,7 @@ describe Orange::Stack do
     x.middlewarez.should have(1).middlewares
     x.prerouting(:no_abstract_format => true)
     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::AbstractFormat)}.should be_empty
     x.middlewarez.select{|y| y.instance_of?(Orange::Middleware::RouteSite)}.should_not be_empty
   end