sketchily 1.5.0 → 4.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 494ccf1bb3cc7f73e15b97ffe5abac1f58f36187
+  data.tar.gz: 7f5d9080442bb38447c9277111fd3cb4454fd3bc
+SHA512:
+  metadata.gz: c8fe19a98e0b3752a01475557f5ea091db010e7aca516aedec4e832af46b80670ba54e36ff4d19d3c06cc4abcfa3d33f774b5044948447481593cbb258cf3004
+  data.tar.gz: 5687890cced694174de97afe510fa0e5913ea71da2caa70d976c01e0be0fd5ac6636ac31159a870fbb69b7f6e4672a1981be0a67e71feba5f1c5354c5b2c57c1

data/README.md

@@ -18,7 +18,7 @@ And then execute:
 $ bundle
 ```
 
-Or install it yourself as:
+Or install it yourself:
 
 ```sh
 $ gem install sketchily
@@ -80,6 +80,8 @@ Currently available options are:
 - `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)
 
+- `extensions` editor plugins (e.g. 'plugin.js' will load '/assets/extensions/plugin.js')
+
 - other standard html attributes for the input tag
 
 The `hyperlink tool` is disabled by default, as embedded links and scripts do not work with the display method used by sketchily_show.

data/Rakefile

@@ -4,38 +4,20 @@ begin
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Sketchily'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
 
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 
-Rake::TestTask.new(:test) do |t|
-  Rake::Task['app:db:test:prepare'].invoke
+Rake::TestTask.new(:test => 'app:db:test:prepare') do |t|
   t.libs << 'lib'
   t.libs << 'spec'
   t.pattern = 'spec/**/*_spec.rb'
   t.verbose = false
 end
 
-
 task :default => :test
+

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

@@ -16,6 +16,7 @@
    show_hyperlink_tool ||= false
    show_layers ||= false
    url ||= nil
+   extensions ||= nil
 %>
 
 <% iframe_src = URI.parse("/assets/svg-editor.html")
@@ -28,6 +29,7 @@
                  :showlayers => show_layers}
    query_hash[:url] = url if url
    query_hash[:source] = nil unless url
+   query_hash[:extensions] = extensions if extensions
 
    iframe_src.query = query_hash.map{|k,v| "#{k}=#{v}"}.join('&') %>
 
@@ -49,4 +51,3 @@
                     <%= show_hyperlink_tool %>,
                     "<%= url %>");
 </script>
-

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

@@ -16,6 +16,7 @@
    show_hyperlink_tool ||= false
    show_layers ||= false
    url ||= nil
+   extensions ||= nil
 %>
 
 <% iframe_src = URI.parse("/assets/svg-editor.html")
@@ -28,6 +29,7 @@
                  :showlayers => show_layers}
    query_hash[:url] = url if url
    query_hash[:source] = nil unless url
+   query_hash[:extensions] = extensions if extensions
 
    iframe_src.query = query_hash.map{|k,v| "#{k}=#{v}"}.join('&') %>
 
@@ -47,6 +49,6 @@
                     <%= hide_menu %>,
                     <%= hide_image_tool %>,
                     <%= show_hyperlink_tool %>,
-                    <%= url %>);
+                    "<%= url %>");
 </script>
 

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

@@ -4,13 +4,16 @@
    # method
    # options %>
 
-<% sketchily_tag = ActionView::Helpers::InstanceTag.new(object_name, method, template, options.delete(:object))
+<% sketchily_tag = Rails::VERSION::MAJOR >= 4 ?
+                     ActionView::Helpers::Tags::HiddenField.new(object_name, method, template, options.except(*Sketchily::SKETCHILY_OPTIONS)) :
+                     ActionView::Helpers::InstanceTag.new(object_name, method, template, options.delete(:object))
+
    options = {:id => sketchily_tag.send(:tag_id),
-              :value => sketchily_tag.value(sketchily_tag.object)}.merge(options) %>
+              :value => sketchily_tag.send(:value, sketchily_tag.object)}.merge(options) %>
 
 <%= render :partial => "sketchily/embed",
            :formats => :html,
            :locals => options.slice(*Sketchily::OPTIONS) %>
 
-<%= sketchily_tag.to_input_field_tag("hidden", options.except(*Sketchily::SKETCHILY_OPTIONS)) %>
-
+<%= Rails::VERSION::MAJOR >= 4 ? sketchily_tag.render :
+      sketchily_tag.to_input_field_tag("hidden", options.except(*Sketchily::SKETCHILY_OPTIONS)) %>

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

@@ -4,14 +4,18 @@
    # method
    # options %>
 
-<% sketchily_tag = ActionView::Helpers::InstanceTag.new(object_name, method, template, options.delete(:object))
+<% sketchily_tag = Rails::VERSION::MAJOR >= 4 ?
+                     ActionView::Helpers::Tags::HiddenField.new(object_name, method, template,
+                       options.except(*Sketchily::SKETCHILY_OPTIONS)).render :
+                     ActionView::Helpers::InstanceTag.new(object_name, method, template, options.delete(:object))
+                       .to_input_field_tag("hidden", options.except(*Sketchily::SKETCHILY_OPTIONS))
+
    options = {:id => sketchily_tag.send(:tag_id),
-              :value => sketchily_tag.value(sketchily_tag.object)}.merge(
-              options) %>
+              :value => sketchily_tag.send(:value, sketchily_tag.object)}.merge(options) %>
 
 <%= render :partial => "sketchily/embed",
            :formats => :html,
            :locals => options.slice(*Sketchily::OPTIONS) %>
 
-<%= sketchily_tag.to_input_field_tag("hidden", options.except(*Sketchily::SKETCHILY_OPTIONS)) %>
-
+<%= Rails::VERSION::MAJOR >= 4 ? sketchily_tag.render :
+      sketchily_tag.to_input_field_tag("hidden", options.except(*Sketchily::SKETCHILY_OPTIONS)) %>

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

@@ -12,4 +12,3 @@
            :locals => options.slice(*Sketchily::OPTIONS) %>
 
 <%= tag :input, {"type" => "hidden", "name" => name}.update(options.except(*Sketchily::SKETCHILY_OPTIONS).stringify_keys) %>
-

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

@@ -5,12 +5,11 @@
    # options %>
 
 <% options = {:id => id,
-              :value => value}.merge(
-              options.slice(*Sketchily::OPTIONS)) %>
+              :value => value}.merge(options) %>
 
 <%= render :partial => "sketchily/embed",
            :formats => :html,
-           :locals => options %>
+           :locals => options.slice(*Sketchily::OPTIONS) %>
 
 <%= tag :input, {"type" => "hidden", "name" => name}.update(options.except(*Sketchily::SKETCHILY_OPTIONS).stringify_keys) %>
 

data/lib/sketchily.rb

@@ -5,12 +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, :bkgd_color, :bkgd_url, :canvas_width, :canvas_height, :canvas_expansion, :hide_rulers, :hide_menu, :hide_image_tool, :show_hyperlink_tool, :show_layers, :url]
+  SKETCHILY_OPTIONS = [:width, :height, :bkgd_color, :bkgd_url, :canvas_width, :canvas_height, :canvas_expansion, :hide_rulers, :hide_menu, :hide_image_tool, :show_hyperlink_tool, :show_layers, :url, :extensions]
   TAG_OPTIONS = [:id, :value, :index]
   OPTIONS = SKETCHILY_OPTIONS + TAG_OPTIONS
 
   ActiveSupport.on_load(:before_initialize) do
-    Rails.configuration.assets.precompile += Sketchily::ASSET_FILES
+    Rails.configuration.assets.precompile += ASSET_FILES
   end
 end
 

data/lib/sketchily.rb~

@@ -5,12 +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, :bkgd_color, :bkgd_url, :canvas_width, :canvas_height, :canvas_expansion, :hide_rulers, :hide_menu, :show_hyperlink_tool, :hide_image_tool, :show_layers, :url]
+  SKETCHILY_OPTIONS = [:width, :height, :bkgd_color, :bkgd_url, :canvas_width, :canvas_height, :canvas_expansion, :hide_rulers, :hide_menu, :hide_image_tool, :show_hyperlink_tool, :show_layers, :url, ]
   TAG_OPTIONS = [:id, :value, :index]
   OPTIONS = SKETCHILY_OPTIONS + TAG_OPTIONS
 
   ActiveSupport.on_load(:before_initialize) do
-    Rails.configuration.assets.precompile += Sketchily::ASSET_FILES
+    Rails.configuration.assets.precompile += ASSET_FILES
   end
 end
 

data/lib/sketchily/sketchily.rb

@@ -12,9 +12,7 @@ module Sketchily
       )
     end
 
-    def svg_edit(method, options = {})
-      sketchily(method, options)
-    end
+    alias_method :svg_edit, :sketchily
   end
 
   module ActionViewBaseInstanceMethods
@@ -30,9 +28,7 @@ module Sketchily
       )
     end
 
-    def svg_edit(object_name, method, options = {})
-      sketchily(object_name, method, options)
-    end
+    alias_method :svg_edit, :sketchily
   end
 end
 

data/lib/sketchily/sketchily.rb~

@@ -1,7 +1,6 @@
 module Sketchily
   module FormBuilderInstanceMethods
     def sketchily(method, options = {})
-      @template ||= self
       @template.render(
         :partial => "sketchily/sketchily",
         :locals => {
@@ -13,9 +12,7 @@ module Sketchily
       )
     end
 
-    def svg_edit(method, options = {})
-      sketchily(method, options)
-    end
+    alias_method :svg_edit, :sketchily
   end
 
   module ActionViewBaseInstanceMethods

data/lib/sketchily/sketchily_tag.rb

@@ -12,9 +12,7 @@ module SketchilyTag
       )
     end
 
-    def svg_edit_tag(name, value = nil, options = {})
-      sketchily_tag(name, value, options)
-    end
+    alias_method :svg_edit_tag, :sketchily_tag
   end
 end
 

data/lib/sketchily/sketchily_tag.rb~

@@ -4,7 +4,6 @@ module SketchilyTag
       self.render(
         :partial => "sketchily/sketchily_tag",
         :locals => {
-          :template => self,
           :name => name,
           :id => sanitize_to_id(name),
           :value => value,

data/lib/sketchily/version.rb

@@ -1,3 +1,3 @@
 module Sketchily
-  VERSION = "1.5.0"
+  VERSION = "4.0.0"
 end

data/lib/sketchily/version.rb~

@@ -1,3 +1,3 @@
 module Sketchily
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 end

data/spec/app/helpers/sketchily_helper_spec.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+describe SketchilyHelper do
+  it 'must show svg image' do
+    uri = 'test'
+    sketchily_show(uri).must_equal "<img src='data:image/svg+xml;base64,#{uri}'  />"
+  end
+end

data/spec/app/helpers/sketchily_helper_spec.rb~

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+describe SketchilyHelper do
+  before do
+    @uri = 'test'
+  end
+  
+  it 'must show svg image' do
+    uri = 'test'
+    sketchily_show(uri).must_equal "<img src='data:image/svg+xml;base64,#{uri}'  />"
+  end
+end

data/spec/dummy/README.md

@@ -0,0 +1,3 @@
+## Dummy
+
+A dummy application used to test the Sketchily engine.

data/spec/dummy/README.md~

@@ -0,0 +1,3 @@
+## Dummy
+
+A dummy application used to test the sketchily engine.

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

@@ -0,0 +1,18 @@
+class DrawingsController < ApplicationController
+  before_filter :get_drawing
+
+  def show
+  end
+
+  def sketchily
+  end
+
+  def sketchily_tag
+  end
+
+  protected
+
+  def get_drawing
+    @drawing = Drawing.find(params[:id])
+  end
+end

data/spec/dummy/app/controllers/drawings_controller.rb~

@@ -0,0 +1,16 @@
+class DrawingsController < ApplicationController
+  def show
+  end
+
+  def sketchily
+  end
+
+  def sketchily_tag
+  end
+
+  protected
+
+  def get_drawing
+    @drawing = Drawing.find(params[:id])
+  end
+end

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

@@ -0,0 +1,3 @@
+<%= form_tag drawing_path(@drawing) do %>
+  <%= sketchily_tag 'drawing' %>
+<% end %>

data/spec/dummy/app/views/drawings/sketchily_tag.html.erb~

@@ -0,0 +1,3 @@
+<%= form_tag drawing_path(@drawing), :method => :patch do %>
+  <%= sketchily_tag 'drawing' %>
+<% end %>

data/spec/dummy/config/application.rb

@@ -2,7 +2,7 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-Bundler.require
+Bundler.require(*Rails.groups)
 require "sketchily"
 
 module Dummy
@@ -11,16 +11,6 @@ module Dummy
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -29,31 +19,9 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable escaping HTML in JSON.
-    config.active_support.escape_html_entities_in_json = true
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    config.generators do |g|
+      g.test_framework :mini_test, :spec => true, :fixture => false
+    end
   end
 end
 

data/spec/dummy/config/application.rb~

@@ -0,0 +1,27 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require(*Rails.groups)
+require "commontator"
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    config.generators do |g|
+      g.test_framework :mini_test, :spec => true, :fixture => false
+    end
+  end
+end
+