bootstrap-wysihtml5-rails 0.3.1.23 → 0.3.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a630de9ab06c30ad1e99a6463d98be54e8fa080e
-  data.tar.gz: 4e12246cec1e36f44dcf5591452bb4c6656ec388
+  metadata.gz: 5eaf6d32fdb755853366210f0368766b5182a1ff
+  data.tar.gz: 68b40177d9b6f9ef12c84b69e69a9c21ba7f521f
 SHA512:
-  metadata.gz: 86bfcb021af75d8c112e4d870105485c061ffc869b8e352f101f4890eb408aae840eb8fbede9652b460f69c4b3929b90e15b0dec8a98735a7acf23468034128c
-  data.tar.gz: 293e8886add2d7479a9b3bc11a3e88d001c06d1f3a08ba56369fd1144c75d117b06ec7a9ac022f073f15d27e037771b6c0a600d5820aaba8894da0ea6f30a94c
+  metadata.gz: a4507aa2d8cc3d58a7b61f6fcb6171a15bc3bf6b3c86797f476c427387275ae72282df3f9124c921c1d91bbf042b02c870133c7545c890ea47380e1ce338add4
+  data.tar.gz: 23d4b1211617692029aaf4c1aa0062560b21221aa81fe4eeaa4ad58d26510bd64f0def91918bdb4d0c14ce986f6815a8171028fb59292e55033a99a4bef25a3b

data/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_JOBS: 8

data/Rakefile

@@ -42,9 +42,9 @@ task 'update' do
     system("cd bootstrap-wysihtml5 && git pull && cd ..")
   else
     system("git clone git://github.com/jhollingworth/bootstrap-wysihtml5.git bootstrap-wysihtml5")
-    system("cd bootstrap-wysihtml5 && git remote add b3 git@github.com:artillery/bootstrap-wysihtml5.git")
-    system("cd bootstrap-wysihtml5 && git fetch b3")
-    system("cd bootstrap-wysihtml5 && git checkout -b tb3 b3/master")
+    # system("cd bootstrap-wysihtml5 && git remote add b3 git@github.com:artillery/bootstrap-wysihtml5.git")
+    # system("cd bootstrap-wysihtml5 && git fetch b3")
+    # system("cd bootstrap-wysihtml5 && git checkout -b tb3 b3/master")
   end
 
   Dir.foreach("bootstrap-wysihtml5/src/locales") do |file|
@@ -58,7 +58,14 @@ task 'update' do
   system("cp #{ORIGIN_LIB_PATH}/css/wysiwyg-color.css #{DEST_CSS_PATH}/wysiwyg-color.css")
 
   b2
-  b3
+  # b3
+
+  # ["#{DEST_JAVASCRIPT_PATH}/core.js.erb", "#{DEST_JAVASCRIPT_PATH}/core-b3.js.erb"].each do |file|
+  ["#{DEST_JAVASCRIPT_PATH}/core.js.erb"].each do |file|
+    initial = File.read(file)
+    initial = "//= depend_on_asset \"bootstrap-wysihtml5/wysiwyg-color.css\"\n\n" + initial
+    File.write(file, initial)
+  end
 
   system("git status")
 end

data/lib/bootstrap-wysihtml5-rails/version.rb

@@ -1,5 +1,5 @@
 module BootstrapWysihtml5Rails
   module Rails
-    VERSION = "0.3.1.23"
+    VERSION = "0.3.1.24"
   end
 end

data/vendor/assets/javascripts/bootstrap-wysihtml5/core-b3.js.erb

@@ -1,3 +1,5 @@
+//= depend_on_asset "bootstrap-wysihtml5/wysiwyg-color.css"
+
 !function($, wysi) {
     "use strict";
 

data/vendor/assets/javascripts/bootstrap-wysihtml5/core.js.erb

@@ -1,3 +1,5 @@
+//= depend_on_asset "bootstrap-wysihtml5/wysiwyg-color.css"
+
 !function($, wysi) {
     "use strict";
 

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-wysihtml5-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1.23
+  version: 0.3.1.24
 platform: ruby
 authors:
 - Gonzalo Rodríguez-Baltanás Díaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A wysiwyg text editor for Twitter Bootstrap
@@ -59,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc
+- ".bundle/config"
+- ".gitignore"
 - CONTRIBUTING.md
 - Gemfile
 - README.md
@@ -119,17 +119,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A wysiwyg text editor for Twitter Bootstrap

data/.rvmrc

@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
-# Only full ruby name is supported here, for short names use:
-#     echo "rvm use 2.0.0" > .rvmrc
-environment_id="ruby-2.0.0-p195@wysihtml5"
-
-# Uncomment the following lines if you want to verify rvm version per project
-# rvmrc_rvm_version="1.20.13 (master)" # 1.10.1 seams as a safe start
-# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
-#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
-#   return 1
-# }
-
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-  for __hook in "${rvm_path:-$HOME/.rvm}/hooks/after_use"*
-  do
-    if [[ -f "${__hook}" && -x "${__hook}" && -s "${__hook}" ]]
-    then \. "${__hook}" || true
-    fi
-  done
-  unset __hook
-  if (( ${rvm_use_flag:=1} >= 2 )) # display only when forced
-  then
-    if [[ $- == *i* ]] # check for interactive shells
-    then printf "%b" "Using: \E[32m$GEM_HOME\E[0m" # show the user the ruby and gemset they are using in green
-    else printf "%b" "Using: $GEM_HOME" # don't use colors in non-interactive shells
-    fi
-  fi
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create  "$environment_id" || {
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  }
-fi
-
-# If you use bundler, this might be useful to you:
-# if [[ -s Gemfile ]] && {
-#   ! builtin command -v bundle >/dev/null ||
-#   builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
-# }
-# then
-#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
-#   gem install bundler
-# fi
-# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
-# then
-#   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
-# fi