apotomo 1.1.1 → 1.1.2

data/apotomo.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "rails",   "~> 3.0"
-  s.add_dependency "cells",   "~> 3.5.6"
+  s.add_dependency "cells",   ">= 3.5.6"
   s.add_dependency "onfire",  "~> 0.2.0"
   s.add_dependency "hooks",   "~> 0.1.3"
 
   s.add_development_dependency "shoulda"
   s.add_development_dependency "slim"
+  s.add_development_dependency "haml"
 end

data/lib/apotomo/javascript_generator.rb

@@ -1,3 +1,5 @@
+require 'action_view/helpers/javascript_helper'
+
 module Apotomo
   class JavascriptGenerator
     def initialize(framework)
@@ -9,21 +11,11 @@ module Apotomo
       "#{javascript}"
     end
     
-    # Copied from ActionView::Helpers::JavascriptHelper.
-    JS_ESCAPE_MAP = {
-      '\\'    => '\\\\',
-      '</'    => '<\/',
-      "\r\n"  => '\n',
-      "\n"    => '\n',
-      "\r"    => '\n',
-      '"'     => '\\"',
-      "'"     => "\\'" }
+    JS_ESCAPER = Object.new.extend(::ActionView::Helpers::JavaScriptHelper)
 
     # Escape carrier returns and single and double quotes for JavaScript segments.
     def self.escape(javascript)
-      return javascript.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { JS_ESCAPE_MAP[$1] } if javascript
-      
-      ''
+      JS_ESCAPER.escape_javascript(javascript)
     end
     
     def escape(javascript)

data/lib/apotomo/version.rb

@@ -1,3 +1,3 @@
 module Apotomo
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/lib/generators/templates/view.erb

@@ -1,7 +1,9 @@
-<h1>
-  <%= class_name %>Widget#<%= @state %>
-</h1>
+<%%= widget_div do %>
+  <h1>
+    <%= class_name %>Widget#<%= @state %>
+  </h1>
 
-<p>
-  Find me in <%= @path %>
-</p>
+  <p>
+    Find me in <%= @path %>
+  </p>
+<%% end %>

data/lib/generators/templates/view.haml

@@ -1,4 +1,5 @@
-%h1
-  <%= class_name %>Widget#<%= @state %>
-%p
-  Find me in <%= @path %>
+= widget_div do
+  %h1
+    <%= class_name %>Widget#<%= @state %>
+  %p
+    Find me in <%= @path %>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,25 +14,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 +01:00
+date: 2011-06-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: cells
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 3
-        - 0
-        version: "3.0"
+        - 5
+        - 6
+        version: 3.5.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: cells
+  name: onfire
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -40,14 +41,14 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 3
-        - 5
-        - 6
-        version: 3.5.6
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: onfire
+  name: hooks
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -56,28 +57,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
-        - 0
-        version: 0.2.0
+        - 1
+        - 3
+        version: 0.1.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hooks
+  name: shoulda
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 3
-        version: 0.1.3
-  type: :runtime
+        version: "0"
+  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: slim
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -90,7 +89,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: slim
+  name: haml
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false