comfortable_mexican_sofa 1.8.2 → 1.8.3

data/.travis.yml

@@ -2,15 +2,14 @@ language: ruby
 before_install:
   - gem update --system
   - gem --version
-  - gem install bundler
 rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - jruby-19mode
 gemfile:
   - test/gemfiles/Gemfile.rails.3.1
   - test/gemfiles/Gemfile.rails.3.2
-  - test/gemfiles/Gemfile.rails.4.0
 notifications:
   recipients:
     - oleg@khabarov.ca
@@ -19,4 +18,4 @@ branches:
     - master
 matrix:
   allow_failures:
-    - gemfile: test/gemfiles/Gemfile.rails.4.0
+    - rvm: jruby-19mode

data/Gemfile

@@ -3,6 +3,9 @@ source 'http://rubygems.org'
 gemspec
 
 group :test do
-  gem 'sqlite3'
-  gem 'coveralls', :require => false
+  gem 'sqlite3',                          :platform => [:ruby, :mswin, :mingw]
+  gem 'jdbc-sqlite3',                     :platform => :jruby
+  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+  
+  gem 'coveralls',    :require => false
 end

data/README.md

@@ -19,6 +19,10 @@ Installation for Rails 4
 For Rails 4 apps feel free to use [2.0.0.beta1](https://github.com/comfy/comfortable-mexican-sofa/tree/2.0) release.
 
     gem 'comfortable_mexican_sofa', '~> 2.0.0.beta1'
+    
+Or even better work with the latest 2.0 branch:
+
+    gem 'comfortable_mexican_sofa', :github => 'comfy/comfortable-mexican-sofa', :branch => '2.0'
 
 Installation
 ------------

data/comfortable_mexican_sofa.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.require_paths = ['lib']
   
-  s.add_dependency 'rails',           '>= 3.1.0'
+  s.add_dependency 'rails',           '~> 3.1'
   s.add_dependency 'formatted_form',  '>= 2.1.0'
   s.add_dependency 'active_link_to',  '>= 1.0.0'
   s.add_dependency 'paperclip',       '>= 3.4.0'
-  s.add_dependency 'redcarpet',       '>= 2.2.0'
+  s.add_dependency 'kramdown',        '>= 1.0.0'
   s.add_dependency 'jquery-rails',    '>= 3.0.0'
   s.add_dependency 'jquery-ui-rails', '>= 4.0.0'
   s.add_dependency 'haml-rails',      '>= 0.3.0'

data/config/database.yml

@@ -1,21 +1,9 @@
-# SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
 development:
   adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 10000
- 
-# config.database_config = 'cms_'
-cms_development:
-  adapter: sqlite3
-  database: db/cms_development.sqlite3
+  database: ":memory:"
   pool: 5
   timeout: 10000
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
   adapter: sqlite3
   database: db/test.sqlite3

data/lib/comfortable_mexican_sofa/engine.rb

@@ -4,7 +4,7 @@ require 'rails'
 require 'formatted_form'
 require 'active_link_to'
 require 'paperclip'
-require 'redcarpet'
+require 'kramdown'
 require 'jquery-rails'
 require 'jquery-ui-rails'
 require 'haml-rails'

data/lib/comfortable_mexican_sofa/tags/page_markdown.rb

@@ -11,12 +11,6 @@ class ComfortableMexicanSofa::Tag::PageMarkdown
   end
   
   def render
-    md = Redcarpet::Markdown.new(Redcarpet::Render::HTML,
-      :autolink           => true,
-      :no_intra_emphasis  => true,
-      :fenced_code_blocks => true,
-      :lax_spacing        => true
-    )
-    md.render(content.to_s)
+    Kramdown::Document.new(content.to_s).to_html
   end
 end

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.8.2"
+  VERSION = "1.8.3"
 end

data/test/gemfiles/Gemfile.rails.3.1

@@ -4,13 +4,15 @@ gem 'rails',          '~> 3.1.0'
 gem 'formatted_form', '>= 2.1.0'
 gem 'active_link_to', '>= 1.0.0'
 gem 'paperclip',      '>= 3.4.0'
-gem 'redcarpet',      '>= 2.2.0'
+gem 'kramdown',       '>= 1.0.0'
 gem 'jquery-rails',   '>= 2.2.0'
 gem 'haml-rails',     '>= 0.3.0'
 gem 'sass-rails',     '>= 3.1.0'
 gem 'coffee-rails',   '>= 3.1.0'
 
 group :test do
-  gem 'sqlite3'
+  gem 'sqlite3',                          :platform => [:ruby, :mswin, :mingw]
+  gem 'jdbc-sqlite3',                     :platform => :jruby
+  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
   gem 'coveralls', :require => false
 end

data/test/gemfiles/Gemfile.rails.3.2

@@ -4,13 +4,15 @@ gem 'rails',          '~> 3.2.0'
 gem 'formatted_form', '>= 2.1.0'
 gem 'active_link_to', '>= 1.0.0'
 gem 'paperclip',      '>= 3.4.0'
-gem 'redcarpet',      '>= 2.2.0'
+gem 'kramdown',       '>= 1.0.0'
 gem 'jquery-rails',   '>= 2.2.0'
 gem 'haml-rails',     '>= 0.3.0'
 gem 'sass-rails',     '>= 3.1.0'
 gem 'coffee-rails',   '>= 3.1.0'
 
 group :test do
-  gem 'sqlite3'
+  gem 'sqlite3',                          :platform => [:ruby, :mswin, :mingw]
+  gem 'jdbc-sqlite3',                     :platform => :jruby
+  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
   gem 'coveralls', :require => false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,24 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: formatted_form
   requirement: !ruby/object:Gem::Requirement
@@ -77,13 +77,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -402,7 +402,6 @@ files:
 - test/functional/cms_content_controller_test.rb
 - test/gemfiles/Gemfile.rails.3.1
 - test/gemfiles/Gemfile.rails.3.2
-- test/gemfiles/Gemfile.rails.4.0
 - test/integration/authentication_test.rb
 - test/integration/fixtures_test.rb
 - test/integration/mirrors_test.rb

data/test/gemfiles/Gemfile.rails.4.0

@@ -1,16 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'rails',          '~> 4.0.0.beta1'
-gem 'formatted_form', '>= 2.1.0'
-gem 'active_link_to', '>= 1.0.0'
-gem 'paperclip',      '>= 3.4.0'
-gem 'redcarpet',      '>= 2.2.0'
-gem 'jquery-rails',   '>= 2.2.0'
-gem 'haml-rails',     '>= 0.3.0'
-gem 'sass-rails',     '~> 4.0.0.beta1'
-gem 'coffee-rails',   '~> 4.0.0.beta1'
-
-group :test do
-  gem 'sqlite3'
-  gem 'coveralls', :require => false
-end