orange 0.0.3 → 0.0.4

data/lib/orange/middleware/static.rb

@@ -43,7 +43,6 @@ module Orange::Middleware
       @urls = options[:urls] || ["/favicon.ico", "/assets/public"]
       @root = options[:root] || File.join(orange.app_dir, 'assets')
       @lib_urls = core.statics
-
       @file_server = Orange::Middleware::StaticFile.new(@root)
     end
 
@@ -51,7 +50,6 @@ module Orange::Middleware
       path = packet.env["PATH_INFO"]
       can_serve_lib = @lib_urls.select{ |url, server| path.index(url) == 0 }.first
       can_serve = @urls.any?{|url| path.index(url) == 0 }
-      
       if can_serve_lib
         lib_url = can_serve_lib.first
         packet['file.root'] = can_serve_lib.last

data/lib/orange/middleware/template.rb

@@ -24,8 +24,10 @@ module Orange::Middleware
       status, headers, content = pass packet
       if needs_wrapped?(packet)
         content = wrap(packet, content)
+        packet[:content] = content.first
       end
-      [status, headers, content]
+      orange.fire(:wrapped, packet)
+      [status, headers, packet.content]
     end
     
     def needs_wrapped?(packet)

data/lib/orange/resources/admin_resource.rb

@@ -0,0 +1,25 @@
+module Orange
+  # Admin resource is a resource to help in building administration
+  # panels. 
+  class AdminResource < Resource
+    def afterLoad
+      @links = {}
+    end
+    
+    def add_link(section, *args)
+      opts = args.extract_with_defaults(:position => 0)
+      @links[section] = [] unless @links.has_key?(section)
+      @links[section].insert(opts.delete(:position), opts)
+      @links[section].compact!
+      @links[section].uniq!
+    end
+    
+    def links(packet)
+      @links.each do |k,section|
+        section.each {|link| 
+          link[:href] = orange[:mapper].route_to(packet, link[:resource], link[:resource_args])
+        }
+      end
+    end
+  end
+end

data/lib/orange/resources/mapper.rb

@@ -8,6 +8,7 @@ module Orange
     end
     
     def route_to(packet, resource, *args)
+      packet = DefaultHash.new unless packet 
       context = packet['route.context', nil]
       site = packet['route.faked_site'] ? packet['route.site_url', nil] : nil
       args.unshift(resource)
@@ -44,6 +45,8 @@ module Orange
       # Parsing for orange urls or something
       when :orange
         packet.route_to(packet['reroute.to'])
+      else
+        packet['reroute.to']
       end
     end
     

data/lib/orange/resources/model_resource.rb

@@ -72,7 +72,7 @@ module Orange
       opts = args.extract_options!.with_defaults({:path => ''})
       props = model_class.form_props(packet['route.context'])
       resource_id = opts[:id] || packet['route.resource_id'] || false
-      all_opts = {:props => props, :resource => self.class.to_s, :model_name => @my_orange_name}.merge!(opts)
+      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
       all_opts.with_defaults! :list => find_list(packet, mode) if is_list
       all_opts.with_defaults! find_extras(packet, mode)
@@ -119,12 +119,13 @@ module Orange
       packet.reroute(@my_orange_name, :orange)
     end
     
-    # Deletes an object specified by packet['route.resource_id'], then reroutes to main
+    # Deletes an object specified by packet['route.resource_id'], then reroutes to main.
+    # The request must come in as a delete. Rack::MethodOverride can be used to do this.
     # @param [Orange::Packet] packet the packet being routed
     def delete(packet, *opts)
       if packet.request.delete?
         m = model_class.get(packet['route.resource_id'])
-        m.destroy! if m
+        m.destroy if m
       end
       packet.reroute(@my_orange_name, :orange)
     end
@@ -136,7 +137,6 @@ module Orange
         m = model_class.get(packet['route.resource_id'])
         if m
           m.update(packet.request.params[@my_orange_name.to_s])
-        else 
         end
       end
       packet.reroute(@my_orange_name, :orange)
@@ -196,13 +196,14 @@ module Orange
     # @param [String, false] confirm text of the javascript confirm (false for none [default])
     # @param [optional, Array] args array of optional arguments, only opts[:method] defined
     # @option opts [String] method method name (Should be 'DELETE', 'PUT' or 'POST')
-    def form_link(text, link, confirm = false, *args)
-      opts = args.extract_options!
+    def form_link(text, link, confirm = false, opts = {})
+      text = "<img src='#{opts[:img]}' alt='#{text}' />" if opts[:img]
+      css = opts[:class]? opts[:class] : 'form_button_link'
       meth = (opts[:method]? "<input type='hidden' name='_method' value='#{opts[:method]}' />" : '')
       if confirm
-        "<form action='#{link}' method='post' class='mini' onsubmit='return confirm(\"#{confirm}\")'><button class='link_button'><a href='#'>#{text}</a></button>#{meth}</form>"
+        "<form action='#{link}' method='post' class='mini' onsubmit='return confirm(\"#{confirm}\")'><button class='link_button'><a href='#' class='#{css}'>#{text}</a></button>#{meth}</form>"
       else
-        "<form action='#{link}' method='post' class='mini'><button class='link_button'><a href='#'>#{text}</a></button>#{meth}</form>"
+        "<form action='#{link}' method='post' class='mini'><button class='link_button'><a href='#' class='#{css}'>#{text}</a></button>#{meth}</form>"
       end
     end
     
@@ -218,6 +219,7 @@ module Orange
       label = args[:label] || false
       show = args[:show] || false
       name = prop[:name]
+      human_readable_name = name.to_s.split('_').each{|w| w.capitalize!}.join(' ')
       unless show
         case prop[:type]
         when :title
@@ -226,10 +228,14 @@ module Orange
           ret = "<input type='text' value='#{val}' name='#{model_name}[#{name}]' />"
         when :fulltext
           ret = "<textarea name='#{model_name}[#{name}]'>#{val}</textarea>"
+        when :boolean
+          human_readable_name = human_readable_name + '?'
+          ret = "<input type='hidden' name='#{model_name}[#{name}]' value='0' /><input type='checkbox' name='#{model_name}[#{name}]' value='1' #{'checked="checked"' if (val && val != '')}/>"
         else
           ret = "<input type='text' value='#{val}' name='#{model_name}[#{name}]' />"
         end
-        ret = "<label for=''>#{name}</label><br />" + ret if label
+        display_name = prop[:display_name] || human_readable_name
+        ret = "<label for=''>#{display_name}</label><br />" + ret if label
       else
         case prop[:type]
         when :title

data/lib/orange/resources/page_parts.rb

@@ -18,13 +18,6 @@ module Orange
     # Feels like part should be plural, no?
     def parts;    part;     end
     
-    def admin_sidebar_link(section, *args)
-      args = args.extract_options!.with_defaults(:position => 0)
-      sidebar = part[:admin_sidebar, {}]
-      sidebar[section] = [] unless sidebar.has_key?(section)
-      sidebar[section].insert(args[:position], {:href => args[:link], :text => args[:text]})
-      part[:admin_sidebar] = sidebar
-    end
     
     def add_css(file, opts = {})
       ie = opts[:ie] || false

data/lib/orange/resources/parser.rb

@@ -18,20 +18,21 @@ module Orange
     def haml(file, packet, *vars, &block)
       opts = vars.extract_options!
       temp = opts.delete(:template)
-      resource = (opts[:resource] || '').downcase
+      opts[:resource_name] = opts[:resource].orange_name.to_s if 
+          opts[:resource] && opts[:resource].respond_to?(:orange_name)
+      resource = (opts[:resource_name] || '').downcase
       opts.merge :orange => orange
       
       templates_dir = File.join(orange.core_dir, 'templates')
       views_dir = File.join(orange.core_dir, 'views')
-      default_dir = File.join(views_dir, 'default_resource')
-      
       string = false
       string ||= read_if_exists('templates', file) if temp
       string ||= read_if_exists(templates_dir, file) if temp
       string ||= read_if_exists('views', resource, file) if resource
       string ||= read_if_exists('views', file)
-      string ||= read_if_exists(views_dir, file)
+      string ||= read_if_exists(views_dir, resource, file) if resource
       string ||= read_if_exists(views_dir, 'default_resource', file)
+      string ||= read_if_exists(views_dir, file)
       raise LoadError, "Couldn't find haml file '#{file}" unless string
       
       haml_engine = Haml::Engine.new(string)

data/lib/orange/resources/singleton_model_resource.rb

@@ -0,0 +1,7 @@
+module Orange
+  # Singleton Model Resource acts similar to model resource, but doesn't have
+  # a list view, and instead only shows a single object
+  class SingletonModelResource < ModelResource
+    
+  end
+end

data/lib/orange/resources/sitemap_resource.rb

@@ -0,0 +1,96 @@
+require 'orange/core'
+require 'orange/resources/model_resource'
+require 'orange/cartons/site_carton'
+require 'dm-is-awesome_set'
+module Orange
+  class Route < SiteCarton
+    id
+    admin do
+      text :slug
+      text :link_text
+      boolean :show_in_nav, :default => false, :display_name => 'Show?'
+    end
+    orange do
+      string :resource
+      string :resource_id
+    end
+    include DataMapper::Transaction::Resource # Make sure Transactions are included
+    is :awesome_set, :scope => [:orange_site_id]
+    
+  end
+  
+  class SitemapResource < ModelResource
+    use Orange::Route
+    def afterLoad
+      orange[:admin, true].add_link('Content', :resource => @my_orange_name, :text => 'Sitemap')
+    end
+    
+    # Creates a new model object and saves it (if a post), then reroutes to the main page
+    # @param [Orange::Packet] packet the packet being routed
+    def new(packet, *opts)
+      if packet.request.post?
+        params = packet.request.params[@my_orange_name.to_s]
+        params.merge!(:orange_site_id => packet['site'].id)
+        a = model_class.new(params)
+        a.move(:into => home(packet))
+      end
+      packet.reroute(@my_orange_name, :orange)
+    end
+    
+    def higher(packet, opts = {})
+      if packet.request.post?
+        me = find_one(packet, :higher, packet['route.resource_id'])
+        me.move(:higher) if me
+      end
+      packet.reroute(@my_orange_name, :orange)
+    end
+    
+    def lower(packet, opts = {})
+      if packet.request.post?
+        me = find_one(packet, :lower, packet['route.resource_id'])
+        me.move(:lower) if me
+      end
+      packet.reroute(@my_orange_name, :orange)
+    end
+    
+    def outdent(packet, opts = {})
+      if packet.request.post?
+        me = find_one(packet, :outdent, packet['route.resource_id'])
+        me.move(:outdent) if me
+      end
+      packet.reroute(@my_orange_name, :orange)
+    end
+    
+    def indent(packet, opts = {})
+      if packet.request.post?
+        me = find_one(packet, :indent, packet['route.resource_id'])
+        me.move(:indent) if me
+      end
+      packet.reroute(@my_orange_name, :orange)
+    end
+    
+    def top_nav
+      
+    end
+    
+    def home(packet)
+      site_id = packet['site'].id
+      home_for_site(site_id) || create_home_for_site(site_id)
+    end
+    
+    def home_for_site(site_id)
+      model_class.first(:slug => '_index_', :orange_site_id => site_id, :order => :lft.asc) 
+    end
+    
+    def create_home_for_site(site_id)
+      home = model_class.new({:orange_site_id => site_id, :slug => '_index_'})
+      home.move(:root)
+      home.save
+      home
+    end
+    
+    def find_list(packet, mode)
+      Orange::Route.all(:order => :lft) || []
+    end
+  end
+end

data/lib/orange/stack.rb

@@ -24,7 +24,7 @@ module Orange
     # other stacks that can be used.
     #
     # @param [Orange::Application] app_class the class of the main application
-    # @param [prebuilt] prebuilt the optional prebuilt stack, if one isn't passed as block
+    # @param [Symbol] prebuilt the optional prebuilt stack, if one isn't passed as block
     def initialize(app_class = nil, prebuilt = :none, &block)
       @build = Rack::Builder.new
       @core = Orange::Core.new
@@ -114,13 +114,13 @@ module Orange
     # 
     def prerouting(*args)
       opts = args.extract_options!
-      stack Orange::Middleware::Rerouter, opts
-      stack Orange::Middleware::Static, opts
+      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::RouteSite, opts
-      stack Orange::Middleware::RouteContext, opts
+      stack Orange::Middleware::RouteSite, opts.dup
+      stack Orange::Middleware::RouteContext, opts.dup
     end
     
     # A shortcut for enabling restful routing via Orange::Middleware::RestfulRouter

data/spec/orange/carton_spec.rb

@@ -0,0 +1,136 @@
+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.id
+  end
+  
+  it "should call self.init after calling id" do
+    MockCartonBlankTwo.should_receive(:init)
+    MockCartonBlankTwo.id
+  end
+  
+  it "should give form properties" do
+    MockCarton.form_props(:live).length.should >= 1
+    MockCarton.form_props(:admin).length.should >= 2
+    MockCarton.form_props(:orange).length.should >= 3
+    MockCarton.form_props(:banana).should have(0).items
+  end
+  
+  it "should call instance eval on admin block" do
+    MockCartonBlank.should_receive(:instance_eval)
+    MockCartonBlank.admin {}
+  end
+  
+  it "should call instance eval on orange block" do
+    MockCartonBlank.should_receive(:instance_eval)
+    MockCartonBlank.orange {}
+  end
+  
+  it "should call instance eval on front block" do
+    MockCartonBlank.should_receive(:instance_eval)
+    MockCartonBlank.front {}
+  end
+  
+  it "should change props when calling front_property" do
+    lambda {
+      MockCarton.front_property :foo, String
+    }.should change(MockCarton, :form_props)
+    
+  end
+  
+  it "should change admin props when calling admin_property (but not front props)" do
+    old_props = MockCarton.form_props(:admin)
+    lambda {
+      MockCarton.admin_property :foo, String
+    }.should_not change(MockCarton, :form_props)
+    old_props.should_not == MockCarton.form_props(:admin)
+  end
+  
+  it "should change orange props when calling orange_property (but not front/admin props)" do
+    admin_props = MockCarton.form_props(:admin)
+    old_props = MockCarton.form_props(:orange)
+    lambda {
+      MockCarton.orange_property :foo, String
+    }.should_not change(MockCarton, :form_props)
+    admin_props.should == MockCarton.form_props(:admin)
+    old_props.should_not == MockCarton.form_props(:orange)
+  end
+  
+  it "should change the levels var when using front block" do
+    MockCartonBlank.should_receive(:test_levels){|me| me.levels.should include(:live)}
+    MockCartonBlank.front{ test_levels(self) }
+    MockCartonBlank.levels.should == false
+  end
+  
+  it "should change the levels var when using admin block" do
+    MockCartonBlank.should_receive(:test_levels){|me| 
+      me.levels.should_not include(:front)
+      me.levels.should include(:admin)
+    }
+    MockCartonBlank.admin{ test_levels(self) }
+    MockCartonBlank.levels.should == false
+  end
+  
+  it "should change the levels var when using orange block" do
+    MockCartonBlank.should_receive(:test_levels){|me| 
+      me.levels.should_not include(:front)
+      me.levels.should_not include(:admin)
+      me.levels.should include(:orange)
+    }
+    MockCartonBlank.orange{ test_levels(self) }
+    MockCartonBlank.levels.should == false
+  end
+  
+  it "should have a front property after calling #front" do
+    front = MockCarton.scaffold_properties.select{|i| i[:name] == :front}
+    front.should have_at_least(1).items
+    front.first[:levels].should include(:live)
+  end 
+  
+  it "should have an admin property after calling #admin" do
+    front = MockCarton.scaffold_properties.select{|i| i[:name] == :admin}
+    front.should have_at_least(1).items
+    front.first[:levels].should_not include(:live)
+    front.first[:levels].should include(:admin)
+  end
+  
+  it "should have an orange property after calling #orange" do
+    front = MockCarton.scaffold_properties.select{|i| i[:name] == :orange}
+    front.should have_at_least(1).items
+    front.first[:levels].should_not include(:live)
+    front.first[:levels].should_not include(:admin)
+    front.first[:levels].should include(:orange)
+  end
+  
+  it "should call property on title" do
+    MockCarton.should_receive(:property).with(an_instance_of(Symbol), String, anything())
+    MockCarton.title(:wibble)
+  end
+  
+  it "should call property on text" do
+    MockCarton.should_receive(:property).with(an_instance_of(Symbol), String, anything())
+    MockCarton.text(:wobble)
+  end
+
+  it "should call property on string" do
+    MockCarton.should_receive(:property).with(an_instance_of(Symbol), String, anything())
+    MockCarton.string(:wubble)
+  end
+  
+  it "should call property on fulltext" do
+    MockCarton.should_receive(:property).with(an_instance_of(Symbol), DataMapper::Types::Text, anything())
+    MockCarton.fulltext(:cudge)
+  end
+  
+  it "should define a constant (resource class)" do
+    lambda{
+      MockCartonBlankTwo_Resource.nil?
+    }.should raise_error(NameError)
+    MockCartonBlankTwo.as_resource
+    lambda{
+      MockCartonBlankTwo_Resource.nil?
+    }.should_not raise_error
+  end
+end