mongoid-textile 0.1.1 → 0.2.0

data/.gitignore

@@ -14,3 +14,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+Gemfile.lock

data/.travis.yml

@@ -1,7 +1,6 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - ruby-head
-  - ree
-  - rbx-18mode
+
+gemfile:
+  - Gemfile
+  - gemfiles/mongoid-2.4.gemfile

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.2.0 - July 11, 2012
+
+### Improvements
+
+* Adding support to Mongoid 3.
+
+### Major Changes (Backwards Incompatible)
+
+* Mongoid Textile no longer supports Ruby 1.8.7 and 1.9.2 (if you use Mongoid 3).
+
 ## 0.1.1 - March 30, 2012
 
 ### Resolved Issues

data/README.md

@@ -1,4 +1,4 @@
-# Mongoid::Textile [![Build Status](https://secure.travis-ci.org/tiagogodinho/mongoid-textile.png)](http://travis-ci.org/tiagogodinho/mongoid-textile) [![Build Status](https://gemnasium.com/tiagogodinho/mongoid-textile.png?travis)](http://gemnasium.com/tiagogodinho/mongoid-textile)
+# Mongoid::Textile [![Build Status](https://secure.travis-ci.org/tiagogodinho/mongoid-textile.png)](http://travis-ci.org/tiagogodinho/mongoid-textile) [![Build Status](https://gemnasium.com/tiagogodinho/mongoid-textile.png)](http://gemnasium.com/tiagogodinho/mongoid-textile)
 
 Textile texts directly from MongoDB.
 
@@ -35,6 +35,10 @@ article = Article.create(text: 'h1. Proud to be a rails developer')
 article.text_formatted #=> <h1>Proud to be a rails developer</h1>
 ```
 
+## Compatibility
+
+Mongoid Textile is tested against Ruby 1.9.3.
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,7 +1,7 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => 'spec'
+task default: 'spec'

data/gemfiles/mongoid-2.4.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'mongoid', '~> 2.4'
+
+gem 'bson_ext', '~> 1.6.0'
+
+gemspec path: '../'

data/lib/mongoid-textile.rb

@@ -1,28 +1,28 @@
-require "mongoid-textile/version"
-require "active_support/concern"
-require "mongoid"
-require "redcloth"
+require 'mongoid-textile/version'
+require 'active_support/concern'
+require 'mongoid'
+require 'redcloth'
 
 module Mongoid
   module Textile
     extend ActiveSupport::Concern
-    
+
     included do
       before_save :textile_to_html
     end
-    
+
     def textile_to_html
       textile_fields.each do |textile_field_name|
         field_name = textile_field_name.gsub(/_formatted/, '')
-        
+
         if self.fields[field_name.to_s].localized?
           values = self.send("#{field_name}_translations") || {}
           formatted_text = {}
-          
+
           values.each do |key, value|
             formatted_text[key.to_s] = RedCloth.new(value.to_s).to_html
           end
-          
+
           self.send("#{textile_field_name}_translations=", formatted_text)
         else
           value = self.send(field_name)
@@ -31,18 +31,18 @@ module Mongoid
         end
       end
     end
-    
+
     private
-    
+
     def textile_fields
       fields.collect{ |field| field.first }.select{ |field_name| field_name =~ /\w+_formatted/ }
     end
-    
+
     module ClassMethods
       def textlize(*fields)
         fields.each do |field_name|
           if self.fields[field_name.to_s].localized?
-            field("#{field_name}_formatted", :localize => true)
+            field("#{field_name}_formatted", localize: true)
           else
             field("#{field_name}_formatted")
           end

data/lib/mongoid-textile/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Textile
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

data/mongoid-textile.gemspec

@@ -1,25 +1,23 @@
-# encoding: UTF-8
-
 require File.expand_path('../lib/mongoid-textile/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Lucas Renan", "Tiago Rafael Godinho"]
-  gem.email         = ["contato@lucasrenan.com", "tiagogodinho3@gmail.com"]
+  gem.authors       = ['Lucas Renan', 'Tiago Rafael Godinho']
+  gem.email         = ['contato@lucasrenan.com', 'tiagogodinho3@gmail.com']
   gem.description   = %q{Textile texts directly from MongoDB.}
   gem.summary       = %q{Mongoid Textile caches Textile texts on MongoDB to eliminate reprocessing.}
-  gem.homepage      = ""
+  gem.homepage      = ''
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "mongoid-textile"
-  gem.require_paths = ["lib"]
+  gem.name          = 'mongoid-textile'
+  gem.require_paths = ['lib']
   gem.version       = Mongoid::Textile::VERSION
-  
-  gem.add_dependency 'mongoid',  '~> 2.4.0'
+
+  gem.add_dependency 'mongoid',  '>= 2.4'
   gem.add_dependency 'RedCloth', '~> 4.2.0'
-  
-  gem.add_development_dependency 'bson_ext', '~> 1.6.1'
-  gem.add_development_dependency 'rspec', '~> 2.9.0'
-  gem.add_development_dependency 'rake', '~> 0.9.2'
+
+  gem.add_development_dependency 'database_cleaner', '~> 0.8'
+  gem.add_development_dependency 'rspec',            '~> 2.9'
+  gem.add_development_dependency 'rake',             '~> 0.9.2'
 end

data/spec/mongoid-textile_spec.rb

@@ -1,86 +1,86 @@
 # encoding: utf-8
 
-require "spec_helper"
+require 'spec_helper'
 
 class Article
   include Mongoid::Document
   include Mongoid::Textile
-  
+
   field :text
-  
+
   textlize :text
 end
 
 class Post
   include Mongoid::Document
   include Mongoid::Textile
-  
-  field :text, :localize => true
-  
+
+  field :text, localize: true
+
   textlize :text
 end
 
 describe Mongoid::Textile do
-  let(:article) { Article.create(:text => "h1. proud to be a rails developer") }
-  
-  it "should build a dynamic field for textilized fields" do
+  let(:article) { Article.create(text: 'h1. proud to be a rails developer') }
+
+  it 'should build a dynamic field for textilized fields' do
     article.should respond_to(:text_formatted)
   end
-  
-  it "should set formatted field from textile to html" do
-    article.text_formatted.should eq("<h1>proud to be a rails developer</h1>")
+
+  it 'should set formatted field from textile to html' do
+    article.text_formatted.should eq('<h1>proud to be a rails developer</h1>')
   end
 
-  it "should change textlized text" do
-    article.text = "p. ruby makes me happy"
+  it 'should change textlized text' do
+    article.text = 'p. ruby makes me happy'
     article.save
 
-    article.text_formatted.should eq("<p>ruby makes me happy</p>")
+    article.text_formatted.should eq('<p>ruby makes me happy</p>')
   end
-  
-  context "when text is nil" do
-    let(:article) { Article.create(:text => nil) }
-    
-    it "should set formatted field with an empty string" do
-      article.text_formatted.should eq("")
+
+  context 'when text is nil' do
+    let(:article) { Article.create(text: nil) }
+
+    it 'should set formatted field with an empty string' do
+      article.text_formatted.should eq('')
     end
   end
 
-  context "when text is localized and is not present" do
+  context 'when text is localized and is not present' do
     let(:post) { Post.create }
 
-    it "should set formatted translations field with an empty hash" do
+    it 'should set formatted translations field with an empty hash' do
       post.text_formatted_translations.should eq({})
       post.text_formatted.should eq(nil)
     end
   end
-  
-  context "when text is empty" do
-    let(:article) { Article.create(:text => "") }
-    
-    it "should set formatted field with an empty string" do
-      article.text_formatted.should eq("")
+
+  context 'when text is empty' do
+    let(:article) { Article.create(text: '') }
+
+    it 'should set formatted field with an empty string' do
+      article.text_formatted.should eq('')
     end
   end
-  
+
   context 'multiple languages' do
-    let(:post) { Post.create(:text_translations => { 'en' => 'h1. ruby makes me happy', 'de' => 'h1. ruby macht mich glücklich' }) }
-    
+    let(:post) { Post.create(text_translations: { en: 'h1. ruby makes me happy', de: 'h1. ruby macht mich glücklich' }) }
+
     context 'in english' do
       before :all do
         I18n.locale = :en
       end
-      
+
       it 'should set formatted field from textile to html' do
         post.text_formatted.should eq('<h1>ruby makes me happy</h1>')
       end
     end
-    
+
     context 'in german' do
       before :all do
         I18n.locale = :de
       end
-      
+
       it 'should set formatted field from textile to html' do
         post.text_formatted.should eq('<h1>ruby macht mich glücklich</h1>')
       end

data/spec/spec_helper.rb

@@ -1,29 +1,23 @@
-require "mongoid-textile"
+require 'mongoid-textile'
+require 'database_cleaner'
 
 RSpec.configure do |config|
-  # Remove this line if you don"t want RSpec"s should and should_not
-  # methods or matchers
-  require "rspec/expectations"
-  config.include RSpec::Matchers
+  config.before(:suite) do
+    if Mongoid.respond_to? :connect_to
+      Mongoid.connect_to('mongoid-textile') # Mongoid 3
+    else
+      Mongoid.master = Mongo::Connection.new.db('mongoid-textile') # Mongoid 2
+    end
 
-  # == Mock Framework
-  config.mock_with :rspec
-
-  config.color_enabled 	= true
-  config.full_backtrace = true
-
-  config.before :suite do
-  	Mongoid.configure do |config|
-  	  config.master = Mongo::Connection.new.db("mongoid-textile")
-  	end
+    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.clean_with(:truncation)
   end
 
-  config.after :each do
-    Mongoid.master.collections.select {|c| c.name !~ /^system/ }.each(&:drop)
+  config.before(:each) do
+    DatabaseCleaner.start
   end
 
-  config.after :suite do
-    Mongoid.master.connection.drop_database("mongoid-textile")
-    Mongoid.master.connection.close
+  config.after(:each) do
+    DatabaseCleaner.clean
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-textile
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,24 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -45,13 +45,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: bson_ext
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -105,10 +105,10 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/mongoid-2.4.gemfile
 - lib/mongoid-textile.rb
 - lib/mongoid-textile/version.rb
 - mongoid-textile.gemspec
@@ -126,15 +126,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4348872174340008729
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4348872174340008729
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Mongoid Textile caches Textile texts on MongoDB to eliminate reprocessing.

data/Gemfile.lock

@@ -1,49 +0,0 @@
-PATH
-  remote: .
-  specs:
-    mongoid-textile (0.1.0)
-      RedCloth (~> 4.2.0)
-      mongoid (~> 2.4.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    RedCloth (4.2.9)
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
-      builder (~> 3.0.0)
-    activesupport (3.2.2)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    bson (1.6.1)
-    bson_ext (1.6.1)
-      bson (~> 1.6.1)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    i18n (0.6.0)
-    mongo (1.6.1)
-      bson (~> 1.6.1)
-    mongoid (2.4.7)
-      activemodel (~> 3.1)
-      mongo (~> 1.3)
-      tzinfo (~> 0.3.22)
-    multi_json (1.2.0)
-    rake (0.9.2.2)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    tzinfo (0.3.32)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bson_ext (~> 1.6.1)
-  mongoid-textile!
-  rake (~> 0.9.2)
-  rspec (~> 2.9.0)