muck-contents 0.2.11 → 0.2.12

data/VERSION

@@ -1 +1 @@
-0.2.11
+0.2.12

data/lib/active_record/acts/muck_content.rb

@@ -32,13 +32,13 @@ module ActiveRecord
           has_many   :content_permissions, :dependent => :destroy
           has_many   :content_translations, :dependent => :destroy
 
-          named_scope :by_newest, :order => "created_at DESC"
-          named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }
-          named_scope :by_alpha, :order => "title ASC"
-          named_scope :public, :conditions => "is_public = true"
-          named_scope :by_parent, lambda { |parent_id| { :conditions => ['parent_id = ?', parent_id || 0] } }
-          named_scope :by_creator, lambda { |creator_id| { :conditions => ['creator_id = ?', creator_id || 0] } }
-          named_scope :no_contentable, :conditions => 'contentable_id IS NULL'
+          named_scope :by_newest, :order => "contents.created_at DESC"
+          named_scope :recent, lambda { { :conditions => ['contents.created_at > ?', 1.week.ago] } }
+          named_scope :by_alpha, :order => "contents.title ASC"
+          named_scope :public, :conditions => "contents.is_public = true"
+          named_scope :by_parent, lambda { |parent_id| { :conditions => ['contents.parent_id = ?', parent_id || 0] } }
+          named_scope :by_creator, lambda { |creator_id| { :conditions => ['contents.creator_id = ?', creator_id || 0] } }
+          named_scope :no_contentable, :conditions => 'contents.contentable_id IS NULL'
           # include the '/' in case the user forgets.  Note 'get_content_scope' will add the '/' so 
           # if we don't include it here the content won't be found as the scope won't match up. 
           named_scope :by_scope, lambda { |scope| { :conditions => ["slugs.scope = ?", File.join('/', scope)], :include => [:slugs] } } 

data/muck-contents.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{muck-contents}
-  s.version = "0.2.11"
+  s.version = "0.2.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2009-11-30}
+  s.date = %q{2009-12-16}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -3136,3 +3136,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<fleakr>, [">= 0"])
   end
 end
+

data/test/rails_root/app/models/comment.rb

@@ -1,3 +1,21 @@
+# == Schema Information
+#
+# Table name: comments
+#
+#  id               :integer         not null, primary key
+#  commentable_id   :integer         default(0)
+#  commentable_type :string(15)      default("")
+#  body             :text
+#  user_id          :integer
+#  parent_id        :integer
+#  lft              :integer
+#  rgt              :integer
+#  is_denied        :integer         default(0), not null
+#  is_reviewed      :boolean
+#  created_at       :datetime
+#  updated_at       :datetime
+#
+
 class Comment < ActiveRecord::Base
   
   acts_as_muck_comment

data/test/rails_root/app/models/content.rb

@@ -1,7 +1,30 @@
+# == Schema Information
+#
+# Table name: contents
+#
+#  id               :integer         not null, primary key
+#  creator_id       :integer
+#  title            :string(255)
+#  body             :text
+#  locale           :string(255)
+#  body_raw         :text
+#  contentable_id   :integer
+#  contentable_type :string(255)
+#  parent_id        :integer
+#  lft              :integer
+#  rgt              :integer
+#  is_public        :boolean
+#  state            :string(255)
+#  created_at       :datetime
+#  updated_at       :datetime
+#  layout           :string(255)
+#  comment_count    :integer         default(0)
+#
+
 class Content < ActiveRecord::Base
   acts_as_muck_content(
     :git_repository => GlobalConfig.content_git_repository,
     :enable_auto_translations => GlobalConfig.enable_auto_translations,
     :enable_solr => GlobalConfig.content_enable_solr
   )
-end
+end

data/test/rails_root/app/models/content_permission.rb

@@ -1,3 +1,14 @@
+# == Schema Information
+#
+# Table name: content_permissions
+#
+#  id         :integer         not null, primary key
+#  content_id :integer
+#  user_id    :integer
+#  created_at :datetime
+#  updated_at :datetime
+#
+
 class ContentPermission < ActiveRecord::Base
   acts_as_muck_content_permission
-end
+end

data/test/rails_root/app/models/content_translation.rb

@@ -1,3 +1,17 @@
+# == Schema Information
+#
+# Table name: content_translations
+#
+#  id          :integer         not null, primary key
+#  content_id  :integer
+#  title       :string(255)
+#  body        :text
+#  locale      :string(255)
+#  user_edited :boolean
+#  created_at  :datetime
+#  updated_at  :datetime
+#
+
 class ContentTranslation < ActiveRecord::Base
   acts_as_muck_content_translation
-end
+end

data/test/rails_root/app/models/upload.rb

@@ -2,34 +2,27 @@
 #
 # Table name: uploads
 #
-#  id                  :integer(4)      not null, primary key
-#  creator_id          :integer(4)
+#  id                  :integer         not null, primary key
+#  creator_id          :integer
 #  name                :string(255)
 #  caption             :string(1000)
 #  description         :text
-#  is_public           :boolean(1)      default(TRUE)
-#  uploadable_id       :integer(4)
+#  is_public           :boolean         default(TRUE)
+#  uploadable_id       :integer
 #  uploadable_type     :string(255)
 #  width               :string(255)
 #  height              :string(255)
 #  local_file_name     :string(255)
 #  local_content_type  :string(255)
-#  local_file_size     :integer(4)
+#  local_file_size     :integer
 #  local_updated_at    :datetime
 #  remote_file_name    :string(255)
 #  remote_content_type :string(255)
-#  remote_file_size    :integer(4)
+#  remote_file_size    :integer
 #  remote_updated_at   :datetime
 #  created_at          :datetime
 #  updated_at          :datetime
 #
-# Indexes
-#
-#  index_uploads_on_creator_id          (creator_id)
-#  index_uploads_on_uploadable_id       (uploadable_id)
-#  index_uploads_on_uploadable_type     (uploadable_type)
-#  index_uploads_on_local_content_type  (local_content_type)
-#
 
 class Upload < ActiveRecord::Base
   

data/test/rails_root/app/models/user.rb

@@ -1,3 +1,34 @@
+# == Schema Information
+#
+# Table name: users
+#
+#  id                  :integer         not null, primary key
+#  login               :string(255)
+#  email               :string(255)
+#  first_name          :string(255)
+#  last_name           :string(255)
+#  crypted_password    :string(255)
+#  password_salt       :string(255)
+#  persistence_token   :string(255)     not null
+#  single_access_token :string(255)     not null
+#  perishable_token    :string(255)     not null
+#  login_count         :integer         default(0), not null
+#  failed_login_count  :integer         default(0), not null
+#  last_request_at     :datetime
+#  current_login_at    :datetime
+#  last_login_at       :datetime
+#  current_login_ip    :string(255)
+#  last_login_ip       :string(255)
+#  terms_of_service    :boolean         not null
+#  time_zone           :string(255)     default("UTC")
+#  disabled_at         :datetime
+#  created_at          :datetime
+#  activated_at        :datetime
+#  updated_at          :datetime
+#  identity_url        :string(255)
+#  url_key             :string(255)
+#
+
 class User < ActiveRecord::Base
   acts_as_authentic do |c|
     c.crypto_provider = Authlogic::CryptoProviders::BCrypt
@@ -14,4 +45,4 @@ class User < ActiveRecord::Base
     true
   end
   
-end
+end

data/test/rails_root/config/database.yml

@@ -1,19 +1,17 @@
 development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  timeout: 5000
+  adapter: mysql
+  database: muck_contents
+  username: root
+  password:
+  host: localhost
+  encoding: utf8
 
 test: &TEST
-  adapter: sqlite3
-  database: db/test.sqlite3
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  timeout: 5000
-
-cucumber:
-  <<: *TEST
+  adapter: mysql
+  database: muck_contents_test
+  username: root
+  password:
+  host: localhost
+  encoding: utf8
 cucumber:
   <<: *TEST

data/test/rails_root/test/unit/content_permission_test.rb

@@ -1,3 +1,14 @@
+# == Schema Information
+#
+# Table name: content_permissions
+#
+#  id         :integer         not null, primary key
+#  content_id :integer
+#  user_id    :integer
+#  created_at :datetime
+#  updated_at :datetime
+#
+
 require File.dirname(__FILE__) + '/../test_helper'
 
 # Used to test muck_content_permission
@@ -29,4 +40,4 @@ class ContentPermissionTest < ActiveSupport::TestCase
     
   end
   
-end
+end

data/test/rails_root/test/unit/content_test.rb

@@ -1,3 +1,26 @@
+# == Schema Information
+#
+# Table name: contents
+#
+#  id               :integer         not null, primary key
+#  creator_id       :integer
+#  title            :string(255)
+#  body             :text
+#  locale           :string(255)
+#  body_raw         :text
+#  contentable_id   :integer
+#  contentable_type :string(255)
+#  parent_id        :integer
+#  lft              :integer
+#  rgt              :integer
+#  is_public        :boolean
+#  state            :string(255)
+#  created_at       :datetime
+#  updated_at       :datetime
+#  layout           :string(255)
+#  comment_count    :integer         default(0)
+#
+
 require File.dirname(__FILE__) + '/../test_helper'
 
 # Used to test muck_content
@@ -29,15 +52,50 @@ class ContentTest < ActiveSupport::TestCase
     should_validate_presence_of :body_raw
     should_validate_presence_of :locale
     
-    should_have_named_scope :by_newest
-    should_have_named_scope :recent
-    should_have_named_scope :by_alpha
-    should_have_named_scope :public
-    should_have_named_scope :no_contentable
-    
+    should_scope_by_newest
+    should_scope_recent
+    should_scope_public
+    should_scope_by_alpha_title
+    should_scope_by_creator
+        
     should_sanitize :title
     should_sanitize :body
-        
+
+    context "named scopes" do
+      context "no_contentable" do
+        # named_scope :no_contentable, :conditions => 'contentable_id IS NULL'
+        setup do
+          @user = Factory(:user)
+          @content_not = Factory(:content, :contentable => nil)
+          @content = Factory(:content, :contentable => @user)
+        end
+        should "not find content with contentable association" do
+          assert !Content.no_contentable.include?(@content)
+        end
+        should "find content without contentable association" do
+          assert Content.no_contentable.include?(@content_not)
+        end
+      end
+      context "by_scope" do
+        # named_scope :by_scope, lambda { |scope| { :conditions => ["slugs.scope = ?", File.join('/', scope)], :include => [:slugs] } }
+        # TODO add test
+      end
+      context "by_parent" do
+        # named_scope :by_parent, lambda { |parent_id| { :conditions => ['parent_id = ?', parent_id || 0] } }
+        setup do
+          Content.delete_all
+          @parent_content = Factory(:content)
+          @item = Factory(:content, :parent => @parent_content)
+          @item1 = Factory(:content)
+        end
+        should "find items by the source they are associated with" do
+          items = Content.by_parent(@parent_content)
+          assert items.include?(@item), "created_by didn't find item whose parent is user"
+          assert !items.include?(@item1), "created_by found item that should not have user as a parent"
+        end
+      end
+    end
+
     context "translations" do
       should "have localized title" do
         assert_equal 'hola', @content.locale_title('es')
@@ -288,4 +346,4 @@ class ContentTest < ActiveSupport::TestCase
     end
   end
   
-end
+end

data/test/rails_root/test/unit/content_translation_test.rb

@@ -1,3 +1,17 @@
+# == Schema Information
+#
+# Table name: content_translations
+#
+#  id          :integer         not null, primary key
+#  content_id  :integer
+#  title       :string(255)
+#  body        :text
+#  locale      :string(255)
+#  user_edited :boolean
+#  created_at  :datetime
+#  updated_at  :datetime
+#
+
 require File.dirname(__FILE__) + '/../test_helper'
 
 # Used to test muck_content_translation
@@ -6,36 +20,59 @@ class ContentTranslationTest < ActiveSupport::TestCase
   context "A content translation instance" do    
     setup do
       @content_translation = Factory(:content_translation)
-    end
-    
+    end    
     subject { @content_translation }
-    
     should_belong_to :content
-    should_have_named_scope :by_newest
-    should_have_named_scope :recent
-    should_have_named_scope :by_alpha
-    should_have_named_scope :by_locale
+    should_scope_recent
   end
   
-  context "find by locale" do
+  context "named scope" do
+    
     setup do
+      @content = Factory(:content)
       ContentTranslation.destroy_all
-      @content_one = Factory(:content)
-      @content_two = Factory(:content)
+      @first = Factory(:content_translation, :created_at => 1.day.ago, :content => @content, :title => 'a')
+      @second = Factory(:content_translation, :created_at => 1.week.ago, :content => @content, :title => 'b')
     end
-    should "find two English translations" do
-      translations = ContentTranslation.by_locale('en')
-      assert_equal 2, translations.length
+    
+    # We have to build a custom 'by_newest' and 'by_alpha' test here since creating a content object 
+    # will create a large number of content translations.
+    context "by_newest scope" do
+      should "sort by created_at" do
+        assert_equal @first, ContentTranslation.by_newest[0]
+        assert_equal @second, ContentTranslation.by_newest[1]
+      end
     end
-    should "find two Spanish translations" do
-      translations = ContentTranslation.by_locale('es')
-      assert_equal 2, translations.length
+    
+    context "by_alpha" do
+      should "sort by title" do
+        assert_equal @first, ContentTranslation.by_alpha[0]
+        assert_equal @second, ContentTranslation.by_alpha[1]
+      end
     end
-    should "delete translations" do
-      assert_difference "ContentTranslation.count", -(@content_two.content_translations.count) do
-        @content_two.destroy
+    
+    context "find by locale" do
+      #named_scope :by_locale, lambda { |locale| { :conditions => ['content_translations.locale = ?', locale] } }
+      setup do
+        ContentTranslation.destroy_all
+        @content_one = Factory(:content)
+        @content_two = Factory(:content)
+      end
+      should "find two English translations" do
+        translations = ContentTranslation.by_locale('en')
+        assert_equal 2, translations.length
+      end
+      should "find two Spanish translations" do
+        translations = ContentTranslation.by_locale('es')
+        assert_equal 2, translations.length
+      end
+      should "delete translations" do
+        assert_difference "ContentTranslation.count", -(@content_two.content_translations.count) do
+          @content_two.destroy
+        end
       end
     end
+    
   end
   
-end
+end

data/test/rails_root/test/unit/user_test.rb

@@ -1,3 +1,34 @@
+# == Schema Information
+#
+# Table name: users
+#
+#  id                  :integer         not null, primary key
+#  login               :string(255)
+#  email               :string(255)
+#  first_name          :string(255)
+#  last_name           :string(255)
+#  crypted_password    :string(255)
+#  password_salt       :string(255)
+#  persistence_token   :string(255)     not null
+#  single_access_token :string(255)     not null
+#  perishable_token    :string(255)     not null
+#  login_count         :integer         default(0), not null
+#  failed_login_count  :integer         default(0), not null
+#  last_request_at     :datetime
+#  current_login_at    :datetime
+#  last_login_at       :datetime
+#  current_login_ip    :string(255)
+#  last_login_ip       :string(255)
+#  terms_of_service    :boolean         not null
+#  time_zone           :string(255)     default("UTC")
+#  disabled_at         :datetime
+#  created_at          :datetime
+#  activated_at        :datetime
+#  updated_at          :datetime
+#  identity_url        :string(255)
+#  url_key             :string(255)
+#
+
 require File.dirname(__FILE__) + '/../test_helper'
 
 # Used to test muck_friend_user
@@ -9,4 +40,4 @@ class UserTest < ActiveSupport::TestCase
 
  
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-contents
 version: !ruby/object:Gem::Version 
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 -07:00
+date: 2009-12-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency