orange 0.0.5 → 0.0.6

data/lib/orange.rb

@@ -3,5 +3,6 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 Dir.glob(File.join(libdir, 'orange', '*.rb')).each {|f| require f }
 Dir.glob(File.join(libdir, 'orange', 'cartons', '*.rb')).each {|f| require f }
+require File.join(libdir, 'orange', 'resources', 'model_resource.rb')
 Dir.glob(File.join(libdir, 'orange', 'resources', '*.rb')).each {|f| require f }
 Dir.glob(File.join(libdir, 'orange', 'middleware', '*.rb')).each {|f| require f }

data/lib/orange/cartons/asset_carton.rb

@@ -0,0 +1,23 @@
+module Orange
+  class Asset < Orange::Carton
+    id
+    admin do
+      title :name
+      text :caption
+    end
+    orange do
+      string :path, :length => 255
+      string :mime_type
+      string :secondary_path, :length => 255, :required => false
+      string :secondary_mime_type
+    end
+    
+    def file_path
+      File.join('', 'assets', 'uploaded', path)
+    end
+    
+    def to_asset_tag
+      "<img src=\"#{file_path}\" />"
+    end
+  end
+end

data/lib/orange/cartons/user_carton.rb

@@ -0,0 +1,15 @@
+module Orange
+  class User < Orange::Carton
+    id
+    admin do
+      title :name
+      text :open_id
+    end
+    
+    # Currently, all users allowed at all times.
+    # Future support for roles to be built here.
+    def allowed?(packet)
+      true
+    end
+  end
+end

data/lib/orange/core.rb

@@ -65,16 +65,24 @@ module Orange
     # Returns the orange library directory
     # @return [String] the directory name indicating where the core file is
     #   located
-    def core_dir
-      options[:core_dir] ||= File.dirname(__FILE__)
+    def core_dir(*args)
+      if args
+        File.join((options[:core_dir] ||= File.dirname(__FILE__)), *args)
+      else
+        options[:core_dir] ||= File.dirname(__FILE__)
+      end
     end
     
     # Returns the directory of the currently executing file (using Dir.pwd),
     # can be overriden using the option :app_dir in initialization
     # 
     # @return [String] the directory name of the currently running application
-    def app_dir
-      options[:app_dir] ||= Dir.pwd
+    def app_dir(*args)
+      if args
+        File.join((options[:app_dir] ||= Dir.pwd), *args)
+      else
+        options[:app_dir] ||= Dir.pwd
+      end
     end
     
     # Called by initialize after finished loading

data/lib/orange/middleware/access_control.rb

@@ -17,14 +17,17 @@ module Orange::Middleware
     
     def init(opts = {})
       defs = {:locked => [:admin, :orange], :login => '/login', :logout => '/logout',
-              :handle_login => true, :openid => true, :config_id => true}
+              :handle_login => true, :openid => true, :single_user => true}
       opts = opts.with_defaults!(defs)
       @openid = opts[:openid]
       @locked = opts[:locked]
       @login = opts[:login]
       @logout = opts[:logout]
       @handle = opts[:handle_login]
-      @single = opts[:config_id]
+      @single = opts[:single_user]
+      unless @single
+        orange.load(Orange::UserResource.new, :users)
+      end
     end
       
     def packet_call(packet)
@@ -51,8 +54,11 @@ module Orange::Middleware
           packet['user.id'] = false
           packet.session['user.id'] = false
           false
-        else
+        # Main_user can always log in (root access)
+        elsif packet['user.id'] == packet['orange.globals']['main_user']
           true
+        else
+          orange[:users].access_allowed?(packet, packet['user.id'])
         end
       else
         false

data/lib/orange/middleware/four_oh_four.rb

@@ -0,0 +1,27 @@
+require 'orange/middleware/base'
+
+module Orange::Middleware
+  # The FlexRouter middleware takes a resource that can route paths and
+  # then intercepts routes for that resource. By default,
+  # it uses the Orange::SitemapResource. 
+  # 
+  # The resource is automatically loaded into the core as 
+  # :sitemap. The resource must respond to "route?(path)" 
+  # and "route(packet)".  
+  # 
+  # Pass a different routing resource using the :resource arg
+  class FourOhFour < Base
+    def init(opts = {})
+      @resource = opts[:resource] || Orange::NotFound
+      orange.load @resource.new, :not_found
+    end
+    
+    # Sets the sitemap resource as the router if the resource can accept 
+    # the path.
+    def packet_call(packet)
+      packet['route.router'] = orange[:not_found] unless packet['route.router']
+      pass packet
+    end
+    
+  end
+end

data/lib/orange/middleware/static.rb

@@ -40,7 +40,7 @@ module Orange::Middleware
       @core = core
       @libs = options[:libs] || [Orange::Core]
       
-      @urls = options[:urls] || ["/favicon.ico", "/assets/public"]
+      @urls = options[:urls] || ["/favicon.ico", "/assets/public", "/assets/uploaded"]
       @root = options[:root] || File.join(orange.app_dir, 'assets')
       @lib_urls = core.statics
       @file_server = Orange::Middleware::StaticFile.new(@root)
@@ -56,7 +56,7 @@ module Orange::Middleware
         packet['route.path'] = path.split(lib_url, 2).last        
         @file_server.call(packet.env)
       elsif can_serve
-        packet['route.path'] = path
+        packet['route.path'] = path.gsub(/^\/assets/, '')
         @file_server.call(packet.env)
       else
         pass packet

data/lib/orange/resources/asset_resource.rb

@@ -0,0 +1,61 @@
+require 'fileutils'
+module Orange
+  class AssetResource < Orange::ModelResource
+    use Orange::Asset
+    call_me :assets
+    def afterLoad
+      orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Assets')
+      orange.register(:stack_loaded) do
+        orange[:radius].context.define_tag "asset" do |tag|
+          if tag.attr['id']
+            (m = model_class.first(:id => tag.attr['id'])) ? m.to_asset_tag : 'Invalid Asset'
+          else
+            ''
+          end
+        end
+      end
+    end
+    
+    def new(packet, *opts)
+      if packet.request.post?
+        params = packet.request.params[@my_orange_name.to_s]
+        if(file = params['file'][:tempfile])
+          file_path = orange.app_dir('assets','uploaded', params['file'][:filename]) if params['file'][:filename]
+          # Check for secondary file (useful for videos/images with thumbnails)
+          if(params['file2'] && secondary = params['file2'][:tempfile])
+            secondary_path = orange.app_dir('assets','uploaded', params['file2'][:filename])
+          else
+            secondary_path = nil
+          end
+          # Move the files
+          FileUtils.cp(file.path, file_path)
+          FileUtils.cp(secondary.path, secondary_path) if secondary_path
+          
+          params['path'] = params['file'][:filename] if file_path
+          params['secondary_path'] = params['file2'][:filename] if secondary_path
+          params['mime_type'] = params['file'][:type] if file_path
+          params['secondary_mime_type'] = params['file2'][:type] if secondary_path
+          params.delete('file')
+          params.delete('file2')
+          
+          model_class.new(params).save
+        end
+      end
+      packet.reroute(@my_orange_name, :orange)
+    end
+    
+    def delete(packet, *opts)
+      if packet.request.delete?
+        m = model_class.get(packet['route.resource_id'])
+        begin
+          FileUtils.rm(orange.app_dir('assets','uploaded', m.path)) if m.path
+          FileUtils.rm(orange.app_dir('assets','uploaded', m.secondary_path)) if m.secondary_path
+        rescue
+          # Problem deleting file
+        end
+        m.destroy if m
+      end
+      packet.reroute(@my_orange_name, :orange)
+    end
+  end
+end

data/lib/orange/resources/mapper.rb

@@ -8,8 +8,9 @@ module Orange
     end
     
     def route_to(packet, resource, *args)
+      opts = args.extract_options!
       packet = DefaultHash.new unless packet 
-      context = packet['route.context', nil]
+      context = opts[:context] || packet['route.context', nil]
       site = packet['route.faked_site'] ? packet['route.site_url', nil] : nil
       args.unshift(resource)
       args.unshift(context)

data/lib/orange/resources/not_found.rb

@@ -0,0 +1,8 @@
+module Orange
+  class NotFound < Orange::Resource
+    call_me :not_found
+    def route(packet)
+      packet[:content] = orange[:parser].haml("404.haml", packet, :resource => self)
+    end
+  end
+end

data/lib/orange/resources/radius.rb

@@ -16,8 +16,82 @@ module Orange
       content = packet[:content, false]
       unless content.blank? 
         parser = ::Radius::Parser.new(context, :tag_prefix => 'o')
-        packet[:content] = parser.parse(content)
+        packet[:content] = parser.parse(content, packet)
       end
     end
   end
-end
+end
+
+module Radius
+  #
+  # The Radius parser. Initialize a parser with a Context object that
+  # defines how tags should be expanded. See the QUICKSTART[link:files/QUICKSTART.html]
+  # for a detailed explaination of its usage.
+  #
+  class Parser
+    def parse(string, packet = false)
+      @stack = [ParseContainerTag.new { |t| t.contents.to_s }]
+      tokenize(string)
+      stack_up(packet)
+      @stack.last.to_s
+    end
+ 
+    protected
+    
+    def stack_up(packet = false)
+      @tokens.each do |t|
+        if t.is_a? String
+          @stack.last.contents << t
+          next
+        end
+        case t[:flavor]
+        when :open
+          @stack.push(ParseContainerTag.new(t[:name], t[:attrs]))
+        when :self
+          @stack.last.contents << ParseTag.new {@context.render_tag(t[:name], t[:attrs], packet)}
+        when :close
+          popped = @stack.pop
+          raise WrongEndTagError.new(popped.name, t[:name], @stack) if popped.name != t[:name]
+          popped.on_parse { |b| @context.render_tag(popped.name, popped.attributes, packet) { b.contents.to_s } }
+          @stack.last.contents << popped
+        when :tasteless
+          raise TastelessTagError.new(t, @stack)
+        else
+          raise UndefinedFlavorError.new(t, @stack)
+        end
+      end
+      raise MissingEndTagError.new(@stack.last.name, @stack) if @stack.length != 1
+    end
+  end
+  class Context
+
+    # Returns the value of a rendered tag. Used internally by Parser#parse.
+    def render_tag(name, attributes = {}, packet = false, &block)
+      if name =~ /^(.+?):(.+)$/
+        render_tag($1) { render_tag($2, attributes, packet, &block) }
+      else
+        tag_definition_block = @definitions[qualified_tag_name(name.to_s)]
+        if tag_definition_block
+          stack(name, attributes, packet, block) do |tag|
+            tag_definition_block.call(tag).to_s
+          end
+        else
+          tag_missing(name, attributes, &block)
+        end
+      end
+    end
+    # A convienence method for managing the various parts of the
+    # tag binding stack.
+    def stack(name, attributes, packet, block)
+      previous = @tag_binding_stack.last
+      previous_locals = previous.nil? ? @globals : previous.locals
+      locals = DelegatingOpenStruct.new(previous_locals)
+      locals.packet = packet
+      binding = TagBinding.new(self, locals, name, attributes, block)
+      @tag_binding_stack.push(binding)
+      result = yield(binding)
+      @tag_binding_stack.pop
+      result
+    end
+  end
+end

data/lib/orange/resources/sitemap_resource.rb

@@ -130,15 +130,15 @@ module Orange
       packet.reroute(@my_orange_name, :orange)
     end
     
-    def top_nav
-      
-    end
-    
     def home(packet)
       site_id = packet['site'].id
       model_class.home_for_site(site_id) || model_class.create_home_for_site(site_id)
     end
     
+    def two_level(packet)
+      do_view(packet, :two_level, :model => home(packet))
+    end
+    
     def routes_for(packet)
       keys = {}
       keys[:resource] = packet['route.resource'] unless packet['route.resource'].blank?

data/lib/orange/resources/slices.rb

@@ -0,0 +1,33 @@
+module Orange
+  class Slices < Orange::Resource
+    call_me :slices
+    def afterLoad
+      orange.register(:stack_loaded){
+        orange[:radius].context.define_tag "slice" do |tag|
+          content = ''
+          resource = (tag.attr['resource'] || :slices).to_sym
+          id = tag.attr['id'] || nil
+          mode = (tag.attr['mode'] || tag.attr['chunk'] || (id ? :show : :index )).to_sym
+          if orange.loaded?(resource)
+            if orange[resource].respond_to?(mode) || resource == :slices
+              content << (id ? orange[resource].__send__(mode, tag.locals.packet, :id => id) : orange[resource].__send__(mode, tag.locals.packet))
+            else
+              content << "resource #{resource} doesn't respond to #{mode}"
+            end
+          else
+            content << "resource #{resource} not loaded"
+          end  
+          content
+        end
+      }
+    end
+    
+    
+    def method_missing(mode, *args)
+      packet = args.first if args.first.kind_of? Orange::Packet
+      opts = args.extract_options!
+      opts[:resource_name] = 'slices'
+      orange[:parser].haml("#{mode.to_s}.haml", packet, opts)
+    end
+  end
+end

data/lib/orange/resources/user_resource.rb

@@ -0,0 +1,15 @@
+module Orange
+  class UserResource < Orange::ModelResource
+    use Orange::User
+    call_me :users
+    def afterLoad
+      orange[:admin, true].add_link("Settings", :resource => @my_orange_name, :text => 'Users')
+    end
+    
+    def access_allowed?(packet, user)
+      u = model_class.first(:open_id => user)
+      return false unless u
+      u.allowed?(packet)
+    end
+  end
+end

data/lib/orange/stack.rb

@@ -132,7 +132,7 @@ module Orange
     # A shortcut to enable Rack::OpenID and Orange::Middleware::AccessControl
     # 
     # Args will be passed on to Orange::Middleware::AccessControl
-    # @todo Make it so this is not dependent on the openid_dm_store gem
+    # @todo Make it so this is not dependent on the openid_dm_store gem (outdated)
     def openid_access_control(*args)
       opts = args.extract_options!
       require 'rack/openid'

data/spec/orange/core_spec.rb

@@ -122,6 +122,13 @@ describe Orange::Core do
     c.app_dir.should == "/non/existent/dir"
   end
   
+  it "should return assigned app_dir with extra path if args passed" do
+    c= Orange::Core.new
+    c.options[:app_dir] = "/non/existent/dir"
+    c.app_dir('foo', 'bar').should_not == c.app_dir
+    c.app_dir('foo', 'bar').should == "/non/existent/dir/foo/bar"
+  end
+  
   it "should allow options" do
     c= Orange::Core.new(:opt_1 => true){ opt_2 true }
     c.options[:opt_1].should == true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: orange
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - David Haslem
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 -05:00
+date: 2010-02-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,14 +53,14 @@ dependencies:
         version: 2.2.13
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mynyml-rack-abstract-format
+  name: rack-abstract-format
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack-openid
@@ -73,14 +73,14 @@ dependencies:
         version: 0.2.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: meekish-openid_dm_store
+  name: openid_dm_store
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.2
+        version: 0.1.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-is-awesome_set
@@ -134,18 +134,21 @@ files:
 - lib/orange.rb
 - lib/orange/application.rb
 - lib/orange/carton.rb
+- lib/orange/cartons/asset_carton.rb
 - lib/orange/cartons/page_carton.rb
 - lib/orange/cartons/page_version_carton.rb
 - lib/orange/cartons/site_carton.rb
+- lib/orange/cartons/user_carton.rb
 - lib/orange/core.rb
 - lib/orange/magick.rb
 - lib/orange/middleware/access_control.rb
 - lib/orange/middleware/base.rb
 - lib/orange/middleware/database.rb
 - lib/orange/middleware/flex_router.rb
+- lib/orange/middleware/four_oh_four.rb
 - lib/orange/middleware/globals.rb
 - lib/orange/middleware/loader.rb
-- lib/orange/middleware/radius.rb
+- lib/orange/middleware/radius_parser.rb
 - lib/orange/middleware/rerouter.rb
 - lib/orange/middleware/restful_router.rb
 - lib/orange/middleware/route_context.rb
@@ -158,8 +161,10 @@ files:
 - lib/orange/packet.rb
 - lib/orange/resource.rb
 - lib/orange/resources/admin_resource.rb
+- lib/orange/resources/asset_resource.rb
 - lib/orange/resources/mapper.rb
 - lib/orange/resources/model_resource.rb
+- lib/orange/resources/not_found.rb
 - lib/orange/resources/page_parts.rb
 - lib/orange/resources/page_resource.rb
 - lib/orange/resources/parser.rb
@@ -167,6 +172,8 @@ files:
 - lib/orange/resources/routable_resource.rb
 - lib/orange/resources/singleton_model_resource.rb
 - lib/orange/resources/sitemap_resource.rb
+- lib/orange/resources/slices.rb
+- lib/orange/resources/user_resource.rb
 - lib/orange/stack.rb
 - README.markdown
 has_rdoc: true