ice 0.2.4 → 0.3.0

data/README.markdown

@@ -34,13 +34,9 @@ In addition, our ice_view.rb file is almost directly ripped out of the liquid pr
 
 ## Installation
 
-For Rails:
+Ice is curently being developed only for Rails 3 (we have a Rails 2 branch as well).  Simply add to your Gemfile
 
-    config.gem 'ice'
-
-Otherwise:
-
-    gem install ice
+    gem 'ice'
 
 ## to_ice
 

data/Rakefile

@@ -11,8 +11,8 @@ begin
     gem.homepage = "http://github.com/ludicast/ice"
     gem.authors = ["Nate Kidwell"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency "therubyracer", "0.7.4"
-    gem.add_dependency "activesupport", ">= 2.2.0"
+    gem.add_dependency "therubyracer", "0.7.5"
+    gem.add_dependency "rails", "3.0.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/ice.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ice}
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nate Kidwell"]
-  s.date = %q{2010-06-17}
+  s.date = %q{2010-10-04}
   s.description = %q{User templates written in javascript}
   s.email = %q{nate@ludicast.com}
   s.extra_rdoc_files = [
@@ -40,22 +40,23 @@ Gem::Specification.new do |s|
      "init.rb",
      "lib/extras/ice_view.rb",
      "lib/ice.rb",
+     "lib/ice/base.rb",
      "lib/ice/base_cube.rb",
      "lib/ice/cube_association.rb",
      "lib/ice/cubeable.rb",
+     "lib/ice/railtie.rb",
      "lib/parser.js",
-     "lib/routes_js.rb",
-     "rails/init.rb",
      "spec/base_cube_spec.rb",
      "spec/cube_spec.rb",
      "spec/ice_spec.rb",
      "spec/spec.opts",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "togo"
   ]
   s.homepage = %q{http://github.com/ludicast/ice}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{User templates written in javascript}
   s.test_files = [
     "spec/base_cube_spec.rb",
@@ -68,19 +69,19 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<therubyracer>, ["= 0.7.4"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.2.0"])
+      s.add_runtime_dependency(%q<therubyracer>, ["= 0.7.5"])
+      s.add_runtime_dependency(%q<rails>, ["= 3.0.0"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<therubyracer>, ["= 0.7.4"])
-      s.add_dependency(%q<activesupport>, [">= 2.2.0"])
+      s.add_dependency(%q<therubyracer>, ["= 0.7.5"])
+      s.add_dependency(%q<rails>, ["= 3.0.0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<therubyracer>, ["= 0.7.4"])
-    s.add_dependency(%q<activesupport>, [">= 2.2.0"])
+    s.add_dependency(%q<therubyracer>, ["= 0.7.5"])
+    s.add_dependency(%q<rails>, ["= 3.0.0"])
   end
 end
 

data/init.rb

@@ -3,4 +3,4 @@ require 'ice/cubeable'
 require 'ice/cube_association'
 require 'ice/base_cube'
 
-require 'active_support'
+require 'rails'

data/lib/extras/ice_view.rb

@@ -4,27 +4,127 @@
 # Example
 #
 #   ActionView::Base::register_template_handler :ice, IceView
+
+module RoutesJs
+
+  def get_routes
+
+      response = rails_route_function
+
+      Rails.application.routes.routes.collect do |route|
+
+        puts route.class.to_s
+        puts route.path
+
+
+
+        puts route.inspect
+
+        path = route.path
+        puts "%%%"
+        puts route.conditions.inspect
+        puts route.requirements
+
+        named_route = Rails.application.routes.
+                        named_routes.routes.key(route).to_s
+
+        if named_route != ''
+          puts named_route +  "   kkyy   " + route.path
+
+          if path.match /(.*)\(\.\:format\)$/
+            path = $1
+          end
+
+          response << route_function("#{named_route}_path", path)
+        end
+      end
+     # puts response
+      response
+  end
+
+private
+
+  def rails_route_function
+<<EOF
+function rails_route(path, var_pairs) {
+var pair_index = 0,
+path_copy = path;
+for(; pair_index < var_pairs.length; pair_index++) {
+path_copy = path_copy.replace(
+':' + var_pairs[pair_index][0],
+var_pairs[pair_index][1]
+);
+}
+return(
+path_copy
+.replace(/[(][.]:.+[)][?]/g, '')
+.replace(/[(]|[)][?]/g, '')
+);
+}
+EOF
+  end
+
+  def route_function name, path
+<<EOF
+function #{name}(variables) {
+var var_pairs = [];
+for(var key in variables) {
+var_pairs.push([key, variables[key]]);
+}
+return(rails_route('#{path}', var_pairs));
+}
+EOF
+  end
+end
+
 class IceView
   include RoutesJs
+  include ActionView::Template::Handlers::Compilable
   PROTECTED_ASSIGNS = %w( template_root response _session template_class action_name request_origin session template
                           _response url _request _cookies variables_added _flash params _headers request cookies
                           ignore_missing_templates flash _params logger before_filter_chain_aborted headers )
   PROTECTED_INSTANCE_VARIABLES = %w( @_request @controller @_first_render @_memoized__pick_template @view_paths
                                      @helpers @assigns_added @template @_render_stack @template_format @assigns )
 
-  def self.call(template)
-    "IceView.new(self).render(template, local_assigns)"
-  end
+ # attr_accessor :controller
+
+#  def self.call(template)
+#    "IceView.new(self).render(#{template})"
+#  end
 
-  def initialize(view)
+  def initialize(view = nil)
     @view = view
   end
 
-  def render(template, local_assigns = nil)
+  def compile(template)
+
+    "IceView.new(self).render('#{template.inspect}' )"
+  end
+
+  def render(template, local_assigns = {})
+
     @view.controller.headers["Content-Type"] ||= 'text/html; charset=utf-8'
+    source = open(Rails.root + template).read
+
+    assigns = @view.assigns.reject{ |k,v| PROTECTED_ASSIGNS.include?(k) }
+    if content_for_layout = @view.instance_variable_get("@content_for_layout")
+      assigns['content_for_layout'] = content_for_layout
+    end
+    assigns.merge!(local_assigns.stringify_keys)
+    route_functions = "<% "  + get_routes + " %>\n"
+
+    path_helper_code = File.read(File.dirname(__FILE__) + "/../../ice_js/lib/path_helper.js")
+    path_helper = "<% " + path_helper_code + " %>\n"
+
+
+    source = route_functions + path_helper + source
+   # puts source
 
+    Ice.convert_template(source, assigns)
+=begin
 
 
+    puts "hhhhhhhooooootttt"
     # Rails 2.2 Template has source, but not locals
     if template.respond_to?(:source) && !template.respond_to?(:locals)
       assigns = (@view.instance_variables - PROTECTED_INSTANCE_VARIABLES).inject({}) do |hash, ivar|
@@ -49,10 +149,14 @@ class IceView
     path_helper = "<% " + path_helper_code + " %>"
     source = route_functions + path_helper + source
 
-    
+    puts "ooooootttt"
     Ice.convert_template(source, assigns)
     #ice = Ice::Template.parse(source)
     #ice.render(assigns, :filters => [@view.controller.master_helper_module], :registers => {:action_view => @view, :controller => @view.controller})
+
+=end
+
+
   end
 
   def compilable?

data/lib/ice.rb

@@ -1,51 +1,11 @@
-require 'rubygems'
-require 'v8'
-
-class Object
-  def to_ice
-    nil
-  end
-end
-
-[FalseClass, TrueClass, Numeric, String].each do |cls|
-  cls.class_eval do
-    def to_ice
-      self
-    end
-  end
-end
-
-class Array
-  def to_ice
-    map &:to_ice
-  end
-end
-
-class Hash
-  def to_ice
-    res = {}
-    each_pair do |key,value|
-      res[key] = value.to_ice
-    end
-    res
-  end
-end
-
+require 'ice'
+require 'ice/cubeable'
+require 'ice/cube_association'
+require 'ice/base_cube'
+require 'ice/base'
 
+require 'rails'
 
 module Ice
-  def self.convert_template(template_text, vars = {})
-
-    V8::Context.new do |cxt|
-      cxt.load "#{File.dirname(__FILE__)}/parser.js"
-
-      vars.each_pair do |key, value|
-        cxt[key] = value.to_ice
-      end
-
-      jst = cxt['Jst']
-      return @evaled = jst.evaluate(jst.compile(template_text), {})
-    end
-  end
+  require 'ice/railtie' if defined?(Rails)
 end
-

data/lib/ice/base.rb

@@ -0,0 +1,50 @@
+require 'v8'
+
+class Object
+  def to_ice
+    nil
+  end
+end
+
+[FalseClass, TrueClass, Numeric, String].each do |cls|
+  cls.class_eval do
+    def to_ice
+      self
+    end
+  end
+end
+
+class Array
+  def to_ice
+    map &:to_ice
+  end
+end
+
+class Hash
+  def to_ice
+    res = {}
+    each_pair do |key,value|
+      res[key] = value.to_ice
+    end
+    res
+  end
+end
+
+
+
+module Ice
+  def self.convert_template(template_text, vars = {})
+
+    V8::Context.new do |cxt|
+      cxt.load "#{File.dirname(__FILE__)}/../parser.js"
+
+      vars.each_pair do |key, value|
+        cxt[key] = value.to_ice
+      end
+
+      jst = cxt['Jst']
+      return @evaled = jst.evaluate(jst.compile(template_text), {})
+    end
+  end
+end
+

data/{rails/init.rb → lib/ice/railtie.rb}

@@ -1,6 +1,13 @@
+module Ice
+  class Railtie < Rails::Railtie
+    initializer "ice.configure_rails_initialization" do
+
+    end  
+  end
+end
+
 ActiveRecord::Base.send(:include, Ice::Cubeable)
 
-require File.dirname(__FILE__) + "/../init"
 require 'extras/ice_view'
 
 if defined? ActionView::Template and ActionView::Template.respond_to? :register_template_handler

data/spec/base_cube_spec.rb

@@ -1,12 +1,9 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-
-
 class FooClassCube < Ice::BaseCube
   revealing :first, :second
 end
 
-
 class FooClass
   include Ice::Cubeable
 

data/togo

@@ -0,0 +1,60 @@
+
+class IceView
+  include RoutesJs
+  PROTECTED_ASSIGNS = %w( template_root response _session template_class action_name request_origin session template
+                          _response url _request _cookies variables_added _flash params _headers request cookies
+                          ignore_missing_templates flash _params logger before_filter_chain_aborted headers )
+  PROTECTED_INSTANCE_VARIABLES = %w( @_request @controller @_first_render @_memoized__pick_template @view_paths
+                                     @helpers @assigns_added @template @_render_stack @template_format @assigns )
+
+  def self.call(template)
+
+    IceView.new(self).render(template)
+  end
+
+  def initialize(view)
+    @view = view
+  end
+
+  def render(template, local_assigns = nil)
+    puts "rendering... #{@view.inspect} ### #{template.inspect}"
+
+    @view.controller.headers["Content-Type"] ||= 'text/html; charset=utf-8'
+
+
+
+    # Rails 2.2 Template has source, but not locals
+    if template.respond_to?(:source) && !template.respond_to?(:locals)
+      assigns = (@view.instance_variables - PROTECTED_INSTANCE_VARIABLES).inject({}) do |hash, ivar|
+                  hash[ivar[1..-1]] = @view.instance_variable_get(ivar)
+                  hash
+                end
+    else
+      assigns = @view.assigns.reject{ |k,v| PROTECTED_ASSIGNS.include?(k) }
+    end
+
+    source = template.respond_to?(:source) ? template.source : template
+    local_assigns = (template.respond_to?(:locals) ? template.locals : local_assigns) || {}
+
+    if content_for_layout = @view.instance_variable_get("@content_for_layout")
+      assigns['content_for_layout'] = content_for_layout
+    end
+    assigns.merge!(local_assigns.stringify_keys)
+
+    route_functions = "<% "  + get_routes + " %>"
+
+    path_helper_code = File.read(File.dirname(__FILE__) + "/../../ice_js/lib/path_helper.js")
+    path_helper = "<% " + path_helper_code + " %>"
+    source = route_functions + path_helper + source
+
+
+    Ice.convert_template(source, assigns)
+    #ice = Ice::Template.parse(source)
+    #ice.render(assigns, :filters => [@view.controller.master_helper_module], :registers => {:action_view => @view, :controller => @view.controller})
+  end
+
+  def compilable?
+    false
+  end
+
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ice
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Nate Kidwell
@@ -9,39 +14,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 -04:00
+date: 2010-10-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: therubyracer
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.4
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
+        segments: 
+        - 0
+        - 7
+        - 5
+        version: 0.7.5
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 2.2.0
-    version: 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id003
 description: User templates written in javascript
 email: nate@ludicast.com
 executables: []
@@ -75,17 +95,18 @@ files:
 - init.rb
 - lib/extras/ice_view.rb
 - lib/ice.rb
+- lib/ice/base.rb
 - lib/ice/base_cube.rb
 - lib/ice/cube_association.rb
 - lib/ice/cubeable.rb
+- lib/ice/railtie.rb
 - lib/parser.js
-- lib/routes_js.rb
-- rails/init.rb
 - spec/base_cube_spec.rb
 - spec/cube_spec.rb
 - spec/ice_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- togo
 has_rdoc: true
 homepage: http://github.com/ludicast/ice
 licenses: []
@@ -96,21 +117,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: User templates written in javascript

data/lib/routes_js.rb

@@ -1,55 +0,0 @@
-module RoutesJs
-
-  def get_routes
-
-      response = rails_route_function
-
-      ActionController::Routing::Routes.routes.collect do |route|
-        path = route.segments.inject('') { |str,s| str << s.to_s }
-
-        named_route = ActionController::Routing::Routes.
-                        named_routes.routes.key(route).to_s
-
-        if named_route != ''
-          response << route_function("#{named_route}_path", path)
-        end
-      end
-
-      response
-  end
-
-private
-
-  def rails_route_function
-<<EOF
-function rails_route(path, var_pairs) {
-var pair_index = 0,
-path_copy = path;
-for(; pair_index < var_pairs.length; pair_index++) {
-path_copy = path_copy.replace(
-':' + var_pairs[pair_index][0],
-var_pairs[pair_index][1]
-);
-}
-return(
-path_copy
-.replace(/[(][.]:.+[)][?]/g, '')
-.replace(/[(]|[)][?]/g, '')
-);
-}
-EOF
-  end
-
-  def route_function name, path
-<<EOF
-function #{name}(variables) {
-var var_pairs = [];
-for(var key in variables) {
-var_pairs.push([key, variables[key]]);
-}
-return(rails_route('#{path}', var_pairs));
-}
-EOF
-  end
-end
-