mercury-rails 0.8.0 → 0.9.0

data/spec/javascripts/mercury/toolbar_spec.js.coffee

@@ -188,6 +188,28 @@ describe "Mercury.Toolbar", ->
       it "returns the element outerheight", ->
         expect(@toolbar.height(true)).toEqual($('.mercury-toolbar-container').outerHeight())
 
+  describe "#top", ->
+
+    beforeEach ->
+      spyOn(Mercury.Toolbar.prototype, 'buildButton').andCallFake(=> $('<div>'))
+      spyOn(Mercury.Toolbar.prototype, 'bindEvents').andCallFake(=>)
+
+    describe "when visible", ->
+
+      beforeEach ->
+        @toolbar = new Mercury.Toolbar({appendTo: '#test', visible: true})
+
+      it "returns the element offests top", ->
+        expect(@toolbar.top()).toEqual($('.mercury-toolbar-container').offset().top)
+
+    describe "when not visible", ->
+
+      beforeEach ->
+        @toolbar = new Mercury.Toolbar({appendTo: '#test', visible: false})
+
+      it "returns the element offests top", ->
+        expect(@toolbar.top()).toEqual(0)
+
 
   describe "#show", ->
 

data/spec/javascripts/templates/mercury/modals/insertmedia.html

@@ -41,6 +41,16 @@
           <option value="absbottom">Absolute Bottom</option>
         </select>
       </div>
+      <label class="select optional control-label" for="media_image_float">Float</label>
+      <div class="controls">
+        <select class="select optional" id="media_image_float" name="media[image_float]">
+          <option value="">None</option>
+          <option value="left">Left</option>
+          <option value="right">Right</option>
+          <option value="none">None</option>
+          <option value="inherit">Inherit</option>
+        </select>
+      </div>
     </div>
   </div>
   <div class="media-options" id="youtube_url_options" style="display:none">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mercury-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -237,6 +237,10 @@ files:
 - lib/generators/mercury/install/images/templates/mongoid_paperclip_image.rb
 - lib/generators/mercury/install/install_generator.rb
 - lib/mercury/authentication.rb
+- lib/mercury/cucumber/step_definitions/mercury_steps.rb
+- lib/mercury/cucumber/step_definitions.rb
+- lib/mercury/cucumber/support/mercury_contents.rb
+- lib/mercury/cucumber/support/mercury_selectors.rb
 - lib/mercury/engine.rb
 - lib/mercury/rails.rb
 - lib/mercury/version.rb
@@ -264,7 +268,9 @@ files:
 - app/assets/images/mercury/toolbar/primary/redo.png
 - app/assets/images/mercury/toolbar/primary/save.png
 - app/assets/images/mercury/toolbar/primary/snippetpanel.png
+- app/assets/images/mercury/toolbar/primary/tools.png
 - app/assets/images/mercury/toolbar/primary/undo.png
+- app/assets/images/mercury/toolbar/primary/user.png
 - app/assets/images/mercury/toolbar/snippets/buttons.png
 - app/assets/javascripts/jquery-1.7.js
 - app/assets/javascripts/mercury/dependencies/jquery-ui-1.8.13.custom.js
@@ -287,13 +293,16 @@ files:
 - app/assets/javascripts/mercury/locales/es.locale.js.coffee
 - app/assets/javascripts/mercury/locales/example.local.js.coffee
 - app/assets/javascripts/mercury/locales/fr.locale.js.coffee
+- app/assets/javascripts/mercury/locales/hu.locale.js.coffee
 - app/assets/javascripts/mercury/locales/it.locale.js.coffee
 - app/assets/javascripts/mercury/locales/ko.local.js.coffee
 - app/assets/javascripts/mercury/locales/nl.locale.js.coffee
 - app/assets/javascripts/mercury/locales/pt.locale.js.coffee
+- app/assets/javascripts/mercury/locales/ru.locale.js.coffee
 - app/assets/javascripts/mercury/locales/sv.local.js.coffee
 - app/assets/javascripts/mercury/locales/swedish_chef.locale.js.coffee
 - app/assets/javascripts/mercury/locales/zh.local.js.coffee
+- app/assets/javascripts/mercury/mercury-compiled.js
 - app/assets/javascripts/mercury/mercury.js.coffee
 - app/assets/javascripts/mercury/modal.js.coffee
 - app/assets/javascripts/mercury/modals/htmleditor.js.coffee
@@ -309,9 +318,9 @@ files:
 - app/assets/javascripts/mercury/plugins/save_as_xml/mercury/page_editor.js.coffee
 - app/assets/javascripts/mercury/plugins/save_as_xml/plugin.js
 - app/assets/javascripts/mercury/region.js.coffee
-- app/assets/javascripts/mercury/regions/full.coffee
+- app/assets/javascripts/mercury/regions/full.js.coffee
 - app/assets/javascripts/mercury/regions/image.js.coffee
-- app/assets/javascripts/mercury/regions/markdown.coffee
+- app/assets/javascripts/mercury/regions/markdown.js.coffee
 - app/assets/javascripts/mercury/regions/simple.js.coffee
 - app/assets/javascripts/mercury/regions/snippets.js.coffee
 - app/assets/javascripts/mercury/select.js.coffee
@@ -327,6 +336,8 @@ files:
 - app/assets/javascripts/mercury/tooltip.js.coffee
 - app/assets/javascripts/mercury/uploader.js.coffee
 - app/assets/javascripts/mercury.js
+- app/assets/stylesheets/_mercury-bootstrap-overrides.scss
+- app/assets/stylesheets/_mercury-sass.scss
 - app/assets/stylesheets/mercury/all_images.css.erb
 - app/assets/stylesheets/mercury/bootstrap-ish.css
 - app/assets/stylesheets/mercury/bootstrap-overrides.css
@@ -357,6 +368,7 @@ files:
 - app/views/mercury/selects/style.html
 - app/views/mercury/snippets/example/options.html.erb
 - app/views/mercury/snippets/example/preview.html.erb
+- app/views/mercury/snippets/no_options/preview.html.erb
 - config/routes.rb
 - LICENSE
 - POST_INSTALL
@@ -389,14 +401,13 @@ files:
 - features/regions/snippets/basic_editing.feature
 - features/regions/snippets/inserting_snippets.feature
 - features/saving/saving.feature
+- features/step_definitions/custom_web_steps.rb
 - features/step_definitions/debug_steps.rb
 - features/step_definitions/generator_steps.rb
 - features/step_definitions/mercury_steps.rb
 - features/step_definitions/web_steps.rb
 - features/support/aruba.rb
 - features/support/env.rb
-- features/support/mercury_contents.rb
-- features/support/mercury_selectors.rb
 - features/support/paths.rb
 - features/support/selectors.rb
 - spec/dummy/Rakefile
@@ -409,8 +420,7 @@ files:
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
-- spec/dummy/config/database.example.yml
-- spec/dummy/config/database.travisci.yml
+- spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
@@ -424,6 +434,7 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/.gitkeep
 - spec/dummy/public/500.html
 - spec/dummy/public/blank.html
 - spec/dummy/public/favicon.ico
@@ -518,7 +529,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2908225509589390282
+      hash: -3496660724334037650
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -527,10 +538,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2908225509589390282
+      hash: -3496660724334037650
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ! 'Mercury Editor: The Rails HTML5 WYSIWYG editor'
@@ -564,14 +575,13 @@ test_files:
 - features/regions/snippets/basic_editing.feature
 - features/regions/snippets/inserting_snippets.feature
 - features/saving/saving.feature
+- features/step_definitions/custom_web_steps.rb
 - features/step_definitions/debug_steps.rb
 - features/step_definitions/generator_steps.rb
 - features/step_definitions/mercury_steps.rb
 - features/step_definitions/web_steps.rb
 - features/support/aruba.rb
 - features/support/env.rb
-- features/support/mercury_contents.rb
-- features/support/mercury_selectors.rb
 - features/support/paths.rb
 - features/support/selectors.rb
 - spec/dummy/Rakefile
@@ -584,8 +594,7 @@ test_files:
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
-- spec/dummy/config/database.example.yml
-- spec/dummy/config/database.travisci.yml
+- spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
@@ -599,6 +608,7 @@ test_files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/.gitkeep
 - spec/dummy/public/500.html
 - spec/dummy/public/blank.html
 - spec/dummy/public/favicon.ico

data/spec/dummy/config/database.example.yml

@@ -1,25 +0,0 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-
-# 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
-  pool: 5
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000

data/spec/dummy/config/database.travisci.yml

@@ -1,4 +0,0 @@
-test:
-  adapter: sqlite3
-  database: ":memory:"
-  timeout: 500