markitup-rails 1.1.1 → 1.1.2

data/.ruby-gemset

@@ -0,0 +1 @@
+markitup-rails

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p392
+1.9.3

data/README.md

@@ -179,6 +179,12 @@ Many thanks go to the following who have contributed to making this gem even bet
     * complete rewrite as an engine for Rails 3.1+
     * add AJAX live preview support
     * add support for Sets and Skins, add many defaults to choose from
+* **[@ilja](https://github.com/ilja)**
+    * update markitup to version 1.1.14
+* **[@zinenko](https://github.com/zinenko)**
+    * fix invalid images url in simple skin
+* **[@tamaloa](https://github.com/tamaloa)**
+    * added default /markitup/preview path to all default settings
 
 
 ## License

data/lib/markitup/rails/version.rb

@@ -1,5 +1,5 @@
 module Markitup
   module Rails
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

data/markitup-rails.gemspec

@@ -9,16 +9,16 @@ Gem::Specification.new do |s|
   s.description = "The markItUp! universal markup editor, bundled for Rails 3.1+ Asset Pipeline."
   s.authors     = ["Uri Gorelik", "Phil Cohen"]
   s.email       = ["uri@ndstorefront.com", "github@phlippers.net"]
-  s.homepage    = "https://github.com/HealthyWeb/markitup-rails"
+  s.homepage    = "https://github.com/phlipper/markitup-rails"
 
   s.files	= `git ls-files`.split("\n")
 
   s.add_dependency "rails", ">= 3.1"
 
   s.add_development_dependency "bundler", ">= 1.2.0"
-  s.add_development_dependency "cane", "~> 2.5.0"
+  s.add_development_dependency "cane", "~> 2.6.0"
   s.add_development_dependency "minitest", "~> 4.3.0"
   s.add_development_dependency "minitest-rails", "~> 0.3.0"
   s.add_development_dependency "rake", ">= 10.0.0"
-  s.add_development_dependency "simplecov", "~> 0.7.1"
+  s.add_development_dependency "simplecov", ">= 0.8.0.pre"
 end

data/vendor/assets/javascripts/markitup/sets/rest/set.js

@@ -13,7 +13,7 @@
 // Feel free to add more tags
 // -------------------------------------------------------------------
 mySettings = {
-	previewParserPath:	'', // path to your ReStructuredText parser
+	previewParserPath: "/markitup/preview",
 	onShiftEnter:		{keepDefault:false, replaceWith:'\n\n'},
 	markupSet: [
 		{name:'Heading', key:'1', placeHolder:'Your title here...', closeWith:function(markItUp) { return miu.markdownTitle(markItUp, '*') } },

data/vendor/assets/javascripts/markitup/sets/textile/set.js

@@ -11,7 +11,7 @@
 // Feel free to add more tags
 // -------------------------------------------------------------------
 mySettings = {
-	previewParserPath:	'', // path to your Textile parser
+	previewParserPath: "/markitup/preview",
 	onShiftEnter:		{keepDefault:false, replaceWith:'\n\n'},
 	markupSet: [
 		{name:'Heading 1', key:'1', openWith:'h1(!(([![Class]!]))!). ', placeHolder:'Your title here...' },

data/vendor/assets/javascripts/markitup/sets/texy/set.js

@@ -12,7 +12,7 @@
 // Feel free to do anything with this.
 // -------------------------------------------------------------------
 mySettings = {	
-	previewParserPath:	'', // path to your Texy parser
+	previewParserPath: "/markitup/preview",
 	onShiftEnter:	    {keepDefault:false, replaceWith:'\n\n'},
 	markupSet: [	 
 		{name:'Heading 1', key:'1', closeWith:function(markItUp) { return miu.texyTitle(markItUp, '#') }, placeHolder:'Your title here...', className:'h1'},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markitup-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -113,17 +113,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0.pre
 description: The markItUp! universal markup editor, bundled for Rails 3.1+ Asset Pipeline.
 email:
 - uri@ndstorefront.com
@@ -133,6 +133,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-gemset
 - .ruby-version
 - Gemfile
 - LICENSE.txt
@@ -439,7 +440,7 @@ files:
 - vendor/assets/stylesheets/markitup/sets/xbbcode/style.scss
 - vendor/assets/stylesheets/markitup/skins/markitup/style.scss
 - vendor/assets/stylesheets/markitup/skins/simple/style.css
-homepage: https://github.com/HealthyWeb/markitup-rails
+homepage: https://github.com/phlipper/markitup-rails
 licenses: []
 post_install_message: 
 rdoc_options: []