mist 0.6.0 → 0.6.1

data/.gitignore

@@ -16,3 +16,4 @@ spec/dummy_rails_app/log/*.log
 spec/dummy_rails_app/tmp
 spec/dummy_rails_app/db/mist.repo.*
 config/initializers/active_gist_credentials.rb
+pkg

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mist (0.6.0)
+    mist (0.6.1)
       activegist (~> 0.6)
       git (~> 1.2)
       github-markup (~> 0.7)

data/app/controllers/mist/posts_controller.rb

@@ -9,11 +9,7 @@ class Mist::PostsController < ApplicationController
   # GET /posts
   # GET /posts.json
   def index
-    if Mist.authorized? :view_drafts, self
-      @posts = Mist::Post.last(20).reverse
-    else
-      @posts = Mist::Post.recently_published(20)
-    end
+    @posts = Mist::Post.recently_published(20, Mist.authorized?(:view_drafts, self))
 
     respond_to do |format|
       format.html # index.html.erb

data/app/models/mist/post.rb

@@ -25,40 +25,51 @@ class Mist::Post < Mist::GitModel
   after_initialize :load_code_examples_from_gist
   after_destroy :destroy_gist
   
-  def self.load_existing_with_attribute(attribute_name, array)
-    array.collect { |(post_id, attribute_value)| find post_id, attribute_name => attribute_value }.reject { |i| i.nil? }
-  end
+  class << self
+    def load_existing_with_attribute(attribute_name, array)
+      array.collect { |(post_id, attribute_value)| find post_id, attribute_name => attribute_value }.reject { |i| i.nil? }
+    end
   
-  def self.most_popular(count)
-    # invert <=> so that result is descending order
-    load_existing_with_attribute :popularity, self[:popular_posts].sort { |a, b| -(a[1].to_i <=> b[1].to_i) }
-  end
+    def most_popular(count)
+      # invert <=> so that result is descending order
+      load_existing_with_attribute :popularity, self[:popular_posts].sort { |a, b| -(a[1].to_i <=> b[1].to_i) }
+    end
   
-  def self.increase_popularity(post)
-    self[:popular_posts][post.id] = popularity_for(post.id) + 1
-    save_meta_data :popular_posts
-    post.popularity = self[:popular_posts][post.id]
-  end
+    def increase_popularity(post)
+      self[:popular_posts][post.id] = popularity_for(post.id) + 1
+      save_meta_data :popular_posts
+      post.popularity = self[:popular_posts][post.id]
+    end
   
-  def self.popularity_for(post_id)
-    self[:popular_posts][post_id] || 0
-  end
+    def popularity_for(post_id)
+      self[:popular_posts][post_id] || 0
+    end
   
-  def self.recently_published(count)
-    all_by_publication_date.tap do |result|
-      result.pop while result.length > count
+    def recently_published(count, include_unpublished = false)
+      recent = all_by_publication_date(include_unpublished)
+      recent.tap do |result|
+        result.pop while result.length > count
+      end
     end
-  end
   
-  def self.all_by_publication_date
-    # invert <=> so that result is descending order
-    load_existing_with_attribute :published_at, self[:published_at].sort { |a, b| -(a[1] <=> b[1]) }
-  end
+    def all_by_publication_date(include_unpublished = false)
+      publications = self[:published_at].sort do |(ka,va), (kb,vb)|
+        if va.nil?
+          vb.nil? ? 0 : -1
+        else
+          vb.nil? ? 1 : -(va <=> vb)
+        end
+      end
+
+      publications.select! { |(post, publish_date)| !publish_date.blank? } unless include_unpublished
+      load_existing_with_attribute :published_at, publications
+    end
   
-  def self.matching_tags(tags)
-    return [] if tags.blank?
-    matches = self[:tags].inject({}) { |h,(k,v)| ((t = v.split(TAG_DELIM)) & tags).size > 0 ? h[k] = t : nil; h }
-    load_existing_with_attribute :tags, matches.sort { |a, b| -((a[1] & tags).size <=> (b[1] & tags).size) }
+    def matching_tags(tags)
+      return [] if tags.blank?
+      matches = self[:tags].inject({}) { |h,(k,v)| ((t = v.split(TAG_DELIM)) & tags).size > 0 ? h[k] = t : nil; h }
+      load_existing_with_attribute :tags, matches.sort { |a, b| -((a[1] & tags).size <=> (b[1] & tags).size) }
+    end
   end
   
   def similar_posts(max_count = nil)
@@ -84,12 +95,8 @@ class Mist::Post < Mist::GitModel
       self.class.save_meta_data :popular_posts
     end
     
-    if published_at_changed?
-      if published_at.blank?
-        self.class[:published_at].delete id
-      else
-        self.class[:published_at][id] = published_at
-      end
+    if published_at_changed? || new_record?
+      self.class[:published_at][id] = published_at
       self.class.save_meta_data :published_at
     end
     

data/lib/mist/version.rb

@@ -1,6 +1,6 @@
 module Mist
   module Version
-    MAJOR, MINOR, PATCH = 0, 6, 0
+    MAJOR, MINOR, PATCH = 0, 6, 1
     STRING = [MAJOR, MINOR, PATCH].join('.')
   end
   

data/spec/controllers/posts_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Mist::PostsController do
-  before { Mist.authorize :all do true end }
+  before { Mist.authorize { true } }
   
   # This should return the minimal set of attributes required to create a valid
   # Post. As you add validations to Post, be sure to
@@ -30,6 +30,31 @@ describe Mist::PostsController do
       get :index, {:use_route => :mist}, valid_session
       assigns(:posts).should eq([post])
     end
+    
+    describe "with 7 posts" do
+      before do
+        @one   = create(:post, :title => "one",   :published_at => 1.day.ago)
+        @two   = create(:post, :title => "two",   :published_at => 5.days.ago)
+        @three = create(:post, :title => "three", :published_at => 1.day.from_now)
+        @four  = create(:post, :title => "four",  :published_at => nil)
+        @five  = create(:post, :title => "five",  :published_at => 2.days.from_now)
+        @six   = create(:post, :title => "six",   :published_at => Time.now)
+        @seven = create(:post, :title => "seven", :published_at => 2.days.ago)
+      end
+      
+      it "assigns the posts in order" do
+        get :index, {:use_route => :mist}, valid_session
+        assigns(:posts).collect { |p| p.id }.should eq([@four.id, @five.id, @three.id, @six.id, @one.id, @seven.id, @two.id])
+      end
+      
+      describe "when not authorized" do
+        before { Mist.authorize { false } }
+        it "assigns the posts in order, omitting unpublished" do
+          get :index, {:use_route => :mist}, valid_session
+          assigns(:posts).collect { |p| p.id }.should eq([@five.id, @three.id, @six.id, @one.id, @seven.id, @two.id])
+        end
+      end
+    end
   end
 
   describe "GET show" do

data/spec/models/mist/post_spec.rb

@@ -63,7 +63,11 @@ describe Mist::Post do
   describe "recent posts" do
     before do
       @order = [ 1.day.ago, 2.days.ago, 3.days.ago, 4.days.ago, 5.days.ago ]
-      5.times { |i| Mist::Post.create!(:title => "title#{i}", :content => "content", :published_at => @order[i]) }
+      Mist::Post.create!(:title => "title0", :content => "content", :published_at => @order[0])
+      Mist::Post.create!(:title => "title2", :content => "content", :published_at => @order[2])
+      Mist::Post.create!(:title => "title4", :content => "content", :published_at => @order[4])
+      Mist::Post.create!(:title => "title1", :content => "content", :published_at => @order[1])
+      Mist::Post.create!(:title => "title3", :content => "content", :published_at => @order[3])
     end
     
     it "should order by published_at descending" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mist
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-27 00:00:00.000000000Z
+date: 2012-01-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &2162694360 !ruby/object:Gem::Requirement
+  requirement: &2155922540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2162694360
+  version_requirements: *2155922540
 - !ruby/object:Gem::Dependency
   name: github-markup
-  requirement: &2162693740 !ruby/object:Gem::Requirement
+  requirement: &2155918340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2162693740
+  version_requirements: *2155918340
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2162693140 !ruby/object:Gem::Requirement
+  requirement: &2155916640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162693140
+  version_requirements: *2155916640
 - !ruby/object:Gem::Dependency
   name: activegist
-  requirement: &2162692460 !ruby/object:Gem::Requirement
+  requirement: &2155914440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *2162692460
+  version_requirements: *2155914440
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &2162691800 !ruby/object:Gem::Requirement
+  requirement: &2155894500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *2162691800
+  version_requirements: *2155894500
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2162691020 !ruby/object:Gem::Requirement
+  requirement: &2154971300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *2162691020
+  version_requirements: *2154971300
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2162690340 !ruby/object:Gem::Requirement
+  requirement: &2154970700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.8.1
   type: :development
   prerelease: false
-  version_requirements: *2162690340
+  version_requirements: *2154970700
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2162689660 !ruby/object:Gem::Requirement
+  requirement: &2154970240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2162689660
+  version_requirements: *2154970240
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &2162688920 !ruby/object:Gem::Requirement
+  requirement: &2154969740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,7 +109,7 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *2162688920
+  version_requirements: *2154969740
 description: a git-powered, gist-backed blogging engine for Rails 3
 email:
 - sinisterchipmunk@gmail.com
@@ -277,7 +277,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2905108893950949948
+      hash: 915941666166025158
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2905108893950949948
+      hash: 915941666166025158
 requirements: []
 rubyforge_project: mist
 rubygems_version: 1.8.10