appdoc 0.1.2 → 0.1.3

data/app/controllers/documents_controller.rb

@@ -11,9 +11,20 @@ class DocumentsController < ApplicationController
   end
 
   def index
-    @documents = Document.named(params[:search])
-    @documents = @documents.tagged_with(params[:tag]) unless params[:tag].blank?
-    @documents = @documents.page(params[:page])
+    
+    if params[:search].blank?
+      @documents = Document.scoped
+    else
+      @documents = Document.named(params[:search])
+      @documents = @documents.tagged_with(params[:tag]) unless params[:tag].blank?
+    end
+    
+    # First check if using kaminari for pagination, else check for will_paginate
+    begin  
+      @documents = @documents.page(params[:page])
+    rescue NoMethodError
+      @documents = @documents.try(:paginate, :page => params[:page])
+    end
 
     respond_with(@documents) do |format|
       format.html { flash.now[:alert] = "No documents were found" if @documents.empty? }

data/app/models/document.rb

@@ -13,8 +13,6 @@ class Document < ActiveRecord::Base
     joins("LEFT OUTER JOIN tags ON taggings.tag_id = tags.id").
     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)

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

@@ -1,5 +1,5 @@
 -if respond_to? :page_entries_info
-  .search.summary!=page_entries_info(@documents, :entry_name=>'document')
+  .search.summary=raw page_entries_info(@documents, :entry_name=>'document')
 
 %table
   %tr
@@ -15,5 +15,9 @@
         %ul.tags
           -document.tags.each do |tag|
             %li!=link_to(tag, {:controller=>'documents', :tag=>tag.name})
-            
-!=paginate(@documents)
+           
+
+-if respond_to? :paginate
+  =paginate(@documents)
+-elsif respond_to? :will_paginate
+  =will_paginate(@documents)

data/lib/appdoc.rb

@@ -5,8 +5,6 @@ module Appdoc
   require 'action_links'
   require 'acts-as-taggable-on'
   require 'haml'
-  require 'kaminari'
-  require 'meta_search'
   
   # Settings
   mattr_accessor(:delimiter)

data/lib/appdoc/version.rb

@@ -1,3 +1,3 @@
 module Appdoc
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,119 +1,147 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: appdoc
-version: !ruby/object:Gem::Version
-  version: 0.1.2
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
-authors:
+authors: 
 - Ryan Hall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-27 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: action_links
-  requirement: &74347070 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
+
+date: 2012-04-19 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rails
   prerelease: false
-  version_requirements: *74347070
-- !ruby/object:Gem::Dependency
-  name: acts-as-taggable-on
-  requirement: &74346480 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: action_links
   prerelease: false
-  version_requirements: *74346480
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &74345730 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
+        version: 0.1.0
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: acts-as-taggable-on
   prerelease: false
-  version_requirements: *74345730
-- !ruby/object:Gem::Dependency
-  name: kaminari
-  requirement: &74345190 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.10.0
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: haml
   prerelease: false
-  version_requirements: *74345190
-- !ruby/object:Gem::Dependency
-  name: meta_search
-  requirement: &74344730 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
-  prerelease: false
-  version_requirements: *74344730
+  version_requirements: *id004
 description: Allows you to add documents and documentation to your app
-email:
+email: 
 - ryan.e.hall@biola.edu
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-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: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: appdoc
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Documentation for your app
 test_files: []
+