netzke-core 0.8.0 → 0.8.1

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# v0.8.0 - WIP
+# v0.8.1 - 2012-12-15
+* bug fix
+  * in production, JS comment stripping could cause modification of form_authenticity_token (issue #43) - by @scho
+
+# v0.8.0 - 2012-12-09
 ## Misc
   * many backward-incompatible API changes, see below
   * major code clean-up and refactor

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 netzke
+Copyright (c) 2012 nomadcoder
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -365,6 +365,6 @@ For RSpec tests (from `test/core_test_app`):
 * [Twitter](http://twitter.com/netzke) - latest news about the framework
 
 ---
-Copyright (c) 2008-2012 [netzke](https://twitter.com/netzke), released under the MIT license (see LICENSE).
+Copyright (c) 2008-2012 [nomadcoder](https://twitter.com/nomadcoder), released under the MIT license (see LICENSE).
 
 **Note** that Ext JS is licensed [differently](http://www.sencha.com/products/extjs/license/), and you may need to purchase a commercial license in order to use it in your projects!

data/lib/netzke/core/javascript.rb

@@ -92,7 +92,7 @@ module Netzke::Core
     # It includes JS-classes for the parents, eagerly loaded child components, and itself.
     def js_missing_code(cached = [])
       code = dependency_classes.inject("") do |r,k|
-        cached.include?(k.js_config.xtype) ? r : r + k.js_config.code_with_dependencies#.strip_js_comments
+        cached.include?(k.js_config.xtype) ? r : r + k.js_config.code_with_dependencies.strip_js_comments
       end
       code.blank? ? nil : code
     end

data/lib/netzke/core/ruby_ext/string.rb

@@ -11,12 +11,12 @@ class String
 
   # removes JS-comments (both single- and multi-line) from the string
   def strip_js_comments
-    regexp = /\/\/.*$|(?m:\/\*.*?\*\/)/
-    self.gsub!(regexp, '')
-
-    # also remove empty lines
-    regexp = /^\s*\n/
-    self.gsub!(regexp, '')
+    if defined?(::Rails) && Rails.application.assets.js_compressor
+      compressor = Rails.application.assets.js_compressor
+      compressor.processor.call(nil, self)
+    else
+      self
+    end
   end
 
   # "false" => false, "whatever_else" => true

data/lib/netzke/core/version.rb

@@ -3,7 +3,7 @@ module Netzke
     module Version
       MAJOR = 0
       MINOR = 8
-      PATCH = 0
+      PATCH = 1
 
       STRING = [MAJOR, MINOR, PATCH].compact.join('.')
     end

data/netzke-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "netzke-core"
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nomadcoder"]
-  s.date = "2012-12-09"
+  s.date = "2012-12-15"
   s.description = "Allows building complex RIA by greatly facilitating modular development"
   s.email = "nmcoder@gmail.com"
   s.extra_rdoc_files = [

data/test/core_test_app/Gemfile

@@ -4,6 +4,9 @@ gem 'rails', '~>3.2.0'
 
 gem 'sqlite3'
 
+gem 'uglifier'
+gem 'execjs'
+
 # Bundle gems for the local environment. Make sure to
 # put test-only gems in this group so their generators
 # and rake tasks are available in development mode:

data/test/core_test_app/Gemfile.lock

@@ -52,9 +52,10 @@ GEM
     database_cleaner (0.9.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    ffi (1.2.0)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    ffi (1.1.5)
     gherkin (2.11.5)
-      json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
@@ -124,6 +125,9 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.35)
+    uglifier (1.3.0)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
     websocket (1.0.4)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -136,6 +140,8 @@ DEPENDENCIES
   cucumber
   cucumber-rails
   database_cleaner
+  execjs
   rails (~> 3.2.0)
   rspec-rails
   sqlite3
+  uglifier

data/test/core_test_app/config/application.rb

@@ -44,5 +44,8 @@ module RailsApp
 
     # Enable the asset pipeline
     config.assets.enabled = true
+
+    config.assets.compress = true
+    config.assets.js_compressor = :uglifier
   end
 end

data/test/core_test_app/spec/core_ext_spec.rb

@@ -16,4 +16,12 @@ describe "Core extensions" do
   it "should properly do deep_map" do
     {a: [1,2,{b:3},{c:[4,5]}], d: 6}.deep_map{|el| el.is_a?(Hash) ? el.merge(e:7) : el + 10}.should == { a: [11,12,{e:7, b:3},{e:7, c:[14,15]}], d: 6}
   end
+
+  it "should strip js comments" do
+    "var test;//commment".strip_js_comments.should == "var test;"
+  end
+
+  it "should not strip // in strings" do
+    'var someVar = "abc//def";'.strip_js_comments.should == 'var someVar="abc//def";'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netzke-core
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2012-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport