netzke-core 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2d3974415d753788a68fa93d39bab6ae4c53a14
-  data.tar.gz: c7ce197f714115ef55ea6f119d9c1a7e89fbbde0
+  metadata.gz: e8985c0704cb87adfae5eb77c6419bac1b2ef76a
+  data.tar.gz: 586a4f56bd0700cd35d72ceec9336d2dfa1796e2
 SHA512:
-  metadata.gz: 8355b25b20420bf35a4c83c0b36483d7e331106c5a92b4a9a286eb3cb1cc38d24bebd1358d027df5b41bd41db665dcdae252e3d3f7a38b85807d30517cda79b2
-  data.tar.gz: 1bb1721a1f5d7d3a013a33dd916abd50ce383e820673853b513aa9793f5f863e057f222554bb810597ae089fb8171a5343f5cbc120c45c4b2107ea9bc8d50ac0
+  metadata.gz: 8a00abb3fb10d0cce4a1bafafb3f2d9de4545e105440ded180fe817a0a5ca64e1b442291135b1431ac5455da54510296789d2cb62cf14dd8329324e00976af88
+  data.tar.gz: e5e7213adadfd0a14a3d5007ad13c546d87d1a1577b0073436e08b1e1d766c02d7e489aa389c24d7cb5a834893b7a74e1e7539363626d348bb4955d6be562207

data/Gemfile

@@ -1,15 +1,3 @@
 source 'http://rubygems.org'
 
 gemspec
-
-# For local development
-# gem 'netzke_testing', path: '~/code/netzke/netzke_testing'
-
-# This partial duplication of gemspec is required for rails_app to run
-group :test do
-  gem 'capybara'
-  gem 'selenium-webdriver'
-  gem 'database_cleaner'
-  gem 'rspec-rails'
-  gem 'netzke-testing', '0.10.0'
-end

data/README.md

@@ -1,3 +1,5 @@
+### TODO
+
 # Netzke Core [![Gem Version](https://fury-badge.herokuapp.com/rb/netzke-core.png)](http://badge.fury.io/rb/netzke-core) [![Build Status](https://travis-ci.org/netzke/netzke-core.png?branch=master)](https://travis-ci.org/netzke/netzke-core) [![Code Climate](https://codeclimate.com/github/netzke/netzke-core.png)](https://codeclimate.com/github/netzke/netzke-core)
 
 [RDocs](http://rdoc.info/projects/netzke/netzke-core)
@@ -325,9 +327,9 @@ Netzke provides support for HAML templates in case you don't want to put HTML in
 
 ## Requirements
 
-* Ruby ~> 1.9.2
-* Rails ~> 4.0.0
-* Ext JS ~> 4.2.0
+* Ruby >= 2.0.0
+* Rails ~> 4.2.0
+* Ext JS = 4.2.1
 
 ## Installation
 
@@ -369,7 +371,7 @@ This assumes that the Ext JS library is located/symlinked in `spec/rails_app/pub
 
 Help developing Netzke by submitting a pull request when you think others can benefit from it.
 
-If you feel particularily generous, you can support the author by donating a couple bucks a week at [GitTip](https://www.gittip.com/uptomax).
+If you feel particularily generous, you can support the author by donating a couple bucks a week at [GitTip](https://www.gittip.com/mxgrn).
 
 ## Useful links
 
@@ -378,6 +380,6 @@ If you feel particularily generous, you can support the author by donating a cou
 * [Twitter](http://twitter.com/netzke) - latest news about the framework
 
 ---
-Copyright (c) 2008-2013 [Max Gorin](https://twitter.com/uptomax), released under the MIT license (see LICENSE).
+Copyright (c) 2008-2015 [Max Gorin](https://twitter.com/mxgrn), 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/app/controllers/netzke_controller.rb

@@ -1,3 +1,5 @@
 class NetzkeController < ApplicationController
   include Netzke::Railz::ControllerExtensions
+
+  skip_before_action :verify_authenticity_token, only: [:ext, :direct, :dispatcher]
 end

data/lib/netzke/core/composition.rb

@@ -134,7 +134,11 @@ module Netzke::Core
       cfg.js_id = options[:js_id]
       send("#{name}_component", cfg)
       cfg.set_defaults!
-      cfg.klass.new(cfg, self)
+      component_instance_from_config(cfg)
+    end
+
+    def component_instance_from_config(c)
+      c.klass.new(c, self)
     end
 
     # @return [Array<Class>] All component classes that we depend on (used to render all necessary javascripts and stylesheets)

data/lib/netzke/core/json_literal.rb

@@ -1,4 +1,27 @@
+# Carefully monkey-patch ActiveSupport's JSON encoder, so it *also* does what we need
+class ActiveSupport::JSON::Encoding::JSONGemEncoder
+  private
+
+  def jsonify(value)
+    case value
+    when Netzke::Core::JsonLiteral
+      value
+    when String
+      EscapedString.new(value)
+    when Numeric, NilClass, TrueClass, FalseClass
+      value
+    when Hash
+      Hash[value.map { |k, v| [jsonify(k), jsonify(v)] }]
+    when Array
+      value.map { |v| jsonify(v) }
+    else
+      jsonify value.as_json
+    end
+  end
+end
+
 class Netzke::Core::JsonLiteral < String
   def as_json(options = nil) self end #:nodoc:
+  def to_json(options = nil) self end #:nodoc:
   def encode_json(encoder) self end #:nodoc:
 end

data/lib/netzke/core/railz/controller_extensions.rb

@@ -97,16 +97,16 @@ module Netzke
           tid: request.tid,
           action: component_name,
           method: request.endpoint,
-          result: Netzke::Core::JsonLiteral.new(endpoint_response.netzke_jsonify.to_json)
+          result: endpoint_response.netzke_jsonify
         }
       end
 
       def invoke_endpoint(request)
         component_name, *sub_components = request.cmp_path.split('__')
-        components_in_session = session[:netzke_components]
+        components_in_session = session[:netzke_components].try(:symbolize_keys)
 
         if components_in_session
-          cmp_config = components_in_session[component_name.to_sym]
+          cmp_config = components_in_session[component_name.to_sym].symbolize_keys
           cmp_config[:client_config] = request.client_configs.shift || {}
           component_instance = Netzke::Base.instance_by_config(cmp_config)
           component_instance.invoke_endpoint((sub_components + [request.endpoint]).join("__"), request.args, request.client_configs)

data/lib/netzke/core/session.rb

@@ -4,20 +4,28 @@ module Netzke::Core
     # Instance of this class is returned through component_session, and allows writing/reading to/from the session part reserved for a specific component (specified by component's js_id).
     class ComponentSessionProxy < Object
       def initialize(component_id)
-        @component_id = component_id
+        @component_id = component_id.to_s
         Netzke::Base.session ||= {}
         Netzke::Base.session[:netzke_sessions] ||= {}
-        @session = Netzke::Base.session[:netzke_sessions][@component_id] ||= {}
+        # @session = Netzke::Base.session[:netzke_sessions][@component_id] ||= {}
+        # @session = {}
       end
 
       # Delegate everything to session
       def method_missing(method, *args)
-        @session.send(method, *args)
+        session_data = to_hash
+        session_data.send(method, *args).tap do |d|
+          Netzke::Base.session[:netzke_sessions] = {@component_id => session_data}
+        end
       end
 
       def clear
         Netzke::Base.session[:netzke_sessions].delete(@component_id)
       end
+
+      def to_hash
+        ActiveSupport::HashWithIndifferentAccess.new(Netzke::Base.session[:netzke_sessions][@component_id] || {})
+      end
     end
 
     # Component-specific session.

data/lib/netzke/core/state.rb

@@ -14,6 +14,31 @@ module Netzke::Core
   # Note that the provided persistence_key has effect on _application_ level, _not_ only within the view.
   # By default +persistence_key+ is set to component's +js_id+. Thus, _two components named equally will share the state even being used in different Rails views_.
   module State
+    class StateProxy < Object
+      def initialize(key)
+        @key = key.to_s
+        Netzke::Base.session ||= {}
+        Netzke::Base.session[:netzke_states] ||= {}
+        # @session = Netzke::Base.session[:netzke_sessions][@component_id] ||= {}
+        # @session = {}
+      end
+
+      # Delegate everything to session
+      def method_missing(method, *args)
+        session_data = to_hash
+        session_data.send(method, *args).tap do |d|
+          Netzke::Base.session[:netzke_states] = {@key => session_data}
+        end
+      end
+
+      def to_hash
+        ActiveSupport::HashWithIndifferentAccess.new(Netzke::Base.session[:netzke_states][@key] || {})
+      end
+
+      def clear
+        Netzke::Base.session[:netzke_states].delete(@key)
+      end
+    end
     # A string which identifies the component. Can be passed as +persistence_key+ config option. Two components with the same +persistence_key+ will be sharing the state.
     # If +persistence_key+ is passed, use it. Otherwise use js_id.
     def persistence_key
@@ -33,8 +58,9 @@ module Netzke::Core
     # * delete(key)
     # * clear
     def state
-      session[:netzke_states] ||= {}
-      session[:netzke_states][persistence_key] ||= {}
+      @state_proxy ||= StateProxy.new(persistence_key)
+      # session[:netzke_states] ||= {}
+      # session[:netzke_states][persistence_key] ||= {}
     end
   end
 end

data/lib/netzke/core/version.rb

@@ -1,5 +1,5 @@
 module Netzke
   module Core
-    VERSION = "0.10.1"
+    VERSION = "0.11.0"
   end
 end

data/netzke-core.gemspec

@@ -0,0 +1,30 @@
+require "./lib/netzke/core/version"
+
+Gem::Specification.new do |s|
+  s.name        = "netzke-core"
+  s.version     = Netzke::Core::VERSION
+  s.author      = "Max Gorin"
+  s.email       = "gorinme@gmail.com"
+  s.homepage    = "http://netzke.org"
+  s.summary     = "Client-server GUI components with Sencha Ext JS and Ruby on Rails"
+  s.description = "Build complex web GUI in a modular way"
+
+  s.files         = Dir["{app,javascripts,lib,stylesheets,tasks}/**/*", "[A-Z]*", "init.rb"] - ["Gemfile.lock"]
+  s.test_files    = Dir["{test}/**/*"]
+  s.require_paths = ["lib"]
+
+  s.add_dependency 'uglifier'
+  s.add_dependency 'execjs'
+
+  s.add_development_dependency 'rails', '~> 4.2.0'
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'redcarpet'
+  s.add_development_dependency 'yard'
+  s.add_development_dependency 'coffee-script'
+  s.add_development_dependency 'capybara'
+  s.add_development_dependency 'selenium-webdriver'
+  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'netzke-testing', '~> 0.11.0'
+
+  s.required_rubygems_version = ">= 1.3.4"
+end

metadata

@@ -1,124 +1,189 @@
 --- !ruby/object:Gem::Specification
 name: netzke-core
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Max Gorin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: netzke-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
 description: Build complex web GUI in a modular way
 email: gorinme@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- TODO.md
 - app/controllers/netzke_controller.rb
+- init.rb
 - javascripts/base.js
 - javascripts/ext.js
 - javascripts/js_extensions.js
+- lib/netzke-core.rb
 - lib/netzke/base.rb
+- lib/netzke/core.rb
 - lib/netzke/core/action_config.rb
 - lib/netzke/core/actions.rb
 - lib/netzke/core/client_class.rb
@@ -137,35 +202,27 @@ files:
 - lib/netzke/core/json_literal.rb
 - lib/netzke/core/panel.rb
 - lib/netzke/core/plugins.rb
-- lib/netzke/core/railz/action_view_ext/ext.rb
+- lib/netzke/core/railz.rb
 - lib/netzke/core/railz/action_view_ext.rb
+- lib/netzke/core/railz/action_view_ext/ext.rb
 - lib/netzke/core/railz/controller_extensions.rb
 - lib/netzke/core/railz/engine.rb
 - lib/netzke/core/railz/routes.rb
-- lib/netzke/core/railz.rb
+- lib/netzke/core/ruby_ext.rb
 - lib/netzke/core/ruby_ext/array.rb
 - lib/netzke/core/ruby_ext/hash.rb
 - lib/netzke/core/ruby_ext/time_with_zone.rb
-- lib/netzke/core/ruby_ext.rb
 - lib/netzke/core/services.rb
 - lib/netzke/core/session.rb
 - lib/netzke/core/state.rb
 - lib/netzke/core/stylesheets.rb
 - lib/netzke/core/version.rb
-- lib/netzke/core.rb
 - lib/netzke/plugin.rb
-- lib/netzke-core.rb
 - lib/tasks/netzke_core_tasks.rake
+- netzke-core.gemspec
 - stylesheets/core.css
 - tasks/app_test_tasks.rake
 - tasks/rake_helper.rb
-- CHANGELOG.md
-- Gemfile
-- LICENSE
-- Rakefile
-- README.md
-- TODO.md
-- init.rb
 homepage: http://netzke.org
 licenses: []
 metadata: {}
@@ -175,17 +232,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.4
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Client-server GUI components with Sencha Ext JS and Ruby on Rails