rails_embed_editor 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDFjZGNkMzQ0YzJiZWI3MDdlMTYyZjFkNDg0M2MwZWIyZDkwZDgwNA==
+    MmI2OGM1NTBjZDQzZTk5MzQ0OTgwNDBhZmE3NTNkYzhjNzAyNTYzZA==
   data.tar.gz: !binary |-
-    MzUwM2Y3NTlmZjUyOTFmMzA2NTgzNTY2Yjg3NzQ2OWI5MTk0NTI1Mg==
+    ZTRiMTE2ODY2OGIwODFiYjdhNjFmZDkzYWQyOGE2YTE5NzdhOWYzYg==
 SHA512:
   metadata.gz: !binary |-
-    MDgwNDE0NWM5NDhjZjRjYTc0NTdlMTBmMWRlNzc0MTA2ZDY0OWZjZDk0NTE2
-    YzZiMjZlNWM3MDYwMzMxNDhhZWRmNmZiYzlkYjc0MjE2Mjg4NDgwYmMwMzQy
-    ODQ2MmJhNjYyZTUyYWZlMDRiMzllOWI3ZGVjY2QyMTRjZDRkZjI=
+    ZTA4ZTZjNzVmMGI1N2ZmMzBhMDVjNmVjMDYwMDdhMTc0MThlMWMzZmI5YTll
+    ZTE1NjliMTYwMmJjMDQ3OWNmZDQ3Y2FlZDMxYzY1NjNlZTBiZmNmZjAzZWIz
+    OTExNGQ3ZGRiMDlmYTQzODJkODRkZDMxYWI5MmM0MGY5YTYzZWY=
   data.tar.gz: !binary |-
-    YzdhODQ0YTQwNTkxMjNiYWE4MWZhNjBmMDdmYzE5NjA5N2ZhNTdmMmJjM2Ez
-    NDJmZWFiOWI3ZmIxOWIyYzFiNzBlNTcxYTM3MmIxYzFkMGRkZTAwYTE2MmM3
-    YjYzZDBhZWZiNDgyMjBhM2ZiNGFjNGUzM2UxMTg4NzBjOWZjYTg=
+    MTY2ZjhlYTg5YWRiNDc0NDViZDEzZTQwMzkyOGZkY2ZmNmJhZjIzYTc4N2U2
+    MTlkYjRhMDVkYjgwNjlhZDJhZWJmN2QxNjBmMDllYmQ1YTgxYWM1NzkxZWMz
+    OWViZWU0NTEyMWRiMmFiY2JiZjk0NzZmZWNmZThkNWQ5MTQ5MTA=

data/app/assets/javascripts/rails_embed_editor/application.coffee

@@ -23,7 +23,7 @@ window.load_rails_embed_code_editor = () ->
       editormode: container.data('editormode')
       highlight: compute_range(container.data('highlight'), container.data('first-line'))
     }
-    setup_editor(container[0], options)
+    setup_editor(container, options)
 
 
 setup_editor = (element, options) ->
@@ -34,7 +34,7 @@ setup_editor = (element, options) ->
     editormode: 'readonly'
   }
   options = $.extend({}, defaults, options);
-  editor = ace.edit(element)
+  editor = ace.edit(element[0])
   editor.commands.removeCommand('replace')
   editor.setTheme("ace/theme/" + options['theme']);
   editor.getSession().setMode("ace/mode/" + options['mode']);
@@ -44,6 +44,13 @@ setup_editor = (element, options) ->
   editor.setOption("maxLines", 40);
   editor.setOption("minLines", 5);
 
+  #highlight the current line only if its focus
+  editor.setHighlightActiveLine(false)
+  editor.on "focus", () ->
+    editor.setHighlightActiveLine(true)
+  editor.on "blur", () ->
+    editor.setHighlightActiveLine(false)
+
   editor.getSession().addMarker(options['highlight'], "editor_highlight", "text") unless options['highlight'] == null
 
   if options['editormode'] != 'readonly'
@@ -57,15 +64,19 @@ setup_editor = (element, options) ->
           button.text('Save')
           editor.setReadOnly(false)
         else
+          last_line = editor.session.getLength() - options['first_line']+1
           $.post('/rails_embed_editor/edit', {
-            content: editor.getValue()
+            content: editor.getValue() + '\n'
             first_line: options['first_line']
             last_line: options['last_line']
             filename: options['filename']
           }).success (data) ->
             if data['success'] == true
               button.text('Saved!')
-
+              console.log('last: ' + options['last_line'])
+              console.log('new: ' + last_line)
+              element.attr('data-last-line', last_line)
+              options['last_line'] = last_line
             else
               button.text('Error')
               console.log('Error saving:' + data['message'])

data/app/controllers/rails_embed_editor/editor_controller.rb

@@ -11,6 +11,8 @@ module RailsEmbedEditor
       if filename.nil? or text.nil?
         render :json => {:success => false, :params => params.to_json}
       else
+        puts text.lines.map{|x| "#{x.chomp}\n"}.to_s
+        p text
         manager = RailsEmbedEditor::FileManager.from_options(filename, params)
         manager.save_text text
         render :json => {:success => true}

data/app/helpers/rails_embed_editor/application_helper.rb

@@ -3,7 +3,7 @@ module RailsEmbedEditor
     def rails_embed_editor(filename, options ={})
       options[:editormode] ||= RailsEmbedEditor::EditorMode::READ_ONLY
       manager = RailsEmbedEditor::FileManager.from_options(filename, options)
-      text = manager.read_text
+      text = manager.read_text.chomp
       first_line = manager.first_line
       last_line = manager.last_line
       content_tag('div', text, :class => 'rails_embed_code_editor',

data/lib/rails_embed_editor/file_manager.rb

@@ -25,7 +25,10 @@ module RailsEmbedEditor
     def read_lines
       lines = []
       File.open(@filename, 'r') do |f|
-        lines = f.readlines[@first_line-1...@last_line]
+        all_lines  = f.readlines
+        @first_line = 1 if @first_line <= 0
+        @last_line = all_lines.size if @first_line > all_lines.size
+        lines = all_lines[@first_line-1...@last_line]
       end
       lines
     end
@@ -35,7 +38,7 @@ module RailsEmbedEditor
     end
 
     def save_text(text)
-      save_lines(text.split(/\r?\n/).map { |x| "#{x}\n" })
+      save_lines(text.lines.map{|x| "#{x.chomp}\n"})
     end
 
     def save_lines(lines)
@@ -43,6 +46,8 @@ module RailsEmbedEditor
       File.open(@filename, 'r') do |f|
         all_lines = f.readlines
       end
+      @first_line = 1 if @first_line <= 0
+      @last_line = all_lines.size if @first_line > all_lines.size
       all_lines = all_lines[0...@first_line-1] + lines + all_lines[@last_line..-1]
       File.open(@filename, 'w') do |f|
         all_lines.each do |line|

data/lib/rails_embed_editor/version.rb

@@ -1,3 +1,3 @@
 module RailsEmbedEditor
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_embed_editor
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Timothee Guerin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,34 +100,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  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'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  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 tool that allow to display a embed editor on your page and edit local
   file(Views, Controller, ...). Details otw
 email:
@@ -184,6 +156,7 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
+- test/dummy/db/development.sqlite3
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
 - test/dummy/log/test.log
@@ -251,6 +224,7 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
+- test/dummy/db/development.sqlite3
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
 - test/dummy/log/test.log