muck-services 3.3.1 → 3.3.2

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rubygems'
-require 'rake'
-require 'rake/rdoctask'
+require 'bundler'
 require 'rspec/core/rake_task'
 
 desc 'Default: run specs.'
@@ -21,7 +20,6 @@ end
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |t|
-    #t.libs << 'lib'
     t.libs << 'test/lib'
     t.pattern = 'test/test/**/*_spec.rb'
     t.verbose = true
@@ -58,23 +56,25 @@ begin
     gem.add_dependency "muck-comments"
     gem.add_development_dependency "shoulda"
     gem.files.exclude 'test/**'
-    gem.test_files.exclude 'test/**'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
-  Jeweler::GemcutterTasks.new
+  Jeweler::RubygemsDotOrgTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
+require 'rake/rdoctask'
+desc 'Generate documentation for the muck-services plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  if File.exist?('VERSION.yml')
+    config = YAML.load(File.read('VERSION.yml'))
+    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
   else
     version = ""
   end
-
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "muck-services #{version}"
+  rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-3.3.1
+3.3.2

data/app/models/service.rb

@@ -26,6 +26,7 @@ class Service < ActiveRecord::Base
   scope :sorted, order("sort ASC")
   scope :identity_services, where('use_for = ?', 'identity')
   scope :tag_services, where('use_for = ?', 'tags')
+  scope :active, where('active = ?', true)
   scope :photo_services, where("service_categories.id = services.service_category_id AND service_categories.name = 'Photos'").includes('service_category')
 
   # Indicates whether service is primarily a photo service ie from flick, picasa, etc

data/app/models/service_category.rb

@@ -10,6 +10,6 @@
 class ServiceCategory < ActiveRecord::Base
   scope :sorted, order("sort ASC")
   has_many :services, :order => 'sort ASC'
-  has_many :identity_services, :class_name => 'Service', :order => 'sort ASC', :conditions => ['use_for = ?', 'identity']
-  has_many :tag_services, :class_name => 'Service', :order => 'sort ASC', :conditions => ['use_for = ?', 'tags']
+  has_many :identity_services, :class_name => 'Service', :order => 'sort ASC', :conditions => ['use_for = ? AND active = ?', 'identity', true]
+  has_many :tag_services, :class_name => 'Service', :order => 'sort ASC', :conditions => ['use_for = ? AND active = ?', 'tags', true]
 end

data/lib/muck-services.rb

@@ -20,5 +20,6 @@ require 'muck-services/models/recommendation'
 require 'muck-services/models/recommendation_owner'
 require 'muck-services/models/services_comment'
 require 'muck-services/models/services_share'
+require 'muck-services/models/tag_cloud'
 
 require 'muck-services/engine'

data/lib/muck-services/models/tag_cloud.rb

@@ -0,0 +1,22 @@
+# include MuckServices::Models::MuckTagCloud
+module MuckServices
+  module Models
+    module MuckTagCloud
+      
+      extend ActiveSupport::Concern
+      
+       module ClassMethods
+         
+         # Get a tag cloud for the given language
+         # HACK language_id = 38 is english
+         def language_tags(language_id = 38, grain_size = 'all', filter = '')
+           cloud = TagCloud.find(:first, :conditions => ["language_id = ? AND grain_size = ? AND filter = ? ", language_id, grain_size, filter.sort.join('/')])
+           cloud.nil? ? '' : cloud.tag_list
+         end
+         
+       end
+      
+    end
+  end
+end
+

data/muck-services.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-services}
-  s.version = "3.3.1"
+  s.version = "3.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin", "Justin Ball"]
-  s.date = %q{2011-03-19}
+  s.date = %q{2011-05-30}
   s.description = %q{This gem contains the rails specific code for dealing with feeds, aggregations and recommendations.  It is meant to work with the muck-raker gem.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -54,7 +54,6 @@ Gem::Specification.new do |s|
     "app/models/service_category.rb",
     "app/models/services_mailer.rb",
     "app/models/subject.rb",
-    "app/models/tag_cloud.rb",
     "app/views/activity_templates/_entry_comment.erb",
     "app/views/activity_templates/_entry_share.erb",
     "app/views/admin/feeds/index.html.erb",
@@ -250,6 +249,7 @@ Gem::Specification.new do |s|
     "lib/muck-services/models/recommendation_owner.rb",
     "lib/muck-services/models/services_comment.rb",
     "lib/muck-services/models/services_share.rb",
+    "lib/muck-services/models/tag_cloud.rb",
     "lib/muck-services/muck_custom_form_builder.rb",
     "lib/muck-services/services.rb",
     "lib/tasks/muck_services.rake",
@@ -261,7 +261,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/tatemae/muck_services}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.0}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Feeds, aggregations and services for muck}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-services
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 3
   - 3
-  - 1
-  version: 3.3.1
+  - 2
+  version: 3.3.2
 platform: ruby
 authors: 
 - Joel Duffin
@@ -16,12 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-19 00:00:00 -06:00
+date: 2011-05-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: acts-as-taggable-on
   prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +31,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  name: acts-as-taggable-on
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: will_paginate
   prerelease: false
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +45,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  name: will_paginate
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: httparty
   prerelease: false
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -59,11 +59,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  name: httparty
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -73,11 +73,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  name: nokogiri
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: hpricot
   prerelease: false
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -87,11 +87,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  name: hpricot
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: muck-feedbag
   prerelease: false
+  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -101,11 +101,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  name: muck-feedbag
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: river
   prerelease: false
+  type: :runtime
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -115,11 +115,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  name: river
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: overlord
   prerelease: false
+  type: :runtime
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -129,11 +129,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  name: overlord
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: feedzirra
   prerelease: false
+  type: :runtime
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -143,11 +143,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  name: feedzirra
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: muck-raker
   prerelease: false
+  type: :runtime
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -157,11 +157,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  name: muck-raker
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: muck-engine
   prerelease: false
+  type: :runtime
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -171,11 +171,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  name: muck-engine
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: muck-users
   prerelease: false
+  type: :runtime
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -185,11 +185,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  name: muck-users
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: muck-comments
   prerelease: false
+  type: :runtime
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -199,11 +199,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  name: muck-comments
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
+  type: :development
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -213,7 +213,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  name: shoulda
   version_requirements: *id014
 description: This gem contains the rails specific code for dealing with feeds, aggregations and recommendations.  It is meant to work with the muck-raker gem.
 email: justin@tatemae.com
@@ -262,7 +262,6 @@ files:
 - app/models/service_category.rb
 - app/models/services_mailer.rb
 - app/models/subject.rb
-- app/models/tag_cloud.rb
 - app/views/activity_templates/_entry_comment.erb
 - app/views/activity_templates/_entry_share.erb
 - app/views/admin/feeds/index.html.erb
@@ -458,6 +457,7 @@ files:
 - lib/muck-services/models/recommendation_owner.rb
 - lib/muck-services/models/services_comment.rb
 - lib/muck-services/models/services_share.rb
+- lib/muck-services/models/tag_cloud.rb
 - lib/muck-services/muck_custom_form_builder.rb
 - lib/muck-services/services.rb
 - lib/tasks/muck_services.rake
@@ -496,7 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Feeds, aggregations and services for muck

data/app/models/tag_cloud.rb

@@ -1,21 +0,0 @@
-# == Schema Information
-#
-# Table name: tag_clouds
-#
-#  id          :integer(4)      not null, primary key
-#  language_id :integer(4)
-#  filter      :string(255)
-#  tag_list    :string(5000)
-#  grain_size  :string(255)     default("all")
-#
-
-class TagCloud < ActiveRecord::Base
-  
-  # Get a tag cloud for the given language
-  # HACK language_id = 38 is english
-  def self.language_tags(language_id = 38, grain_size = 'all', filter = '')
-    cloud = TagCloud.find(:first, :conditions => ["language_id = ? AND grain_size = ? AND filter = ? ", language_id, grain_size, filter.sort.join('/')])
-    cloud.nil? ? '' : cloud.tag_list
-  end
-  
-end