dailyshare 0.2.1 → 0.3.0

data/Gemfile

@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
-
-gemspec
+gemspec

data/lib/dailyshare.rb

@@ -20,17 +20,10 @@ Encoding.default_internal = Encoding::UTF_8
 require 'linguistics'
 Linguistics::use(:en)
 
-# load helpers
-require 'dailyshare/helpers/entry'
-require 'dailyshare/helpers/helpers'
-
-# load models
-require 'dailyshare/models/member'
-require 'dailyshare/models/photo'
-
-# load controllers
-require 'dailyshare/controllers/admin'
-require 'dailyshare/controllers/main'
+require 'dailyshare/helpers'
+require 'dailyshare/models'
+require 'dailyshare/models'
+require 'dailyshare/controllers'
 
 module DailyShare
   class App < Sinatra::Base

data/lib/dailyshare/controllers.rb

@@ -0,0 +1,111 @@
+module DailyShare
+
+  class App < Sinatra::Base
+
+
+    get '/' do
+      context = context_from_date(Date.today)
+      @title = "#{CONFIG['seo']['title']} - day #{context[:count]}"
+      slim :index, :locals => context
+    end
+
+    get '/:y/:m/:d' do
+      begin
+        date = date_from_params(params)
+        context = context_from_date(date)
+        @title = "#{CONFIG['seo']['title']} - day #{context[:count]}"
+      rescue
+        pass
+      end
+
+      if valid_date?(date)
+        slim :index, :locals => context
+      else
+        redirect request.referrer
+      end
+    end
+
+    get '/:name' do
+      if (member = Member.byName(params[:name])).nil?
+        redirect request.referrer
+      end
+
+      slim :member, :locals => { :member => member }
+    end
+
+    get '/:name/missing' do
+      if (member = Member.byName(params[:name])).nil?
+        redirect request.referrer
+      end
+      slim :member_missing, :locals => { :photos => member.missingPhotos }
+    end
+
+    get '/admin' do
+      protected!
+      redirect '/'
+    end
+
+    get '/logout' do
+      session.delete(:member_id)
+      session.delete(:member_name)
+      status 401
+      slim :logout
+    end
+
+    post '/upload' do
+      protected!
+      if params[:file]
+        save_photo(params, params[:file][:tempfile])
+      end
+      redirect request.referrer
+    end
+
+    post '/edit' do
+      protected!
+      puts params
+
+      photo = Photo[:id=>params[:photo_id]]
+      if photo
+        photo.update_fields(params, [:title, :description])
+      end
+
+      redirect request.referrer
+    end
+
+    ##
+    # Receive emailed photos via Postmark.
+    #
+    post '/receiver' do
+      # parse post data
+      data = JSON.parse(request.body.read)
+
+      # grab image data
+      image = data['Attachments'][0]['Content']
+
+      # check which member this is based on sender
+      member = Member[:email=>data['From']]
+
+      # was there a member with that email?
+      if !member.nil?
+
+        # get most recent photo
+        recent = member.mostRecentPhoto
+
+        # only continue if a photo doesn't exist for today
+        if !recent.nil? && recent.date_added+1 <= Date.today
+
+          # prep params for submission
+          params = {
+            :member_id => member.id,
+            :title => data['Subject'],
+            :description => data['TextBody'],
+            :date_added => recent.date_added+1
+          }
+          save_photo(params,StringIO.new(Base64.decode64(image)))
+        end
+      end
+    end
+
+  end
+
+end

data/lib/dailyshare/{helpers/helpers.rb → helpers.rb}

@@ -142,5 +142,56 @@ module DailyShare
       end
     end
 
+    def date_from_params(params)
+      if params[:y] && params[:m] && params[:d]
+        Date.parse("#{params[:y]}-#{params[:m]}-#{params[:d]}")
+      else
+        Date.today
+      end
+    end
+
+    def valid_date?(date)
+      (date.year > 2011 || date <= Date.today)
+    end
+
+    def context_from_date(date)
+      edition = (date.strftime('%Y').to_i)-(CONFIG['dailyshare']['start'].strftime('%Y').to_i)
+      {
+        :ymd => date.strftime('%Y-%m-%d'),
+        :date => date,
+        :year => (edition+1).en.numwords,
+        :count => (((date-CONFIG['dailyshare']['start']).to_i)-((edition)*365).to_i).en.numwords,
+        :members => Member.order(:id).all
+      }
+    end
+
+    def prev_entry(date)
+      (date-1).strftime('/%Y/%m/%d/')
+    end
+
+    def next_entry(date)
+      (date+1).strftime('/%Y/%m/%d/')
+    end
+
+    def save_photo(params, file)
+      begin
+        photo = Photo.new
+        photo.set_fields(params, [:title, :description, :date_added, :member_id])
+        puts photo.inspect
+        photo.save_original(file)
+        photo.generate_sizes
+        photo.save_to_s3
+      rescue
+        false
+      else
+        photo.save
+        send_email(
+          CONFIG['email']['to'],
+          "new submisson",
+          slim(:'emails/uploaded', {:locals=>{:photo=>photo},:layout=>false})
+        )
+      end
+    end
+
   end
 end

data/lib/dailyshare/models.rb

@@ -0,0 +1,122 @@
+require "stringio"
+
+module DailyShare
+  class Photo < Sequel::Model
+    many_to_one :member
+
+    def before_save
+      description.strip!
+    end
+
+    def file(size)
+      case size
+        when :original
+          "#{date_added}-#{member.name}.jpg"
+        when :thumb
+          "#{date_added}-#{member.name}-thumb.jpg"
+        when :big
+          "#{date_added}-#{member.name}-big.jpg"
+      end
+    end
+
+    def url(size)
+      "#{CONFIG['url']['cdn']}/photos/#{file(size)}"
+    end
+
+    def save_original(tmpfile)
+      image = File.join(CONFIG['photo_dir'],file(:original))
+      File.open(image,'wb') {|f| f.write(tmpfile.read) }
+      image
+    end
+
+    def generate_sizes
+      img = Magick::Image::read(File.join(CONFIG['photo_dir'],file(:original))).first
+      if img
+        img.resize_to_fit(240,240).write(File.join(CONFIG['photo_dir'],file(:thumb)))
+        img.resize_to_fit(960,680).write(File.join(CONFIG['photo_dir'],file(:big)))
+        img.destroy!
+        true
+      else
+        false
+      end
+    end
+
+    def sizes
+      [File.join(CONFIG['photo_dir'],file(:original)),
+       File.join(CONFIG['photo_dir'],file(:thumb)),
+       File.join(CONFIG['photo_dir'],file(:big))]
+    end
+
+    def save_to_s3
+      sizes.each do |file|
+        AWS::S3::S3Object.store(
+          "/photos/#{File.basename(file)}",
+          open(file),
+          AUTH['aws']['bucket'],
+          {
+            :cache_control => 'max-age=315360000',
+            :access => 'public_read'
+          }
+        )
+      end
+    end
+
+    def parse_exif
+      img = EXIFR::JPEG.new(file)
+
+      # store fstop/focal length for comparison
+      fstop = img.exif[:f_number].to_f
+      flen = img.exif[:focal_length].to_f
+
+      {
+        # if no decimal is needed, leave it off
+        :fstop => (fstop == fstop.to_i ? fstop.to_i : fstop),
+        # convert exposure to string
+        :exposure => img.exif[:exposure_time].to_s,
+        # if no decimal is needed, leave it off
+        :focal_length => (flen == flen.to_i ? flen.to_i : flen).to_s+'mm'
+      }
+    end
+
+  end
+end
+
+
+module DailyShare
+  class Member < Sequel::Model
+    one_to_many :photos
+
+    def self.byName(name)
+      self[:name=>name]
+    end
+
+    def self.byEmail(email)
+      self[:email=>email.downcase]
+    end
+
+    def missingPhotos
+      DB["SELECT
+            date('2012-01-01'::date+(interval '1 day'*s.num)) AS date
+          FROM
+            (SELECT generate_series(0,now()::date-'2012-01-01'::date) AS num) AS s
+          WHERE
+            (SELECT
+               true
+             FROM
+               photos
+             WHERE
+               date_added=date('2012-01-01'::date+(interval '1 day'*s.num))
+             AND
+               member_id=?) IS null",id]
+    end
+
+    def mostRecentPhoto
+      photos_dataset.order(:date_added.desc).first
+    end
+
+    def submissionByDate(date)
+      photos_dataset.where(:date_added=>date).first
+    end
+
+  end
+end

data/lib/dailyshare/version.rb

@@ -1,3 +1,3 @@
 module DailyShare
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dailyshare
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linguistics
@@ -104,12 +104,9 @@ files:
 - Rakefile
 - dailyshare.gemspec
 - lib/dailyshare.rb
-- lib/dailyshare/controllers/admin.rb
-- lib/dailyshare/controllers/main.rb
-- lib/dailyshare/helpers/entry.rb
-- lib/dailyshare/helpers/helpers.rb
-- lib/dailyshare/models/member.rb
-- lib/dailyshare/models/photo.rb
+- lib/dailyshare/controllers.rb
+- lib/dailyshare/helpers.rb
+- lib/dailyshare/models.rb
 - lib/dailyshare/version.rb
 homepage: https://github.com/tkellen/ruby-dailyshare
 licenses: []

data/lib/dailyshare/controllers/admin.rb

@@ -1,65 +0,0 @@
-require 'base64'
-
-module DailyShare
-
-  class App < Sinatra::Base
-
-    get '/admin' do
-      protected!
-      redirect '/'
-    end
-
-    post '/upload/:date_added/:name' do
-      protected!
-      if params[:file]
-        params[:member_id] = Member.byName(params[:name]).id
-        save_photo(params,params[:file][:tempfile])
-      end
-      redirect request.referrer
-    end
-
-    post '/edit/:date/:name' do
-      protected!
-
-      member = Member.byName(params[:name])
-      photo = Photo.by_date_and_member(params[:date],member)
-      photo.update_fields(params,[:title,:description])
-
-      redirect request.referrer
-    end
-
-    ##
-    # Receive emailed photos via Postmark.
-    #
-    post '/receiver' do
-      # parse post data
-      data = JSON.parse(request.body.read)
-
-      # grab image data
-      image = data['Attachments'][0]['Content']
-
-      # check which member this is based on sender
-      member = Member[:email=>data['From']]
-
-      # was there a member with that email?
-      if !member.nil?
-
-        # get most recent photo
-        recent = Photo.most_recent_by_member(member)
-
-        # only continue if a photo doesn't exist for today
-        if !recent.nil? && recent.date_added+1 <= Date.today
-
-          # prep params for submission
-          params = {
-            :member_id => member.id,
-            :title => data['Subject'],
-            :description => data['TextBody'],
-            :date_added => recent.date_added+1
-          }
-          save_photo(params,StringIO.new(Base64.decode64(image)))
-        end
-      end
-    end
-  end
-end

data/lib/dailyshare/controllers/main.rb

@@ -1,51 +0,0 @@
-module DailyShare
-
-  class App < Sinatra::Base
-
-    get '/' do
-      context = context_from_date(Date.today)
-      @title = "#{CONFIG['seo']['title']} - day #{context[:count]}"
-      slim :index, :locals => context
-    end
-
-    get '/logout' do
-      session.delete(:member_id)
-      session.delete(:member_name)
-      status 401
-      slim :logout
-    end
-
-    get '/:y/:m/:d' do
-      begin
-        date = date_from_params(params)
-        context = context_from_date(date)
-        @title = "#{CONFIG['seo']['title']} - day #{context[:count]}"
-      rescue
-        pass
-      end
-
-      if valid_date?(date)
-        slim :index, :locals => context
-      else
-        redirect request.referrer
-      end
-    end
-
-    get '/:name' do
-      if (member = Member.byName(params[:name])).nil?
-        redirect request.referrer
-      end
-
-      slim :member, :locals => { :photos => member.photos }
-    end
-
-    get '/:name/missing' do
-      if (member = Member.byName(params[:name])).nil?
-        redirect request.referrer
-      end
-      slim :member_missing, :locals => { :photos => member.missingPhotos }
-    end
-
-  end
-
-end

data/lib/dailyshare/helpers/entry.rb

@@ -1,51 +0,0 @@
-module DailyShare
-  module Helpers
-
-    def date_from_params(params)
-      Date.parse("#{params[:y]}-#{params[:m]}-#{params[:d]}")
-    end
-
-    def valid_date?(date)
-      (date.year > 2011 || date <= Date.today)
-    end
-
-    def context_from_date(date)
-      edition = (date.strftime('%Y').to_i)-(CONFIG['dailyshare']['start'].strftime('%Y').to_i)
-      {
-        :ymd => date.strftime('%Y-%m-%d'),
-        :date => date,
-        :year => (edition+1).en.numwords,
-        :count => (((date-CONFIG['dailyshare']['start']).to_i)-((edition)*365).to_i).en.numwords,
-        :photos => Member.all_with_photo_for(date)
-      }
-    end
-
-    def prev_entry(date)
-      (date-1).strftime('/%Y/%m/%d/')
-    end
-
-    def next_entry(date)
-      (date+1).strftime('/%Y/%m/%d/')
-    end
-
-    def save_photo(params,file)
-      begin
-        photo = Photo.new
-        photo.set_fields(params,[:title,:description,:date_added,:member_id])
-        photo.save_original(file)
-        photo.generate_sizes
-        photo.save_to_s3
-      rescue
-        false
-      else
-        photo.save
-        send_email(
-          CONFIG['email']['to'],
-          "new submisson",
-          slim(:'emails/uploaded', {:locals=>{:photo=>photo},:layout=>false})
-        )
-      end
-    end
-
-  end
-end

data/lib/dailyshare/models/member.rb

@@ -1,36 +0,0 @@
-module DailyShare
-  class Member < Sequel::Model
-    one_to_many :photos
-
-    def self.byName(name)
-      self[:name=>name]
-    end
-
-    def self.byEmail(email)
-      self[:email=>email.downcase]
-    end
-
-    def self.all_with_photo_for(date)
-      select(:members__name,:p__title,:p__description,:p__date_added).
-      left_join(:photos.as(:p),[:p__member_id=>:members__id,:date.sql_function(:p__date_added)=>date]).
-      order(:members__id)
-    end
-
-    def missingPhotos
-      DB["SELECT
-            date('2012-01-01'::date+(interval '1 day'*s.num)) AS date
-          FROM
-            (SELECT generate_series(0,now()::date-'2012-01-01'::date) AS num) AS s
-          WHERE
-            (SELECT
-               true
-             FROM
-               photos
-             WHERE
-               date_added=date('2012-01-01'::date+(interval '1 day'*s.num))
-             AND
-               member_id=?) IS null",id]
-    end
-
-  end
-end

data/lib/dailyshare/models/photo.rb

@@ -1,87 +0,0 @@
-require "stringio"
-
-module DailyShare
-  class Photo < Sequel::Model
-    many_to_one :member
-
-    def self.by_date_and_member(date,member)
-      where(:date.sql_function(:date_added)=>date,:member_id=>member.id).first
-    end
-
-    def self.most_recent_by_member(member)
-      where(:member_id=>member.id).order(:date_added.desc).first
-    end
-
-    def before_save
-      description.strip!
-    end
-
-    def original
-      "#{date_added}-#{self.member.name}.jpg"
-    end
-
-    def thumb
-      "#{date_added}-#{self.member.name}-thumb.jpg"
-    end
-
-    def big
-      "#{date_added}-#{self.member.name}-big.jpg"
-    end
-
-    def save_original(file)
-      image = File.join(CONFIG['photo_dir'],original)
-      File.open(image,'wb') {|f| f.write file.read }
-      image
-    end
-
-    def generate_sizes
-      img = Magick::Image::read(File.join(CONFIG['photo_dir'],original)).first
-      if img
-        img.resize_to_fit(240,240).write(File.join(CONFIG['photo_dir'],thumb))
-        img.resize_to_fit(960,680).write(File.join(CONFIG['photo_dir'],big))
-        img.destroy!
-        true
-      else
-        false
-      end
-    end
-
-    def sizes
-      [File.join(CONFIG['photo_dir'],original),
-       File.join(CONFIG['photo_dir'],thumb),
-       File.join(CONFIG['photo_dir'],big)]
-    end
-
-    def save_to_s3
-      sizes.each do |file|
-        AWS::S3::S3Object.store(
-          "/photos/#{File.basename(file)}",
-          open(file),
-          AUTH['aws']['bucket'],
-          {
-            :cache_control => 'max-age=315360000',
-            :access => 'public_read'
-          }
-        )
-      end
-    end
-
-    def parse_exif
-      img = EXIFR::JPEG.new(file)
-
-      # store fstop/focal length for comparison
-      fstop = img.exif[:f_number].to_f
-      flen = img.exif[:focal_length].to_f
-
-      {
-        # if no decimal is needed, leave it off
-        :fstop => (fstop == fstop.to_i ? fstop.to_i : fstop),
-        # convert exposure to string
-        :exposure => img.exif[:exposure_time].to_s,
-        # if no decimal is needed, leave it off
-        :focal_length => (flen == flen.to_i ? flen.to_i : flen).to_s+'mm'
-      }
-    end
-
-  end
-end