appdoc 0.0.1 → 0.1.0

data/app/controllers/documents_controller.rb

@@ -1,72 +1,58 @@
 class DocumentsController < ApplicationController
 
-  filter_access_to :all
+  respond_to :html
+  respond_to :js, :only => :index
+
+  # Authorization
+  if respond_to? :filter_access_to
+    filter_access_to :all # Devise
+  elsif respond_to? :check_authorization
+    check_authorization # cancan
+  end
 
-  # GET /documents
   def index
-    if params[:tag].blank?
-      @search = Document.search(params[:search])
-    else
-      @search = Document.tagged_with(params[:tag]).search(params[:search])
-      flash[:warn] = "No documents are tagged with \"#{params[:tag]}\"" if @search.count == 0 and params[:search].nil?
-    end
-    @documents = @search.page(params[:page]).per(20)
+    @documents = Document.named(params[:search])
+    @documents = @documents.tagged_with(params[:tag]) unless params[:tag].blank?
+    @documents = @documents.page(params[:page])
 
-    respond_to do |format|
-      format.html # index.html.haml
+    respond_with(@documents) do |format|
+      format.html { flash.now[:alert] = "No documents were found" if @documents.empty? }
       format.js { render :partial=>'documents' }
     end
   end
 
-  # GET /documents/1
   def show
-    @document = Document.find_by_id(params[:id]) || Document.find_by_slug!(params[:id])
+    @document = Document.find_by_id_or_slug!(params[:id])
   end
 
-  # GET /documents/new
   def new
     @document = Document.new
   end
 
-  # GET /documents/1/edit
   def edit
-    @document = Document.find_by_id(params[:id]) || Document.find_by_slug(params[:id])
+    @document = Document.find_by_id_or_slug!(params[:id])
   end
 
-  # POST /documents
   def create
     @document = Document.new(params[:document])
-
     if @document.save
       flash[:notice] = 'Document was successfully created.'
-      redirect_to(@document)
-    else
-      render :action => 'new'
     end
+    respond_with @document
   end
 
-  # PUT /documents/1
   def update
-  
-    @document = Document.find_by_id(params[:id]) || Document.find_by_slug(params[:id])
-
+    @document = Document.find_by_id_or_slug!(params[:id])
     if @document.update_attributes(params[:document])
       flash[:notice] = 'Document was successfully updated.'
-      redirect_to(@document)
-    else
-      render :action => 'edit'
     end
-    
+    respond_with @document
   end
 
-  # DELETE /documents/1
   def destroy
-  
-    @document = Document.find_by_id(params[:id]) || Document.find_by_slug(params[:id])
+    @document = Document.find_by_id_or_slug!(params[:id])
     @document.destroy
-
-    redirect_to(documents_url)
-    
+    respond_with @document
   end
   
 end

data/app/models/document.rb

@@ -8,15 +8,25 @@ class Document < ActiveRecord::Base
   
   default_scope :order => 'name'
   
-  scope :named, lambda {|name| select("DISTINCT documents.*").
-    joins("LEFT OUTER JOIN taggings ON (taggings.taggable_id = documents.id AND taggable_type = 'Document')").
+  scope :named, lambda {|name| select("DISTINCT #{table_name}.*").
+    joins("LEFT OUTER JOIN taggings ON (taggings.taggable_id = #{table_name}.id AND taggings.taggable_type = 'Document')").
     joins("LEFT OUTER JOIN tags ON taggings.tag_id = tags.id").
-    where("documents.name LIKE ? OR documents.slug LIKE ? OR tags.name LIKE ?", "%#{name}%", "%#{name}%", "%#{name}%") }
+    where("#{table_name}.name LIKE ? OR #{table_name}.slug LIKE ? OR tags.name LIKE ?", "%#{name}%", "%#{name}%", "%#{name}%") }
   
   search_methods :named
   
   acts_as_taggable
   
+  def self.find_by_id_or_slug(id_or_slug)
+    where("#{table_name}.id = ? OR #{table_name}.slug = ?", id_or_slug, id_or_slug).first
+  end
+  
+  def self.find_by_id_or_slug!(id_or_slug)
+    doc = self.find_by_id_or_slug(id_or_slug)
+    raise ActiveRecord::RecordNotFound if doc.nil?
+    doc
+  end
+  
   def to_param
     self.slug.blank? ? self.id.to_s : self.slug
   end

data/app/views/documents/_documents.html.haml

@@ -13,6 +13,6 @@
       %td.tags
         %ul.tags
           -document.tags.each do |tag|
-            %li!=link_to(tag, {:controller=>'documents', :tag=>tag.to_s})
+            %li!=link_to(tag, {:controller=>'documents', :tag=>tag.name})
             
 !=paginate(@documents)

data/app/views/documents/index.html.haml

@@ -1,12 +1,12 @@
 %h2 Documentation
 
-=form_for(@search, :html=>{:class=>'search'}) do |f|
+!=form_tag(documents_path, :class => 'search', :method => :get) do
   !=hidden_field_tag(:tag, params[:tag])
-  !=f.label(:named, 'Search')
-  !=f.text_field(:named)
-  !=f.submit('Search')
+  !=label_tag(:search, 'Search')
+  !=text_field_tag(:search, params[:search])
+  !=submit_tag('Search')
 
 .search_results
-  !=render('documents', :documents=>@documents)
+  !=render('documents', :documents => @documents)
             
 !=render('index_aside')

data/lib/appdoc/version.rb

@@ -1,3 +1,3 @@
 module Appdoc
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appdoc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,63 +9,41 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-06 00:00:00.000000000Z
+date: 2011-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &73967610 !ruby/object:Gem::Requirement
+  requirement: &75343890 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *73967610
-- !ruby/object:Gem::Dependency
-  name: declarative_authorization
-  requirement: &73966490 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *73966490
+  version_requirements: *75343890
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &73964810 !ruby/object:Gem::Requirement
+  requirement: &75343630 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *73964810
+  version_requirements: *75343630
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &73963450 !ruby/object:Gem::Requirement
+  requirement: &75433740 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *73963450
-- !ruby/object:Gem::Dependency
-  name: meta_search
-  requirement: &73960980 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.6
-  type: :runtime
-  prerelease: false
-  version_requirements: *73960980
+  version_requirements: *75433740
 description: Allows you to add documents and documentation to your app
 email:
 - ryan.e.hall@biola.edu
@@ -74,23 +52,23 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/models/document.rb
-- app/views/documents/new.html.haml
-- app/views/documents/edit.html.haml
 - app/views/documents/show.html.haml
-- app/views/documents/index.html.haml
+- app/views/documents/new.html.haml
 - app/views/documents/_documents.html.haml
 - app/views/documents/_form.html.haml
+- app/views/documents/index.html.haml
 - app/views/documents/_index_aside.html.haml
+- app/views/documents/edit.html.haml
 - app/controllers/documents_controller.rb
-- lib/appdoc/version.rb
-- lib/appdoc/engine.rb
-- lib/generators/appdoc/appdoc_generator.rb
+- lib/generators/appdoc/templates/public/javascripts/SmartTextBox.js
 - lib/generators/appdoc/templates/public/stylesheets/jquery/smart_text_box/imgs/close.gif
 - lib/generators/appdoc/templates/public/stylesheets/jquery/smart_text_box/SmartTextBox.css
-- lib/generators/appdoc/templates/public/javascripts/SmartTextBox.js
 - lib/generators/appdoc/templates/migration.rb
 - lib/generators/appdoc/templates/appdoc_config.rb
+- lib/generators/appdoc/appdoc_generator.rb
 - lib/appdoc.rb
+- lib/appdoc/version.rb
+- lib/appdoc/engine.rb
 - config/routes.rb
 homepage: https://github.com/biola/appdoc
 licenses: []
@@ -112,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: appdoc
-rubygems_version: 1.8.10
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Documentation for your app