netzke-core 0.1.3 → 0.1.4

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.1.4
+Helpers added to facilitate ExtJS/netzke.js inclusion
+The route defined for netzke_controller
+netzke.html.erb-layout is not needed anymore, so not produced by the generator
+Now compliant with Rails' forgery protection
+
 v0.1.3
 Generators fixed
 

data/Manifest

@@ -2,7 +2,6 @@ CHANGELOG
 generators/netzke_core/netzke_core_generator.rb
 generators/netzke_core/templates/create_netzke_layouts.rb
 generators/netzke_core/templates/create_netzke_preferences.rb
-generators/netzke_core/templates/netzke.html.erb
 generators/netzke_core/USAGE
 init.rb
 install.rb
@@ -10,10 +9,12 @@ javascripts/core.js
 lib/app/controllers/netzke_controller.rb
 lib/app/models/netzke_layout.rb
 lib/app/models/netzke_preference.rb
+lib/netzke/action_view_ext.rb
 lib/netzke/base.rb
 lib/netzke/controller_extensions.rb
 lib/netzke/core_ext.rb
 lib/netzke/js_class_builder.rb
+lib/netzke/routing.rb
 lib/netzke-core.rb
 lib/vendor/facets/hash/recursive_merge.rb
 LICENSE

data/generators/netzke_core/netzke_core_generator.rb

@@ -2,10 +2,6 @@
 class NetzkeCoreGenerator < Rails::Generator::Base
   def manifest
     record do |m|
-      # m.directory "public/javascripts/netzke"
-      # m.file 'netzke.js', "public/javascripts/netzke/netzke.js"
-      m.file 'netzke.html.erb', "app/views/layouts/netzke.html.erb"
-
       # FIXME: how do we avoid getting the same migration timestamps?
       # m.migration_template 'create_netzke_preferences.rb', "db/migrate", {:migration_file_name => "create_netzke_preferences"}
       # m.migration_template 'create_netzke_layouts.rb', "db/migrate", {:migration_file_name => "create_netzke_layouts"}

data/javascripts/core.js

@@ -3,6 +3,11 @@ Ext.componentCache = {};
 
 Ext.namespace('Ext.netzke');
 
+// to comply with Rails' forgery protection
+Ext.Ajax.extraParams = {
+    'authenticity_token': Ext.authenticityToken
+};
+
 // helper method to do multiple Ext.apply's
 Ext.chainApply = function(objectArray){
 	var res = {};

data/lib/netzke-core.rb

@@ -1,12 +1,15 @@
 # NetzkeCore
 require 'netzke/js_class_builder'
 require 'netzke/base'
-require 'netzke/core_ext'
+require 'netzke/action_view_ext'
 require 'netzke/controller_extensions'
+require 'netzke/core_ext'
+require 'netzke/routing'
 
 # Vendor
 require 'vendor/facets/hash/recursive_merge'
 
+# Load models and controllers from lib/app
 %w{ models controllers }.each do |dir|
   path = File.join(File.dirname(__FILE__), 'app', dir)
   $LOAD_PATH << path
@@ -14,12 +17,19 @@ require 'vendor/facets/hash/recursive_merge'
   ActiveSupport::Dependencies.load_once_paths.delete(path)
 end
 
+# Provide controllers with netzke_widget class method
 ActionController::Base.class_eval do
   include Netzke::ControllerExtensions
 end
 
-# Make this plugin reloadable for easier development
+# Make this plugin auto-reloaded for easier development
 ActiveSupport::Dependencies.load_once_paths.delete(File.join(File.dirname(__FILE__)))
 
 # Include the javascript
-Netzke::Base.config[:javascripts] << "#{File.dirname(__FILE__)}/../javascripts/core.js"
+Netzke::Base.config[:javascripts] << "#{File.dirname(__FILE__)}/../javascripts/core.js"
+
+# Include the route to netzke controller
+ActionController::Routing::RouteSet::Mapper.send :include, Netzke::Routing::MapperExtensions
+
+# Helpers to be put into layouts
+ActionView::Base.send :include, Netzke::ActionViewExt

data/lib/netzke/action_view_ext.rb

@@ -0,0 +1,25 @@
+module Netzke
+  module ActionViewExt
+
+    def netzke_js_include
+      res = ""
+
+      if ENV['RAILS_ENV'] == 'development'
+    	  res << javascript_include_tag("/extjs/adapter/ext/ext-base.js", "/extjs/ext-all-debug.js")
+  	  else
+  	    res << javascript_include_tag("/extjs/build/adapter/ext/ext-base-min.js", "/extjs/ext-all.js")
+      end
+      res << javascript_tag( "Ext.authenticityToken = '#{form_authenticity_token}'") # forgery protection
+    	res << javascript_include_tag("/netzke/netzke.js")
+      
+    	res
+    end
+
+    def netzke_css_include(theme_name = :default)
+      res = stylesheet_link_tag("/extjs/resources/css/ext-all.css")
+      res << stylesheet_link_tag("/extjs/resources/css/xtheme-#{theme_name}.css") unless theme_name == :default
+      res
+    end
+  end
+end
+

data/lib/netzke/base.rb

@@ -1,6 +1,10 @@
 require 'json'
+
 module Netzke
   class Base
+    # client-side code (generates JS-classes of the widgets)
+    include Netzke::JsClassBuilder
+
     # Global Netzke configuration
     def self.config
       @@config ||= {
@@ -27,9 +31,6 @@ module Netzke
       end
     end
   
-    # client-side code (generates JS-classes of the widgets)
-    include Netzke::JsClassBuilder
-
     attr_accessor :config, :server_confg, :parent, :logger, :id_name, :permissions
     attr_reader :pref
 

data/lib/netzke/controller_extensions.rb

@@ -77,16 +77,24 @@ module Netzke
         # add controller action which will render a simple HTML page containing the widget
         define_method("#{name}_test") do
           @widget_name = name
-          render :inline => %Q(
-          <script type="text/javascript" charset="utf-8">
-          <%= #{name}_class_definition %>
-          Ext.onReady(function(){
-          	<%= #{name}_widget_instance %>
-          	#{name.to_js}.render("#{name.to_s.split('_').join('-')}");
-          })
-        	</script>
-          <div id="#{name.to_s.split('_').join('-')}"></div>
-          ), :layout => "netzke"
+          render :inline => <<-HTML
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<title><%= @widget_name %></title>
+	<%= netzke_js_include %>
+	<%= netzke_css_include %>
+  <script type="text/javascript" charset="utf-8">
+    <%= #{name}_class_definition %>
+    Ext.onReady(function(){
+    	<%= #{name}_widget_instance %>
+    	#{name.to_js}.render("#{name.to_s.split('_').join('-')}");
+    })
+	</script>
+</head>
+<body>
+  <div id="#{name.to_s.split('_').join('-')}"></div>
+</body>
+          HTML
         end
       end
     end

data/lib/netzke/routing.rb

@@ -0,0 +1,9 @@
+module Netzke
+  module Routing
+    module MapperExtensions
+      def netzke
+        @set.add_route("/netzke/:action.:format", {:controller => "netzke"})
+      end
+    end
+  end
+end

data/netzke-core.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{netzke-core}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergei Kozlov"]
   s.date = %q{2009-01-02}
   s.description = %q{Build ExtJS/Rails widgets with minimum effort}
   s.email = %q{sergei@writelesscode.com}
-  s.extra_rdoc_files = ["CHANGELOG", "lib/app/controllers/netzke_controller.rb", "lib/app/models/netzke_layout.rb", "lib/app/models/netzke_preference.rb", "lib/netzke/base.rb", "lib/netzke/controller_extensions.rb", "lib/netzke/core_ext.rb", "lib/netzke/js_class_builder.rb", "lib/netzke-core.rb", "lib/vendor/facets/hash/recursive_merge.rb", "LICENSE", "README.mdown", "tasks/netzke_core_tasks.rake"]
-  s.files = ["CHANGELOG", "generators/netzke_core/netzke_core_generator.rb", "generators/netzke_core/templates/create_netzke_layouts.rb", "generators/netzke_core/templates/create_netzke_preferences.rb", "generators/netzke_core/templates/netzke.html.erb", "generators/netzke_core/USAGE", "init.rb", "install.rb", "javascripts/core.js", "lib/app/controllers/netzke_controller.rb", "lib/app/models/netzke_layout.rb", "lib/app/models/netzke_preference.rb", "lib/netzke/base.rb", "lib/netzke/controller_extensions.rb", "lib/netzke/core_ext.rb", "lib/netzke/js_class_builder.rb", "lib/netzke-core.rb", "lib/vendor/facets/hash/recursive_merge.rb", "LICENSE", "Manifest", "netzke-core.gemspec", "Rakefile", "README.mdown", "tasks/netzke_core_tasks.rake", "test/app_root/app/controllers/application.rb", "test/app_root/config/boot.rb", "test/app_root/config/database.yml", "test/app_root/config/environment.rb", "test/app_root/config/environments/in_memory.rb", "test/app_root/config/environments/mysql.rb", "test/app_root/config/environments/postgresql.rb", "test/app_root/config/environments/sqlite.rb", "test/app_root/config/environments/sqlite3.rb", "test/app_root/config/routes.rb", "test/app_root/script/console", "test/core_ext_test.rb", "test/netzke_core_test.rb", "test/test_helper.rb", "uninstall.rb"]
+  s.extra_rdoc_files = ["CHANGELOG", "lib/app/controllers/netzke_controller.rb", "lib/app/models/netzke_layout.rb", "lib/app/models/netzke_preference.rb", "lib/netzke/action_view_ext.rb", "lib/netzke/base.rb", "lib/netzke/controller_extensions.rb", "lib/netzke/core_ext.rb", "lib/netzke/js_class_builder.rb", "lib/netzke/routing.rb", "lib/netzke-core.rb", "lib/vendor/facets/hash/recursive_merge.rb", "LICENSE", "README.mdown", "tasks/netzke_core_tasks.rake"]
+  s.files = ["CHANGELOG", "generators/netzke_core/netzke_core_generator.rb", "generators/netzke_core/templates/create_netzke_layouts.rb", "generators/netzke_core/templates/create_netzke_preferences.rb", "generators/netzke_core/USAGE", "init.rb", "install.rb", "javascripts/core.js", "lib/app/controllers/netzke_controller.rb", "lib/app/models/netzke_layout.rb", "lib/app/models/netzke_preference.rb", "lib/netzke/action_view_ext.rb", "lib/netzke/base.rb", "lib/netzke/controller_extensions.rb", "lib/netzke/core_ext.rb", "lib/netzke/js_class_builder.rb", "lib/netzke/routing.rb", "lib/netzke-core.rb", "lib/vendor/facets/hash/recursive_merge.rb", "LICENSE", "Manifest", "netzke-core.gemspec", "Rakefile", "README.mdown", "tasks/netzke_core_tasks.rake", "test/app_root/app/controllers/application.rb", "test/app_root/config/boot.rb", "test/app_root/config/database.yml", "test/app_root/config/environment.rb", "test/app_root/config/environments/in_memory.rb", "test/app_root/config/environments/mysql.rb", "test/app_root/config/environments/postgresql.rb", "test/app_root/config/environments/sqlite.rb", "test/app_root/config/environments/sqlite3.rb", "test/app_root/config/routes.rb", "test/app_root/script/console", "test/core_ext_test.rb", "test/netzke_core_test.rb", "test/test_helper.rb", "uninstall.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://writelesscode.com}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Netzke-core", "--main", "README.mdown"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netzke-core
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -24,10 +24,12 @@ extra_rdoc_files:
 - lib/app/controllers/netzke_controller.rb
 - lib/app/models/netzke_layout.rb
 - lib/app/models/netzke_preference.rb
+- lib/netzke/action_view_ext.rb
 - lib/netzke/base.rb
 - lib/netzke/controller_extensions.rb
 - lib/netzke/core_ext.rb
 - lib/netzke/js_class_builder.rb
+- lib/netzke/routing.rb
 - lib/netzke-core.rb
 - lib/vendor/facets/hash/recursive_merge.rb
 - LICENSE
@@ -38,7 +40,6 @@ files:
 - generators/netzke_core/netzke_core_generator.rb
 - generators/netzke_core/templates/create_netzke_layouts.rb
 - generators/netzke_core/templates/create_netzke_preferences.rb
-- generators/netzke_core/templates/netzke.html.erb
 - generators/netzke_core/USAGE
 - init.rb
 - install.rb
@@ -46,10 +47,12 @@ files:
 - lib/app/controllers/netzke_controller.rb
 - lib/app/models/netzke_layout.rb
 - lib/app/models/netzke_preference.rb
+- lib/netzke/action_view_ext.rb
 - lib/netzke/base.rb
 - lib/netzke/controller_extensions.rb
 - lib/netzke/core_ext.rb
 - lib/netzke/js_class_builder.rb
+- lib/netzke/routing.rb
 - lib/netzke-core.rb
 - lib/vendor/facets/hash/recursive_merge.rb
 - LICENSE

data/generators/netzke_core/templates/netzke.html.erb

@@ -1,10 +0,0 @@
-<head>
-	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-	<title><%= @widget_name %></title>
-	<%= javascript_include_tag("/extjs/adapter/ext/ext-base.js", "/extjs/ext-all-debug.js") %>
-	<%= javascript_include_tag("/netzke/netzke.js") %>
-	<%= stylesheet_link_tag("/extjs/resources/css/ext-all.css") %>
-</head>
-<body id="">
-<%= yield %>	
-</body>