frendms-rails 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fa8eb3368bc807fbf368b087a7ccdcda1d616b9
-  data.tar.gz: 3c4723051cca5750cb487c9492e12f57df158b44
+  metadata.gz: b3e3f98672eae3d9f518f416c77ab315a9b44fde
+  data.tar.gz: 11f47583bbeffe034fca369f0f63210f577e38fb
 SHA512:
-  metadata.gz: 0e65eeec3ff6f68da76ba971ee77a25438d2a8d3e494845d582f5737c76bb662c419b5c34595ea0ff6168b640ec0afb55d651e362318a60cac12499f7341fc19
-  data.tar.gz: 2cc25abb35556c456b37be3e37c575624359554e85437a89a7ac0ace397006024fa15c4c07bafe3c0cdab5eabbfe8f93f4d6fcb5df3dfaaaed106e5406c3a7b9
+  metadata.gz: 5a4cd1f2e8c318c7b1ac653dfa78ef98c99f7742abfbe53491c305c6ae7c1445bd5bc74ca5dbdcb48960ce9a7a9e2369bd3586acce9caa1cf026ee05a3f5da20
+  data.tar.gz: ae84dfeb5cda8b0f46fc412f9d068f8c413341fa55fe4eebb87ca9c6c27297d015a4631b3a5cdb9430712a9f887123ca825cad9946ce45f8ffa23ca3d947f5e2

data/README.md

@@ -71,7 +71,7 @@ Example of an editable layout:
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/frendms-rails. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/tysonholub/frendms-rails. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
 
 ## License

data/app/controllers/frendms/element_controller.rb

@@ -4,19 +4,20 @@ module Frendms
     def get_elements
       e = Element.where('frender = ?', params[:frender])
       respond_to do |format|
-        format.json { render :json => e.to_json(:only => [:elementId, :text]) }
+        format.json { render :json => e.to_json(:only => [:elementId, :elementIndex, :text]) }
       end
     end
 
     def update_element
       if user_signed_in?
-        e = Element.find_by(:elementId => params[:id], :frender => params[:frender])
+        e = Element.find_by(:elementId => params[:id], :elementIndex => params[:index], :frender => params[:frender])
 
         if(params[:text].length > 0)
           if e.nil?
             e = Element.new
             e.frender = params[:frender]
             e.elementId = params[:id]
+            e.elementIndex = params[:index]
           end
           e.text = params[:text]
           e.save

data/frendms-rails.gemspec

@@ -3,10 +3,10 @@
 
 Gem::Specification.new do |s|
   s.name = "frendms-rails"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  # s.metadata = { "allowed_push_host" => "TODO: Set to 'http://mygemserver.com'" } if s.respond_to? :metadata=
+  s.metadata = { "allowed_push_host" => "https://rubygems.org" } if s.respond_to? :metadata=
   s.require_paths = ["lib"]
   s.authors = ["Tyson Holub"]
   s.bindir = "exe"

data/lib/frendms/rails/version.rb

@@ -1,5 +1,5 @@
 module Frendms
   module Rails
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/generators/frendms/templates/migration.rb

@@ -2,6 +2,7 @@ class CreateElementsTable < ActiveRecord::Migration
   def self.up
     create_table :elements do |t|
       t.string :elementId
+      t.integer :elementIndex
       t.string :frender
       t.text :text
 

data/vendor/assets/javascripts/frendms.js

@@ -8,18 +8,9 @@ function getElements(frender){
 
 		},
 		success : function(data) {
-			console.log(data);
 			$.each(data, function(i, element){
-				if(element['elementId'].length > 1){
-					$.each($(element['elementId']), function(j, inner){
-						if($(inner).dompath().split(' ').length + 1 == element['elementId'].split(' ').length){
-							$(inner).html(element['text'])
-						}
-					})
-				} else {
-					$(element['elementId']).html(element['text'])
-				}
-			})
+				$(element['elementId'])[element['elementIndex']].innerHTML = element['text'];
+			});
 			$('.frend').show()
 		},
 		complete : function(data) {
@@ -36,11 +27,17 @@ function updateElement(element){
 	element.parent().toggleClass('focused');
 	var id = element.dompath().replace('.enabled', '');
 	var text = element.val().trim();
+	var index = $(id).toArray().indexOf(element.parent()[0]);
 	var frender = element.closest('.frender').attr('id');
 
 	$.ajax({
 		url : '/element/update',
-		data : { frender : frender, text : text, id : id },
+		data : {
+			frender : frender,
+			text : text,
+			index : index,
+			id : id
+		},
 		type : 'PUT',
 		dataType : 'json',
 		success : function(data) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frendms-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tyson Holub
@@ -70,7 +70,8 @@ files:
 homepage: http://frendms.tysonholub.com
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -87,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: The Front End Management System