writefully 0.4.10 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea727086bde7ed0d78dd3e7958a1fb03e97a81d2
-  data.tar.gz: a918d1b2a13efcebd964644d9c7cd6026815d5f2
+  metadata.gz: f90afad3ac8a344ab63f1b9d301f27feaa0b4b4e
+  data.tar.gz: f4729685c69d37d11d244f8eafcaf96fbf67d8b7
 SHA512:
-  metadata.gz: e320662c11c6f99e2daafd18095130c6bfc3979b5c0e4612b6a09d1b117bd70583c5c281b1b73d66eb3e132ee2598ff9703972ed33d07debf7cabe8924ac944d
-  data.tar.gz: 96c3d3cac5e7eb62d7b28cee033ff1c53b9f12e217bead0f7e9fb18e9f08c10f90dfaf05ff48c5699b9bd4a6a029bef5affa5fd390a45fadbab2dd515999f4b8
+  metadata.gz: 9328f4d1e289b665ddc26ef2caaf29b43c555f0da2ee203aa1124de44923a5f27a28b9ae67d5f383453e6790b6785bf2827f63aa2a582a5b38bce5d59b8e08b1
+  data.tar.gz: 64c333720e0aba0799289765427724065676410bc607393cef7a209dab8a358bc33d9f0e3b2daf412eaf88e659f2cf94198d55aa5cea0f6ba8d99f77c6e837a4

data/app/assets/images/writefully/loading-bubbles.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="32" height="32" fill="#ccc">
+  <circle transform="translate(8 0)" cx="0" cy="16" r="0"> 
+    <animate attributeName="r" values="0; 4; 0; 0" dur="1.2s" repeatCount="indefinite" begin="0"
+      keytimes="0;0.2;0.7;1" keySplines="0.2 0.2 0.4 0.8;0.2 0.6 0.4 0.8;0.2 0.6 0.4 0.8" calcMode="spline" />
+  </circle>
+  <circle transform="translate(16 0)" cx="0" cy="16" r="0"> 
+    <animate attributeName="r" values="0; 4; 0; 0" dur="1.2s" repeatCount="indefinite" begin="0.3"
+      keytimes="0;0.2;0.7;1" keySplines="0.2 0.2 0.4 0.8;0.2 0.6 0.4 0.8;0.2 0.6 0.4 0.8" calcMode="spline" />
+  </circle>
+  <circle transform="translate(24 0)" cx="0" cy="16" r="0"> 
+    <animate attributeName="r" values="0; 4; 0; 0" dur="1.2s" repeatCount="indefinite" begin="0.6"
+      keytimes="0;0.2;0.7;1" keySplines="0.2 0.2 0.4 0.8;0.2 0.6 0.4 0.8;0.2 0.6 0.4 0.8" calcMode="spline" />
+  </circle>
+</svg>

data/app/assets/javascripts/writefully/writefully/initializers/manifest.coffee

@@ -1,4 +1,4 @@
-Application.services_manifest = ->
+Writefully.services_manifest = ->
   # fill in your manifest here
   # example:
   # if you want to trigger a service on your entire app
@@ -21,8 +21,8 @@ Application.services_manifest = ->
   #    body.photos.index').trigger 'application:services:service_name'
   # 
 
-Application.run_ready = ->
-  Application.services_manifest()
+Writefully.run_ready = ->
+  Writefully.services_manifest()
 
-$(document).ready Application.run_ready
-$(document).on 'page:load', Application.run_ready
+$(document).ready Writefully.run_ready
+$(document).on 'page:load', Writefully.run_ready

data/app/assets/javascripts/writefully/writefully/initializers/setup.coffee

@@ -1,4 +1,4 @@
-window.Application =
+window.Writefully =
   Helpers: {}
   Services: {}
   Presenters: {}

data/app/assets/javascripts/writefully/writefully/services/autosave.coffee

@@ -0,0 +1,8 @@
+class Writefully.Services.Notepad extends Transponder.Service
+  serviceName: 'autosave'
+  module: 'writefully'
+
+  init: ->
+    
+  serve: ->
+    @init()

data/app/assets/stylesheets/writefully/base.sass

@@ -20,4 +20,19 @@ div.container
 
 .panel
   h1, h2, h3, h4, h5, h6
-    margin: 0px !important
+    margin: 0px !important
+
+form.form-horizontal
+  margin-top: 40px
+  p.form-info
+    padding: 10px
+
+.form-control
+  border: none
+  @include box-shadow(none)
+  border-radius: 0px
+  background: #f8f8f8
+  border: 1px solid #e7e7e7
+
+  &:focus
+    @include box-shadow(0px 0px 5px #ddd)

data/app/assets/stylesheets/writefully/profiles.sass

@@ -0,0 +1,3 @@
+body.writefully.profiles
+  h1
+    font-weight: 100

data/app/assets/stylesheets/writefully/sites.sass

@@ -13,10 +13,6 @@ body.writefully.sites, body.writefully.posts.index
   ul.nav-tabs
     margin-bottom: 20px
 
-  form#new_site
-    margin-top: 40px
-    p.form-info
-      padding: 10px
 
 
   div.site.media

data/app/assets/stylesheets/writefully/writefully.sass

@@ -1,4 +1,6 @@
 @import "bootstrap"
+@import "bootstrap/mixins"
 @import "base"
 @import "sites"
+@import "profiles"
 @import "sessions"

data/app/controllers/writefully/profiles_controller.rb

@@ -0,0 +1,12 @@
+require_dependency "writefully/application_controller"
+
+module Writefully
+  class ProfilesController < ApplicationController
+    before_filter :authenticate_wf_authorship!
+
+
+    def edit
+      @authorship = current_wf_authorship
+    end
+  end
+end

data/app/models/writefully/authorship.rb

@@ -7,7 +7,7 @@ module Writefully
     has_many :posts
     has_many :owned_sites, class_name: "Writefully::Site", foreign_key: :owner_id
 
-    store_accessor :data, :name, :email, :uid, :user_name, :auth_token
+    store_accessor :data, :name, :email, :uid, :user_name, :auth_token, :bio
 
     def to_s
       data["name"] || data["login"] || data["email"] || data["uid"]

data/app/models/writefully/post.rb

@@ -8,7 +8,7 @@ module Writefully
     friendly_id :title, use: :slugged
 
     has_many :taggings, dependent: :destroy
-    wf_taxonomize :tags, -> { where(type: nil) }, through: :taggings
+    wf_taxonomize :tags, through: :taggings
 
     belongs_to :authorship
     belongs_to :translation_source, class_name: "Writefully::Post"

data/app/views/writefully/application/_navigation.html.erb

@@ -10,12 +10,9 @@
       <%= link_to "Writefully", root_path, class: 'navbar-brand' %>
     </div>
     <div class="collapse navbar-collapse">
-      <ul class='nav navbar-nav'>
-        <%= activeable_link_to :li, "Dashboard",    root_path, icon: 'home' %>
-        <%= activeable_link_to :li, "New Site", new_site_path, icon: 'plus' %>
-      </ul>
+      <%= render 'super_admin' if current_wf_authorship.role == 'super_admin' %>
       <ul class="nav navbar-nav navbar-right">
-        <li><p class='navbar-text'><%= current_wf_authorship %></p></li>
+        <li><%= link_to current_wf_authorship, edit_profile_path %></li>
         <li><%= link_to "Sign Out", signout_path %></li>
       </ul>
     </div>

data/app/views/writefully/application/_super_admin.html.erb

@@ -0,0 +1,4 @@
+  <ul class='nav navbar-nav'>
+    <%= activeable_link_to :li, "Dashboard",    root_path, icon: 'home' %>
+    <%= activeable_link_to :li, "New Site", new_site_path, icon: 'plus' %>
+  </ul>

data/app/views/writefully/profiles/_form.html.erb

@@ -0,0 +1,17 @@
+<%= form_for @authorship, html: { class: 'form-horizontal', role: 'form' } do |f| %>
+  <div class='form-group'>
+    <div class='col-sm-12'>
+      <%= f.text_field :name, class: 'form-control input-lg', placeholder: 'Name' %>
+    </div>
+  </div>
+  <div class='form-group'>
+    <div class='col-sm-12'>
+      <%= f.text_field :email, class: 'form-control input-lg', placeholder: 'Email' %>
+    </div>
+  </div>
+  <div class='form-group'>
+    <div class='col-sm-12'>
+      <%= f.text_area :bio,  class: 'form-control input-lg', placeholder: 'A bit about yourself' %>
+    </div>
+  </div>
+<% end %>

data/app/views/writefully/profiles/edit.html.erb

@@ -0,0 +1,11 @@
+<%= content_for(:title, "Edit Author Profile") %>
+<div class='row'>
+  <div class='col-md-4 col-md-offset-4'>
+    <h1 class='text-center'><%= current_wf_authorship %></h1>
+    <%= render 'form' %>
+    <p class='text-center loader hide'>
+      <%= image_tag 'writefully/loading-bubbles.svg', alt: 'loading icon', width: '128', height: '128' %>
+    </p>
+  </div>
+</div>
+

data/app/views/writefully/sites/new.html.erb

@@ -1,4 +1,4 @@
-<%#= content_for(:title, "Site Setup") %>
+<%= content_for(:title, "Site Setup") %>
 <div class='row'>
   <div class='col-md-4 col-md-offset-4'>
     <h1 class='text-center'>Site Setup</h1>

data/config/routes.rb

@@ -5,7 +5,8 @@ Writefully::Engine.routes.draw do
     resources :posts, only: [:index, :show]
   end
 
-  resources :authorships
+  resource  :profile,    only: [:edit]
+  resource  :authorship, only: [:update]
   resource  :hook, only: [:create]
 
   get '/signin',     to: 'sessions#new'

data/db/migrate/20140501094825_add_trashed_to_posts.rb

@@ -0,0 +1,5 @@
+class AddTrashedToPosts < ActiveRecord::Migration
+  def change
+    add_column :writefully_posts, :trashed, :boolean, default: false
+  end
+end

data/lib/writefully/cli.rb

@@ -45,7 +45,7 @@ module Writefully
 
     no_tasks do 
       def listen(config)
-        Writefully::Process.new(config).listen
+        Writefully::Process.instance.listen(config)
       end
 
       def setup_logger(logfile)

data/lib/writefully/loader.rb

@@ -5,6 +5,10 @@ module Writefully
   SCOPES  = %w(repo public_repo user write:repo_hook)
 
   class << self
+    QUEUE = { 
+      top:    -> (c, job) { c.lpush "jobs", job },
+      bottom: -> (c, job) { c.rpush "jobs", job }
+    }
 
     def options=(config)
       @_options = config
@@ -21,8 +25,9 @@ module Writefully
       end
     end
 
-    def add_job worker, message
-      Writefully.redis.with { |c| c.sadd "jobs", convert_job(worker, message) }
+    def add_job worker, message, position = nil
+      position_selector = position || :bottom
+      Writefully.redis.with { |c| QUEUE[position_selector].call(c, convert_job(worker, message)) }
     end
 
     def convert_job worker, message

data/lib/writefully/postable.rb

@@ -9,6 +9,8 @@ module Writefully
       after_initialize :check_content_field_existence
       attr_accessor :publish
 
+      scope :with_taxonomies, -> (*types) { select(Taxon::EagerLoader.new(self).build(*types)) }
+
       before_save :publish_resource, if: -> { respond_to?(:published_at) }
     end
 
@@ -41,17 +43,37 @@ module Writefully
         class_eval do 
           has_many :"#{type}", *args
 
+          define_method("all_#{type}") do 
+            read_attribute(:"all_#{type}").map { |taxon| Hashie::Mash.new(taxon) }
+          end
+
           define_method("#{type}=") do |tokens|
             self.taxonomize_with(tokens, type)
           end
         end
       end
 
+      def filter_with(filters)
+        if filters.present?
+          filters.keys.inject(self) do |klass, type| 
+            klass.where(id: by_taxonomies(filters[type].split(/,/), type))
+          end
+        else all end
+      end
+
+      def by_taxonomies(taxonomies, type)
+        joins(type.to_sym)
+        .where(writefully_tags: { slug: taxonomies, 
+                                  type: (type == "tags" ? nil : type.classify) })
+        .uniq
+      end
+
       def wf_content(field_name)
         class_eval do 
           alias_attribute :content, :"#{field_name}" unless field_name == :content
         end
       end
+
     end
   end
 end

data/lib/writefully/process.rb

@@ -14,15 +14,21 @@ require 'writefully/loader'
 require 'writefully/tools'
 require 'writefully/workers'
 require 'writefully/news_agency'
+require 'singleton'
 
 %w(tag post site tagging authorship).each do |model|
   require File.dirname(__FILE__) + "/../../app/models/writefully/#{model}"
 end
 
 module Writefully
-  Process = Struct.new(:config) do
+  class Process
+    include Singleton
+
+    attr_reader :config
+
+    def listen config
+      @config = config
 
-    def listen
       set_title
       set_options
       log_start
@@ -88,7 +94,7 @@ module Writefully
 
     JOBS = { 
       write:  -> (index) { Writefully.add_job :journalists, index.merge({task: :publish}) },
-      remove: -> (index) { Wrotefully.add_job :journalists, index.merge({task: :remove})  }
+      remove: -> (index) { Writefully.add_job :journalists, index.merge({task: :remove}), :top  }
     }
 
     def queue_jobs indices, action

data/lib/writefully/taxon.rb

@@ -1,5 +1,13 @@
 module Writefully
-  Taxon = Struct.new(:incoming, :existing, :type) do 
+  class Taxon
+    attr_reader :incoming, :existing, :type
+
+    def initialize(incoming, existing, type)
+      @incoming = incoming
+      @existing = existing
+      @type     = type
+    end
+
     def non_existing
       get_difference.map { |token| Tag.new(build_attributes(token)) }
     end
@@ -24,5 +32,48 @@ module Writefully
     def parameterized items
       items.map { |t| t.parameterize }
     end
+
+    class EagerLoader
+      attr_reader :tags, :taggings, :resource
+
+      def initialize(klass)
+        @tags      = Tag.arel_table
+        @taggings  = Tagging.arel_table
+        @resource  = klass.arel_table
+      end
+
+      def build *types
+        [resource[Arel.star]] << types.map { |type| array_of_taxonomy_hstores_for(type) }
+      end
+
+    private
+
+      def array_of_taxonomy_hstores_for type
+        Arel::Nodes::NamedFunction.new('ARRAY', [hstore_for_taxon(type)]).as("all_#{type}")
+      end
+
+      def hstore_for_taxon type
+        tags.project(Arel.sql('hstore(taxon)')).from(taxons_for_resource(type))
+      end
+
+      def taxons_for_resource type
+        Tag.joins(:taggings).arel.where(tags_by_type(type))
+                                 .where(taggings_by_resource).as('taxon')
+      end
+
+      def tags_by_type type
+        tags[:type].eq(calculate_type(type))
+      end
+
+      def taggings_by_resource
+        # we use post_id for now but we should 
+        # make it a polymorphic association later
+        taggings[:post_id].eq(resource[:id])
+      end
+
+      def calculate_type type
+        type == :tags ? nil : type.to_s.classify 
+      end
+    end
   end
 end

data/lib/writefully/tools/dispatcher.rb

@@ -12,7 +12,7 @@ module Writefully
       end
 
       def get_job_data
-        Writefully.redis.with { |c| c.spop 'jobs' }
+        Writefully.redis.with { |c| c.lpop 'jobs' }
       end
 
       def heartbeat

data/lib/writefully/tools/eraser.rb

@@ -0,0 +1,16 @@
+module Writefully
+  module Tools
+    class Eraser  < Stationery
+
+      def use
+        destroy
+      end
+
+      def destroy
+        compute_type.by_site(site_id)
+                      .where(slug: content.slug)
+                        .first.update_attributes(trashed: true)
+      end
+    end
+  end
+end

data/lib/writefully/tools/pencil.rb

@@ -1,21 +1,8 @@
 module Writefully
   module Tools
-    class Pencil
-      include Celluloid
+    class Pencil < Stationery
 
-      attr_reader :resource, :content, :asset, :index, :site_id, :asset
-
-      class ContentModelNotFound < StandardError; end
-      class SomeAssetsNotUploaded < StandardError; end
-
-      def initialize(index)
-        @site_id  = Site.where(slug: index[:site]).first.id
-        @index    = index
-        @content  = Content.new(index)
-        @asset    = Asset.new(index)
-      end
-
-      def perform
+      def use
         assets_uploaded = upload_assets.map(&:value).compact
         written_to_db   = future.write if can_update_db?(assets_uploaded)
         terminate if written_to_db.value
@@ -24,7 +11,8 @@ module Writefully
       def computed_attributes
         content.meta.merge({ 
           "content" => asset.convert_for(content.body),
-          "details" => asset.convert_for(content.details)
+          "details" => asset.convert_for(content.details),
+          "trashed" => false
         })
       end
 
@@ -32,8 +20,6 @@ module Writefully
         compute_type.by_site(site_id).where(slug: content.slug)
                       .first_or_initialize
                         .update_attributes(computed_attributes)
-      ensure 
-        ::ActiveRecord::Base.clear_active_connections! if defined?(::ActiveRecord)
       end
       
       def upload_assets
@@ -49,22 +35,6 @@ module Writefully
           raise SomeAssetsNotUploaded, "Some assets was not uploaded"
         end
       end
-
-    private
-
-      def compute_type
-        index[:resource].classify.constantize
-      rescue NameError
-        fallback_type
-      end
-
-      def fallback_type
-        if index[:resource] == "posts"
-          "Writefully::Post".constantize
-        else 
-          raise ContentModelNotFound, "Model #{index[:resource].classify} was not found"
-        end
-      end
       
     end
   end

data/lib/writefully/tools/stationery.rb

@@ -0,0 +1,42 @@
+module Writefully
+  module Tools
+    class Stationery
+      include Celluloid
+      
+      attr_reader  :content, :asset, :index, :site_id
+
+      class ContentModelNotFound < StandardError; end
+      class SomeAssetsNotUploaded < StandardError; end
+
+      def initialize(index)
+        @site_id  = Site.where(slug: index[:site]).first.id
+        @index    = index
+        @content  = Content.new(index)
+        @asset    = Asset.new(index)
+      end
+
+      def perform
+        use
+      ensure
+        ::ActiveRecord::Base.clear_active_connections! if defined?(::ActiveRecord)
+      end
+
+    private
+
+      def compute_type
+        index[:resource].classify.constantize
+      rescue NameError
+        fallback_type
+      end
+
+      def fallback_type
+        if index[:resource] == "posts"
+          "Writefully::Post".constantize
+        else 
+          raise ContentModelNotFound, "Model #{index[:resource].classify} was not found"
+        end
+      end
+
+    end
+  end
+end

data/lib/writefully/tools.rb

@@ -4,6 +4,7 @@ module Writefully
   end
 end
 
+require 'writefully/tools/stationery'
 require 'writefully/tools/eraser'
 require 'writefully/tools/pencil'
 require 'writefully/tools/pigeon'

data/lib/writefully/version.rb

@@ -1,3 +1,3 @@
 module Writefully
-  VERSION = "0.4.10"
+  VERSION = "0.5.0"
 end

data/lib/writefully/workers/journalist.rb

@@ -9,6 +9,8 @@ module Writefully
 
       def remove
         Writefully.logger.info "Removing #{message[:resource]} #{message[:slug]}"
+        eraser = Tools::Eraser.new_link(message)
+        eraser.perform
       end
 
       def message_with_tries

data/spec/controllers/writefully/authorships_controller_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+module Writefully
+  describe AuthorshipsController do
+
+  end
+end

data/spec/controllers/writefully/profiles_controller_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+module Writefully
+  describe ProfilesController do
+
+  end
+end

data/spec/dummy/content/codemy-net/posts/1-hash-selector-pattern/meta.yml

@@ -1,5 +1,4 @@
 title: "Ruby Hash Selector Pattern"
-slug: "ruby-hash-selector-pattern"
 tags: ["Ruby"]
 playlists: ["A Shot of Ruby"]
 details:

data/spec/dummy/content/codemy-net/posts/2-rails-flash-partials/meta.yml

@@ -1,5 +1,4 @@
 title: "Rails Flash Partials"
-slug: "rails-flash-partials"
 tags: ["Rails"]
 playlists: ["A Shot of Ruby"]
 details: 

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140403181629) do
+ActiveRecord::Schema.define(version: 20140501094825) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -41,6 +41,7 @@ ActiveRecord::Schema.define(version: 20140403181629) do
     t.integer  "authorship_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "trashed",               default: false
   end
 
   add_index "writefully_posts", ["authorship_id"], name: "index_writefully_posts_on_authorship_id", using: :btree