sketchily 0.2.0 → 0.3.0

data/README.md

@@ -1,6 +1,6 @@
 # Sketchily
 
-Sketchily allows the easy integration of svg-edit with any rails application.
+Sketchily allows the easy integration of [svg-edit](http://code.google.com/p/svg-edit/) with any rails application.
 
 Currently supports and provides `svg-edit-2.6`.
 
@@ -38,14 +38,15 @@ This gem also adds a helper method that can be called to display the resulting S
 
 Currently available options are:
 
-- `width`
-- `height`
-- `hide_menu` (true if you want svg-edit's menu to be hidden)
-- `hide_image_tool` (true if you want to hide the image tool button)
-- `canvas_width` (number specifying initial canvas width)
-- `canvas_height` (number specifying initial canvas height)
+- `width` (total width of editor)
+- `height` (total height of editor)
+- `canvas_width` (initial canvas width)
+- `canvas_height` (initial canvas height)
 - `canvas_expansion` (0 if you want to disable scrolling)
 - `hide_rulers` (true if you want to hide the canvas rulers)
+- `hide_menu` (true if you want svg-edit's menu to be hidden)
+- `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)
 - other standard html attributes for the input tag
 
 It is recommended that the database entries associated with sketchily form elements be of type `text`.
@@ -81,7 +82,7 @@ Although more testing is needed, we currently believe sketchily supports any bro
 - Safari 4+
 - Chrome 1+
 - IE 9+
-- IE 6+ (with the Chrome Frame plugin) 
+- IE 6+ (with the [Chrome Frame plugin](http://www.google.com/chromeframe)) 
 
 ## Contributing
 

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

@@ -3,14 +3,15 @@
    # value
    #
    # Additionally, they may override the following variables:
-   hide_menu ||= false
-   hide_image_tool ||= false
+   width ||= "750px"
+   height ||= "650px"
    canvas_width ||= 640
    canvas_height ||= 480
    canvas_expansion ||= 3
    hide_rulers ||= false
-   width ||= "750px"
-   height ||= "650px" %>
+   hide_menu ||= false
+   hide_image_tool ||= false
+   hide_hyperlink_tool ||= false %>
 
 <%= javascript_include_tag "embedapi" %>
 <%= javascript_include_tag "svgutils" %>
@@ -21,7 +22,8 @@
              :locals => {:id => id,
                          :value => value,
                          :hide_menu => hide_menu,
-                         :hide_image_tool => hide_image_tool} %>
+                         :hide_image_tool => hide_image_tool,
+                         :hide_hyperlink_tool => hide_hyperlink_tool} %>
 </script>
 
 <iframe src="/assets/svg-editor.html?source=&dimensions=<%= "#{canvas_width},#{canvas_height}" %>&canvas_expansion=<%= canvas_expansion %>&showRulers=<%= !hide_rulers %>"

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

@@ -3,14 +3,15 @@
    # value
    #
    # Additionally, they may override the following variables:
-   hide_menu ||= false
-   hide_image_tool ||= false
+   width ||= "750px"
+   height ||= "650px"
    canvas_width ||= 640
    canvas_height ||= 480
    canvas_expansion ||= 3
+   hide_menu ||= false
    hide_rulers ||= false
-   width ||= "750px"
-   height ||= "650px" %>
+   hide_image_tool ||= false
+   hide_hyperlink_tool ||= false %>
 
 <%= javascript_include_tag "embedapi" %>
 <%= javascript_include_tag "svgutils" %>
@@ -20,8 +21,9 @@
              :formats => :js,
              :locals => {:id => id,
                          :value => value,
-                         :show_menu => show_menu,
-                         :hide_image_tool => hide_image_tool} %>
+                         :hide_menu => hide_menu,
+                         :hide_image_tool => hide_image_tool,
+                         :hide_hyperlink_tool => hide_hyperlink_tool} %>
 </script>
 
 <iframe src="/assets/svg-editor.html?source=&dimensions=<%= "#{canvas_width},#{canvas_height}" %>&canvas_expansion=<%= canvas_expansion %>&showRulers=<%= !hide_rulers %>"

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

@@ -4,7 +4,8 @@
    # id
    # value
    # hide_menu
-   # hide_image_tool %>
+   # hide_image_tool
+   # hide_hyperlink_tool %>
 
 var svgCanvas_<%= id %> = null;
 
@@ -38,14 +39,19 @@ function initEmbed_<%= id %>() {
 
   <% if hide_menu %>
     var mainButton = doc.getElementById('main_button');
-    mainButton.style.display = 'none';
+    mainButton.parentNode.removeChild(mainButton);
     var toolsTop = doc.getElementById('tools_top');
     toolsTop.style.left = '5px';
   <% end %>
   
   <% if hide_image_tool %>
     var imageTool = doc.getElementById('tool_image');
-    imageTool.style.display = 'none';
+    imageTool.parentNode.removeChild(imageTool);
+  <% end %>
+
+  <% if hide_hyperlink_tool %>
+    var hyperlinkTool = doc.getElementById('tool_make_link');
+    hyperlinkTool.parentNode.removeChild(hyperlinkTool);
   <% end %>
   
   attachSubmitHandler_<%= id %>();

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

@@ -4,7 +4,8 @@
    # id
    # value
    # hide_menu
-   # hide_image_tool %>
+   # hide_image_tool
+   # hide_hyperlink_tool %>
 
 var svgCanvas_<%= id %> = null;
 
@@ -38,14 +39,19 @@ function initEmbed_<%= id %>() {
 
   <% if hide_menu %>
     var mainButton = doc.getElementById('main_button');
-    mainButton.style.display = 'none';
+    mainButton.parentNode.removeChild(mainButton);
     var toolsTop = doc.getElementById('tools_top');
-    toolsTop.style.left = '0px';
+    toolsTop.style.left = '5px';
   <% end %>
   
   <% if hide_image_tool %>
     var imageTool = doc.getElementById('tool_image');
-    imageTool.style.display = 'none';
+    imageTool.parentNode.removeChild(imageTool);
+  <% end %>
+
+  <% if hide_hyperlink_tool %>
+    var hyperlinkTool = doc.getElementById('tool_make_link');
+    //hyperlinkTool.parentNode.removeChild(hyperlinkTool);
   <% end %>
   
   attachSubmitHandler_<%= id %>();

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

@@ -8,16 +8,9 @@
 
 <%= render :partial => "sketchily/embed",
            :formats => :html,
-           :locals => {:id => sketchily_tag.send(:tag_id),
-                       :value => sketchily_tag.value(sketchily_tag.object),
-                       :hide_menu => options[:hide_menu],
-                       :hide_rulers => options[:hide_rulers],
-                       :hide_image_tool => options[:hide_image_tool],
-                       :canvas_width => options[:canvas_width],
-                       :canvas_height => options[:canvas_height],
-                       :canvas_expansion => options[:canvas_expansion],
-                       :width => options[:width],
-                       :height => options[:height]} %>
+           :locals => options.slice(*Sketchily::OPTIONS).merge(
+                        {:id => sketchily_tag.send(:tag_id),
+                         :value => sketchily_tag.value(sketchily_tag.object)}) %>
 
-<%= sketchily_tag.to_input_field_tag("hidden", options.except(:hide_menu, :hide_rulers, :hide_image_tool, :canvas_width, :canvas_height, :canvas_expansion, :width, :height)) %>
+<%= sketchily_tag.to_input_field_tag("hidden", options.except(*Sketchily::OPTIONS)) %>
 

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

@@ -9,15 +9,7 @@
 <%= render :partial => "sketchily/embed",
            :formats => :html,
            :locals => {:id => sketchily_tag.send(:tag_id),
-                       :value => sketchily_tag.value(sketchily_tag.object),
-                       :hide_menu => options[:hide_menu],
-                       :hide_image_tool => options[:hide_image_tool],
-                       :hide_rulers => options[:hide_rulers],
-                       :canvas_width => options[:canvas_width],
-                       :canvas_height => options[:canvas_height],
-                       :canvas_expansion => options[:canvas_expansion],
-                       :width => options[:width],
-                       :height => options[:height]} %>
+                       :value => sketchily_tag.value(sketchily_tag.object)}.merge(options.slice(*Sketchily::OPTIONS)) %>
 
-<%= sketchily_tag.to_input_field_tag("hidden", options.except(:hide_menu, :hide_image_tool, :hide_rulers, :canvas_width, :canvas_height, :canvas_expansion, :width, :height)) %>
+<%= sketchily_tag.to_input_field_tag("hidden", options.except(*Sketchily::OPTIONS)) %>
 

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

@@ -6,16 +6,9 @@
 
 <%= render :partial => "sketchily/embed",
            :formats => :html,
-           :locals => {:id => id,
-                       :value => value,
-                       :hide_menu => options[:hide_menu],
-                       :hide_rulers => options[:hide_rulers],
-                       :hide_image_tool => options[:hide_image_tool],
-                       :canvas_width => options[:canvas_width],
-                       :canvas_height => options[:canvas_height],
-                       :canvas_expansion => options[:canvas_expansion],
-                       :width => options[:width],
-                       :height => options[:height]} %>
+           :locals => options.slice(*Sketchily::OPTIONS).merge(
+                        {:id => id,
+                         :value => value}) %>
 
-<%= tag :input, { "type" => "hidden", "name" => name, "id" => id, "value" => value }.update(options.except(:hide_menu, :hide_rulers, :hide_image_tool, :canvas_width, :canvas_height, :canvas_expansion, :width, :height).stringify_keys) %>
+<%= tag :input, { "type" => "hidden", "name" => name, "id" => id, "value" => value }.update(options.except(*Sketchily::OPTIONS).stringify_keys) %>
 

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

@@ -7,15 +7,7 @@
 <%= render :partial => "sketchily/embed",
            :formats => :html,
            :locals => {:id => id,
-                       :value => value,
-                       :show_menu => options[:show_menu],
-                       :hide_image_tool => options[:hide_image_tool],
-                       :canvas_width => options[:canvas_width],
-                       :canvas_height => options[:canvas_height],
-                       :canvas_expansion => options[:canvas_expansion],
-                       :hide_rulers => options[:hide_rulers],
-                       :width => options[:width],
-                       :height => options[:height]} %>
+                       :value => value}.merge(options.slice(*Sketchily::OPTIONS)) %>
 
-<%= tag :input, { "type" => "hidden", "name" => name, "id" => id, "value" => value }.update(options.except(:show_menu, :hide_image_tool, :canvas_width, :canvas_height, :canvas_expansion, :hide_rulers, :width, :height).stringify_keys) %>
+<%= tag :input, { "type" => "hidden", "name" => name, "id" => id, "value" => value }.update(options.except(*Sketchily::OPTIONS).stringify_keys) %>
 

data/lib/sketchily/version.rb

@@ -1,3 +1,3 @@
 module Sketchily
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/sketchily/version.rb~

@@ -1,3 +1,3 @@
 module Sketchily
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/sketchily.rb

@@ -1,4 +1,6 @@
 module Sketchily
+  OPTIONS = [:width, :height, :canvas_width, :canvas_height, :canvas_expansion, :hide_rulers, :hide_menu, :hide_image_tool, :hide_hyperlink_tool]
+
   ROOT = File.expand_path('../..', __FILE__)
 
   VIEW = ActionView::Base.new

data/lib/sketchily.rb~

@@ -1,9 +1,10 @@
 module Sketchily
+  OPTIONS = [:width, :height, :canvas_width, :canvas_height, :canvas_expansion, :hide_menu, :hide_rulers, :hide_image_tool, :hide_hyperlink_tool]
+
   ROOT = File.expand_path('../..', __FILE__)
 
   VIEW = ActionView::Base.new
   VIEW.view_paths << "#{ROOT}/app/views"
-  VIEW.view_paths << "#{ROOT}/app/views/sketchily"
 
   def self.render(options = {}, local_assigns = {}, &block)
     VIEW.render(options, local_assigns, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sketchily
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -77,10 +77,6 @@ files:
 - app/views/sketchily/_embed.html.erb~
 - app/views/sketchily/_embed.html.erb
 - lib/sketchily/version.rb~
-- lib/sketchily/svg_edit_tag.rb~
-- lib/sketchily/sketchily_tag.rb~
-- lib/sketchily/svg_edit.rb~
-- lib/sketchily/sketchily.rb~
 - lib/sketchily/engine.rb
 - lib/sketchily/sketchily_tag.rb
 - lib/sketchily/version.rb
@@ -92,10 +88,8 @@ files:
 - vendor/assets/svg-edit-2.6/spinbtn/JQuerySpinBtn.min.js
 - vendor/assets/svg-edit-2.6/spinbtn/spinbtn_updn.png
 - vendor/assets/svg-edit-2.6/spinbtn/JQuerySpinBtn.js
-- vendor/assets/svg-edit-2.6/svgedit.compiled.js~
 - vendor/assets/svg-edit-2.6/embedapi.html
 - vendor/assets/svg-edit-2.6/jquery.js
-- vendor/assets/svg-edit-2.6/svg-editor.js~
 - vendor/assets/svg-edit-2.6/jquery-ui/jquery-ui-1.8.custom.min.js
 - vendor/assets/svg-edit-2.6/jquery-ui/jquery-ui-1.8.17.custom.min.js
 - vendor/assets/svg-edit-2.6/jgraduate/jquery.jgraduate.js
@@ -122,7 +116,6 @@ files:
 - vendor/assets/svg-edit-2.6/path.js
 - vendor/assets/svg-edit-2.6/svgcanvas.js
 - vendor/assets/svg-edit-2.6/svgutils.js
-- vendor/assets/svg-edit-2.6/svg-editor.css~
 - vendor/assets/svg-edit-2.6/locale/lang.fi.js
 - vendor/assets/svg-edit-2.6/locale/lang.sq.js
 - vendor/assets/svg-edit-2.6/locale/lang.fr.js
@@ -220,7 +213,6 @@ files:
 - vendor/assets/svg-edit-2.6/extensions/shapelib/object.json
 - vendor/assets/svg-edit-2.6/extensions/shapelib/raphael.txt
 - vendor/assets/svg-edit-2.6/extensions/shapelib/flowchart.json
-- vendor/assets/svg-edit-2.6/extensions/ext-imagelib.js~
 - vendor/assets/svg-edit-2.6/extensions/ext-grid.js
 - vendor/assets/svg-edit-2.6/extensions/markers-icons.xml
 - vendor/assets/svg-edit-2.6/extensions/foreignobject-icons.xml
@@ -232,7 +224,6 @@ files:
 - vendor/assets/svg-edit-2.6/extensions/ext-server_moinsave.js
 - vendor/assets/svg-edit-2.6/extensions/closepath_icons.svg
 - vendor/assets/svg-edit-2.6/extensions/ext-imagelib.xml
-- vendor/assets/svg-edit-2.6/extensions/ext-server_opensave.js~
 - vendor/assets/svg-edit-2.6/extensions/ext-markers.js
 - vendor/assets/svg-edit-2.6/extensions/ext-arrows.js
 - vendor/assets/svg-edit-2.6/extensions/eyedropper.png
@@ -313,7 +304,6 @@ files:
 - vendor/assets/svg-edit-2.6/images/paste.png
 - vendor/assets/svg-edit-2.6/images/align-center.svg
 - vendor/assets/svg-edit-2.6/images/polygon.png
-- vendor/assets/svg-edit-2.6/svg-editor.html~
 - vendor/assets/svg-edit-2.6/browser.js
 - vendor/assets/svg-edit-2.6/select.js
 - vendor/assets/svg-edit-2.6/embedapi.js
@@ -353,7 +343,6 @@ files:
 - spec/dummy/public/404.html
 - spec/dummy/log/development.log
 - spec/dummy/config.ru
-- spec/spec_helper.rb~
 - spec/lib/sketchily_spec.rb
 homepage: http://github.com/lml/sketchily
 licenses: []
@@ -410,5 +399,4 @@ test_files:
 - spec/dummy/public/404.html
 - spec/dummy/log/development.log
 - spec/dummy/config.ru
-- spec/spec_helper.rb~
 - spec/lib/sketchily_spec.rb

data/lib/sketchily/sketchily.rb~

@@ -1,28 +0,0 @@
-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
-    end
-
-    def svg_edit(method, options = {})
-      sketchily(method, options)
-    end
-  end
-
-  module ActionViewBaseInstanceMethods
-    def sketchily(object_name, method, options = {})
-      Sketchily.render(:partial => "sketchily/sketchily",
-        :locals => {:template => self, :object_name => object_name,
-                    :method => method, :options => objectify_options(options)}).html_safe
-    end
-
-    def svg_edit(object_name, method, options = {})
-      sketchily(object_name, method, options)
-    end
-  end
-end
-
-ActionView::Helpers::FormBuilder.send :include, Sketchily::FormBuilderInstanceMethods
-ActionView::Base.send :include, Sketchily::ActionViewBaseInstanceMethods

data/lib/sketchily/sketchily_tag.rb~

@@ -1,15 +0,0 @@
-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
-    end
-
-    def svg_edit_tag(name, value = nil, options = {})
-      sketchily_tag(name, value, options)
-    end
-  end
-end
-
-ActionView::Base.send :include, SketchilyTag::ActionViewBaseInstanceMethods

data/lib/sketchily/svg_edit.rb~

@@ -1,15 +0,0 @@
-module Sketchily
-  module FormHelperInstanceMethods
-    def sketchily(object_name, method, options = {})
-      ActionView::Helpers::InstanceTag.new(object_name, method, self, options.delete(:object)).to_input_field_tag("hidden", options)
-    end
-  end
-
-  module FormBuilderInstanceMethods
-    def sketchily(method, options = {})
-      @template.hidden_field(@object_name, method, objectify_options(options))
-    end
-  end
-end
-
-ActionView::Helpers::FormBuilder.send :include, Sketchily::InstanceMethods

data/lib/sketchily/svg_edit_tag.rb~

@@ -1,9 +0,0 @@
-module SvgEditTag
-  module InstanceMethods
-    def svg_edit_tag(name, value = nil, options = {})
-      tag :input, { "type" => "text", "name" => name, "id" => sanitize_to_id(name), "value" => value }.update(options.stringify_keys)
-    end
-  end
-end
-
-ActionView::Helpers::FormTagHelper.send :include, SvgEditTag::InstanceMethods

data/spec/spec_helper.rb~

@@ -1,18 +0,0 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-require "rails/test_help"
-
-require "minitest/autorun"
-require "minitest/rails"
-
-Rails.backtrace_cleaner.remove_silencers!
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-# Load fixtures from the engine
-if ActiveSupport::TestCase.method_defined?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-end