kiteditor 1.0.12 → 1.0.13

data/{lib/mercury/cucumber → features}/support/mercury_selectors.rb

@@ -123,6 +123,26 @@ module MercurySelectorsHelpers
     end
   end
 
+  def region_selector_for(locator)
+    case locator.downcase
+
+      when 'the first editable region', 'the editable region' then '#editable1'
+      when 'the first markupable region', 'the markupable region', 'the markdown region' then '#markupable1'
+      when 'the first snippetable region', 'the first snippet region', 'the snippetable region', 'the snippet region' then '#snippetable1'
+
+      else locator
+    end
+  end
+
+  def snippet_name_for(locator)
+    case locator.downcase
+
+      when 'the example snippet' then 'example'
+
+      else locator
+    end
+  end
+
 end
 
 World(MercurySelectorsHelpers)

data/features/support/selectors.rb

@@ -39,29 +39,6 @@ module HtmlSelectorsHelpers
                       "Now, go and add a mapping in #{__FILE__}"
     end
   end
-
-  def region_selector_for(locator)
-    return '#full_1' if locator.blank? || locator == 'the region'
-    case locator.downcase
-
-      when 'the first full region', 'the full region' then '#full_1'
-      when 'the first markdown region', 'the markdown region' then '#markdown_1'
-      when 'the first snippets region', 'the first snippet region', 'the snippets region', 'the snippet region' then '#snippets_1'
-
-      else locator
-    end
-  end
-
-  def snippet_name_for(locator)
-    case locator.downcase
-
-      when 'the example snippet' then 'example'
-      when 'the snippet with no options' then 'no_options'
-
-      else locator
-    end
-  end
-
 end
 
 World(HtmlSelectorsHelpers)

data/lib/generators/mercury/install/install_generator.rb

@@ -1,5 +1,3 @@
-require "mercury/engine"
-
 module Mercury
   module Generators
     class InstallGenerator < Rails::Generators::Base
@@ -7,25 +5,38 @@ module Mercury
 
       desc "Installs Mercury into your application by copying the configuration file."
 
-      class_option :full, :type => :boolean, :aliases => '-g',
-                   :desc => 'Full installation will install the layout and css files for easier customization.'
+      class_option :orm, :default => 'active_record', :banner => 'mongoid',
+                   :desc => 'ORM for required models -- active_record, or mongoid'
 
-      class_option :template_engine, :type => :string,
-                   :desc => 'Set preferred template engine for layout instead of ERB (haml or slim)'
+      class_option :full, :type => :boolean, :aliases => '-g',
+                   :desc => 'Full installation will install the layout and css overrides for easier customization.'
 
       def copy_config
-        copy_file 'app/assets/javascripts/mercury.js'
+        copy_file 'vendor/assets/javascripts/mercury.js', 'app/assets/javascripts/mercury.js'
       end
 
       def add_routes
-        route %Q{mount Mercury::Engine => '/'}
+        route %Q{Mercury::Engine.routes}
+      end
+
+      def copy_models
+        if options[:orm] == 'mongoid'
+          copy_file 'lib/generators/mercury/install/templates/mongoid_paperclip_image.rb', 'app/models/mercury/image.rb'
+        else
+          copy_file 'app/models/mercury/image.rb' if options[:full]
+        end
       end
 
       def copy_layout_and_css_overrides
-        if options[:full] || yes?("Install the layout file and CSS? [yN]")
-          layout_ext = options[:template_engine] || 'erb'
-          copy_file "app/views/layouts/mercury.html.#{layout_ext}"
-          copy_file 'app/assets/stylesheets/mercury.css'
+        if options[:full] || yes?("Install the layout and CSS overrides files? [yN]")
+          copy_file 'app/views/layouts/mercury.html.erb', 'app/views/layouts/mercury.html.erb'
+          copy_file 'vendor/assets/stylesheets/mercury_overrides.css', 'app/assets/stylesheets/mercury_overrides.css'
+        end
+      end
+
+      def copy_authentication_overrides
+        if options[:full] || yes?("Install the authentication file so you can restrict access to editing? [yN]")
+          copy_file 'lib/mercury/authentication.rb'
         end
       end
 

data/lib/mercury/authentication.rb

@@ -4,6 +4,5 @@ module Mercury
     def can_edit?
       true # check here to see if the user is logged in/has access
     end
-
   end
 end

data/lib/mercury-rails.rb

@@ -1,2 +1,3 @@
-require 'mercury/rails'
+require 'paperclip'
 
+require File.expand_path('../config/engine', File.dirname(__FILE__))

data/spec/javascripts/mercury/{dialog_spec.coffee → dialog_spec.js.coffee}

@@ -1,7 +1,8 @@
 describe "Mercury.Dialog", ->
 
+  template 'mercury/dialog.html'
+
   beforeEach ->
-    fixture.load('mercury/dialog.html')
     $.fx.off = true
     Mercury.determinedLocale =
       top: {'hello world!': 'bork! bork!'}
@@ -48,7 +49,7 @@ describe "Mercury.Dialog", ->
       @preloadSpy = spyOn(Mercury.Dialog.prototype, 'preload').andCallFake(=>)
 
     it "builds an element", ->
-      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: fixture.el})
+      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: '#test'})
       html = $('<div>').html(@dialog.element).html()
       expect(html).toContain('class="mercury-dialog mercury-foo-dialog loading"')
       expect(html).toContain('style="display:none"')
@@ -69,18 +70,18 @@ describe "Mercury.Dialog", ->
       @loadSpy = spyOn(Mercury.Dialog.prototype, 'load').andCallFake(=>)
 
     it "calls load if configured", ->
-      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: fixture.el, preload: true})
+      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: '#test', preload: true})
       expect(@loadSpy.callCount).toEqual(1)
 
     it "doesn't call load if configured", ->
-      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: fixture.el, preload: false})
+      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: '#test', preload: false})
       expect(@loadSpy.callCount).toEqual(0)
 
 
   describe "#toggle", ->
 
     beforeEach ->
-      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: fixture.el})
+      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: '#test'})
 
     it "shows or hides", ->
       expect(@dialog.element.css('display')).toEqual('none')
@@ -93,7 +94,7 @@ describe "Mercury.Dialog", ->
   describe "#resize", ->
 
     beforeEach ->
-      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: fixture.el})
+      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: '#test'})
 
     it "calls show", ->
       spy = spyOn(Mercury.Dialog.prototype, 'show').andCallFake(=>)
@@ -104,7 +105,7 @@ describe "Mercury.Dialog", ->
   describe "#show", ->
 
     beforeEach ->
-      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: fixture.el})
+      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: '#test'})
 
     it "triggers a custom event to hide all other dialogs", ->
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
@@ -156,7 +157,7 @@ describe "Mercury.Dialog", ->
   describe "#appear", ->
 
     beforeEach ->
-      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: fixture.el})
+      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: '#test'})
 
     it "animates the dialog in", ->
       @dialog.appear()
@@ -169,7 +170,7 @@ describe "Mercury.Dialog", ->
   describe "#hide", ->
 
     beforeEach ->
-      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: fixture.el})
+      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: '#test'})
 
     it "hides the dialog", ->
       @dialog.element.css({display: 'block'})
@@ -183,7 +184,7 @@ describe "Mercury.Dialog", ->
     beforeEach ->
       @spyFunction = ->
       Mercury.dialogHandlers.foo = ->
-      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: fixture.el, for: $('#button')})
+      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: '#test', for: $('#button')})
 
     it "does nothing if there's no url", ->
       spy = spyOn($, 'ajax').andCallFake(=>)
@@ -260,7 +261,7 @@ describe "Mercury.Dialog", ->
   describe "#loadContent", ->
 
     beforeEach ->
-      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: fixture.el})
+      @dialog = new Mercury.Dialog('/blank.html', 'foo', {appendTo: '#test'})
 
     it "sets loaded to be true", ->
       @dialog.loadContent()

data/spec/javascripts/mercury/dialogs/backcolor_spec.js.coffee

@@ -1,8 +1,9 @@
 describe "Mercury.dialogHandlers.backColor", ->
 
+  template 'mercury/dialogs/backcolor.html'
+
   beforeEach ->
-    fixture.load('mercury/dialogs/backcolor.html')
-    @dialog = {element: $(fixture.el), button: $('#button')}
+    @dialog = {element: $('#test'), button: $('#button')}
     Mercury.dialogHandlers.backColor.call(@dialog)
 
   describe "when a .picker or .last-picked element is clicked", ->

data/spec/javascripts/mercury/dialogs/forecolor_spec.js.coffee

@@ -1,8 +1,9 @@
 describe "Mercury.dialogHandlers.foreColor", ->
 
+  template 'mercury/dialogs/forecolor.html'
+
   beforeEach ->
-    fixture.load('mercury/dialogs/forecolor.html')
-    @dialog = {element: $(fixture.el), button: $('#button')}
+    @dialog = {element: $('#test'), button: $('#button')}
     Mercury.dialogHandlers.foreColor.call(@dialog)
 
   describe "when a .picker or .last-picked element is clicked", ->
@@ -25,7 +26,7 @@ describe "Mercury.dialogHandlers.foreColor", ->
       spy = spyOn(Mercury, 'trigger').andCallFake(=>)
       jasmine.simulate.click($('#white').get(0))
       expect(spy.callCount).toEqual(1)
-      expect(spy.argsForCall[0]).toEqual(['action', {action: 'foreColor', value: '#FFFFFF'}])
+      expect(spy.argsForCall[0]).toEqual(['action', {action: 'foreColor', value: 'rgb(255, 255, 255)'}])
 
 
   describe "when any other element is clicked", ->

data/spec/javascripts/mercury/dialogs/formatblock_spec.js.coffee

@@ -1,8 +1,9 @@
 describe "Mercury.dialogHandlers.formatblock", ->
 
+  template 'mercury/dialogs/formatblock.html'
+
   beforeEach ->
-    fixture.load('mercury/dialogs/formatblock.html')
-    @dialog = {element: $(fixture.el)}
+    @dialog = {element: $('#test')}
     Mercury.dialogHandlers.formatblock.call(@dialog)
 
   describe "when an element with a data-tag attribute is clicked", ->

data/spec/javascripts/mercury/dialogs/snippetpanel_spec.js.coffee

@@ -1,8 +1,9 @@
 describe "Mercury.dialogHandlers.snippetPanel", ->
 
+  template 'mercury/dialogs/snippetpanel.html'
+
   beforeEach ->
-    fixture.load('mercury/dialogs/snippetpanel.html')
-    @dialog = {element: $(fixture.el), button: $('#button')}
+    @dialog = {element: $('#test'), button: $('#button')}
     Mercury.dialogHandlers.snippetPanel.call(@dialog)
 
   describe "filter", ->

data/spec/javascripts/mercury/dialogs/style_spec.js.coffee

@@ -1,8 +1,9 @@
 describe "Mercury.dialogHandlers.style", ->
 
+  template 'mercury/dialogs/style.html'
+
   beforeEach ->
-    fixture.load('mercury/dialogs/style.html')
-    @dialog = {element: $(fixture.el)}
+    @dialog = {element: $('#test')}
     Mercury.dialogHandlers.style.call(@dialog)
 
   describe "when an element with a data-class attribute is clicked", ->