orange-core 0.7.0 → 0.7.1

data/README.markdown

@@ -36,19 +36,19 @@ Should I Use Orange?
 
 Sinatra is probably better for this kind of thing. It's perfect for creating quick web apps based on RESTful
 ideals. Or perhaps use a Sinatra clone built on Orange, so you can incorporate orange plugins and built in 
-database support... but such a clone doesn't exist [does it](http://github.com/therabidbanana/orange-juice)?
+database support... But [orange-juice](http://github.com/therabidbanana/orange-juice) was written for orange 0.5, so it's a bit behind. Hopefully it will be updated soon.
 
     "I want to create a powerful web application that needs to be rock solid and use a 
     well-tested foundation"
 
-No. This is where Ruby on Rails shines, it's a well supported, thoroughly tested framework
+This is where Ruby on Rails shines, it's a well supported, thoroughly tested framework
 for building web applications that gives you everything you need for the lifecycle of your
-application
+application.
 
     "I want to deploy a website on Ruby that has some dynamic elements, maybe allowing me
     to create my own plugin without jumping through too many hoops."
     
-Yes. This is what orange was designed for - we're building it to be able to quickly deploy
+This is what orange was designed for - we're building it to be able to quickly deploy
 websites that can have a Ruby base without the heavy-weight Ruby on Rails backend, but also 
 without feeling like you have to start from scratch like it feels in Sinatra.
 
@@ -60,6 +60,7 @@ orange-core tries to stay light on the dependencies.
 
 * dm-core (+ dm-[sqlite3|mysql|...]-adapter )
 * dm-migrations
+* tilt
 * rack
 * haml
 * crack

data/lib/orange-core/carton.rb

@@ -22,7 +22,7 @@ module Orange
   # class and just include DataMapper::Resource. All carton methods are to
   # improve scaffolding capability.
   class Carton
-    SCAFFOLD_OPTIONS = [:display_name, :levels] unless defined?(SCAFFOLD_OPTIONS)
+    SCAFFOLD_OPTIONS = [:display_name, :levels, :related_to, :wrap_tag] unless defined?(SCAFFOLD_OPTIONS)
     extend ClassInheritableAttributes
     cattr_accessor :scaffold_properties
     
@@ -51,6 +51,7 @@ module Orange
     
     # Return properties that should be shown for a given context
     def self.form_props(context = :live, mode = :any)
+      self.scaffold_properties ||= []
       self.scaffold_properties.select{|p| should_use?(p, context, mode)  }
     end
     
@@ -92,6 +93,10 @@ module Orange
       self.property(name, dm_type, opts)
     end
     
+    def self.relationship_scaffold(name, type, opts)
+      self.scaffold_properties << {:name => name, :type => type, :levels => @levels, :lazy => false, :relationship => true}.merge(opts) if @levels || opts.has_key?(:levels)
+    end
+    
     # Define a helper for title type database stuff
     # Show in a context if wrapped in one of the helpers
     def self.title(name, opts = {})
@@ -116,6 +121,12 @@ module Orange
       add_scaffold(name, :time, Time, opts)
     end
     
+    
+    # Show in a context if wrapped in one of the helpers
+    def self.number(name, opts = {})
+      add_scaffold(name, :number, Float, opts)
+    end
+    
     # Define a helper for fulltext type database stuff
     # Show in a context if wrapped in one of the helpers
     def self.fulltext(name, opts = {})
@@ -134,12 +145,45 @@ module Orange
       add_scaffold(name, :text, String, opts)
     end
     
+    # Define a helper for belongs_to stuff
+    def self.belongs(name, model, opts = {})
+      relationship_scaffold(name, :belongs, opts.with_defaults(:related_to => model))
+      opts = opts.delete_if{|k,v| SCAFFOLD_OPTIONS.include?(k)} # DataMapper doesn't like arbitrary opts
+      self.belongs_to(name, model, opts)
+    end
+    
+    # Define a helper for has_one
+    def self.has_one(name, model, opts = {})
+      relationship_scaffold(name, :has_one, opts.with_defaults(:related_to => model))
+      opts = opts.delete_if{|k,v| SCAFFOLD_OPTIONS.include?(k)} # DataMapper doesn't like arbitrary opts
+      self.has(1, name, model, opts)
+    end
+    
+    
+    # Define a helper for has_many
+    def self.has_many(name, model, opts = {})
+      relationship_scaffold(name, :has_many, opts.with_defaults(:related_to => model))
+      opts = opts.delete_if{|k,v| SCAFFOLD_OPTIONS.include?(k)} # DataMapper doesn't like arbitrary opts
+      self.has(n, name, model, opts)
+    end
+    
+    
+    # Define a helper for has_many
+    def self.has_and_belongs_to_many(name, model, opts = {})
+      relationship_scaffold(name, :has_and_belongs_to_many, opts.with_defaults(:related_to => model))
+      opts = opts.delete_if{|k,v| SCAFFOLD_OPTIONS.include?(k)} # DataMapper doesn't like arbitrary opts
+      opts.with_defaults!({:through => DataMapper::Resource})
+      self.has(n, name, model, opts)
+    end
+    
+    
     # Define a helper for type database stuff
     # Show in a context if wrapped in one of the helpers
     def self.expose(name, opts = {})
       self.scaffold_properties << {:name => name, :type => :text, :levels => @levels, :opts => opts} if @levels
     end
     
+    
     # Define a helper for input type="text" type database stuff
     # Show in a context if wrapped in one of the helpers
     def self.string(name, opts = {})
@@ -177,6 +221,14 @@ module Orange
       add_scaffold(name, my_type, type, opts)
     end
     
+    def scaffold_name
+      titles = self.class.scaffold_properties.select{|p| p[:type] == :title}
+      return __send__(titles.first[:name]) if(self.respond_to?(titles.first[:name]))
+      return title if(self.respond_to?(:title)) 
+      return name if(self.respond_to?(:name))
+      return "#{self.class.to_s} ##{id}"
+    end
+    
     def to_s
       <<-DOC
       {"class": "#{self.class.to_s}", "id": "#{self.id}"}

data/lib/orange-core/core.rb

@@ -40,6 +40,18 @@ module Orange
     Packet.mixin inc
   end
   
+  # Automatically load and require resources, cartons, and middleware
+  def self.autoload!
+    Dir.glob(File.join('cartons', '*.rb')).each { |f|  require f }
+    Dir.glob(File.join('resources', '*.rb')).each { |f| require f }
+    Dir.glob(File.join('middleware', '*.rb')).each { |f|  require f }
+    @required = true
+  end
+  
+  def self.autoloaded?
+    @required || false
+  end
+  
   # Core is one of two main sources of interaction for Orange Applications
   # 
   # All portions of Orange based code have access to the Core upon
@@ -72,13 +84,13 @@ module Orange
     # This method calls afterLoad when it is done. Subclasses can override
     # the afterLoad method for initialization needs.
     def initialize(*args, &block)
-      @options = Mash.new(Options.new(*args, &block).hash.with_defaults(DEFAULT_CORE_OPTIONS))
       @resources = {}
       @application = false
       @stack = false
       @middleware = []
       @events = {}
       @file = __FILE__
+      @options = Mash.new(Orange::Options.new(self, *args, &block).hash.with_defaults(DEFAULT_CORE_OPTIONS))
       load(Orange::Parser.new, :parser)
       load(Orange::Mapper.new, :mapper)
       load(Orange::Scaffold.new, :scaffold)
@@ -127,7 +139,7 @@ module Orange
     # @param [Symbol] resource_name The short name of the resource
     # @return [Boolean] result of has_key? in the resources list
     def loaded?(resource_name)
-      @resources.has_key?(resource_name)
+      @resources.has_key?(resource_name) && (!@resources[resource_name].blank?)
     end
     
     # Takes an instance of a Orange::Resource subclass, sets orange
@@ -140,6 +152,9 @@ module Orange
     # Resources must respond to set_orange, which is automatically used to 
     # create a link back to the Core, and to notify the resource of its assigned
     # short name.
+    #
+    # 0.7 Feature - Passing a Carton class instead of an Orange::Resource instance
+    # will call Carton#as_resource and then load the ModelResource for that carton
     # 
     # @param [Orange::Resource] resource An instance of Orange::Resource subclass
     # @param [optional, Symbol, String] name A short name to assign as key in Hash 
@@ -147,11 +162,20 @@ module Orange
     #   Doesn't necessarily need to be a symbol, but generally is.
     #   Set to the class name lowercase as a symbol by default.
     def load(resource, name = false)
+      if(resource.instance_of?(Class) && (resource < Orange::Carton))
+        carton = resource # Resource isn't really ar resource
+        carton.as_resource
+        resource_class = Object.const_get("#{carton.to_s}_Resource")
+        resource = resource_class.new
+        name = carton.to_s.gsub(/::/, '_').downcase.to_sym if(!name)
+      end 
       name = resource.orange_name if(!name)
-      name = resource.class.to_s.gsub(/::/, '_').downcase.to_sym if(!name) 
+      name = resource.class.to_s.gsub(/::/, '_').downcase.to_sym if(!name)
       @resources[name] = resource.set_orange(self, name)
     end
     
+    
+    
     # Takes an instance of Orange::Middleware::Base subclass and
     # keeps it for later. This way we can provide introspection into the 
     # middleware instances (useful for calling stack_init on them)
@@ -229,7 +253,7 @@ module Orange
     # 
     # @return [Mash] Hash-like mash of options
     def options(*args, &block)
-      @options.merge(Options.new(*args, &block).hash) if (args.size > 0 || block_given?)
+      @options.merge(Options.new(self, *args, &block).hash) if (args.size > 0 || block_given?)
       @options
     end
     

data/lib/orange-core/magick.rb

@@ -139,6 +139,7 @@ module Orange
   # so this should be used with caution.
   class Ignore
     def blank?; true; end
+    def include?(*args); false; end
     def method_missing(name, *args, &block)
       return self
     end
@@ -148,6 +149,7 @@ module Orange
   class Options
     
     def initialize(*options, &block)
+      @core = options.first if(options.size > 0 && options.first.kind_of?(Orange::Core))
       @options = options.extract_options!
       @options ||= {}
       instance_eval(&block) if block_given?
@@ -156,11 +158,18 @@ module Orange
     def hash
       @options
     end
+    
+    # Load needs fixing up.
+    def load(*args)
+      @core.load(*args)
+    end
 
     def method_missing(key, *args)
       return (@options[key.to_s.gsub(/\?$/, '').to_sym].eql?(true)) if key.to_s.match(/\?$/)
       if args.empty?
         @options[key.to_sym]
+      elsif(@core && @core.respond_to?(key.to_sym))
+        @core.__send__(key, *args)
       elsif(key.to_s.match(/\=$/))
         @options[key.to_s.gsub(/\=$/, '').to_sym] = (args.size == 1 ? args.first : args)
       else

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

@@ -2,12 +2,14 @@ require 'orange-core/middleware/base'
 module Orange::Middleware
   class Loader < Base
     def init(*args)
-      Dir.glob(File.join(orange.app_dir, 'resources', '*.rb')).each do |f| 
-        require f 
-        orange.load Orange::Inflector.constantize(Orange::Inflector.camelize(File.basename(f, '.rb'))).new
+      unless Orange.autoloaded?
+        Dir.glob(File.join(orange.app_dir, 'resources', '*.rb')).each do |f| 
+          require f 
+          orange.load Orange::Inflector.constantize(Orange::Inflector.camelize(File.basename(f, '.rb'))).new
+        end
+        Dir.glob(File.join(orange.app_dir, 'cartons', '*.rb')).each { |f|  require f }
+        Dir.glob(File.join(orange.app_dir, 'middleware', '*.rb')).each { |f|  require f }
       end
-      Dir.glob(File.join(orange.app_dir, 'cartons', '*.rb')).each { |f|  require f }
-      Dir.glob(File.join(orange.app_dir, 'middleware', '*.rb')).each { |f|  require f }
     end
   end  
 end

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

@@ -40,7 +40,7 @@ module Orange
         packet['reroute.to']
       # Parsing for orange urls or something
       when :orange
-        packet.route_to(packet['reroute.to'], *packet['reroute.args', []])
+        "http://"+packet.env['HTTP_HOST']+packet.route_to(packet['reroute.to'], *packet['reroute.args', []])
       else
         packet['reroute.to']
       end

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

@@ -47,13 +47,13 @@ module Orange::Middleware
       pad = parts.shift
       if !parts.empty?
         resource = parts.shift
-        if orange.loaded?(resource.to_sym) && (!nested_in || orange[nested_in].nests.keys.include?(resource.to_sym))
+        if orange.loaded?(resource.to_sym) && (!nested_in || orange[nested_in, true].nests.keys.include?(resource.to_sym))
           return_parts[:resource] = resource.to_sym
           if !parts.empty?
             second = parts.shift
             if second =~ /^\d+$/
               return_parts[:resource_id] = second
-              if !(parts.empty? || orange[resource.to_sym].nests.keys.include?(parts.first.to_sym))
+              if !(parts.empty? || orange[resource.to_sym, true].nests.keys.include?(parts.first.to_sym))
                 return_parts[:resource_action] = parts.shift.to_sym
               else
                 return_parts[:resource_action] = :show
@@ -88,7 +88,7 @@ module Orange::Middleware
         new_path = parts[:remainder]
         nested = my_parts.last[:resource]
       end
-      my_parts
+      packet['route.route_parts'] = my_parts
     end
     
     def should_route?(packet, parts)

data/lib/orange-core/resource.rb

@@ -62,6 +62,7 @@ module Orange
     end
     
     def viewable(packet, mode, opts={})
+      self.class.viewable_actions ||= []
       if(self.respond_to?(mode))
         self.__send__(mode, packet, opts)
       elsif(self.class.viewable_actions.include?(mode))

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

@@ -22,6 +22,7 @@ module Orange
       args.unshift(resource)
       args.unshift(context)
       args.unshift(site)
+      orange.fire(:route_extras, packet, args)
       root_url(packet) + args.compact.join('/')
     end
   end

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

@@ -38,7 +38,7 @@ module Orange
     end
     
     def nests
-      self.class.nests
+      self.class.nests || {}
     end
     
     # Allows the resource to nest inside other resources
@@ -163,6 +163,7 @@ module Orange
       no_reroute = opts.delete(:no_reroute)
       if packet.request.post? || !opts.blank?
         params = opts.with_defaults(opts.delete(:params) || packet.request.params[@my_orange_name.to_s] || {})
+        params = params_parse(packet, :new, params)
         before = beforeNew(packet, params)
         obj = onNew(packet, params) if before
         afterNew(packet, obj, params) if before
@@ -172,6 +173,12 @@ module Orange
       obj || false
     end
     
+    def params_parse(packet, mode, params)
+      props = model_class.form_props(packet['route.context'], :any)
+      params.each{|k,v| params[k] = nil if(k.to_s =~ /_id$/ && v.blank?)}
+      params
+    end
+    
     # A callback for the actual new item event
     def onNew(packet, opts = {})
       model_class.new(opts)
@@ -225,6 +232,7 @@ module Orange
         my_id = opts.delete(:resource_id) || packet['route.resource_id']
         m = opts.delete(:model) || model_class.get(my_id)
         params = opts.with_defaults(opts.delete(:params) || packet.request.params[@my_orange_name.to_s] || {})
+        params = params_parse(packet, :save, params)
         if m
           before = beforeSave(packet, m, params)
           onSave(packet, m, params) if before
@@ -298,6 +306,7 @@ module Orange
     
     # Exposed method for helping the RestfulRouter class.
     def exposed(packet)
+      self.class.exposed_actions ||= {:all => [:show, :list], :admin => :all, :orange => :all}
       all = self.class.exposed_actions[:all]
       all = [all] unless all.is_a?(Array)
       context = self.class.exposed_actions[packet['route.context']]

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

@@ -66,9 +66,11 @@ module Orange
         end unless string
       
         # Check for default resource views
+        string ||= read_if_exists('views', 'default_resource', context+"."+file) if context
         string ||= read_if_exists('views', 'default_resource', file)
         @view_dirs.reverse_each do |views_dir|
-          string ||= read_if_exists(views_dir, 'default_resource', file) if resource
+          string ||= read_if_exists(views_dir, 'default_resource', context+"."+file) if context
+          string ||= read_if_exists(views_dir, 'default_resource', file)
         end unless string
         raise LoadError, "Couldn't find haml file '#{file}'" unless string
         

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

@@ -12,11 +12,13 @@ module Orange
       end
       @scaffold_types = {}
       add_scaffold_type(:boolean) do |name, val, opts|
+        opts = opts.with_defaults({:wrap_tag => 'p'})
         if opts[:show]
           val ? "true" : "false"
         else
           ret = "<input type='hidden' name='#{opts[:model_name]}[#{name}]' value='0' /><input type='checkbox' name='#{opts[:model_name]}[#{name}]' value='1' #{'checked="checked"' if (val && val != '')}/>"
           ret = "<label for=''>#{opts[:display_name]}</label><br />" + ret if opts[:label]
+          ret = "<#{opts[:wrap_tag]}>#{ret}</#{opts[:wrap_tag]}>" if opts[:wrap_tag]
         end
       end
     end
@@ -27,12 +29,13 @@ module Orange
     
     def scaffold_attribute(packet, prop, model_name, *args)
       args = args.extract_options!
-      args.with_defaults!({:packet => packet, :value => '', :label => false, :show => false})
+      args = args.with_defaults({:packet => packet, :value => '', :label => false, :show => false, :wrap_tag => 'p'})
       val = args[:value]
       label = args[:label]
       show = args[:show]
       name = prop[:name]
       human_readable_name = name.to_s.split('_').each{|w| w.capitalize!}.join(' ')
+      relationship = prop[:relationship]
       display_name = prop[:display_name] || human_readable_name
       return @scaffold_types[prop[:type]].call(name, val, args.with_defaults!(:display_name => display_name, :model_name => model_name)) if @scaffold_types.has_key?(prop[:type])
       unless show
@@ -51,15 +54,33 @@ module Orange
         when :date
           val.gsub!('"', '&quot;')
           ret = "<input class=\"date\" type=\"text\" value=\"#{val}\" name=\"#{model_name}[#{name}]\" />"
+        when :belongs
+          val_id = val.blank? ? nil : val.id
+          vals = Object.const_get(prop[:related_to]).all
+          vals = vals.map{|obj| "<option value=\"#{obj.id}\"#{val_id && val_id == obj.id ? 'selected=\'selected\'' : ''}>#{obj.scaffold_name}</option>"}.join("\n")
+          ret = "<select name=\"#{model_name}[#{name}_id]\">#{prop[:required] ? '' : '<option value="">None</option>'}#{vals}</select>"
+        when :has_one
+          ret = ""
+          args[:wrap_tag] = false
+        when :has_many
+          ret = ""
+          args[:wrap_tag] = false
+        when :has_and_belongs_to_many
+          ret = ""
+          args[:wrap_tag] = false
+        when :number
+          val = val.to_s
+          ret = "<input class=\"number\" type=\"text\" value=\"#{val}\" name=\"#{model_name}[#{name}]\"  />"
         else
           val.gsub!('"', '&quot;')
           ret = "<input type=\"text\" value=\"#{val}\" name=\"#{model_name}[#{name}]\" />"
         end
-        ret = "<label for=''>#{display_name}</label><br />" + ret if label
+        ret = "<label for=''>#{display_name}</label><br />" + ret if label && !ret.blank?
+        ret = "<#{args[:wrap_tag]}>#{ret}</#{args[:wrap_tag]}>" if args[:wrap_tag]
       else
         case prop[:type]
         when :title
-          ret = "<h3 class='#{model_name}-#{name}'>#{val}</h3>"
+          ret = "<h1 class='#{model_name}-#{name}'>#{val}</h3>"
         when :text
           ret = "<p class='#{model_name}-#{name}'>#{val}</p>"
         when :fulltext

data/lib/orange-core/stack.rb

@@ -94,7 +94,7 @@ module Orange
     # Shortcut for adding Orange::Middleware::ShowExceptions to the middleware
     # stack
     def use_exceptions
-      stack Orange::Middleware::ShowExceptions
+      stack Orange::Middleware::ShowExceptions unless ENV['RACK_ENV'] == 'production'
     end
     
     # Alias for use_exceptions

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

@@ -1,4 +1,4 @@
 %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)
+    !~ view_attribute(prop, model_name, :label => true)
   %input{:type => 'submit', :value => 'Save New Item'}

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

@@ -3,7 +3,10 @@
     = 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', :"accept-charset" => "UTF-8"}
     - for prop in props
-      %p!= view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]), :model => model)
+      - if(prop[:relationship])
+        !~ view_attribute(prop, model_name, :label => true, :value => model.__send__(prop[:name]), :model => model)
+      - else
+        !~ view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]), :model => model)
     %input{:type => 'submit', :value => 'Save Changes'}
 - else
   %p Couldn't find the item you're looking for.

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

@@ -1,4 +1,7 @@
 - if model
   %div{ :class => model_name}
     - for prop in props
-      = view_attribute(prop, model_name, :show => true, :value => model.attribute_get(prop[:name]), :model => model)
+      - if(prop[:relationship])
+        !~ view_attribute(prop, model_name, :show => true, :value => model.__send__(prop[:name]), :model => model)
+      - else
+        !~ view_attribute(prop, model_name, :show => true, :value => model.attribute_get(prop[:name]), :model => model)

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

@@ -1,7 +1,10 @@
 - if model
   %tr
     - for prop in props
-      %td= model.attribute_get(prop[:name]).to_s[0..150]
+      - if(prop[:relationship])
+        %td= [:belongs, :has_one].include?(prop[:type]) ? (model.__send__(prop[:name]) ? model.__send__(prop[:name]).scaffold_name : "") : ""
+      - else
+        %td= model.attribute_get(prop[:name]).to_s[0..150]
     %td.actions
       = form_link('Delete', route_to(model_name, model.id, 'delete'), 'Are you sure you want to delete this?', {:method => 'delete'})
       %a{:href => route_to(model_name, model.id, 'edit')} Edit

data/spec/orange-core/carton_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Orange::Carton do
   it "should call property with :id, Serial on #self.id" do
-    MockCartonBlank.should_receive(:property).with(:id, DataMapper::Types::Serial)
+    MockCartonBlank.should_receive(:property).with(:id, DataMapper::Property::Serial)
     MockCartonBlank.id
   end
   
@@ -120,7 +120,7 @@ describe Orange::Carton do
   end
   
   it "should call property on fulltext" do
-    MockCarton.should_receive(:property).with(an_instance_of(Symbol), DataMapper::Types::Text, anything())
+    MockCarton.should_receive(:property).with(an_instance_of(Symbol), DataMapper::Property::Text, anything())
     MockCarton.fulltext(:cudge)
   end
   

data/spec/orange-core/core_spec.rb

@@ -3,6 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe Orange::Core do
   before(:all) do
     class Orange::Core; attr_reader :resources, :events, :file; end;
+    class MockCartonForCore < Orange::Carton; end;
   end
   
   it "should allow core mixin via class mixin method" do
@@ -139,6 +140,14 @@ describe Orange::Core do
     c.options.should_not have_key(:opt_3)
   end
   
+  it "should allow passthrough of options (for load method)" do
+    c= Orange::Core.new(:opt_1 => true) do 
+      opt_2 true
+      load Orange::ModelResource.new, :foo
+    end
+    c[:foo].should be_an_instance_of(Orange::ModelResource)
+  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)
@@ -177,6 +186,15 @@ describe Orange::Core do
     c.resources.should have_key(:mock_one)
   end
   
+  it "should say a resource is loaded after calling load for carton" do
+    c= Orange::Core.new
+    MockCartonForCore.should < Orange::Carton
+    c.load(MockCartonForCore, :mock_one)
+    c.should be_loaded(:mock_one)
+    c.resources.should have_key(:mock_one)
+    c[:mock_one].model_class.should == MockCartonForCore
+  end
+  
   it "should return self on orange" do
     c= Orange::Core.new
     c.orange.should eql(c)

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

@@ -40,4 +40,7 @@ class MockCartonBlank < Orange::Carton
 end
 
 class MockCartonBlankTwo < Orange::Carton
+end
+
+class MockCartonForCore < Orange::Carton
 end

data/spec/orange-core/stack_spec.rb

@@ -160,7 +160,7 @@ describe Orange::Stack do
     end
     x.middlewarez.should have(1).middlewares
     x.prerouting
-    x.middlewarez.should have(9).middlewares
+    x.middlewarez.should have(10).middlewares
     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
@@ -188,7 +188,7 @@ describe Orange::Stack do
     end
     x.middlewarez.should have(1).middlewares
     x.prerouting(:no_abstract_format => true)
-    x.middlewarez.should have(8).middlewares
+    x.middlewarez.should have(9).middlewares
     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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - David Haslem
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -04:00
+date: 2010-10-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,7 +110,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 description: Orange is a Ruby framework for building managed websites with code as simple as Sinatra
-email: therabidbanana@gmail.com
+email: david@orangesparkleball.com
 executables: []
 
 extensions: []
@@ -161,7 +161,7 @@ files:
 - lib/orange-core/views/not_found/404.haml
 - README.markdown
 has_rdoc: true
-homepage: http://github.com/therabidbanana/orange-core
+homepage: http://github.com/orange-project/orange-core
 licenses: []
 
 post_install_message: |