e9_vendors 0.0.4 → 0.0.5

data/app/decorators/vendor_member_decorator.rb

@@ -32,7 +32,8 @@ class VendorMemberDecorator < VendorsDecorator
 <script type="text/javascript">
   try {
     new E9.VendorWidget({
-      code: "#{model.md5_hash}"
+      code: "#{model.md5_hash}",
+       url: "#{base_url}"
     }).render();
   } catch (e) {}
 </script>
@@ -43,7 +44,11 @@ class VendorMemberDecorator < VendorsDecorator
 
   def script_url
     dir = Rails.env.development? && 'javascripts' || 'assets'
-    Linkable.urlify_path("/#{dir}/vendor-widget.js")
+    "#{base_url}/#{dir}/vendor-widget.js"
+  end
+
+  def base_url
+    h.request.protocol + h.request.host_with_port
   end
 
   def liquid_context

data/lib/e9_vendors/version.rb

@@ -1,3 +1,3 @@
 module E9Vendors
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/generators/e9_vendors/templates/javascripts/vendor-widget.js

@@ -9,7 +9,8 @@
    <script type="text/javascript" src="http://%{Your Host}/assets/vendor-widget.js"></script>
    <script type="text/javascript">
      new E9.VendorWidget({
-       code: "your provided widget code"
+       code: "your provided widget code",
+       url: "%{Your Host}"
      }).render();
    </script>
  *
@@ -293,15 +294,6 @@ E9 = window.E9 || {};
     recaptchaPublicKey = "6LfGdMASAAAAAHfYpORJWsFUtqJGM7WhxMElUMlo",
 
     defaults = {
-        /**
-         * The url of vendorboon.
-         *
-         * This is overridable mainly for testing purposes.  It is one of the
-         * two variables included in the output of the generated widget code and
-         * shouldn't be changed under normal circumstances.
-         */
-        url: 'http://www.vendorboon.com',
-
         /**
          * The element ID of the div where the widget should be written.
          *
@@ -378,7 +370,7 @@ E9 = window.E9 || {};
         onError: function(widget) {},
 
         /**
-         * the timeout to wait for a response from the vendorboon server before displaying
+         * the timeout to wait for a response from the server before displaying
          * an error.
          */
         timeout: 10000,
@@ -423,9 +415,9 @@ E9 = window.E9 || {};
       init: function(opts) {
         var that = this, html;
 
-        if (!opts) opts = {};
+        opts = opts || {};
 
-        this.url = opts.url || defaults.url;
+        this.url = opts.url || '';
 
         // if url is protocol relative, prepend protocol
         if (/^\/\//.test(this.url)) {
@@ -450,7 +442,9 @@ E9 = window.E9 || {};
         }
 
         // code must be passed
-        if (!opts.code) {
+        if (!opts.url) {
+          html = tag('h3', {'class':'e9-error'}, 'E9.VendorWidget requires a script url');
+        } else if (!opts.code) {
           html = tag('h3', {'class':'e9-error'}, 'E9.VendorWidget requires that you pass a code identifying yourself as a member');
         } else {
           html = tag('h3', {'class':'e9-loading'}, 'Loading...');

data/lib/generators/e9_vendors/templates/migration.rb

@@ -32,7 +32,7 @@ class CreateE9Vendors < ActiveRecord::Migration
 
     create_table :vendor_proxies, :force => true do |t|
       t.references :vendor, :vendor_member
-      t.boolean  "display_on_widget",                                  :default => true
+      t.boolean  "display_on_widget", :default => true
       t.string   "discount_code"
       t.string   "sales_full_name"
       t.string   "sales_title"
@@ -60,14 +60,14 @@ class CreateE9Vendors < ActiveRecord::Migration
       t.string   "state"
       t.text     "website"
       t.text     "admin_notes"
-      t.boolean  "display_on_widget_contact_form",                                :default => true
+      t.boolean  "display_on_widget_contact_form", :default => true
       t.string   "sales_email"
       t.string   "sales_full_name"
       t.string   "sales_title"
       t.string   "sales_phone"
       t.text     "short_description"
       t.text     "long_description"
-      t.text     "default_landing_page"
+      t.text     "landing_page"
       t.decimal  "discount_percentage",     :precision => 10, :scale => 2
       t.decimal  "member_compensation", :precision => 10, :scale => 2
       t.string   "logo"
@@ -76,9 +76,20 @@ class CreateE9Vendors < ActiveRecord::Migration
 
     add_column :settings, :e9_vendors_widget_title,      :string
     add_column :settings, :e9_vendors_widget_form_title, :string
+    add_column :settings, :e9_vendors_logo_size,         :integer
     add_column :settings, :e9_vendors_widget_form_text,  :text
   end
 
   def self.down
+    remove_column :settings, :e9_vendors_widget_form_text
+    remove_column :settings, :e9_vendors_logo_size
+    remove_column :settings, :e9_vendors_widget_form_title
+    remove_column :settings, :e9_vendors_widget_title
+
+    drop_table :vendors
+    drop_table :vendor_proxies
+    drop_table :vendor_categories_vendors
+    drop_table :vendor_categories
+    drop_table :vendor_members
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: e9_vendors
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Travis Cox