tmin 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    tmin (0.0.1)
+    tmin (0.0.3)
       dm-aggregates (~> 1.2.0)
       dm-core (~> 1.2.0)
       dm-migrations (~> 1.2.0)
       dm-mysql-adapter (~> 1.2.0)
       dm-transactions (~> 1.2.0)
+      escape_utils (~> 0.2.3)
       haml (~> 3.0.18)
       sinatra (~> 1.2.0)
 
@@ -39,6 +40,7 @@ GEM
       data_objects (= 0.10.8)
     do_sqlite3 (0.10.8)
       data_objects (= 0.10.8)
+    escape_utils (0.2.4)
     haml (3.0.25)
     rack (1.4.1)
     rack-test (0.5.7)
@@ -67,6 +69,7 @@ DEPENDENCIES
   dm-mysql-adapter (~> 1.2.0)
   dm-sqlite-adapter (~> 1.2.0)
   dm-transactions (~> 1.2.0)
+  escape_utils (~> 0.2.3)
   haml (~> 3.0.18)
   rack-test (~> 0.5.4)
   rspec (~> 2.5.0)

data/config.ru.example

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'tminus'
+require 'tmin'
 disable :run
 
 app = Firefly::Server.new do

data/lib/tmin/server.rb

@@ -158,7 +158,7 @@ module Firefly
       @authenticated = has_valid_api_cookie?
       @config        = config
       @highlight     = nil
-      @title         = "Firefly at http://#{@config[:hostname]}"
+      @title         = "tminus.it at http://#{@config[:hostname]}"
 
       set :session_secret, @config[:session_secret]
     end
@@ -273,8 +273,8 @@ module Firefly
         status 404
         "Sorry, that code is unknown."
       else
-        @url.register_click!
-        redirect @url.url, 301
+        @short_url = "http://#{config[:hostname]}/#{@url.code}"
+	haml :redirect
       end
     end
 

data/lib/tmin/url.rb

@@ -3,8 +3,6 @@ module Firefly
   class Url
     include DataMapper::Resource
   
-   VALID_URL_REGEX = / /ix
-    VALID_CODE_REGEX = / /i    
 
     property :id,           Serial
     property :url,          String,     :index => true, :length => 355
@@ -19,7 +17,7 @@ module Firefly
 
     # Shorten a long_url and return a new FireFly::Url
     def self.shorten(long_url, code = nil)
-      code = nil if code ! /\S/
+      code = nil if code !~ /\S/
 
   
 

data/lib/tmin/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tmin
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - drobs
@@ -253,6 +253,9 @@ files:
 - spec/spec_helper.rb
 - test/helper.rb
 - test/test_tmin.rb
+- tmin-0.0.1.gem
+- tmin-0.0.2.gem
+- tmin-0.0.3.gem
 - tmin.gemspec
 - views/error.haml
 - views/index.haml