murlsh 1.5.0 → 1.6.0

data/Gemfile

@@ -1,41 +1,3 @@
 source :rubygems
 
-# This does not use 'gemspec' because it creates a Gemfile.lock that treats
-# murlsh as a "gem" and will not work on Heroku, which sees murlsh as an
-# "app".
-
-# Dependencies duplicated in gemspec and here until a better solution is
-# found.
-
-%w{
-  activerecord >= 2.3.4
-  aws-s3 ~> 0.6
-  bcrypt-ruby >= 2.1.2
-  builder > 0
-  htmlentities >= 4.2.0
-  json >= 1.2.3
-  nokogiri ~> 1.0
-  plumnailer >= 0.1.3
-  postrank-uri ~> 1.0
-  public_suffix_service ~> 0.0
-  push-notify >= 0.1.0
-  rack >= 1.0.0
-  rack-cache >= 0.5.2
-  rack-rewrite >= 1.0.2
-  rack-throttle >= 0.3.0
-  rmagick >= 1.15.14
-  rmail ~> 1.0
-  sqlite3 ~> 1.3
-  tinyatom >= 0.3.4
-  treetop ~> 1.4
-  twitter >= 0.9.12
-  }.each_slice(3) { |g,o,v| gem g, "#{o} #{v}" }
-
-group :development do
-  %w{
-    fakeweb ~> 1.3
-    flog >= 2.5.0
-    rack-test ~> 0.5
-    rspec ~> 2.0
-    }.each_slice(3) { |g,o,v| gem g, "#{o} #{v}" }
-end
+gemspec

data/Gemfile.app

@@ -0,0 +1,8 @@
+# This Gemfile is for 'instances' of murlsh. It is not the Gemfile for the
+# gem, but for installations of murlsh created with the 'murlsh' command.
+
+require 'murlsh/version'
+
+source :rubygems
+
+gem 'murlsh', "= #{Murlsh::VERSION}"

data/README.textile

@@ -26,30 +26,29 @@ DESTINATION_DIRECTORY is the web directory to install the murlsh site to.
 
 <pre>
 <code>
-gem sources -a http://gemcutter.org/
 gem install murlsh
 murlsh DESTINATION_DIRECTORY
 cd DESTINATION_DIRECTORY
-edit config.yaml
+rake config[root_url,<site root url>]
+change anything else you want in config.yaml
 rake init
 </code>
 </pre>
 
 h2. Heroku
 
+S3 is used for thumbnail storage because Heroku cannot write local files.
+
 <pre>
 <code>
 gem install heroku
 heroku keys:add
-</code>
-</pre>
 
-Create a fork on github and clone it or clone public url:
-
-<pre>
-<code>
-git clone git://github.com/mmb/murlsh.git
-cd murlsh
+gem install murlsh
+mkdir murlsh_deploy <or any other name>
+cd murlsh_deploy
+murlsh .
+git init
 bundle install
 heroku create <choose a name>
 rake heroku:config
@@ -58,15 +57,7 @@ rake config[root_url,<your app's Heroku url>]
 rake config[s3_bucket,<your S3 bucket name>]
 rake config[s3_id,<your S3 id>]
 rake config[s3_secret,<your S3 secret>]
-</code>
-</pre>
-
-S3 is used for thumbnail storage because Heroku cannot write local files.
-
-Other config in config.yaml is optional.
-
-<pre>
-<code>
+change anything else you want in config.yaml
 rake user:add
 git add .
 git commit

data/bin/murlsh

@@ -16,12 +16,3 @@ if ARGV.empty?; usage; exit 1; end
 dest_dir = ARGV[0]
 
 Murlsh.install(dest_dir)
-
-cd_command = File.expand_path(dest_dir) == Dir.pwd ? '' : "cd #{dest_dir}\n"
-
-puts <<eos
-Next steps:
-
-#{cd_command}edit config.yaml
-rake init
-eos

data/lib/murlsh/install.rb

@@ -21,8 +21,13 @@ module Murlsh
         db/
         plugins/
         public/
+        Gemfile.app
       }.map { |x| File.join(MurlshRoot, x) }, dest_dir, :verbose => true)
 
+    File.rename(
+      File.join(dest_dir, 'Gemfile.app'),
+      File.join(dest_dir, 'Gemfile'))
+
     FileUtils.mkdir_p(File.join(dest_dir, 'tmp'), :verbose => true)
   end
 

data/lib/murlsh/version.rb

@@ -0,0 +1,3 @@
+module Murlsh
+  VERSION = '1.6.0'
+end

data/lib/murlsh.rb

@@ -39,6 +39,7 @@ require 'murlsh/url_body'
 require 'murlsh/url'
 require 'murlsh/url_result_set'
 require 'murlsh/url_server'
+require 'murlsh/version'
 require 'murlsh/write_ordered_hash'
 require 'murlsh/yaml_ordered_hash'
 

data/murlsh.gemspec

@@ -1,8 +1,12 @@
 # -*- encoding: utf-8 -*-
 
+$:.unshift(File.join(File.dirname(__FILE__), 'lib'))
+
+require 'murlsh/version'
+
 Gem::Specification.new do |s|
   s.name = 'murlsh'
-  s.version = '1.5.0'
+  s.version = Murlsh::VERSION
   s.summary = 'Host your bookmarks or maintain a link blog'
   s.description = s.summary
   s.homepage = 'https://github.com/mmb/murlsh'
@@ -12,35 +16,35 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.3.6'
 
   %w{
-    activerecord >= 2.3.4
-    aws-s3 ~> 0.6
-    bcrypt-ruby >= 2.1.2
-    builder > 0
-    htmlentities >= 4.2.0
-    json >= 1.2.3
-    nokogiri ~> 1.0
-    plumnailer >= 0.1.3
-    postrank-uri ~> 1.0
-    public_suffix_service ~> 0.0
-    push-notify >= 0.1.0
-    rack >= 1.0.0
-    rack-cache >= 0.5.2
-    rack-rewrite >= 1.0.2
-    rack-throttle >= 0.3.0
-    rmagick >= 1.15.14
-    rmail ~> 1.0
-    sqlite3 ~> 1.3
-    tinyatom >= 0.3.4
-    treetop ~> 1.4
-    twitter >= 0.9.12
-    }.each_slice(3) { |g,o,v| s.add_dependency(g, "#{o} #{v}") }
+    activerecord
+    aws-s3
+    bcrypt-ruby
+    builder
+    htmlentities
+    json
+    nokogiri
+    plumnailer
+    postrank-uri
+    public_suffix_service
+    push-notify
+    rack
+    rack-cache
+    rack-rewrite
+    rack-throttle
+    rmagick
+    rmail
+    sqlite3
+    tinyatom
+    treetop
+    twitter
+    }.each { |g| s.add_dependency g }
 
   %w{
-    fakeweb ~> 1.3
-    flog >= 2.5.0
-    rack-test ~> 0.5
-    rspec ~> 2.0
-    }.each_slice(3) { |g,o,v| s.add_development_dependency(g, "#{o} #{v}") }
+    fakeweb
+    flog
+    rack-test
+    rspec
+    }.each { |g| s.add_development_dependency g }
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files spec/*`.split("\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murlsh
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 15
   prerelease: 
   segments: 
   - 1
-  - 5
+  - 6
   - 0
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 -05:00
+date: 2011-02-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 3
         segments: 
-        - 2
-        - 3
-        - 4
-        version: 2.3.4
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,13 +38,12 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 0
-        - 6
-        version: "0.6"
+        version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,12 +54,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -71,7 +66,7 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
@@ -87,12 +82,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 3
         segments: 
-        - 4
-        - 2
         - 0
-        version: 4.2.0
+        version: "0"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -103,12 +96,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 3
         segments: 
-        - 1
-        - 2
-        - 3
-        version: 1.2.3
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -117,13 +108,12 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 1
         - 0
-        version: "1.0"
+        version: "0"
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -134,12 +124,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 3
         segments: 
         - 0
-        - 1
-        - 3
-        version: 0.1.3
+        version: "0"
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -148,13 +136,12 @@ dependencies:
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 1
         - 0
-        version: "1.0"
+        version: "0"
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -163,13 +150,12 @@ dependencies:
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 3
         segments: 
         - 0
-        - 0
-        version: "0.0"
+        version: "0"
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
@@ -180,12 +166,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
         - 0
-        - 1
-        - 0
-        version: 0.1.0
+        version: "0"
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
@@ -196,12 +180,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: "0"
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -212,12 +194,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
         - 0
-        - 5
-        - 2
-        version: 0.5.2
+        version: "0"
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -228,12 +208,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 3
         segments: 
-        - 1
         - 0
-        - 2
-        version: 1.0.2
+        version: "0"
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
@@ -244,12 +222,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 3
         segments: 
         - 0
-        - 3
-        - 0
-        version: 0.3.0
+        version: "0"
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -260,12 +236,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 3
         segments: 
-        - 1
-        - 15
-        - 14
-        version: 1.15.14
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
@@ -274,13 +248,12 @@ dependencies:
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 1
         - 0
-        version: "1.0"
+        version: "0"
   type: :runtime
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
@@ -289,13 +262,12 @@ dependencies:
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 3
         segments: 
-        - 1
-        - 3
-        version: "1.3"
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
@@ -306,12 +278,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
         - 0
-        - 3
-        - 4
-        version: 0.3.4
+        version: "0"
   type: :runtime
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
@@ -320,13 +290,12 @@ dependencies:
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 1
-        - 4
-        version: "1.4"
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id020
 - !ruby/object:Gem::Dependency 
@@ -337,12 +306,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 3
         segments: 
         - 0
-        - 9
-        - 12
-        version: 0.9.12
+        version: "0"
   type: :runtime
   version_requirements: *id021
 - !ruby/object:Gem::Dependency 
@@ -351,13 +318,12 @@ dependencies:
   requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 3
         segments: 
-        - 1
-        - 3
-        version: "1.3"
+        - 0
+        version: "0"
   type: :development
   version_requirements: *id022
 - !ruby/object:Gem::Dependency 
@@ -368,12 +334,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 2
-        - 5
         - 0
-        version: 2.5.0
+        version: "0"
   type: :development
   version_requirements: *id023
 - !ruby/object:Gem::Dependency 
@@ -382,13 +346,12 @@ dependencies:
   requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 3
         segments: 
         - 0
-        - 5
-        version: "0.5"
+        version: "0"
   type: :development
   version_requirements: *id024
 - !ruby/object:Gem::Dependency 
@@ -397,13 +360,12 @@ dependencies:
   requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 2
         - 0
-        version: "2.0"
+        version: "0"
   type: :development
   version_requirements: *id025
 description: Host your bookmarks or maintain a link blog
@@ -420,6 +382,7 @@ files:
 - .htaccess
 - COPYING
 - Gemfile
+- Gemfile.app
 - README.textile
 - Rakefile
 - bin/murlsh
@@ -469,11 +432,11 @@ files:
 - lib/murlsh/url_body.rb
 - lib/murlsh/url_result_set.rb
 - lib/murlsh/url_server.rb
+- lib/murlsh/version.rb
 - lib/murlsh/write_ordered_hash.rb
 - lib/murlsh/yaml_ordered_hash.rb
 - murlsh.gemspec
 - plugins/add_post_60_notify_hubs.rb
-- plugins/add_pre_30_unajax_twitter.rb
 - plugins/add_pre_35_url_clean.rb
 - plugins/add_pre_40_convert_mobile.rb
 - plugins/add_pre_40_thumbnail_shortcuts.rb

data/plugins/add_pre_30_unajax_twitter.rb

@@ -1,19 +0,0 @@
-require 'murlsh'
-
-module Murlsh
-
-  # Convert Ajax friendly Twitter urls (with #!) into usable urls.
-  class AddPre30UnajaxTwitter < Plugin
-
-    @hook = 'add_pre'
-
-    TwitterAjaxRe = %r{^(https?://twitter\.com/)#!/}i
-
-    def self.run(url, config)
-      url.url.sub! TwitterAjaxRe, '\1'
-      url.via.sub!(TwitterAjaxRe, '\1')  if url.via
-    end
-
-  end
-
-end