sketchily 1.1.0 → 1.2.0

data/README.md

@@ -68,6 +68,10 @@ Currently available options are:
 - `hide_image_tool` true if you want to hide the image tool button
 - `hide_hyperlink_tool` true if you want to hide the hyperlink tool button
 
+- `show_layers` (true if you want the layer selector to display automatically when the editor is loaded)
+
+- `url` override contents of the canvas with the svg file in the given url (careful: changes lost whenever editor is loaded)
+
 - `id` override the default id (see explanation below)
 - `value` override the default value (the svg itself; can be useful when using form_for)
 - `index` override the default index (affects the tag name; can be useful when using form_for)

data/Rakefile

@@ -16,11 +16,11 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Sketchily'
   rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 
@@ -30,9 +30,10 @@ Bundler::GemHelper.install_tasks
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
+  Rake::Task['app:db:test:prepare'].invoke
   t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << 'spec'
+  t.pattern = 'spec/**/*_spec.rb'
   t.verbose = false
 end
 

data/app/assets/javascripts/sketchily_embed.js

@@ -1,2 +1,2 @@
 //= require embedapi
-//= require svgutils
+//= require base64

data/app/assets/javascripts/sketchily_embed.js~

@@ -1,4 +1 @@
-//= require jquery
-//= require jquery_ujs
 //= require embedapi
-//= require svgutils

data/app/views/sketchily/_embed.html.erb

@@ -11,12 +11,33 @@
    hide_rulers ||= false
    hide_menu ||= false
    hide_image_tool ||= false
-   hide_hyperlink_tool ||= false %>
+   hide_hyperlink_tool ||= false
+   show_layers ||= false
+   url ||= nil
+%>
+
+<% iframe_src = URI.parse("/assets/svg-editor.html")
+
+   query_hash = {:dimensions => [canvas_width, canvas_height].join(','),
+                 :canvas_expansion => canvas_expansion,
+                 :showRulers => !hide_rulers,
+                 :showlayers => show_layers}
+   if url
+     query_hash[:url] = url
+   else
+     query_hash[:source] = nil
+   end
+
+   iframe_src.query = query_hash.map{|k,v| "#{k}=#{v}"}.join('&') %>
 
 <%= javascript_include_tag "sketchily_embed" %>
 
-<iframe src="/assets/svg-editor.html?source=&dimensions=<%= "#{canvas_width},#{canvas_height}" %>&canvas_expansion=<%= canvas_expansion %>&showRulers=<%= !hide_rulers %>"
-  width="<%= width %>" height="<%= height %>" id="svgedit_<%= id %>"></iframe>
+<%= content_tag(:iframe,
+                "svg-edit",
+                :src => iframe_src.to_s.html_safe,
+                :width => width,
+                :height => height,
+                :id => "svgedit_#{id}") %>
 
 <script type="text/javascript">
   <%= render :partial => "sketchily/embed",
@@ -25,5 +46,7 @@
                          :value => value,
                          :hide_menu => hide_menu,
                          :hide_image_tool => hide_image_tool,
-                         :hide_hyperlink_tool => hide_hyperlink_tool} %>
+                         :hide_hyperlink_tool => hide_hyperlink_tool,
+                         :url => url} %>
 </script>
+

data/app/views/sketchily/_embed.html.erb~

@@ -11,10 +11,34 @@
    hide_rulers ||= false
    hide_menu ||= false
    hide_image_tool ||= false
-   hide_hyperlink_tool ||= false %>
+   hide_hyperlink_tool ||= false
+   show_layers ||= false
+   url ||= nil
+%>
+
+<% iframe_src = URI.parse("/assets/svg-editor.html")
+
+   query_hash = {:dimensions => [canvas_width, canvas_height].join(','),
+                 :canvas_expansion => canvas_expansion,
+                 :showRulers => !hide_rulers,
+                 :showlayers => show_layers}
+   if url
+     query_hash[:url] = url
+   else
+     query_hash[:source] = nil
+   end
+
+   iframe_src.query = query_hash.map{|k,v| "#{k}=#{v}"}.join('&') %>
 
 <%= javascript_include_tag "sketchily_embed" %>
 
+<%= content_tag(:iframe,
+                "svg-edit",
+                :src => iframe_src.to_s.html_safe,
+                :width => width,
+                :height => height,
+                :id => "svgedit_#{id}") %>
+
 <script type="text/javascript">
   <%= render :partial => "sketchily/embed",
              :formats => :js,
@@ -22,8 +46,6 @@
                          :value => value,
                          :hide_menu => hide_menu,
                          :hide_image_tool => hide_image_tool,
-                         :hide_hyperlink_tool => hide_hyperlink_tool} %>
+                         :hide_hyperlink_tool => hide_hyperlink_tool,
+                         :url => url} %>
 </script>
-
-<iframe src="/assets/svg-editor.html?source=&dimensions=<%= "#{canvas_width},#{canvas_height}" %>&canvas_expansion=<%= canvas_expansion %>&showRulers=<%= !hide_rulers %>"
-  width="<%= width %>" height="<%= height %>" id="svgedit_<%= id %>"></iframe>

data/app/views/sketchily/_embed.js.erb

@@ -5,7 +5,8 @@
    # value
    # hide_menu
    # hide_image_tool
-   # hide_hyperlink_tool %>
+   # hide_hyperlink_tool 
+   # url %>
 
 var svgCanvas_<%= id %> = null;
 
@@ -24,7 +25,7 @@ function handleSvgData_<%= id %>(data, error) {
     alert('Error: ' + error);
   }
   else {
-    $("input#<%= id %>").attr("value", svgedit.utilities.encode64("<?xml version=\"1.0\"?>\n" + data));
+    $("input#<%= id %>").attr("value", sketchily_encode64("<?xml version=\"1.0\"?>\n" + data));
     $("input#<%= id %>").closest("form").off("submit", submitHandler_<%= id %>);
     $("input#<%= id %>").closest("form").one("submit", attachSubmitHandler_<%= id %>);
     $("input#<%= id %>").closest("form").submit();
@@ -58,7 +59,9 @@ function initEmbed_<%= id %>() {
     hyperlinkTool.parentNode.removeChild(hyperlinkTool);
   <% end %>
 
-  svgCanvas_<%= id %>.setSvgString(svgedit.utilities.decode64("<%= value.try(:squish) %>"));
+  <% unless url %>
+    svgCanvas_<%= id %>.setSvgString(sketchily_decode64("<%= value.try(:squish) %>"));
+  <% end %>
 
   attachSubmitHandler_<%= id %>();
 }

data/app/views/sketchily/_embed.js.erb~

@@ -5,7 +5,8 @@
    # value
    # hide_menu
    # hide_image_tool
-   # hide_hyperlink_tool %>
+   # hide_hyperlink_tool 
+   # url %>
 
 var svgCanvas_<%= id %> = null;
 
@@ -24,9 +25,8 @@ function handleSvgData_<%= id %>(data, error) {
     alert('Error: ' + error);
   }
   else {
-    $("input#<%= id %>").attr("value", svgedit.utilities.encode64("<?xml version=\"1.0\"?>\n" + data));
+    $("input#<%= id %>").attr("value", sketchily_encode64("<?xml version=\"1.0\"?>\n" + data));
     $("input#<%= id %>").closest("form").off("submit", submitHandler_<%= id %>);
-    waitingForCallback_<%= id %> = false;
     $("input#<%= id %>").closest("form").one("submit", attachSubmitHandler_<%= id %>);
     $("input#<%= id %>").closest("form").submit();
   }
@@ -59,7 +59,7 @@ function initEmbed_<%= id %>() {
     hyperlinkTool.parentNode.removeChild(hyperlinkTool);
   <% end %>
 
-  svgCanvas_<%= id %>.setSvgString(svgedit.utilities.decode64("<%= value.try(:squish) %>"));
+  svgCanvas_<%= id %>.setSvgString(sketchily_decode64("<%= value.try(:squish) %>"));
 
   attachSubmitHandler_<%= id %>();
 }

data/lib/sketchily.rb

@@ -5,21 +5,12 @@ require "sketchily/sketchily_tag"
 module Sketchily
   ASSET_FILES = %w(sketchily.css sketchily.js sketchily_embed.js canvg/canvg.js canvg/rgbcolor.js extensions/ext-*.js locale/lang.*.js)
 
-  SKETCHILY_OPTIONS = [:width, :height, :canvas_width, :canvas_height, :canvas_expansion, :hide_rulers, :hide_menu, :hide_image_tool, :hide_hyperlink_tool]
+  SKETCHILY_OPTIONS = [:width, :height, :canvas_width, :canvas_height, :canvas_expansion, :hide_rulers, :hide_menu, :hide_image_tool, :hide_hyperlink_tool, :show_layers, :url]
   TAG_OPTIONS = [:id, :value, :index]
   OPTIONS = SKETCHILY_OPTIONS + TAG_OPTIONS
 
-  ROOT = File.expand_path('../..', __FILE__)
-
-  VIEW = ActionView::Base.new
-  VIEW.view_paths << "#{ROOT}/app/views"
-
   ActiveSupport.on_load(:before_initialize) do
     Rails.configuration.assets.precompile += Sketchily::ASSET_FILES
   end
-
-  def self.render(options = {}, local_assigns = {}, &block)
-    VIEW.render(options, local_assigns, &block).html_safe
-  end
 end
 

data/lib/sketchily.rb~

@@ -5,21 +5,12 @@ require "sketchily/sketchily_tag"
 module Sketchily
   ASSET_FILES = %w(sketchily.css sketchily.js sketchily_embed.js canvg/canvg.js canvg/rgbcolor.js extensions/ext-*.js locale/lang.*.js)
 
-  SKETCHILY_OPTIONS = [:width, :height, :canvas_width, :canvas_height, :canvas_expansion, :hide_rulers, :hide_menu, :hide_image_tool, :hide_hyperlink_tool]
-  TAG_OPTIONS = [:id, :value]
+  SKETCHILY_OPTIONS = [:width, :height, :canvas_width, :canvas_height, :canvas_expansion, :hide_rulers, :hide_menu, :hide_image_tool, :hide_hyperlink_tool, :url, :show_layers]
+  TAG_OPTIONS = [:id, :value, :index]
   OPTIONS = SKETCHILY_OPTIONS + TAG_OPTIONS
 
-  ROOT = File.expand_path('../..', __FILE__)
-
-  VIEW = ActionView::Base.new
-  VIEW.view_paths << "#{ROOT}/app/views"
-
   ActiveSupport.on_load(:before_initialize) do
     Rails.configuration.assets.precompile += Sketchily::ASSET_FILES
   end
-
-  def self.render(options = {}, local_assigns = {}, &block)
-    VIEW.render(options, local_assigns, &block).html_safe
-  end
 end
 

data/lib/sketchily/sketchily.rb

@@ -1,9 +1,15 @@
 module Sketchily
   module FormBuilderInstanceMethods
     def sketchily(method, options = {})
-      Sketchily.render(:partial => "sketchily/sketchily",
-        :locals => {:template => @template, :object_name => @object_name,
-                    :method => method, :options => objectify_options(options)})
+      @template.render(
+        :partial => "sketchily/sketchily",
+        :locals => {
+          :template => @template,
+          :object_name => @object_name,
+          :method => method,
+          :options => objectify_options(options)
+        }
+      )
     end
 
     def svg_edit(method, options = {})
@@ -13,9 +19,15 @@ module Sketchily
 
   module ActionViewBaseInstanceMethods
     def sketchily(object_name, method, options = {})
-      Sketchily.render(:partial => "sketchily/sketchily",
-        :locals => {:template => self, :object_name => object_name,
-                    :method => method, :options => options})
+      self.render(
+        :partial => "sketchily/sketchily",
+        :locals => {
+          :template => self,
+          :object_name => object_name,
+          :method => method,
+          :options => options
+        }
+      )
     end
 
     def svg_edit(object_name, method, options = {})

data/lib/sketchily/sketchily.rb~

@@ -1,9 +1,16 @@
 module Sketchily
   module FormBuilderInstanceMethods
     def sketchily(method, options = {})
-      Sketchily.render(:partial => "sketchily/sketchily",
-        :locals => {:template => @template, :object_name => @object_name,
-                    :method => method, :options => objectify_options(options)}).html_safe
+      @template ||= self
+      @template.render(
+        :partial => "sketchily/sketchily",
+        :locals => {
+          :template => @template,
+          :object_name => @object_name,
+          :method => method,
+          :options => objectify_options(options)
+        }
+      )
     end
 
     def svg_edit(method, options = {})
@@ -13,9 +20,15 @@ module Sketchily
 
   module ActionViewBaseInstanceMethods
     def sketchily(object_name, method, options = {})
-      Sketchily.render(:partial => "sketchily/sketchily",
-        :locals => {:template => self, :object_name => object_name,
-                    :method => method, :options => options}).html_safe
+      self.render(
+        :partial => "sketchily/sketchily",
+        :locals => {
+          :template => self,
+          :object_name => object_name,
+          :method => method,
+          :options => options
+        }
+      )
     end
 
     def svg_edit(object_name, method, options = {})

data/lib/sketchily/sketchily_tag.rb

@@ -1,9 +1,15 @@
 module SketchilyTag
   module ActionViewBaseInstanceMethods
     def sketchily_tag(name, value = nil, options = {})
-      Sketchily.render(:partial => "sketchily/sketchily_tag",
-        :locals => {:name => name, :id => sanitize_to_id(name),
-                    :value => value, :options => options})
+      self.render(
+        :partial => "sketchily/sketchily_tag",
+        :locals => {
+          :name => name,
+          :id => sanitize_to_id(name),
+          :value => value,
+          :options => options
+        }
+      )
     end
 
     def svg_edit_tag(name, value = nil, options = {})

data/lib/sketchily/sketchily_tag.rb~

@@ -1,9 +1,16 @@
 module SketchilyTag
   module ActionViewBaseInstanceMethods
     def sketchily_tag(name, value = nil, options = {})
-      Sketchily.render(:partial => "sketchily/sketchily_tag",
-        :locals => {:name => name, :id => sanitize_to_id(name),
-                    :value => value, :options => options}).html_safe
+      self.render(
+        :partial => "sketchily/sketchily_tag",
+        :locals => {
+          :template => self,
+          :name => name,
+          :id => sanitize_to_id(name),
+          :value => value,
+          :options => options
+        }
+      )
     end
 
     def svg_edit_tag(name, value = nil, options = {})

data/lib/sketchily/version.rb

@@ -1,3 +1,3 @@
 module Sketchily
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/sketchily/version.rb~

@@ -1,3 +1,3 @@
 module Sketchily
-  VERSION = "1.0.4"
+  VERSION = "1.1.1"
 end

data/spec/dummy/app/controllers/sketchily_controller.rb

@@ -0,0 +1,9 @@
+class SketchilyController < ApplicationController
+  def sketchily
+    @drawing = Drawing.new
+  end
+
+  def sketchily_tag
+    @drawing = Drawing.new
+  end
+end

data/spec/dummy/app/models/drawing.rb

@@ -0,0 +1,2 @@
+class Drawing < ActiveRecord::Base
+end

data/spec/dummy/app/models/drawing.rb~

@@ -0,0 +1,3 @@
+class Drawing < ActiveRecord::Base
+
+end

data/spec/dummy/app/views/sketchily/sketchily.html.erb

@@ -0,0 +1,3 @@
+<%= form_for @drawing do |f| %>
+  <%= f.sketchily :svg %>
+<% end %>

data/spec/dummy/app/views/sketchily/sketchily_tag.html.erb

@@ -0,0 +1,3 @@
+<%= form_tag 'drawing', :url => drawings_path do %>
+  <%= sketchily_tag 'drawing' %>
+<% end %>

data/spec/dummy/config/routes.rb

@@ -1,58 +1,5 @@
 Dummy::Application.routes.draw do
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => 'welcome#index'
-
-  # See how all your routes lay out with "rake routes"
-
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id))(.:format)'
+  resource :drawings
+  get 'sketchily', :to => 'sketchily#sketchily'
+  get 'sketchily_tag', :to => 'sketchily#sketchily_tag'
 end