nice 0.0.5 → 0.0.6

data/lib/assets/javascripts/nice_imp_jquery.js.coffee

@@ -20,6 +20,11 @@ class NiceJquery
 	@insert_inside: (event) ->
 		act = (ref,ins) -> ref.prepend(ins)		
 		NiceJquery.perform_transition(event.ref_node, event.new_node, act)
+		
+	# replace ref node with new node
+	@replace: (event) ->
+		act = (ref,ins) -> ref.replaceWith(ins)
+		NiceJquery.perform_transition(event.ref_node, event.new_node, act)		
 
 	# remove all elements which are not of current state and all elements
 	# which are of current state and secondly annotated to be always updated.
@@ -27,6 +32,9 @@ class NiceJquery
 		$("[data-state]").not("[data-state~='#{event.curr_state}']").remove()
 		$("[data-state~='#{event.curr_state}'][data-state-update!='no']").remove()
 
+	# remove everything under the "root tag"
+	@clean_root_tree: (event) ->
+		$("[data-state-root]").children().remove()
 
 	# Browser History Stuff
 	@move_to_url: (event) ->
@@ -105,8 +113,10 @@ class NiceJquery
 ## add event listener
 document.addEventListener "nice.dom.InsertAfterEvent", NiceJquery.insert_after, false
 document.addEventListener "nice.dom.InsertInsideEvent", NiceJquery.insert_inside, false
+document.addEventListener "nice.dom.ReplaceEvent", NiceJquery.replace, false
 document.addEventListener "nice.dom.RemoveStateEvent", NiceJquery.remove_state_elements, false
 document.addEventListener "nice.dom.ChangeTopCssEvent", NiceJquery.change_top_css, false
+document.addEventListener "nice.dom.CleanRootEvent", NiceJquery.clean_root_tree, false
 document.addEventListener "nice.hist.ChangeURLEvent", NiceJquery.move_to_url, false
 document.addEventListener "nice.hist.PopHistoryEvent", NiceJquery.insert_or_update_back_listener, false
 

data/lib/nice/html_parser.rb

@@ -16,9 +16,10 @@ module Nice
       doc
     end
 
-  	def self.add_elements_of_current_state doc, curr_state
+  	def self.add_elements_of_current_state doc, curr_state, upper_root=false
 
-  		# get all nodes of the current state
+  		# get all nodes of the current state      
+      doc.css("*[data-state-root]").remove  if upper_root # for upper_root option remove tree below root to shorten the search
   		curr_state_nodes = doc.css("[data-state~='#{curr_state}']")
 
   		# get reference nodes in DOM tree for current nodes and generate js insert statements
@@ -119,6 +120,19 @@ module Nice
 	    doc.css("body").add_class("state-#{current_state}")
 	    doc
 	  end
+	  
+	  def self.add_root_content doc
+      if doc.css("[data-state-root]").length == 0
+        raise "You must add add a data-state-root in your application.html to your main container"
+      else
+  			ref_node_name = "[data-state-root]"
+  			js = []
+  			doc.css("*[data-state-root]").each do |curr_node|
+	        js << Nice::Js::Caller.replace_node(curr_node, ref_node_name).gsub(/(\r\n|\n|\r|\t|\s\s)/,'')
+        end
+        js
+	    end
+	  end
 	
   	private
 	

data/lib/nice/js/caller.rb

@@ -11,9 +11,17 @@ module Nice
 				"NiceEventDispatcher.dispatch_event(\'nice.dom.InsertInsideEvent\',{new_node:\'#{new_node}\', ref_node:\"#{reference_node_ref}\"});"			
 			end
 
+			def self.replace_node new_node, reference_node_ref
+				"NiceEventDispatcher.dispatch_event(\'nice.dom.ReplaceEvent\',{new_node:\'#{new_node}\', ref_node:\"#{reference_node_ref}\"});"			
+			end
+
 			def self.generate_js_remove curr_state
 				"NiceEventDispatcher.dispatch_event(\'nice.dom.RemoveStateEvent\',{curr_state:\'#{curr_state}\'});"				
 			end
+			
+			def self.clean_root_tree
+			  "NiceEventDispatcher.dispatch_event(\'nice.dom.CleanRootEvent\',{});"				
+			end			
 
 
 			# History Manipulation

data/lib/nice/logic.rb

@@ -24,42 +24,75 @@ module Nice
 		
 		# => 	respond with JS which either first removes all elements of the current state and
 		#		later inserts new content OR directly replaces elements
+		
+	## case 4: the controller changed
+	  # => replace all contents under the "container yield" mentioned in the application layout file
 	
   class Logic
     
     def self.run current_method, current_path, referer, doc, is_js
 
-    	current_state = current_method.downcase + current_path.gsub("/", "_")
-    	prev_state = referer.gsub("/","_") unless referer.nil?
+        ref_c = Rails.application.routes.recognize_path(referer)[:controller]
+        ref_a = Rails.application.routes.recognize_path(referer)[:action]
+    	  curr_c = Rails.application.routes.recognize_path(current_path)[:controller]
+    	  curr_a = Rails.application.routes.recognize_path(current_path)[:action]
+    	
+    	  current_state = "#{current_method.downcase}_#{curr_c}_#{curr_a}"
+    	
+    	  prev_state = referer.gsub("/","_") unless referer.nil?
 
       	referenced_doc = Nice::HtmlParser.annotate_referencing_nodes doc	
 
       	cleaned_doc = Nice::HtmlParser.remove_elements_not_of_state current_state, referenced_doc
       	
+      	controller_same = (ref_c == curr_c)
+      	
       	# case 1
       	if !is_js then   
 
-          Nice::HtmlParser.add_top_css(cleaned_doc, current_state).to_html
+          response = Nice::HtmlParser.add_top_css(cleaned_doc, current_state).to_html
 
       	# case 2
-      	else   
+      	elsif controller_same && is_js then   
       		js_stack = ["// remove elements not present in the following state"]
       		js_stack << Nice::Js::Caller.generate_js_remove(current_state)
 
       		js_stack << "// add new elements"
       		js_stack += Nice::HtmlParser.add_elements_of_current_state(cleaned_doc,current_state).compact
-
-      		js_stack << "// add browser history scripts"		
+      		
+      	# case 4
+      	elsif !controller_same && is_js then
+      		js_stack = ["// remove elements not present in the following state"]
+      		js_stack << Nice::Js::Caller.generate_js_remove(current_state)
+      		      	  
+          js_stack << ["// remove elements below root"]
+      		js_stack << Nice::Js::Caller.clean_root_tree
+      		
+      		js_stack << "// add new content tree blow root tag"
+      		js_stack += Nice::HtmlParser.add_root_content(cleaned_doc).compact
+      		
+      		js_stack << "// add elements of the current state above root"
+      		js_stack += Nice::HtmlParser.add_elements_of_current_state(cleaned_doc,current_state,true).compact      		
+      	end
+      	
+      	# add completing js 
+      	if is_js then
+      	  js_stack << "// add browser history scripts"		
       		js_stack << Nice::Js::Caller.move_to_url(current_path,"title")
       		js_stack << Nice::Js::Caller.insert_or_update_back_listener(referer)
 
       		js_stack << "// inform ui on state change"
       		js_stack << Nice::Js::Caller.state_did_change(prev_state,current_state)
 
-      		js_stack << Nice::Js::Caller.change_top_css(current_state)      		
-
-      		js_stack.join("\n")
+          js_stack << "// switch body css class"      		
+      		js_stack << Nice::Js::Caller.change_top_css(current_state)
+      		
+      	  js_stack << "// AJAX RAILS ENGINE (nice.codebility.com)"		      		
+      		      		
+      		response = js_stack.join("\n")
       	end
+      	
+      	response
     end
     
   end

data/lib/nice/version.rb

@@ -1,3 +1,3 @@
 module Nice
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nice
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -97,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3643352142035015313
+      hash: -579488533932706128
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -106,10 +106,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3643352142035015313
+      hash: -579488533932706128
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Nice / Nizza is a posh little town in south France.