cortex-reaver 0.0.9 → 0.1.0

data/lib/cortex_reaver/helper/attachments.rb

@@ -4,6 +4,24 @@ module Ramaze
     module Attachments
       Helper::LOOKUP << self
 
+      def self.included(base)
+        base.instance_eval do
+          # Saves all attachments from a request which match form to model.
+          # Returns true if all were successful. Returns an array of
+          # attachments which were added.
+          def self.add_attachments(model, attachments)
+            return unless attachments.respond_to? :each
+
+            attachments.each do |key, file|
+              if tempfile = file[:tempfile] and filename = file[:filename] and not filename.blank?
+                model.attachment(filename).file = tempfile
+              end
+            end
+            attachments
+          end
+        end
+      end
+
       # Deletes an attachment on a model identified by id.
       def delete_attachment(id, name)
         unless @model = model_class.get(id)
@@ -33,18 +51,6 @@ module Ramaze
 
       private
 
-      # Saves all attachments from a request which match form to model. Returns true if
-      # all were successful. Returns an array of attachments which were added.
-      def add_attachments(model, attachments)
-        attachments.each do |key, file|
-          puts "adding #{key}: #{file.inspect}"
-          if tempfile = file[:tempfile] and filename = file[:filename] and not filename.blank?
-            model.attachment(filename).file = tempfile
-          end
-        end
-        attachments
-      end
-
       # Renders an attachments form for a model. Shows current attachments,
       # provides links to edit/delete, and a multiple-upload box. Doesn't
       # include form tags.

data/lib/cortex_reaver/helper/auth.rb

@@ -12,11 +12,11 @@ module Ramaze
           # Failed block
           if session[:user]
             flash[:error] = "You don't have permission to do this."
-            redirect :/
+            redirect CortexReaver::MainController.r
           else
             flash[:notice] = "Please log in first."
             session[:target_uri] = request.request_uri
-            redirect R('/users', :login)
+            redirect CortexReaver::UserController.r(:login)
           end
         end
       end

data/lib/cortex_reaver/helper/canonical.rb

@@ -28,7 +28,7 @@ module Ramaze
 
 // Updates the "name" field as the watched field changes.
 $('##{watch}').change(function () {
-    $.get('#{Rs('canonicalize')}', {
+    $.get('#{rs('canonicalize')}', {
       new: $('##{watch}').val(),
       id: '#{model.id}'
     }, function(response) {
@@ -38,7 +38,7 @@ $('##{watch}').change(function () {
 
 // Canonicalizes the name when we're done, just to make sure.
 $('##{name}').blur(function() {
-  $.get('#{Rs('canonicalize')}', {
+  $.get('#{rs('canonicalize')}', {
     new: $('##{name}').val(),
     id: '#{model.id}'
   }, function(response) {

data/lib/cortex_reaver/helper/crud.rb

@@ -24,6 +24,11 @@ module Ramaze
           #   journal.title = request[:title]
           #   journal.body = request[:body].downcase
           # end
+          # 
+          # You can also define on_save, on_second_save, and on_update methods
+          # which will be called after the blocks. The difference is that the
+          # block forms are evaluated in the class, and the method forms are
+          # evaluated in the context of the instance.
           
           def self.on_create(&block)
             unless block_given? and block.arity == 2
@@ -84,14 +89,6 @@ module Ramaze
             const_set('PLURAL_MODEL_VAR', const_get('SINGULAR_MODEL_VAR').pluralize)
           end
 
-          # Prevent conflicts with our 0-ary action methods.  Not needed if
-          # we're using controller/show/name instead of controller/name
-          #
-          #begin
-          #  const_get('MODEL').reserved_canonical_names += ['index', 'new']
-          #rescue
-          #end
-
           # This action can't be in the normal module body, or it breaks things.
           def new
             # You need to be able to create one of these.
@@ -112,9 +109,15 @@ module Ramaze
                   if block = self.class.on_save_block
                     block.call(@model, request)
                   end
+                  if respond_to? :on_save
+                    on_save(@model, request)
+                  end
                   if block = self.class.on_create_block
                     block.call(@model, request)
                   end
+                  if respond_to? :on_create
+                    on_create(@model, request)
+                  end
 
                   # Save for the first time
                   raise unless @model.save
@@ -122,6 +125,11 @@ module Ramaze
                   # Second save callback, if applicable
                   if block = self.class.on_second_save_block
                     block.call(@model, request)
+                  end
+                  if respond_to? :on_second_save
+                    on_second_save @model, request
+                  end
+                  if block or respond_to? :on_second_save
                     raise unless @model.save
                   end
 
@@ -131,7 +139,13 @@ module Ramaze
               rescue => e
                 # An error occurred
                 Ramaze::Log.error e.inspect + e.backtrace.join("\n")
-                flash[:error] = "Couldn't create #{model_class.to_s.demodulize.downcase} #{h request[:title]}: #{h e}."
+
+                if e.is_a? Sequel::ValidationFailed
+                  flash[:error] = "Couldn't update #{model_class.to_s.demodulize.downcase} #{h @model.to_s}, because there were errors in the form."
+                else
+                  flash[:error] = "Couldn't create #{model_class.to_s.demodulize.downcase} #{h request[:title]}: #{h e}."
+                end
+
                 set_singular_model_var @model
               end
             else
@@ -166,10 +180,10 @@ module Ramaze
         if id
           # Redirect to show
           #
-          # This way, you can (assuming your name doesn't conflict with an existing
-          # action) tell people to visit /journals/my-cool-event, and it will go to
-          # /journals/show/my-cool-event.
-          raw_redirect Rs(:show, id), :status => 301
+          # This way, you can (assuming your name doesn't conflict with an
+          # existing action) tell people to visit /journals/my-cool-event, and
+          # it will go to /journals/show/my-cool-event.
+          raw_redirect rs(:show, id), :status => 301
         else
           # Display index
           page :last
@@ -182,16 +196,22 @@ module Ramaze
             u.can_edit? @model
           end
 
-          if @model.destroy
+          begin
+            raise unless @model.destroy
             flash[:notice] = "#{model_class.to_s.demodulize.downcase} #{h @model.to_s} deleted."
-            redirect Rs()
-          else
+            redirect rs()
+          rescue => e
             flash[:notice] = "Couldn't delete #{model_class.to_s.demodulize.downcase} #{h @model.to_s}."
+            if @model.errors.size > 0
+              flash[:notice] << ' ' + @model.errors.to_s
+            else
+              flash[:notice] << ' ' + e.message
+            end
             redirect @model.url
           end
         else
           flash[:error] = "No such #{model_class.to_s.demodulize.downcase} (#{h id}) exists."
-          redirect Rs()
+          redirect rs()
         end
       end
 
@@ -214,9 +234,15 @@ module Ramaze
                 if block = self.class.on_save_block
                   block.call(@model, request)
                 end
+                if respond_to? :on_save
+                  on_save @model, request
+                end
                 if block = self.class.on_update_block
                   block.call(@model, request)
                 end
+                if respond_to? :on_update
+                  on_update @model, request
+                end
 
                 # Save
                 raise unless @model.save
@@ -224,13 +250,16 @@ module Ramaze
                 # Second callbacks and save if applicable
                 if block = self.class.on_second_save_block
                   block.call(@model, request)
+                end
+                if respond_to? :on_second_save
+                  on_second_save @model, request
+                end
+                if block or respond_to? :on_second_save
                   raise unless @model.save
                 end
 
                 # Invalidate caches
-                if respond_to? :action_cache
-                  action_cache.clear
-                end
+                Ramaze::Cache.action.clear
 
                 flash[:notice] = "Updated #{model_class.to_s.demodulize.downcase} #{h @model.to_s}."
                 redirect @model.url
@@ -238,16 +267,21 @@ module Ramaze
             rescue => e
               # An error occurred
               Ramaze::Log.error e.inspect + e.backtrace.join("\n")
-              flash[:error] = "Couldn't update #{model_class.to_s.demodulize.downcase} #{h @model.to_s}: #{h e}."
+              
+              if e.is_a? Sequel::ValidationFailed
+                flash[:error] = "Couldn't update #{model_class.to_s.demodulize.downcase} #{h @model.to_s}, because there were errors in the form."
+              else
+                flash[:error] = "Couldn't update #{model_class.to_s.demodulize.downcase} #{h @model.to_s}: #{h e}."
+              end
             end
           end
         else
           flash[:error] = "No such #{model_class.to_s.demodulize.downcase} (#{id}) exists."
-          redirect Rs()
+          redirect rs()
         end
       end
 
-      def page(page)
+      def page(page = nil)
         page = case page
         when Symbol
           page
@@ -261,32 +295,40 @@ module Ramaze
           page.to_i
         end
 
+        if page.is_a? Integer and (page < 0 or page > model_class.window_count)
+          # This page isn't in the sequence!
+          error_404
+        end
+
         @title = "#{model_class.to_s.demodulize.pluralize.titleize}"
         if self.class.private_method_defined? :feed and model_class.respond_to? :atom_url
           feed @title, model_class.atom_url
         end
-        @models = model_class.window(page)
-        @page = page
 
-        if model_class.count.zero?
-          # There are NO models
-        elsif @models.empty?
-          # Empty page
-          error_404
+        @models = model_class.window(page)
+        if @models.respond_to? :viewable_by
+          @models = @models.viewable_by(user)
         end
 
+        @page = page
+
         set_plural_model_var @models
 
         if user.can_create? model_class.new
-          workflow "New #{model_class.to_s.demodulize}", Rs(:new)
+          workflow "New #{model_class.to_s.demodulize}", rs(:new)
         end
 
-        render_template :list
+        render_view(:list)
       end
 
-      def show(id)
+      def show(id = nil)
         if id and @model = model_class.get(id)
           # Found that model
+          
+          unless user.can_view? @model
+            error_403
+          end
+
           # Redirect IDs to names
           raw_redirect(@model.url, :status => 301) if id =~ /^\d+$/
 
@@ -309,16 +351,14 @@ module Ramaze
           end
           
           if user.can_create? model_class.new
-            workflow "New #{model_class.to_s.demodulize}", Rs(:new)
+            workflow "New #{model_class.to_s.demodulize}", rs(:new)
           end
           if user.can_edit? @model
-            workflow "Edit this #{model_class.to_s.demodulize}", Rs(:edit, @model.id)
+            workflow "Edit this #{model_class.to_s.demodulize}", rs(:edit, @model.id)
           end
           if user.can_delete? @model
-            workflow "Delete this #{model_class.to_s.demodulize}", Rs(:delete, @model.id)
+            workflow "Delete this #{model_class.to_s.demodulize}", rs(:delete, @model.id)
           end
-          
-          render_template :show
         elsif id
           # Didn't find that model
           error_404

data/lib/cortex_reaver/helper/feeds.rb

@@ -21,12 +21,9 @@ module Ramaze
           end
 
           # Cache feeds
-          if base.respond_to? :cache
-            cache :atom, :ttl => 300
+          if base.respond_to? :cache_action
+            base.cache_action(:method => :atom, :ttl => 300)
           end
-
-          # Don't use layout
-          base.deny_layout :atom
         end
       end
 

data/lib/cortex_reaver/helper/form.rb

@@ -89,7 +89,7 @@ module Ramaze
 
         case type
         when 'textarea'
-          f << "<textarea name=\"#{id}\" id=\"#{id}\">#{default}</textarea>"
+          f << "<textarea name=\"#{id}\" id=\"#{id}\">#{Rack::Utils::escape_html default}</textarea>"
         when 'checkbox'
           f << "<input type=\"checkbox\" name=\"#{id}\" id=\"#{id}\" #{default ? 'checked="checked"' : ''} />"
         else

data/lib/cortex_reaver/helper/navigation.rb

@@ -162,7 +162,7 @@ module Ramaze
         case x
         when CortexReaver::User
           name = x.name || x.login
-          A(name, :href => x.url)
+          "<a href=\"#{attr_h x.url}\">#{h name}</a>"
         when CortexReaver::Comment
           if x.send(who)
             # Use attached creator/whoever

data/lib/cortex_reaver/helper/photographs.rb

@@ -6,11 +6,11 @@ module Ramaze
         begin
           if exif = photo.exif
             description = ''
-            description << photo.date.strftime('%m/%d/%Y') + ': '
-            description << exif.make if exif.make
+            description << photo.date.strftime('%m/%d/%Y') + ' '
+#            description << exif.make if exif.make
             description << ' ' + exif.model + ', ' if exif.model
             description << ' ' + exif.focal_length_in_35mm_film.to_i.to_s + 'mm' if exif.focal_length_in_35mm_film
-            description << ' at ' + exposure_time_to_s(exif.exposure_time) if exif.exposure_time
+            description << ' at ' + neat_time(exif.exposure_time) if exif.exposure_time
             description << ' F' + exif.f_number.to_f.to_s if exif.f_number
           else
             nil
@@ -20,6 +20,15 @@ module Ramaze
           return description
         end
       end
+
+      # 1/60 => '1/60th'
+      def neat_time(rational)
+        if rational.denominator == 1
+          rational.numerator.ordinal.to_s
+        else
+          "#{rational.numerator}/#{rational.denominator.ordinal.to_s}"
+        end
+      end
     end
   end
 end

data/lib/cortex_reaver/helper/template.rb

@@ -0,0 +1,37 @@
+module Ramaze
+  module Helper
+    # Simple render_template method
+    module Template
+#      # HACK: find the template to render 
+#      def render_template(path)
+#        opts = Ramaze::App[:cortex_reaver].options
+#
+#        # Construct possible directories
+#        roots = opts.roots.map do |root| 
+#          opts.views.map do |view| 
+#            root = File.join(root, view)
+#
+#            if path[0..0] != '/'
+#              # Append controller map as well
+#              File.join(root, Ramaze::Current.action.node.mapping)
+#            else
+#              root
+#            end
+#          end
+#        end
+#        roots.flatten!
+#
+#        # Try to find the path in each root
+#        roots.each do |root|
+#          file = File.join(root, path)
+#          if File.exists? file
+#            return render_file(file)
+#          end
+#        end
+#      
+#        # Lookup failed    
+#        raise RuntimeError.new("No template #{path} in any of #{roots.inspect}")
+#      end
+    end
+  end
+end

data/lib/cortex_reaver/{view/blank_layout.rhtml → layout/blank.rhtml}

@@ -32,7 +32,7 @@
     <script type="text/javascript" defer="defer" src="/js/admin.js"></script>
     <script type="text/javascript" src="/js/photo.js"></script>
   
-    <%= render_template 'adminbox.rhtml' %>
+    <%= CortexReaver::MainController.render_view('adminbox') %>
 
     <%= flashbox %>
             

data/lib/cortex_reaver/{view/text_layout.rhtml → layout/text.rhtml}

@@ -59,7 +59,7 @@
         <tbody>
           <tr>
             <td id="main">
-              <%= render_template "adminbox.rhtml" %>
+              <%= CortexReaver::MainController.render_view('adminbox') %>
 
               <%= flashbox %>
 

data/lib/cortex_reaver/migrations/013_draft.rb

@@ -0,0 +1,17 @@
+module CortexReaver
+  class DraftSchema < Sequel::Migration
+    def down
+      alter_table(:pages)       { drop_column :draft }
+      alter_table(:projects)    { drop_column :draft }
+      alter_table(:journals)    { drop_column :draft }
+      alter_table(:photographs) { drop_column :draft }
+    end
+
+    def up
+      alter_table(:pages)       { add_column :draft, :boolean, :default => false }
+      alter_table(:projects)    { add_column :draft, :boolean, :default => false }
+      alter_table(:journals)    { add_column :draft, :boolean, :default => false }
+      alter_table(:photographs) { add_column :draft, :boolean, :default => false }
+    end
+  end
+end