RubyGems - shawty-server - Versions diffs - 1.1.2 → 1.1.3 - Mend

shawty-server 1.1.2 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

data/.gems CHANGED Viewed

	@@ -1 +1,2 @@
1 1	alphadecimal --version '>= 1.0.1'
2	+ inline-style

data/Gemfile ADDED Viewed

@@ -0,0 +1,13 @@
+source :rubygems
+gem "sinatra", '1.0.0'
+gem "activerecord"
+gem "activesupport"
+gem "alphadecimal"
+gem "pg"
+group :development, :test do
+  gem 'rack-test'
+  gem "shoulda", "2.11.0"
+  gem "jeweler"
+end

data/Gemfile.lock ADDED Viewed

@@ -0,0 +1,50 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
+      builder (~> 3.0.0)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.6)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    alphadecimal (1.1.2)
+    arel (3.0.2)
+    builder (3.0.0)
+    git (1.2.5)
+    i18n (0.6.0)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.3)
+    multi_json (1.3.6)
+    pg (0.13.2)
+    rack (1.4.1)
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    shoulda (2.11.0)
+    sinatra (1.0)
+      rack (>= 1.0)
+    tzinfo (0.3.33)
+PLATFORMS
+  ruby
+DEPENDENCIES
+  activerecord
+  activesupport
+  alphadecimal
+  jeweler
+  pg
+  rack-test
+  shoulda (= 2.11.0)
+  sinatra (= 1.0.0)

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 1.1.1
1	+ 1.1.3

data/config.ru CHANGED Viewed

@@ -1,4 +1,4 @@
-require 'shawty'
+require File.expand_path('../lib/shawty', __FILE__)
 ## There is no need to set directories here anymore;
 ## Just run the application

data/lib/shawty/helpers.rb ADDED Viewed

@@ -0,0 +1,44 @@
+class Shawty < Sinatra::Base
+  module Helpers
+    def select_column sql
+      connection.select_rows(sql).flatten.first
+    end
+    def execute sql
+      connection.execute sql
+    end
+    def quote string
+      connection.quote string
+    end
+    def table_name
+      connection.quote_table_name 'shawty'
+    end
+    def connection
+      ActiveRecord::Base.connection
+    end
+    def initialize_database
+      table = execute %Q{select * from pg_tables where tablename = #{quote 'shawty'}}
+      return if table.any?
+      execute %Q{
+        CREATE TABLE #{table_name} (
+          id SERIAL PRIMARY KEY,
+          url varchar(2048) UNIQUE
+        )
+      }
+    end
+    def database_config
+      YAML.load(File.read('config/database.yml'))
+    end
+    def init(environment)
+      ActiveRecord::Base.establish_connection database_config[environment]
+      initialize_database
+    end
+  end
+end

data/lib/shawty.rb ADDED Viewed

@@ -0,0 +1,60 @@
+## Resources
+require 'sinatra/base'
+require 'active_record'
+require 'alphadecimal'
+require File.expand_path('../shawty/helpers', __FILE__)
+class Shawty < Sinatra::Base
+  include Helpers
+  extend Helpers
+  get '/' do
+    %Q{
+      <body style='line-height: 1.8em; font-family: Archer, Museo, Helvetica, Georgia; font-size 25px; text-align: center; padding-top: 20%;'>
+        Post to '/' to save a url and receive a plaintext short url in response. Example:
+        <pre style='font-family: Iconsolata, monospace;background-color:#EEE'>curl -X POST http://#{request.host}/http://some.url/at.someplace</pre>
+        <br />
+        <form action=/ method=POST onsubmit='if(\"\"==this.url.value)return false;else{this.action=\"/\"+this.url.value}'>
+          <input type=text name='url' />
+          <input type=submit value='Get Shawty' />
+        </form>
+        <small>Also, try <a href='http://github.com/JackDanger/shawty-client'>the official Ruby client</a></small>
+      </body
+  }
+  end
+  get '/:id' do
+    url = select_column %Q{
+                    SELECT url FROM #{table_name}
+                    WHERE id = #{quote params[:id].alphadecimal.to_i}
+                  }
+    pass unless url
+    redirect url, 301
+  end
+  post '*' do
+    url = request.env['REQUEST_URI'] || Array(params[:splat]).first
+    url = url[1, url.size] if url =~ /^\//
+    pass if url.nil? || '' == url
+    quoted = quote url
+    id = select_column %Q{ SELECT id FROM #{table_name} WHERE url = #{quoted} }
+    id ||= select_column %Q{
+            INSERT INTO #{table_name} (url, id) VALUES (#{quoted}, nextval('shawty_id_seq'))
+            RETURNING id
+          }
+    "http://#{request.host}/#{id.to_i.alphadecimal}"
+  end
+  ## Environments
+  configure :development  do init 'development' end
+  configure :test         do init 'test'        end
+  configure :production   do init 'production'  end
+end

data/shawty-server.gemspec CHANGED Viewed

@@ -4,51 +4,75 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
-  s.name = %q{shawty-server}
-  s.version = "1.1.2"
+  s.name = "shawty-server"
+  s.version = "1.1.3"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Danger Canty"]
-  s.date = %q{2011-05-04}
-  s.description = %q{Run your own url shortener add your own web address for free on Heroku.com}
-  s.email = %q{gitcommit@6brand.com}
+  s.date = "2012-07-11"
+  s.description = "Run your own url shortener add your own web address for free on Heroku.com"
+  s.email = "gitcommit@6brand.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.markdown"
   ]
   s.files = [
     ".gems",
+    "Gemfile",
+    "Gemfile.lock",
     "LICENSE",
     "README.markdown",
     "Rakefile",
     "VERSION",
     "config.ru",
     "config/database.yml",
+    "lib/shawty.rb",
+    "lib/shawty/helpers.rb",
     "shawty-server.gemspec",
-    "shawty.rb",
     "test.rb"
   ]
-  s.homepage = %q{http://github.com/JackDanger/shawty-server}
+  s.homepage = "http://github.com/JackDanger/shawty-server"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
-  s.summary = %q{Ultra-lightweight url shortening server for Heroku.com}
+  s.rubygems_version = "1.8.17"
+  s.summary = "Ultra-lightweight url shortening server for Heroku.com"
   if s.respond_to? :specification_version then
     s.specification_version = 3
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, ["= 1.2.1"])
+      s.add_runtime_dependency(%q<sinatra>, ["= 1.0.0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<alphadecimal>, [">= 0"])
+      s.add_runtime_dependency(%q<pg>, [">= 0"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, ["= 2.11.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<alphadecimal>, [">= 1.0.1"])
       s.add_development_dependency(%q<active_record>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
     else
-      s.add_dependency(%q<rack>, ["= 1.2.1"])
+      s.add_dependency(%q<sinatra>, ["= 1.0.0"])
+      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<alphadecimal>, [">= 0"])
+      s.add_dependency(%q<pg>, [">= 0"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
+      s.add_dependency(%q<shoulda>, ["= 2.11.0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<alphadecimal>, [">= 1.0.1"])
       s.add_dependency(%q<active_record>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rack>, ["= 1.2.1"])
+    s.add_dependency(%q<sinatra>, ["= 1.0.0"])
+    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<alphadecimal>, [">= 0"])
+    s.add_dependency(%q<pg>, [">= 0"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
+    s.add_dependency(%q<shoulda>, ["= 2.11.0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<alphadecimal>, [">= 1.0.1"])
     s.add_dependency(%q<active_record>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])

data/test.rb CHANGED Viewed

@@ -5,17 +5,20 @@ require 'test/unit'
 require 'active_support'
 require 'shoulda'
 require 'rack/test'
-require 'shawty'
+require 'pp'
+require File.expand_path('../lib/shawty', __FILE__)
 class ShawtyTest < Test::Unit::TestCase
   include Rack::Test::Methods
+  include Shawty::Helpers
+  extend Shawty::Helpers
   def setup
     execute "DELETE FROM #{table_name}"
   end
   def app
-    Sinatra::Application
+    Shawty
   end
   context "on GET to /" do
@@ -88,4 +91,4 @@ class ShawtyTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: shawty-server
 version: !ruby/object:Gem::Version
-  hash: 23
+  hash: 21
   prerelease:
   segments:
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors:
 - Jack Danger Canty
@@ -15,28 +15,126 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-05-04 00:00:00 -07:00
-default_executable:
+date: 2012-07-11 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - "="
       - !ruby/object:Gem::Version
-        hash: 29
+        hash: 23
         segments:
         - 1
-        - 2
-        - 1
-        version: 1.2.1
-  requirement: *id001
+        - 0
+        - 0
+        version: 1.0.0
+  version_requirements: *id001
+  name: sinatra
+  type: :runtime
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &id002 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  version_requirements: *id002
+  name: activerecord
+  type: :runtime
   prerelease: false
-  name: rack
 - !ruby/object:Gem::Dependency
+  requirement: &id003 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  version_requirements: *id003
+  name: activesupport
+  type: :runtime
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &id004 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  version_requirements: *id004
+  name: alphadecimal
+  type: :runtime
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &id005 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  version_requirements: *id005
+  name: pg
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &id006 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  version_requirements: *id006
+  name: rack-test
+  type: :development
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &id007 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - "="
+      - !ruby/object:Gem::Version
+        hash: 35
+        segments:
+        - 2
+        - 11
+        - 0
+        version: 2.11.0
+  version_requirements: *id007
+  name: shoulda
+  type: :development
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &id008 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  version_requirements: *id008
+  name: jeweler
+  type: :development
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &id009 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
@@ -47,12 +145,12 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
-  requirement: *id002
-  prerelease: false
+  version_requirements: *id009
   name: alphadecimal
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
@@ -61,12 +159,12 @@ dependencies:
         segments:
         - 0
         version: "0"
-  requirement: *id003
-  prerelease: false
+  version_requirements: *id010
   name: active_record
-- !ruby/object:Gem::Dependency
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  requirement: &id011 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
@@ -75,9 +173,10 @@ dependencies:
         segments:
         - 0
         version: "0"
-  requirement: *id004
-  prerelease: false
+  version_requirements: *id011
   name: shoulda
+  type: :development
+  prerelease: false
 description: Run your own url shortener add your own web address for free on Heroku.com
 email: gitcommit@6brand.com
 executables: []
@@ -89,16 +188,18 @@ extra_rdoc_files:
 - README.markdown
 files:
 - .gems
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.markdown
 - Rakefile
 - VERSION
 - config.ru
 - config/database.yml
+- lib/shawty.rb
+- lib/shawty/helpers.rb
 - shawty-server.gemspec
-- shawty.rb
 - test.rb
-has_rdoc: true
 homepage: http://github.com/JackDanger/shawty-server
 licenses: []
@@ -128,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project:
-rubygems_version: 1.4.2
+rubygems_version: 1.8.17
 signing_key:
 specification_version: 3
 summary: Ultra-lightweight url shortening server for Heroku.com

data/shawty.rb DELETED Viewed

@@ -1,106 +0,0 @@
-## Resources
-require 'rubygems' # sorry @defunkt, this is easier
-gem 'sinatra', :version => '1.0'
-require 'sinatra'
-require 'active_record'
-gem 'alphadecimal'
-require 'alphadecimal'
-## Application
-get '/' do
-  %Q{
-    <body style='line-height: 1.8em; font-family: Archer, Museo, Helvetica, Georgia; font-size 25px; text-align: center; padding-top: 20%;'>
-      Post to '/' to save a url and receive a plaintext short url in response. Example:
-      <pre style='font-family: Iconsolata, monospace;background-color:#EEE'>curl -X POST http://#{request.host}/http://some.url/at.someplace</pre>
-      <br />
-      <form action=/ method=POST onsubmit='if(\"\"==this.url.value)return false;else{this.action=\"/\"+this.url.value}'>
-        <input type=text name='url' />
-        <input type=submit value='Get Shawty' />
-      </form>
-      <small>Also, try <a href='http://github.com/JackDanger/shawty-client'>the official Ruby client</a></small>
-    </body
-}
-end
-get '/:id' do
-  url = select_column %Q{
-                  SELECT url FROM #{table_name}
-                  WHERE id = #{quote params[:id].alphadecimal.to_i}
-                }
-  pass unless url
-  redirect url, 301
-end
-post '*' do
-  url = request.env['REQUEST_URI'] || Array(params[:splat]).first
-  url = url[1, url.size] if url =~ /^\//
-  pass if url.nil? || '' == url
-  quoted = quote url
-  id = select_column %Q{ SELECT id FROM #{table_name} WHERE url = #{quoted} }
-  id ||= select_column %Q{
-          INSERT INTO #{table_name} (url, id) VALUES (#{quoted}, nextval('shawty_id_seq'))
-          RETURNING id
-        }
-  "http://#{request.host}/#{id.to_i.alphadecimal}"
-end
-## Helpers
-def select_column sql
-  connection.select_rows(sql).flatten.first
-end
-def execute sql
-  connection.execute sql
-end
-def quote string
-  connection.quote string
-end
-def table_name
-  connection.quote_table_name 'shawty'
-end
-def connection
-  ActiveRecord::Base.connection
-end
-def initialize_database
-  table = execute %Q{select * from pg_tables where tablename = #{quote 'shawty'}}
-  return if table.any?
-  execute %Q{
-    CREATE TABLE #{table_name} (
-      id SERIAL PRIMARY KEY,
-      url varchar(255) UNIQUE
-    )
-  }
-end
-def database_config
-  YAML.load(File.read('config/database.yml'))
-end
-def init(environment)
-  ActiveRecord::Base.establish_connection database_config[environment]
-  initialize_database
-end
-## Environments
-configure :development  do init 'development' end
-configure :test         do init 'test'        end
-configure :production   do init 'production'  end