netzke-core 0.2.9 → 0.2.10

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.2.10
+Removed dependency on 'json' gem.
+Rails v2.3.2 compatibility.
+
 v0.2.9
 Actions, toolbars and tools reworked for easier configuration.
 Menus introduced (based on actions).

data/lib/app/models/netzke_preference.rb

@@ -30,7 +30,7 @@ class NetzkePreference < ActiveRecord::Base
     when nil             then r = norm_value  # do not cast
     when 'Boolean'       then r = norm_value == 'false' ? false : (norm_value == 'true' || norm_value)
     when 'NilClass'      then r = nil
-    when 'Array', 'Hash' then r = JSON.parse(norm_value)
+    when 'Array', 'Hash' then r = ActiveSupport::JSON.decode(norm_value)
     else
       r = norm_value.send(ELEMENTARY_CONVERTION_METHODS[klass])
     end

data/lib/netzke/base.rb

@@ -2,12 +2,6 @@ require 'netzke/base_extras/js_builder'
 require 'netzke/base_extras/interface'
 
 module Netzke
-  # 
-  # Configuration:
-  # * Define NETZKE_BOOT_CONFIG in environment.rb to specify which Netzke functionality should be disabled 
-  # to reduce the size of /netzke/netzke.[js|css]. Those Netzke gems that use additional JS/CSS-code 
-  # should be aware of this constant.
-  #
   class Base
     
     # Class-level Netzke::Base configuration. The defaults also get specified here.

data/lib/netzke/base_extras/interface.rb

@@ -1,10 +1,8 @@
-require 'json'
-
 module Netzke
   module BaseExtras
     module Interface
       def get_widget(params = {})
-        components_cache = (JSON.parse(params[:components_cache]) if params[:components_cache]) || []
+        components_cache = (ActiveSupport::JSON.decode(params[:components_cache]) if params[:components_cache]) || []
 
         js = js_missing_code(components_cache)
         css = css_missing_code(components_cache)

data/lib/netzke/base_extras/js_builder.rb

@@ -3,7 +3,7 @@ module Netzke
     # 
     # Module which provides JS-class generation functionality for the widgets ("client-side"). This code is executed only once per widget class, and the results are cached at the server (unless widget specifies config[:no_caching] => true).
     # Included into Netzke::Base class
-    # Most of the methods below are meant to be overwritten by a concrete widget class.
+    # Most of the methods below are meant to be overwritten
     # 
     module JsBuilder
       def self.included(base)
@@ -222,14 +222,6 @@ JS
 
         # returns all extra js-code (as string) required by this widget's class
         def js_included
-          # from extjs - defined in the widget class with ext_js_include
-          # extjs_dir = "#{RAILS_ROOT}/public/extjs" # TODO: make extjs location configurable
-          # begin
-          # res = super
-          # rescue
-          #   raise self.superclass.to_s
-          # end
-
           res = ""
           
           included_js = read_inheritable_attribute(:included_js) || []
@@ -238,17 +230,6 @@ JS
             r << f.read
           end
 
-          # res << "\n"
-          # 
-          # # from <widget_name>_extras/javascripts - all *.js files found there
-          # js_dir = File.join(File.dirname(widget_file), short_widget_class_name.underscore + "_extras", "javascripts") 
-          # file_list = Dir.glob("#{js_dir}/*.js")
-          # 
-          # for file_name in file_list
-          #   f = File.new(file_name)
-          #   res << f.read
-          # end
-          
           res
         end
         
@@ -267,21 +248,6 @@ JS
           res
         end
 
-        # returns all css code require by this widget's class
-        # def css_included
-        #   res = ""
-        #   # from <widget_name>_extras/stylesheets - all *.css files found there
-        #   js_dir = File.join(File.dirname(widget_file), short_widget_class_name.underscore + "_extras", "stylesheets") 
-        #   file_list = Dir.glob("#{js_dir}/*.css")
-        # 
-        #   for file_name in file_list
-        #     f = File.new(file_name)
-        #     res << f.read
-        #   end
-        #   
-        #   res
-        # end
-
         # all JS code needed for this class including the one from the ancestor widget
         def css_code(cached_dependencies = [])
           res = ""

data/lib/netzke/core_ext.rb

@@ -53,7 +53,7 @@ end
 class String
   # Converts self to "literal JSON"-string - one that doesn't get quotes appended when being sent "to_json" method
   def l
-    def self.to_json
+    def self.to_json(options={})
       self
     end
     self
@@ -82,7 +82,7 @@ end
 
 module ActiveSupport
   class TimeWithZone
-    def to_json
+    def to_json(options = {})
       self.to_s(:db).to_json
     end
   end

data/netzke-core.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{netzke-core}
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergei Kozlov"]
-  s.date = %q{2009-03-19}
+  s.date = %q{2009-03-24}
   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/action_view_ext.rb", "lib/netzke/base.rb", "lib/netzke/base_extras/interface.rb", "lib/netzke/base_extras/js_builder.rb", "lib/netzke/controller_extensions.rb", "lib/netzke/core_ext.rb", "lib/netzke/feedback_ghost.rb", "lib/netzke/routing.rb", "lib/netzke-core.rb", "lib/vendor/facets/hash/recursive_merge.rb", "LICENSE", "README.mdown", "tasks/netzke_core_tasks.rake", "TODO"]

data/test/app_root/config/environment.rb

@@ -3,6 +3,7 @@ require File.join(File.dirname(__FILE__), 'boot')
 Rails::Initializer.run do |config|
   config.cache_classes = false
   config.whiny_nils = true
+  config.action_controller.session = { :key => "_myapp_session", :secret => "some very long secret phrase required by action pack" }
   config.plugin_locators.unshift(
     Class.new(Rails::Plugin::Locator) do
       def plugins

data/test/core_ext_test.rb

@@ -1,14 +1,12 @@
 require 'test_helper'
 require 'netzke/core_ext'
 
-require 'json'
-
 class CoreExtTest < ActiveSupport::TestCase
   test "to_js" do
-    assert_equal({"aProperty" => true}, JSON.parse({:a_property => true}.to_js))
-    assert_equal({"aProperty" => true}, JSON.parse({:a_property => true, :nil_property => nil}.to_js))
-    assert_equal([{"aProperty" => true}, {"anotherProperty" => false}], JSON.parse([{:a_property => true}, {:another_property => false}].to_js))
-    assert_equal([{"aProperty" => true}, {"anotherProperty" =>false}], JSON.parse([{:a_property => true, :nil_property => nil}, {:another_property => false}].to_js))
+    assert_equal({"aProperty" => true}, ActiveSupport::JSON.decode({:a_property => true}.to_js))
+    assert_equal({"aProperty" => true}, ActiveSupport::JSON.decode({:a_property => true, :nil_property => nil}.to_js))
+    assert_equal([{"aProperty" => true}, {"anotherProperty" => false}], ActiveSupport::JSON.decode([{:a_property => true}, {:another_property => false}].to_js))
+    assert_equal([{"aProperty" => true}, {"anotherProperty" =>false}], ActiveSupport::JSON.decode([{:a_property => true, :nil_property => nil}, {:another_property => false}].to_js))
   end
   
   test "recursive delete if nil" do

data/test/test_helper.rb

@@ -4,17 +4,9 @@ ENV['RAILS_ENV'] ||= 'in_memory'
 # Load the Rails environment and testing framework
 require "#{File.dirname(__FILE__)}/app_root/config/environment"
 require 'test_help'
-require 'action_view/test_case' # Load additional test classes not done automatically by < Rails 2.2.2
 
 # Undo changes to RAILS_ENV
 silence_warnings {RAILS_ENV = ENV['RAILS_ENV']}
 
 # Run the migrations
-ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
-
-# Set default fixture loading properties
-Test::Unit::TestCase.class_eval do
-  self.use_transactional_fixtures = true
-  self.use_instantiated_fixtures = false
-  self.fixture_path = "#{File.dirname(__FILE__)}/fixtures"
-end
+ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netzke-core
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-19 00:00:00 +01:00
+date: 2009-03-24 00:00:00 +01:00
 default_executable: 
 dependencies: []