nice 0.0.6 → 0.0.7

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

@@ -29,8 +29,22 @@ class NiceJquery
 	# remove all elements which are not of current state and all elements
 	# which are of current state and secondly annotated to be always updated.
 	@remove_state_elements: (event) ->
-		$("[data-state]").not("[data-state~='#{event.curr_state}']").remove()
-		$("[data-state~='#{event.curr_state}'][data-state-update!='no']").remove()
+		a = jQuery.makeArray( $("[data-state]").not("[data-state~='#{event.curr_state}']").not("[data-state~='all']") )
+		a = a.concat jQuery.makeArray( $("[data-state~='#{event.curr_state}'][data-state-update]").not("[data-state~='all']") )
+		a = a.concat jQuery.makeArray( $("[data-state~='all'][data-state-update]") )
+		
+		for elem in a
+			transition = $(elem).data('state-transition-class')
+			console.log "######## REMOVE ELEMENT: #{elem}"
+			if( transition ) 
+				$(elem).bind 'transitionend webkitTransitionEnd oTransitionEnd otransitionend', (e) ->
+					$(this).remove()					
+				$(elem).addClass(transition)
+			else    
+				$(elem).remove()
+				
+		return null
+
 
 	# remove everything under the "root tag"
 	@clean_root_tree: (event) ->

data/lib/nice/html_parser.rb

@@ -8,7 +8,12 @@ module Nice
     def self.remove_elements_not_of_state(state, doc)
 
       doc.css("[data-state]").each do |node|
-        if !node.attribute('data-state').value.split(" ").include?(state) then
+        state_list = node.attribute('data-state').value.split(" ")
+
+        if  !state_list.include?('all') &&
+            !state_list.include?(state) then
+          
+          p "removed state: #{state_list}"            
           node.remove
         end
       end
@@ -21,20 +26,25 @@ module Nice
   		# 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}']")
+  		all_nodes = doc.css("[data-state~='all']")
+  		
 
   		# get reference nodes in DOM tree for current nodes and generate js insert statements
   		stack = curr_state_nodes.reverse.each_with_index.map do |curr_node,index|
 
-        if curr_node.has_attribute?("data-state-update") && 
-          curr_node.attribute("data-state-update").value == "no" then
+        # in case this node is not only assigned to the current state - check if it should be updated
+        if curr_node.attribute("data-state").value != curr_state &&
+           !curr_node.has_attribute?("data-state-update") then
           next
         end
 
-  			ref_id = self.ref_node_uid(curr_state,curr_state_nodes.count - index)
+  			ref_id = self.ref_node_uid( curr_state,curr_state_nodes.count - index)
   			ref_node_name = "[data-state-uid~=\'#{ref_id}\']"  			
   			ref_node = doc.css(ref_node_name)
-
-  			next if ref_node == nil
+  			
+  			if ref_node.blank?
+  			  next
+  			end
   			
   			#get index
   			idx = ref_node.attribute("data-state-uid").value.split(" ").find_index(ref_id)
@@ -50,6 +60,36 @@ module Nice
   			# remove unuseful chars which will break the js parser
   			js_text = js_text.gsub(/(\r\n|\n|\r|\t|\s\s)/,'')
   		end
+  		
+  		# nodes with 'all' attribute
+  		stack += all_nodes.reverse.each_with_index.map do |curr_node,index|
+
+        if !curr_node.has_attribute?("data-state-update") then
+          next
+        end
+
+  			ref_id = self.ref_node_uid( 'all',all_nodes.count - index)
+  			ref_node_name = "[data-state-uid~=\'#{ref_id}\']"  			
+  			ref_node = doc.css(ref_node_name)
+  			
+  			if ref_node.blank?
+  			  next
+  			end
+  			
+  			#get index
+  			idx = ref_node.attribute("data-state-uid").value.split(" ").find_index(ref_id)
+
+  			ref_node_method = ref_node.attribute('data-state-insert-method').value.split(" ")[idx]
+
+  			if ref_node_method == "insert"
+  				js_text = Nice::Js::Caller.generate_js_insert_after curr_node, ref_node_name
+  			else
+  				js_text = Nice::Js::Caller.generate_js_insert_inside curr_node, ref_node_name
+  			end
+
+  			# remove unuseful chars which will break the js parser
+  			js_text = js_text.gsub(/(\r\n|\n|\r|\t|\s\s)/,'')
+  		end  		
 
   		stack
   	end

data/lib/nice/middleware.rb

@@ -18,7 +18,12 @@ module Nice
 		## case 3: curr_state == prev_state 
 		
 		# => 	respond with JS which either first removes all elements of the current state and
-		#		later inserts new content OR directly replaces elements
+		#		later inserts new content OR directly replaces elements    
+		
+		
+		## case 4: this is a normal ajax request responding with javascript from rails
+		
+		# => ignore any NICE handling and return body unfiltered
 		
     
     def initialize(app)
@@ -30,32 +35,41 @@ module Nice
       @referer = nil
 
       status, @headers, @body = @app.call(env)
+                                                     
+      p ""
+      p "!!!!!!!! RAILS RESPONSE HEADERS: #{@headers}"
+      p ""
       
-      @is_js = Rack::Request.new(env).xhr?
+      @call_is_js = Rack::Request.new(env).xhr?
+      @app_resp_is_js = js?
+            
+      if !@app_resp_is_js && (html? || @call_is_js)
+        
+        @referer = env["HTTP_REFERER"]
+      	@method = env["REQUEST_METHOD"]
+      	@path = env["PATH_INFO"]
 
-      if html? || @is_js
-      	 @referer = env["HTTP_REFERER"]
-      	 @method = env["REQUEST_METHOD"]
-      	 @path = env["PATH_INFO"]
-
-      	 # in case 2+3 the response will be plain javascript
-      	 if @is_js
-      	 	@headers = {"Content-Type" => "text/javascript"}
-      	 end
+      	# in case 2+3 the response will be plain javascript
+      	if @call_is_js
+      	  @headers = {"Content-Type" => "text/javascript"}
+      	end
 
         [status, @headers, self]
+      
       else
-        [status, @headers, @body]
+        [status, @headers, @body]      
       end
     end
     
-    def each(&block)
-      if html? || @is_js
-        block.call("<!-- previous state: #{@referer} -->\n")
-        block.call( Nice::Logic.run( @method, @path, @referer, doc, @is_js) )
-      else
-        block.call(@body)
+    def each(&block)         
+
+      if !@app_resp_is_js && (html? || @call_is_js)
+        block.call("<!-- NICE Interception -->\n")
+        block.call( Nice::Logic.run( @method, @path, @referer, doc, @call_is_js) )
+      else        
+        block.call(@body)      
       end
+      
     end
     
     # Helper
@@ -64,6 +78,10 @@ module Nice
     def html?
       @headers["Content-Type"] && @headers["Content-Type"].include?("text/html")
     end
+    
+    def js?
+      @headers["Content-Type"] && ( @headers["Content-Type"].include?("text/javascript") || @headers["Content-Type"].include?("application/json") )
+    end
 
     def doc
       @doc ||= Nokogiri::HTML(body_to_string)

data/lib/nice/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nice
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2013-02-18 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: -579488533932706128
+      hash: 3851994827556330401
 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: -579488533932706128
+      hash: 3851994827556330401
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Nice / Nizza is a posh little town in south France.