meme_captain 0.2.0 → 0.3.0

data/ChangeLog

@@ -1,3 +1,7 @@
+0.3.0   2013-06-25
+
+	Move Sinatra web application to meme_captain_web_v1 repo.
+
 0.2.0	2013-06-10
 
 	Blur stroke.

data/README.md

@@ -45,48 +45,3 @@ Text box sizes and positions can be specified as pixels (the origin is the top
 left corner of the image) or as floats which are percentages of the image
 width and height. The x and y coordinates of a text box are the coordinates
 of its top left corner.
-
-Also includes a Sinatra app that exposes the API over HTTP which is currently
-running http://memecaptain.com/
-
-You can use the memecaptain.com API if you prefer it to using the gem.
-
-Simplest API:
-
-```
-http://memecaptain.com/i?u=<url encoded source image url>&t1=<url encoded top text>&t2=<url encoded bottom text>
-```
-
-Example:
-
-```
-http://memecaptain.com/i?u=http%3A%2F%2Fmemecaptain.com%2Fyao_ming.jpg&t1=sure+i%27ll+test&t2=the+api
-```
-
-![Sure I'll test the API](http://memecaptain.com/i?u=http%3A%2F%2Fmemecaptain.com%2Fyao_ming.jpg&t1=sure+i%27ll+test&t2=the+api)
-
-If you want better error messages, use this which will return JSON:
-
-```
-http://memecaptain.com/g?u=<url encoded source image url>&t1=<url encoded top text>&t2=<url encoded bottom text>
-```
-
-Example:
-
-```
-http://memecaptain.com/g?u=http%3A%2F%2Fmemecaptain.com%2Fyao_ming.jpg&t1=sure+i%27ll+test&t2=the+api
-```
-
-```json
-{
-  imageUrl: "http://memecaptain.com/c7757f.jpg",
-  templateUrl: "http://memecaptain.com/?u=c7757f.jpg"
-}
-```
-
-Optional parameters t1x, t1y, t1w, t1h, t2x, t2y, t2w, t2h can be added to
-position and size text (see example above).
-
-If you want to host a customized version of the memecaptain.com web interface
-on your own web server but use the memecaptain.com backend see
-[lightweight front end](https://github.com/mmb/meme_captain/blob/master/doc/lightweight_front_end.md).

data/lib/meme_captain.rb

@@ -4,11 +4,5 @@ require 'meme_captain/draw'
 require 'meme_captain/image_list'
 require 'meme_captain/meme'
 require 'meme_captain/memebg'
-require 'meme_captain/meme_data'
-require 'meme_captain/norm_params'
-require 'meme_captain/pretty_format'
-require 'meme_captain/server'
-require 'meme_captain/source_fetch_fail'
 require 'meme_captain/text_pos'
-require 'meme_captain/upload'
 require 'meme_captain/version'

data/lib/meme_captain/caption.rb

@@ -1,8 +1,10 @@
+# encoding: UTF-8
+
 module MemeCaptain
 
   class Caption < String
 
-    def initialize(s='')
+    def initialize(s = '')
       super s.to_s
     end
 
@@ -27,9 +29,9 @@ module MemeCaptain
         if lines.empty?
           lines << word
         else
-          if (lines[-1].size + 1 + word.size) <= chars_per_line or
-            lines.size >= num_lines
-            lines[-1] << ' '  unless lines[-1].empty?
+          if (lines[-1].size + 1 + word.size) <= chars_per_line ||
+              lines.size >= num_lines
+            lines[-1] << ' ' unless lines[-1].empty?
             lines[-1] << word
           else
             lines << word

data/lib/meme_captain/caption_choice.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module MemeCaptain
 
   # For comparing different caption line break and pointsize choices.
@@ -17,7 +19,7 @@ module MemeCaptain
     end
 
     def fits
-      metrics.width <= bound_width and metrics.height <= bound_height
+      metrics.width <= bound_width && metrics.height <= bound_height
     end
 
     def fits_i

data/lib/meme_captain/image_list.rb

@@ -1,6 +1 @@
-require 'meme_captain/image_list/cache'
-require 'meme_captain/image_list/fetch'
-require 'meme_captain/image_list/fetch_error'
 require 'meme_captain/image_list/watermark'
-
-require 'meme_captain/image_list/source_image'

data/lib/meme_captain/text_pos.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'RMagick'
 
 module MemeCaptain
@@ -13,7 +15,7 @@ module MemeCaptain
     #
     # x, y, width and height can be in pixels or a float that represents a
     # percentage of the width and height of the image the text is put onto.
-    def initialize(text, x, y, width, height, options={})
+    def initialize(text, x, y, width, height, options = {})
       @text = text
       @x = x
       @y = y
@@ -24,11 +26,11 @@ module MemeCaptain
       @min_pointsize = options.delete(:min_pointsize) || 12
 
       @draw_options = {
-        :fill         => 'white',
-        :font         => 'Impact',
-        :gravity      => Magick::CenterGravity,
-        :stroke       => 'black',
-        :stroke_width => 8,
+          fill: 'white',
+          font: 'Impact',
+          gravity: Magick::CenterGravity,
+          stroke: 'black',
+          stroke_width: 8,
       }.merge(options)
     end
 

data/lib/meme_captain/version.rb

@@ -1,3 +1,3 @@
 module MemeCaptain
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/meme_captain.gemspec

@@ -13,25 +13,12 @@ Gem::Specification.new do |s|
   s.authors = ['Matthew M. Boedicker']
   s.email = %w{matthewm@boedicker.org}
 
-  %w{
-    bson_ext
-    curb
-    json
-    mime-types
-    mongo
-    mongo_mapper
-    rack
-    rack-contrib
-    rack-rewrite
-    rmagick
-    sinatra
-    }.each { |g| s.add_dependency g }
+  s.add_dependency 'mime-types'
+  s.add_dependency 'rmagick'
 
-  %w{
-    rake
-    rspec
-    webmock
-    }.each { |g| s.add_development_dependency g }
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'webmock'
 
   s.files = `git ls-files`.split("\n")
   s.executables = %w{memecaptain}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meme_captain
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,56 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: curb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -75,86 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongo_mapper
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack-contrib
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack-rewrite
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
@@ -171,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -251,60 +107,25 @@ files:
 - README.md
 - Rakefile
 - bin/memecaptain
-- config.ru
-- doc/lightweight_front_end.md
-- doc/setup.md
 - lib/meme_captain.rb
 - lib/meme_captain/caption.rb
 - lib/meme_captain/caption_choice.rb
 - lib/meme_captain/draw.rb
 - lib/meme_captain/image_list.rb
-- lib/meme_captain/image_list/cache.rb
-- lib/meme_captain/image_list/fetch.rb
-- lib/meme_captain/image_list/fetch_error.rb
-- lib/meme_captain/image_list/source_image.rb
 - lib/meme_captain/image_list/watermark.rb
 - lib/meme_captain/meme.rb
-- lib/meme_captain/meme_data.rb
 - lib/meme_captain/memebg.rb
-- lib/meme_captain/norm_params.rb
-- lib/meme_captain/pretty_format.rb
-- lib/meme_captain/server.rb
-- lib/meme_captain/source_fetch_fail.rb
 - lib/meme_captain/text_pos.rb
-- lib/meme_captain/upload.rb
 - lib/meme_captain/version.rb
 - meme_captain.gemspec
-- public/css/screen.css
-- public/favicon.ico
-- public/js/fabric.min.js
-- public/js/jquery-1.7.2.min.js
-- public/js/meme_captain.js
-- public/source_images.json
-- public/thumbs.jpg
-- public/thumbs_1330486916.jpg
-- public/thumbs_1333591668.jpg
-- public/thumbs_1334189407.jpg
-- public/thumbs_1334973608.jpg
-- public/thumbs_1336623277.jpg
-- public/thumbs_1336624196.jpg
-- public/thumbs_1339811279.jpg
-- public/tmp/.gitignore
-- script/thumb_sprites.rb
 - spec/assets/me_gusta.png
 - spec/assets/otter.gif
 - spec/assets/town_crier.jpg
 - spec/caption_choice_spec.rb
 - spec/caption_spec.rb
-- spec/image_list/fetch_spec.rb
 - spec/meme_captain_spec.rb
 - spec/memebg_spec.rb
-- spec/norm_params_spec.rb
-- spec/pretty_format_spec.rb
 - spec/text_pos_spec.rb
-- views/404.erb
-- views/index.erb
-- watermark.png
 homepage: https://github.com/mmb/meme_captain
 licenses: []
 post_install_message: 

data/config.ru

@@ -1,50 +0,0 @@
-$:.unshift(File.join(File.dirname(__FILE__), 'lib'))
-
-require 'mongo'
-require 'mongo_mapper'
-require 'rack'
-require 'rack/contrib/jsonp'
-require 'rack/rewrite'
-
-require 'meme_captain'
-
-use Rack::ConditionalGet
-use Rack::Sendfile
-use Rack::JSONP
-
-use Rack::Static, :urls => %w{/tmp}, :root => 'public'
-
-MongoMapper.connection = Mongo::Connection.new
-MongoMapper.database = 'memecaptain'
-
-MemeCaptain::MemeData.ensure_index :meme_id
-
-MemeCaptain::MemeData.ensure_index [
-  [:source_url, 1],
-  [:texts, 1],
-]
-
-MemeCaptain::Upload.ensure_index :upload_id
-
-MemeCaptain::SourceFetchFail.ensure_index :url
-
-use Rack::Rewrite do
-  rewrite %r{/([gi])\?(.+)}, lambda { |match, rack_env|
-    result = match[0]
-
-    if match[2].index('tt=') or match[2].index('tb=')
-      q = Rack::Utils.parse_query(match[2])
-      if q.key?('tt') or q.key?('tb')
-        q['t1'] = q.delete('tt')  if q.key?('tt')
-        q['t2'] = q.delete('tb')  if q.key?('tb')
-        new_q = q.map { |k,v|
-          "#{Rack::Utils.escape(k)}=#{Rack::Utils.escape(v)}" }.join('&')
-        result = "#{match[1]}?#{new_q}"
-      end
-    end
-
-    result
-  }
-end
-
-run MemeCaptain::Server