ice 0.2.1 → 0.2.2

data/README.markdown

@@ -60,9 +60,13 @@ In order for everything to work easily, you can have your cubes inherit from our
 
     class BookCube < Ice::BaseCube
       revealing :title, :author_id, :genre_id
+
+      def reviewer_names
+        @source.reviewers.map(&:name)
+      end
     end
 
-would provide a cube with access to the title, author_id and genre properties of the underlying ActiveRecord.
+would provide a cube with access to the title, author_id and genre properties of the underlying ActiveRecord.  In addition, it exposes a reviewer_names function that uses the @source instance variable to get at the record which is being filtered.
 
 These cubes also have simple belongs_to and has_many associations, so you can write things like:
 

data/Rakefile

@@ -11,7 +11,7 @@ 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.0"
+    gem.add_dependency "therubyracer", "0.7.1"
     gem.add_dependency "activesupport", ">= 2.2.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/ice.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ice}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nate Kidwell"]
-  s.date = %q{2010-05-31}
+  s.date = %q{2010-06-04}
   s.description = %q{User templates written in javascript}
   s.email = %q{nate@ludicast.com}
   s.extra_rdoc_files = [
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
      "lib/ice/cube_association.rb",
      "lib/ice/cubeable.rb",
      "lib/parser.js",
+     "lib/routes_js.rb",
      "rails/init.rb",
      "spec/base_cube_spec.rb",
      "spec/cube_spec.rb",
@@ -67,16 +68,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<therubyracer>, ["= 0.7.0"])
+      s.add_runtime_dependency(%q<therubyracer>, ["= 0.7.1"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.2.0"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<therubyracer>, ["= 0.7.0"])
+      s.add_dependency(%q<therubyracer>, ["= 0.7.1"])
       s.add_dependency(%q<activesupport>, [">= 2.2.0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<therubyracer>, ["= 0.7.0"])
+    s.add_dependency(%q<therubyracer>, ["= 0.7.1"])
     s.add_dependency(%q<activesupport>, [">= 2.2.0"])
   end
 end

data/ice_js/lib/path_helper.js

@@ -1,17 +1,24 @@
-function view_path(item) {
-  return "/" + item.class_path + "/" + item.id
+function link_to(location, default_label, opts) {
+  if (! default_label) {
+    default_label = location
+  }
+  label = (opts && opts.label) || default_label
+  return "<a href=\"" + location + "\">" + label + "</a>"
 }
 
-function edit_path(item) {
-  return "/" + item.class_path + "/" + item.id + "/edit"
+var NavBar = function () {
+
+}
+
+NavBar.prototype.link_to = function (link) {
+  return "<li>" + link_to(link) + "</li>"
+}
+
+NavBar.prototype.open = function () {
+    return "<ul class=\"linkBar\">"
 }
 
-function view_link(item, opts) {
-  label = (opts && opts.label) || "View"
-  return "<a href=\"" + view_path(item) + "\">" + label + "</a>"
+NavBar.prototype.close = function () {
+    return "</ul>"
 }
 
-function edit_link(item, opts) {
-  label = (opts && opts.label) || "Edit"
-  return "<a href=\"" + edit_path(item) + "\">" + label + "</a>"
-}

data/ice_js/spec/unit/spec.js

@@ -1,40 +1,17 @@
-
-describe 'path_helper'
+describe "nav bar helper"
   before_each
-    user = {id:1, class_path:'users'}
+    bar = new NavBar()
   end
 
-  describe 'for paths'
-    it "should generate view path from item"
-      view_path(user).should.eql "/users/1"
-    end
 
-    it "should generate edit path from item"
-      edit_path(user).should.eql "/users/1/edit"
-    end
+  it "should generate list by default"
+    (bar.open() + bar.close()).should.eql "<ul class=\"linkBar\"></ul>"
   end
 
+  it "should generate list with internal links"
 
-  describe "for links"
-    describe "without parameters"
-      it "should generate view link from item"
-        view_link(user).should.eql "<a href=\"/users/1\">View</a>"
-      end
-      it "should generate edit link from item"
-        edit_link(user).should.eql "<a href=\"/users/1/edit\">Edit</a>"
-      end
-    end
-
-    describe "with parameters"
-      it "should generate view link from item"
-        view_link(user, {label:"See Info"}).should.eql "<a href=\"/users/1\">See Info</a>"
-      end
-      it "should generate edit link from item"
-        edit_link(user, {label:"Change Info"}).should.eql "<a href=\"/users/1/edit\">Change Info</a>"
-      end
-    end
+    links = (bar.open() + bar.link_to("ff") + bar.link_to("aa") + bar.close())
 
+    links.should.eql "<ul class=\"linkBar\"><li><a href=\"ff\">ff</a></li><li><a href=\"aa\">aa</a></li></ul>"
   end
-
-
-end
+end

data/lib/extras/ice_view.rb

@@ -5,6 +5,7 @@
 #
 #   ActionView::Base::register_template_handler :ice, IceView
 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 )
@@ -41,6 +42,17 @@ class IceView
       assigns['content_for_layout'] = content_for_layout
     end
     assigns.merge!(local_assigns.stringify_keys)
+
+    route_functions = "<% "  + get_routes + " %>"
+    puts route_functions
+    5.times {puts "****************************"}
+
+    path_helper_code = File.read(File.dirname(__FILE__) + "/../../ice_js/lib/path_helper.js")
+    path_helper = "<% " + path_helper_code + " %>"
+    puts path_helper
+    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})

data/lib/ice.rb

@@ -7,12 +7,12 @@ class Object
   end
 end
 
-[FalseClass, TrueClass, Numeric, String].each do |class_name|
-  eval "class #{class_name}
+[FalseClass, TrueClass, Numeric, String].each do |cls|
+  cls.class_eval do
     def to_ice
       self
     end
-  end"
+  end
 end
 
 class Array
@@ -43,12 +43,9 @@ module Ice
         cxt[key] = value.to_ice
       end
 
-      cxt['____templateText'] = template_text
-
-      @evaled = cxt.eval "Jst.evaluate(Jst.compile(____templateText), {});"
-
+      jst = cxt['Jst']
+      return @evaled = jst.evaluate(jst.compile(template_text), {})
     end
-    @evaled
   end
 end
 

data/lib/routes_js.rb

@@ -0,0 +1,55 @@
+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
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Nate Kidwell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-31 00:00:00 -04:00
+date: 2010-06-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,8 @@ dependencies:
         segments: 
         - 0
         - 7
-        - 0
-        version: 0.7.0
+        - 1
+        version: 0.7.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -94,6 +94,7 @@ files:
 - lib/ice/cube_association.rb
 - lib/ice/cubeable.rb
 - lib/parser.js
+- lib/routes_js.rb
 - rails/init.rb
 - spec/base_cube_spec.rb
 - spec/cube_spec.rb