tmin 0.0.9 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tmin (0.0.8)
+    tmin (0.0.9)
       dm-aggregates (~> 1.2.0)
       dm-core (~> 1.2.0)
       dm-migrations (~> 1.2.0)

data/lib/tmin/server.rb

@@ -158,22 +158,49 @@ module Firefly
       @authenticated = has_valid_api_cookie?
       @config        = config
       @highlight     = nil
-      @title         = "tminus.it at http://#{@config[:hostname]}"
+      @title         = "tminus.it"
 
       set :session_secret, @config[:session_secret]
     end
 
     get '/' do
+      if @authenticated
       @highlight = Firefly::Url.first(:code => params[:highlight])
       @error     = params[:highlight] == "error"
 
       sort_column = params[:s] || 'created_at'
       sort_order  = params[:d] || 'desc'
+    
 
       @urls = Firefly::Url.all(:limit => config[:recent_urls], :order => [ sort_column.to_sym.send(sort_order.to_sym) ] )
 
+
+      haml :admin
+    else
       haml :index
     end
+  end 
+    
+ 
+   get '/admin' do
+     
+    if  @unthenticated   
+        redirect "/", 301
+     else 
+       @highlight = Firefly::Url.first(:code => params[:highlight])
+        @error     = params[:highlight] == "error"
+
+        sort_column = params[:s] || 'created_at'
+        sort_order  = params[:d] || 'desc'
+
+
+        @urls = Firefly::Url.all(:limit => config[:recent_urls], :order => [ sort_column.to_sym.send(sort_order.to_sym) ] )
+
+
+        haml :admin
+ end
+end
+     
 
     post '/api/set' do
       store_api_key(params[:api_key])
@@ -269,15 +296,26 @@ module Firefly
     get '/:code' do
       @url = Firefly::Url.first(:code => params[:code])
 
+      
+      
       if @url.nil?
         status 404
         "Sorry, that code is unknown."
+        
+      else 
+        if @url.code == 'ec'
+          @short_url = "http://#{config[:hostname]}/#{@url.code}"
+          @url.register_click!
+        	haml :ec
       else
         @short_url = "http://#{config[:hostname]}/#{@url.code}"
 	@url.register_click!
 	haml :redirect
       end
     end
+    end
+    
+    
 
     def initialize config = {}, &blk
       super

data/lib/tmin/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Tminus
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/views/admin.haml

@@ -0,0 +1,92 @@
+- if @authenticated
+  .sidebox
+    %h2 Bookmarklet
+
+    %p
+      Drag the following link to your bookmarks. Click it to shorten the URL to the page you're currently viewing.
+    %p
+      %a{ :href => "javascript:var%20d=document,w=window,enc=encodeURIComponent,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),s2=((s.toString()=='')?s:('%22'+enc(s)+'%22')),key=enc('#{@config[:api_key]}'),f='http://#{@config[:hostname]}/api/add',l=d.location,p='?visual=1&api_key='+key+'&url='+enc(l.href),u=f+p;try{if(!/^(.*\.)?tumblrzzz[^.]*$/.test(l.host))throw(0);tstbklt();}catch(z){a%20=function(){if(!w.open(u))l.href=u;};if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else%20a();}void(0)" } Shorten with #{@config[:hostname]}
+
+  %h1 How about shortening a URL?
+
+  .the_form
+    %form{ :action => '/api/add', :method => 'post' }
+      %input{ :type => "hidden", :name => "visual", :value => "1" }
+      %p
+        %input.big_url{ :type => 'text', :placeholder => "Paste your long URL here...", :name => 'url', :id => 'url', :size => 40, :autocomplete => "off", :spellcheck => 'false' }
+        %span{ :style => "font-size: 1.8em;" }= '>' 
+        %input.big_url{ :type => 'text', :placeholder => "Optional short code", :name => 'short', :id => 'short', :size => 20, :autocomplete => "off", :spellcheck => 'false' }
+      %p
+        %input.big_url{ :type => 'submit', :name => 'submit', :id => 'submit', :value => "Make it short!" }
+
+  - if @highlight
+    %h2 Your short URL
+
+    %table
+      %tr
+        %td.label Short URL
+        %td.label Full URL
+        %td.label Clicks
+        %td.label Shortened at
+        %td.label  
+      %tr.highlighted
+        %td.value
+          %input{ :type => "text", :value => short_url(@highlight), :class => 'short_url', :size => 21 }
+        %td.value.fill <a href="#{@highlight.url}">#{truncate @highlight.url, 130}</a>
+        %td.value.center= @highlight.clicks
+        %td.value= @highlight.created_at.strftime("%Y-%m-%d %H:%M")
+        %td.value
+          %a{ :href => "http://twitter.com/home?status=#{tweet(short_url(@highlight))}" }
+            %img.twitter{ :src => "/images/twitter.png", :width => "16", :height => "16" }
+
+  %h2 Recently shortened
+  
+  %table
+    %tr
+      %td.label(nowrap='nowrap') Short URL <a href="/?s=code&d=asc">▲</a> <a href="/?s=code&d=desc">▼</a>
+      %td.label(nowrap='nowrap') Full URL <a href="/?s=url&d=asc">▲</a> <a href="/?s=url&d=desc">▼</a>
+      %td.label(nowrap='nowrap') Clicks <a href="/?s=clicks&d=asc">▲</a> <a href="/?s=clicks&d=desc">▼</a>
+      %td.label(nowrap='nowrap') Shortened At <a href="/?s=created_at&d=asc">▲</a> <a href="/?s=created_at&d=desc">▼</a>
+      %td.label &nbsp;
+    - @urls.each do |url|
+      %tr{ :class => is_highlighted?(url) ? 'highlighted' : '' }
+        %td.value
+          %input{ :type => "text", :value => short_url(url), :class => 'short_url', :size => 31 }
+        %td.value.fill <a href="#{url.url}">#{truncate url.url, 95}</a>
+        %td.value.center= url.clicks
+        %td.value= url.created_at.strftime("%Y-%m-%d %H:%M")
+        %td.value
+          %a{ :href => "http://twitter.com/home?status=#{tweet(short_url(url))}" }
+            %img.twitter{ :src => "/images/twitter.png", :width => "16", :height => "16" }
+
+
+  :javascript
+    $(document).ready(function() {
+      $('input.short_url').each(function(index) {
+        $(this).mouseup(function() { $(this).select(); });
+      });  
+
+      if (window.location.search == "") {
+        var pathname = window.location.pathname + '?s=created_at&d=desc';
+      } else {
+        var pathname = window.location.pathname + window.location.search;
+      }
+
+      $('#main table tr td.label a').each(function(index) {
+        if ($(this).attr('href') == pathname) {
+          $(this).addClass('highlight');
+        }
+      });
+    });
+- else
+  %h1 Please enter your API key
+  
+  %p
+    Please enter your API key below to make sure only you can shorten URLs here.
+  
+  %form{ :action => '/api/set', :method => 'post' }
+    %p
+      %label{ :for => 'api_key' } API Key
+      %input{ :type => 'password', :name => 'api_key', :id => 'api_key' }
+    %p
+      %input{ :type => 'submit', :name => 'submit', :id => 'submit', :value => "Let me in" }

data/views/ec.haml

@@ -0,0 +1,35 @@
+%a#applink1{:href => "#{@url.url}"}
+  %img#thumb{:src => "/images/ec_background.gif", :alt => "My Pic"}
+  %p Download tminus now
+
+
+:javascript
+  var ref = document.referrer; 
+  if(ref && ref.toLowerCase().indexOf("twitter.com")!==-1){
+    window.location.href="/";
+  }
+  var appstorefail = "itms://itunes.apple.com/us/app/tminus-make-share-countdown/id507726329?mt=8";  
+  function applink(fail){
+      return function(){
+          var clickedAt = +new Date;
+          // During tests on 3g/3gs this timeout fires immediately if less than 500ms.
+          setTimeout(function(){
+              // To avoid failing on return to MobileSafari, ensure freshness!
+              if (+new Date - clickedAt < 2000){
+                  window.location = fail;
+              }
+          }, 500);    
+      };
+  }
+  document.getElementById("applink1").onclick = applink(appstorefail); 
+  var button = document.getElementById("applink1")
+  simulateClick("applink1");
+  function simulateClick(elId) {
+    var evt;
+    var el = document.getElementById(elId);
+    if (document.createEvent) {
+        evt = document.createEvent("MouseEvents");
+        evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+    }
+    (evt) ? el.dispatchEvent(evt) : (el.click && el.click());
+  }

data/views/index.haml

@@ -1,91 +1 @@
-- if @authenticated
-  .sidebox
-    %h2 Bookmarklet
-
-    %p
-      Drag the following link to your bookmarks. Click it to shorten the URL to the page you're currently viewing.
-    %p
-      %a{ :href => "javascript:var%20d=document,w=window,enc=encodeURIComponent,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),s2=((s.toString()=='')?s:('%22'+enc(s)+'%22')),key=enc('#{@config[:api_key]}'),f='http://#{@config[:hostname]}/api/add',l=d.location,p='?visual=1&api_key='+key+'&url='+enc(l.href),u=f+p;try{if(!/^(.*\.)?tumblrzzz[^.]*$/.test(l.host))throw(0);tstbklt();}catch(z){a%20=function(){if(!w.open(u))l.href=u;};if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else%20a();}void(0)" } Shorten with #{@config[:hostname]}
-
-  %h1 How about shortening a URL?
-
-  .the_form
-    %form{ :action => '/api/add', :method => 'post' }
-      %input{ :type => "hidden", :name => "visual", :value => "1" }
-      %p
-        %input.big_url{ :type => 'text', :placeholder => "Paste your long URL here...", :name => 'url', :id => 'url', :size => 40, :autocomplete => "off", :spellcheck => 'false' }
-        %span{ :style => "font-size: 1.8em;" }= '>' 
-        %input.big_url{ :type => 'text', :placeholder => "Optional short code", :name => 'short', :id => 'short', :size => 20, :autocomplete => "off", :spellcheck => 'false' }
-      %p
-        %input.big_url{ :type => 'submit', :name => 'submit', :id => 'submit', :value => "Make it short!" }
-
-  - if @highlight
-    %h2 Your short URL
-
-    %table
-      %tr
-        %td.label Short URL
-        %td.label Full URL
-        %td.label Clicks
-        %td.label Shortened at
-        %td.label  
-      %tr.highlighted
-        %td.value
-          %input{ :type => "text", :value => short_url(@highlight), :class => 'short_url', :size => 21 }
-        %td.value.fill <a href="#{@highlight.url}">#{truncate @highlight.url, 130}</a>
-        %td.value.center= @highlight.clicks
-        %td.value= @highlight.created_at.strftime("%Y-%m-%d %H:%M")
-        %td.value
-          %a{ :href => "http://twitter.com/home?status=#{tweet(short_url(@highlight))}" }
-            %img.twitter{ :src => "/images/twitter.png", :width => "16", :height => "16" }
-
-  %h2 Recently shortened
-  
-  %table
-    %tr
-      %td.label(nowrap='nowrap') Short URL <a href="/?s=code&d=asc">▲</a> <a href="/?s=code&d=desc">▼</a>
-      %td.label(nowrap='nowrap') Full URL <a href="/?s=url&d=asc">▲</a> <a href="/?s=url&d=desc">▼</a>
-      %td.label(nowrap='nowrap') Clicks <a href="/?s=clicks&d=asc">▲</a> <a href="/?s=clicks&d=desc">▼</a>
-      %td.label(nowrap='nowrap') Shortened At <a href="/?s=created_at&d=asc">▲</a> <a href="/?s=created_at&d=desc">▼</a>
-      %td.label &nbsp;
-    - @urls.each do |url|
-      %tr{ :class => is_highlighted?(url) ? 'highlighted' : '' }
-        %td.value
-          %input{ :type => "text", :value => short_url(url), :class => 'short_url', :size => 31 }
-        %td.value.fill <a href="#{url.url}">#{truncate url.url, 130}</a>
-        %td.value.center= url.clicks
-        %td.value= url.created_at.strftime("%Y-%m-%d %H:%M")
-        %td.value
-          %a{ :href => "http://twitter.com/home?status=#{tweet(short_url(url))}" }
-            %img.twitter{ :src => "/images/twitter.png", :width => "16", :height => "16" }
-
-  :javascript
-    $(document).ready(function() {
-      $('input.short_url').each(function(index) {
-        $(this).mouseup(function() { $(this).select(); });
-      });  
-
-      if (window.location.search == "") {
-        var pathname = window.location.pathname + '?s=created_at&d=desc';
-      } else {
-        var pathname = window.location.pathname + window.location.search;
-      }
-
-      $('#main table tr td.label a').each(function(index) {
-        if ($(this).attr('href') == pathname) {
-          $(this).addClass('highlight');
-        }
-      });
-    });
-- else
-  %h1 Please enter your API key
-  
-  %p
-    Please enter your API key below to make sure only you can shorten URLs here.
-  
-  %form{ :action => '/api/set', :method => 'post' }
-    %p
-      %label{ :for => 'api_key' } API Key
-      %input{ :type => 'password', :name => 'api_key', :id => 'api_key' }
-    %p
-      %input{ :type => 'submit', :name => 'submit', :id => 'submit', :value => "Let me in" }
+%h3 Nothing to see here!

data/views/redirect.haml

@@ -1,6 +1,12 @@
 <a id="applink1" href="#{@url.url}">Opening the awesome event now!</a>
 
+
+
 :javascript
+  var ref = document.referrer; 
+  if(ref && ref.toLowerCase().indexOf("twitter.com")!==-1){
+    window.location.href="/";
+  }
   var appstorefail = "itms://itunes.apple.com/us/app/tminus-make-share-countdown/id507726329?mt=8";  
   function applink(fail){
       return function(){

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tmin
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - drobs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-15 00:00:00 -05:00
+date: 2012-03-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -228,6 +228,7 @@ files:
 - README.rdoc
 - Rakefile
 - config.ru.example
+- firefly.sqlite3
 - lib/tmin.rb
 - lib/tmin/base62.rb
 - lib/tmin/code_factory.rb
@@ -236,6 +237,7 @@ files:
 - lib/tmin/url.rb
 - lib/tmin/version.rb
 - public/favicon.ico
+- public/images/ec_background.gif
 - public/images/twitter.png
 - public/jquery-1.4.2.min.js
 - public/reset.css
@@ -261,7 +263,11 @@ files:
 - tmin-0.0.6.gem
 - tmin-0.0.7.gem
 - tmin-0.0.8.gem
+- tmin-0.0.9.gem
+- tmin-0.1.0.gem
 - tmin.gemspec
+- views/admin.haml
+- views/ec.haml
 - views/error.haml
 - views/index.haml
 - views/info.haml