opinio 0.3.3 → 0.3.4

data/{Gemfile → Gemfile-rails-3.0.x}

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gemspec
 
 gem "kaminari"
-gem "rails", "~> 3.0.4"
+gem "rails", "~> 3.0.0"
 gem "sqlite3"
 gem "jquery-rails"
 

data/Gemfile-rails-3.1.x

@@ -0,0 +1,29 @@
+source "http://rubygems.org"
+
+gemspec
+
+gem "kaminari"
+gem "rails", ">= 3.1"
+gem "sqlite3"
+gem "jquery-rails"
+
+group :development do
+  gem "ruby-debug19" if RUBY_VERSION == '1.9.2'
+  gem 'guard-rspec'
+  if RUBY_PLATFORM =~ /darwin/i
+    gem 'rb-fsevent'
+    gem 'growl'
+  end
+end
+
+group :test do
+  gem "cucumber"
+  gem "cucumber-rails"
+  gem "capybara"
+  gem "launchy"
+  gem "database_cleaner"
+  gem "rspec-rails"
+end
+# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
+# gem 'ruby-debug'
+# gem 'ruby-debug19'

data/app/controllers/opinio/comments_controller.rb

@@ -10,14 +10,14 @@ class Opinio::CommentsController < ApplicationController
     @comment = resource.comments.build(params[:comment])
     @comment.owner = send(Opinio.current_user_method)
     if @comment.save
-      flash[:notice] = I18n.translate('opinio.comment.sent', :default => "Comment sent successfully.")
+      messages = {:notice => I18n.translate('opinio.comment.sent', :default => "Comment sent successfully.")}
     else
-      flash[:error]  = I18n.translate('opinio.comment.error', :default => "Error sending the comment.")
+      messages = {:error => I18n.translate('opinio.comment.error', :default => "Error sending the comment.")}
     end
 
     respond_to do |format|
       format.js
-      format.html { redirect_to( resource ) }
+      format.html { redirect_to( resource, :flash => messages ) }
     end
   end
 

data/app/views/opinio/comments/_new.html.erb

@@ -4,7 +4,7 @@
     <%= form_for Comment.new, :remote => true do |f| %>
       <p>
         <%= f.label :body, "Comment" %>
-        <%= f.text_area :body %>
+        <%= f.text_area :body, :id => "Comment" %>
       </p>
       <%= hidden_field_tag :commentable_id, commentable.id %>
       <%= hidden_field_tag :commentable_type, commentable.class.base_class.name.to_s %>

data/app/views/opinio/comments/reply.js.erb

@@ -1,3 +1,4 @@
 $("#commentable_id").val('<%= @commentable_id %>')
 $("#commentable_type").val('<%= @commentable_type %>')
+$("#new_comment textarea").val('')
 $("#new_comment textarea").focus()

data/lib/opinio/controllers/helpers.rb

@@ -9,7 +9,8 @@ module Opinio
 
       def render_comments(object, options = {})
         limit = options.delete(:limit) || Opinio.model_name.constantize.default_per_page
-        render( :partial => "opinio/comments/comments", :locals => {:comments => object.comments.page(1).limit(limit), :commentable => object, :options => options} )
+        page  = options.delete(:page)  || 1
+        render( :partial => "opinio/comments/comments", :locals => {:comments => object.comments.page(page).limit(limit), :commentable => object, :options => options} )
       end
 
       def render_comments_form(object, options = {})

data/lib/opinio/opinio_model.rb

@@ -32,7 +32,7 @@ module Opinio
         if Opinio.use_title
           attr_accessible :title 
           validates       :title,
-                          {}.merge( :length => options[:title_length] )
+                          {:presence => true}.merge( :length => options[:title_length] )
         end
         attr_accessible :body
 
@@ -66,13 +66,19 @@ module Opinio
         send :include, Opinio::OpinioModel::InstanceMethods
 
         if Opinio.accept_replies
-          validate :cannot_be_comment_of_a_comments_comment
-          opinio_subjectum :order => 'created_at ASC'
+          send :include, RepliesSupport
         end
 
       end
     end
 
+    module RepliesSupport
+      def self.included(base)
+        base.validate :cannot_be_comment_of_a_comments_comment
+        base.opinio_subjectum :order => 'created_at ASC'
+      end
+    end
+
     module InstanceMethods
 
       private

data/lib/opinio/version.rb

@@ -1,5 +1,5 @@
 module Opinio
   class Version
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opinio
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-20 00:00:00.000000000Z
+date: 2012-01-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &22270380 !ruby/object:Gem::Requirement
+  requirement: &2157268020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *22270380
+  version_requirements: *2157268020
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &22269960 !ruby/object:Gem::Requirement
+  requirement: &2157267600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22269960
+  version_requirements: *2157267600
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &22269500 !ruby/object:Gem::Requirement
+  requirement: &2157267140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22269500
+  version_requirements: *2157267140
 description: Opinio is an engine used to add comments functionallity to rails 3 applications.
 email:
 - luiz.felipe.gp@gmail.com
@@ -51,35 +51,36 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/controllers/opinio/comments_controller.rb
+- app/views/opinio/comments/_comment.html.erb
 - app/views/opinio/comments/_comments.html.erb
 - app/views/opinio/comments/_new.html.erb
 - app/views/opinio/comments/create.js.erb
-- app/views/opinio/comments/_comment.html.erb
-- app/views/opinio/comments/reply.js.erb
-- app/views/opinio/comments/index.html.erb
 - app/views/opinio/comments/destroy.js.erb
-- app/controllers/opinio/comments_controller.rb
-- lib/opinio/version.rb
-- lib/opinio/rails/routes.rb
-- lib/opinio/orm/active_record.rb
-- lib/opinio/opinio_model.rb
-- lib/opinio/railtie.rb
-- lib/opinio/rails.rb
-- lib/opinio/opinio_subjectum.rb
-- lib/opinio/schema.rb
-- lib/opinio/controllers/extensions.rb
-- lib/opinio/controllers/internal_helpers.rb
-- lib/opinio/controllers/replies.rb
-- lib/opinio/controllers/helpers.rb
-- lib/opinio.rb
+- app/views/opinio/comments/index.html.erb
+- app/views/opinio/comments/reply.js.erb
 - lib/generators/opinio/install/install_generator.rb
+- lib/generators/opinio/install/templates/initializers/opinio.erb
 - lib/generators/opinio/install/templates/migrations/create_model.rb
 - lib/generators/opinio/install/templates/models/model.rb
-- lib/generators/opinio/install/templates/initializers/opinio.erb
 - lib/generators/opinio/views/views_generator.rb
+- lib/opinio/controllers/extensions.rb
+- lib/opinio/controllers/helpers.rb
+- lib/opinio/controllers/internal_helpers.rb
+- lib/opinio/controllers/replies.rb
+- lib/opinio/opinio_model.rb
+- lib/opinio/opinio_subjectum.rb
+- lib/opinio/orm/active_record.rb
+- lib/opinio/rails/routes.rb
+- lib/opinio/rails.rb
+- lib/opinio/railtie.rb
+- lib/opinio/schema.rb
+- lib/opinio/version.rb
+- lib/opinio.rb
 - MIT-LICENSE
 - Rakefile
-- Gemfile
+- Gemfile-rails-3.0.x
+- Gemfile-rails-3.1.x
 - README.rdoc
 homepage: 
 licenses: []