muck-services 0.1.10 → 0.1.11

data/test/rails_root/config/environment.rb

@@ -15,23 +15,24 @@ end
 
 Rails::Initializer.run do |config|
   config.time_zone = 'UTC'
-  config.gem 'mislav-will_paginate', :lib => 'will_paginate', :source => 'http://gems.github.com'
-  config.gem "binarylogic-authlogic", :lib => 'authlogic', :source  => 'http://gems.github.com', :version => ">=2.1.0"
-  config.gem "binarylogic-searchlogic", :lib => 'searchlogic', :source  => 'http://gems.github.com', :version => '~> 2.1.1'
+  config.gem "will_paginate"
+  config.gem "authlogic"
+  config.gem "searchlogic"
   config.gem "bcrypt-ruby", :lib => "bcrypt", :version => ">=2.0.5"
-  config.gem 'mbleigh-acts-as-taggable-on', :lib => "acts-as-taggable-on", :source => "http://gems.github.com"
-  config.gem "collectiveidea-awesome_nested_set", :lib => 'awesome_nested_set', :source => "http://gems.github.com"
+  config.gem "acts-as-taggable-on"
+  config.gem "awesome_nested_set"
   config.gem "muck-feedbag", :lib => "feedbag", :source => "http://gems.github.com"
   config.gem "pauldix-feedzirra", :lib => 'feedzirra', :source => "http://gems.github.com"
   config.gem "httparty"
   config.gem "river"
   config.gem "overlord"
-  config.gem "friendly_id", :version => '>=2.1.3'
+  config.gem "friendly_id"
   config.gem 'muck-engine', :lib => 'muck_engine'
   config.gem 'muck-users', :lib => 'muck_users'
   config.gem 'muck-comments', :lib => 'muck_comments'
   config.gem 'muck-activities', :lib => 'muck_activities'
   config.gem 'muck-shares', :lib => 'muck_shares'
   config.gem 'muck-solr', :lib => 'acts_as_solr'
+  config.gem 'muck-raker', :lib => 'muck-raker'
   config.plugin_locators << TestGemLocator
 end

data/test/rails_root/config/environments/test.rb

@@ -22,13 +22,3 @@ config.action_controller.allow_forgery_protection    = false
 config.action_mailer.delivery_method = :test
 
 HOST = "localhost"
-
-config.gem 'thoughtbot-shoulda',
-  :lib     => 'shoulda',
-  :source  => "http://gems.github.com",
-  :version => '>= 2.9.1'
-config.gem 'thoughtbot-factory_girl',
-  :lib     => 'factory_girl',
-  :source  => "http://gems.github.com",
-  :version => '>= 1.2.0'
-config.gem "rcov", :version => '>=0.8.1.2.0'

data/test/rails_root/db/migrate/20090602191243_create_muck_raker.rb

@@ -1,10 +1,7 @@
 class CreateMuckRaker < ActiveRecord::Migration
 
   def self.up
-    
-    # Gets the database adapter info defined in the database.yml file
-    adapter = User.connection.instance_variable_get("@config")[:adapter]
-             
+
     create_table "action_types", :force => true do |t|
       t.string  "action_type"
       t.integer "weight"
@@ -257,13 +254,7 @@ class CreateMuckRaker < ActiveRecord::Migration
       t.integer  "entry_id"
       t.boolean  "autogenerated", :default => false
     end
-    
-    if adapter == 'mysql'
-      execute "ALTER TABLE entries_subjects DROP COLUMN id, DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, entry_id);"
-    elsif adapter == 'postgresql'
-      execute "CREATE UNIQUE INDEX entries_subjects_subject_id_entry_id ON entries_subjects USING btree(subject_id, entry_id); "
-      execute "ALTER TABLE entries_subjects CLUSTER ON entries_subjects_subject_id_entry_id; "
-    end
+    execute "ALTER TABLE entries_subjects DROP COLUMN id, DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, entry_id);"
     add_index "entries_subjects", ["subject_id"]
     add_index "entries_subjects", ["entry_id"]
     add_index "entries_subjects", ["autogenerated"]
@@ -273,14 +264,8 @@ class CreateMuckRaker < ActiveRecord::Migration
       t.string   "filter"
       t.string   "tag_list", :limit => 2500
     end
-    
-    if adapter == 'mysql'
-      execute "ALTER TABLE cloud_caches DROP COLUMN id, DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(language_id, filter);"
-    elsif adapter == 'postgresql'
-      execute "CREATE UNIQUE INDEX cloud_caches_language_id_filter ON cloud_caches USING btree(language_id, filter); "
-      execute "ALTER TABLE cloud_caches CLUSTER ON cloud_caches_language_id_filter; "
-    end
-    
+    execute "ALTER TABLE cloud_caches DROP COLUMN id, DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(language_id, filter);"
+
     # add a flag to the languages table to flag languages we support
     add_column :languages, :muck_raker_supported, :boolean, :default => false
     add_column :languages, :indexed_records, :integer, :default => 0

data/test/rails_root/db/migrate/20090703175825_denormalize_entries_subjects.rb

@@ -1,41 +1,15 @@
 class DenormalizeEntriesSubjects < ActiveRecord::Migration
   def self.up
-    
-    # Gets the database adapter info defined in the database.yml file
-    adapter = User.connection.instance_variable_get("@config")[:adapter]
-    
     add_column :entries_subjects, :language_id, :integer
     add_column :entries_subjects, :grain_size, :string
     add_index "entries_subjects", ["language_id"]
     add_index "entries_subjects", ["grain_size"]
-    
-    if adapter == 'mysql'
-      execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, language_id, grain_size, entry_id);"
-      execute "UPDATE entries_subjects AS es INNER JOIN entries AS e ON e.id = es.entry_id SET es.language_id = e.language_id, es.grain_size = e.grain_size"
-    elsif adapter == 'postgresql'
-      execute "DROP INDEX entries_subjects_subject_id_entry_id"
-      execute "CREATE UNIQUE INDEX entries_subjects_subject_id_entry_id ON entries_subjects USING btree(subject_id, language_id, grain_size, entry_id); "
-      execute "ALTER TABLE entries_subjects CLUSTER ON entries_subjects_subject_id_entry_id; "
-      execute "UPDATE entries_subjects es SET language_id = e.language_id, grain_size = e.grain_size FROM entries e WHERE es.entry_id = e.id"
-    else
-      raise 'Migration not implemented for this DB adapter'
-    end
-    
+    execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, language_id, grain_size, entry_id);"
+    execute "UPDATE entries_subjects AS es INNER JOIN entries AS e ON e.id = es.entry_id SET es.language_id = e.language_id, es.grain_size = e.grain_size"
   end
 
   def self.down
-    
-    # Gets the database adapter info defined in the database.yml file
-    adapter = User.connection.instance_variable_get("@config")[:adapter]
-    
-    if adapter == 'mysql'
-      execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, entry_id);"
-    elsif adapter == 'postgresql'
-      execute "DROP INDEX entries_subjects_subject_id_entry_id" 
-      execute "CREATE UNIQUE INDEX entries_subjects_subject_id_entry_id ON entries_subjects USING btree(subject_id, entry_id); "
-      execute "ALTER TABLE entries_subjects CLUSTER ON entries_subjects_subject_id_entry_id; "
-    end
-    
+    execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, entry_id);"
     remove_column :entries_subjects, :language_id 
     remove_column :entries_subjects, :grain_size 
   end

data/test/rails_root/db/migrate/20090717175825_normalize_entries_subjects.rb

@@ -1,19 +1,6 @@
 class NormalizeEntriesSubjects < ActiveRecord::Migration
   def self.up
-    
-    # Gets the database adapter info defined in the database.yml file
-    adapter = User.connection.instance_variable_get("@config")[:adapter]
-    
-    if adapter == 'mysql'
-      execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, entry_id);"
-    elsif adapter == 'postgresql'
-      execute "DROP INDEX entries_subjects_subject_id_entry_id" 
-      execute "CREATE UNIQUE INDEX entries_subjects_subject_id_entry_id ON entries_subjects USING btree(subject_id, entry_id); "
-      execute "ALTER TABLE entries_subjects CLUSTER ON entries_subjects_subject_id_entry_id; "
-    else
-      raise 'Migration not implemented for this data adapter'
-    end
-    
+    execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, entry_id);"
     remove_column :entries_subjects, :language_id 
     remove_column :entries_subjects, :grain_size 
     execute "delete from entries_subjects where entry_id IN (select entries.id from entries inner join feeds ON feeds.id = entries.feed_id where feeds.uri = 'http://ndr.nsdl.org/oai?verb=ListRecords&metadataPrefix=nsdl_dc&set=439869');"
@@ -21,27 +8,11 @@ class NormalizeEntriesSubjects < ActiveRecord::Migration
   end
 
   def self.down
-    
-    # Gets the database adapter info defined in the database.yml file
-    adapter = User.connection.instance_variable_get("@config")[:adapter]
-    
     add_column :entries_subjects, :language_id, :integer
     add_column :entries_subjects, :grain_size, :string
     add_index "entries_subjects", ["language_id"]
     add_index "entries_subjects", ["grain_size"]
-    
-    if adapter == 'mysql'
-      execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, language_id, grain_size, entry_id);"
-      execute "UPDATE entries_subjects AS es INNER JOIN entries AS e ON e.id = es.entry_id SET es.language_id = e.language_id, es.grain_size = e.grain_size"
-    elsif adapter == 'postgresql'
-      execute "DROP INDEX entries_subjects_subject_id_entry_id"
-      execute "CREATE UNIQUE INDEX entries_subjects_subject_id_entry_id ON entries_subjects USING btree(subject_id, language_id, grain_size, entry_id); "
-      execute "ALTER TABLE entries_subjects CLUSTER ON entries_subjects_subject_id_entry_id; "
-      execute "UPDATE entries_subjects es SET language_id = e.language_id, grain_size = e.grain_size FROM entries e WHERE es.entry_id = e.id"
-    else
-      raise 'Migration not implemented for this data adapter'
-    end
-    
-    
+    execute "ALTER TABLE entries_subjects DROP PRIMARY KEY, ADD PRIMARY KEY USING BTREE(subject_id, language_id, grain_size, entry_id);"
+    execute "UPDATE entries_subjects AS es INNER JOIN entries AS e ON e.id = es.entry_id SET es.language_id = e.language_id, es.grain_size = e.grain_size"
   end
 end

data/test/rails_root/test/factories.rb

@@ -1,151 +1,6 @@
-Factory.sequence :email do |n|
-  "somebody#{n}@example.com"
-end
-
-Factory.sequence :uri do |n|
-  "www#{n}.example.com"
-end
-
-Factory.sequence :login do |n|
-  "inquire#{n}"
-end
-
-Factory.sequence :name do |n|
-  "a_name#{n}"
-end
-
-Factory.sequence :abbr do |n|
-  "abbr#{n}"
-end
-
-Factory.sequence :locale do |n|
-  "a#{n}"
-end
-
-Factory.sequence :description do |n|
-  "This is the description: #{n}"
-end
-
-Factory.sequence :title do |n|
-  "This is the title: #{n}"
-end
-
-Factory.define :state do |f|
-  f.name { Factory.next(:name) }
-  f.abbreviation { Factory.next(:abbr) }
-  f.country {|a| a.association(:country) }
-end
-
-Factory.define :country do |f|
-  f.name { Factory.next(:name) }
-  f.abbreviation { Factory.next(:abbr) }
-end
-
-Factory.define :language do |f|
-  f.name { Factory.next(:name) }
-  f.english_name { Factory.next(:name) }
-  f.locale { Factory.next(:locale) }
-  f.supported true
-  f.muck_raker_supported true
-end
-
-Factory.define :user do |f|
-  f.login { Factory.next(:login) }
-  f.email { Factory.next(:email) }
-  f.password 'inquire_pass'
-  f.password_confirmation 'inquire_pass'
-  f.first_name 'test'
-  f.last_name 'guy'
-  f.terms_of_service true
-  f.activated_at DateTime.now
-end
-
-Factory.define :permission do |f|
-  f.role {|a| a.association(:role)}
-  f.user {|a| a.association(:user)}
-end
-
-Factory.define :role do |f|
-  f.rolename 'administrator'
-end
-
-Factory.define :comment do |f|
-  f.body 'test comment'
-  f.user {|a| a.association(:user)}
-end
-
-Factory.define :aggregation do |f|
-  f.title { Factory.next(:name) }
-  f.terms { Factory.next(:name) }
-  f.description { Factory.next(:description) }
-  f.ownable {|a| a.association(:user)}
-end
-
-Factory.define :aggregation_feed do |f|
-  f.feed {|a| a.association(:feed)}
-  f.aggregation {|a| a.association(:aggregation)}
-end
-
-Factory.define :oai_endpoint do |f|
-  f.contributor { |a| a.association(:user) }
-  f.uri { Factory.next(:uri) }
-  f.display_uri { Factory.next(:uri) }
-  f.title { Factory.next(:title) }
-  f.short_title { Factory.next(:title) }
-  f.status 1
-end
-
-Factory.define :feed do |f|
-  f.contributor { |a| a.association(:user) }
-  f.uri { Factory.next(:uri) }
-  f.display_uri { Factory.next(:uri) }
-  f.title { Factory.next(:title) }
-  f.short_title { Factory.next(:title) }
-  f.description { Factory.next(:description) }
-  f.top_tags { Factory.next(:name) }
-  f.priority 1
-  f.status 1
-  f.last_requested_at DateTime.now
-  f.last_harvested_at DateTime.now
-  f.harvest_interval 86400
-  f.failed_requests 0
-  f.harvested_from_display_uri { Factory.next(:uri) }
-  f.harvested_from_title { Factory.next(:title) }
-  f.harvested_from_short_title { Factory.next(:title) }
-  f.entries_count 0
-  f.default_language { |a| a.association(:language) }
-  f.default_grain_size 'unknown'
-end
-
-Factory.define :entry do |f|
-  f.feed { |a| a.association(:feed) }
-  f.permalink { Factory.next(:uri) }
-  f.author { Factory.next(:name) }
-  f.title { Factory.next(:title) }
-  f.description { Factory.next(:description) }
-  f.content { Factory.next(:description) }
-  f.unique_content { Factory.next(:description) }
-  f.published_at DateTime.now
-  f.entry_updated_at DateTime.now
-  f.harvested_at DateTime.now
-  f.language { |a| a.association(:language) }
-  f.direct_link { Factory.next(:uri) }
-  f.grain_size 'unknown'
-end
-
 Factory.define :share do |f|
   f.uri { Factory.next(:uri) }
   f.title { Factory.next(:title) }
   f.shared_by {|a| a.association(:user)}
   f.entry {|a| a.association(:entry)}
-end
-
-Factory.define :service do |f|
-  f.uri { Factory.next(:uri) }
-  f.name { Factory.next(:name) }
-  f.service_category { |a| a.association(:service_category) }
-end
-
-Factory.define :service_category do |f|
-  f.name { Factory.next(:name) }
 end

data/test/rails_root/test/functional/topics_controller_test.rb

@@ -6,6 +6,10 @@ class Muck::TopicsControllerTest < ActionController::TestCase
 
   context "topics controller" do
 
+    setup do
+      bootstrap_services
+    end
+    
     context "GET new" do
       setup do
         get :new

data/test/rails_root/test/test_helper.rb

@@ -1,19 +1,15 @@
 $:.reject! { |e| e.include? 'TextMate' }
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
-require 'ruby-debug'
-gem 'thoughtbot-factory_girl' # from github
-require 'factory_girl'
-require 'mocha'
+gem 'muck-engine'
+require 'muck_test_helper'
 require 'authlogic/test_case'
 require 'active_record/fixtures'
-require 'redgreen' rescue LoadError
 require File.expand_path(File.dirname(__FILE__) + '/factories')
-require File.join(File.dirname(__FILE__), 'shoulda_macros', 'controller')
-require File.join(File.dirname(__FILE__), 'shoulda_macros', 'models')
 
-class ActiveSupport::TestCase 
+class ActiveSupport::TestCase
+  include MuckTestMethods
+  include Authlogic::TestCase
   self.use_transactional_fixtures = true
   self.use_instantiated_fixtures  = true
 
@@ -21,41 +17,10 @@ class ActiveSupport::TestCase
   TEST_RSS_URI = 'http://www.engadget.com/rss.xml'
   TEST_USERNAME_TEMPLATE = 'http://feeds.delicious.com/v2/rss/{username}?count=100'
   
-  include Authlogic::TestCase
-  
-  def login_as(user)
-    success = UserSession.create(user)
-    if !success
-      errors = user.errors.full_messages.to_sentence
-      message = 'User has not been activated' if !user.active?
-      raise "could not login as #{user.to_param}.  Please make sure the user is valid. #{message} #{errors}"
-    end
-    UserSession.find
-  end
-  
-  def assure_logout
-    user_session = UserSession.find
-    user_session.destroy if user_session
-  end
-  
   def ensure_flash(val)
     assert_contains flash.values, val, ", Flash: #{flash.inspect}"
   end
   
-  def ensure_flash_contains(val)
-    flash.values.each do |flv|
-      return true if flv.include?(val)
-    end
-    false
-  end
-  
-end
-
-# turn off solr for tests
-class ActsAsSolr::Post
-  def self.execute(request)
-    true
-  end
 end
 
 

data/test/rails_root/test/unit/share_test.rb

@@ -21,6 +21,9 @@ class ShareTest < ActiveSupport::TestCase
     setup do
       @share = Factory(:share)
     end
+    
+    subject { @share }
+    
     should_belong_to :entry
     should "return entry for discover_attach_to" do
       assert_equal @share.entry, @share.discover_attach_to

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

@@ -34,6 +34,9 @@ class UserTest < ActiveSupport::TestCase
     setup do
       @user = Factory(:user)
     end
+    
+    subject { @user }
+    
     should_have_many :feed_parents
     should_have_many :aggregations
     should_have_many :feeds

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-services
 version: !ruby/object:Gem::Version 
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors: 
 - Joel Duffin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 -07:00
+date: 2009-11-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -237,13 +237,14 @@ files:
 - app/views/oai_endpoints/show.html.erb
 - app/views/parts/_add_feed.html.erb
 - app/views/parts/_select_feed.html.erb
+- app/views/recommendations/get_button.html.erb
 - app/views/recommendations/index.html.erb
 - app/views/recommendations/index.pjs.erb
 - app/views/recommendations/index.rss.builder
 - app/views/recommendations/index.xml.builder
-- app/views/recommendations/index_js.pjs.erb
-- app/views/recommendations/index_real_time.pjs.erb
-- app/views/recommendations/index_real_time.xml.builder
+- app/views/recommendations/real_time.html.erb
+- app/views/recommendations/real_time.pjs.erb
+- app/views/recommendations/real_time.xml.builder
 - app/views/search/_languages.html.erb
 - app/views/search/_result.html.erb
 - app/views/search/_search_box.html.erb
@@ -458,48 +459,6 @@ files:
 - app/views/visits/_toolbar.html.erb
 - app/views/visits/show.html.erb
 - config/muck_services_routes.rb
-- config/solr/README.txt
-- config/solr/cores/de/conf/protwords.txt
-- config/solr/cores/de/conf/schema.xml
-- config/solr/cores/de/conf/solrconfig.xml
-- config/solr/cores/de/conf/stopwords.txt
-- config/solr/cores/de/conf/synonyms.txt
-- config/solr/cores/en/conf/protwords.txt
-- config/solr/cores/en/conf/schema.xml
-- config/solr/cores/en/conf/solrconfig.xml
-- config/solr/cores/en/conf/stopwords.txt
-- config/solr/cores/en/conf/synonyms.txt
-- config/solr/cores/es/conf/protwords.txt
-- config/solr/cores/es/conf/schema.xml
-- config/solr/cores/es/conf/solrconfig.xml
-- config/solr/cores/es/conf/stopwords.txt
-- config/solr/cores/es/conf/synonyms.txt
-- config/solr/cores/fr/conf/protwords.txt
-- config/solr/cores/fr/conf/schema.xml
-- config/solr/cores/fr/conf/solrconfig.xml
-- config/solr/cores/fr/conf/stopwords.txt
-- config/solr/cores/fr/conf/synonyms.txt
-- config/solr/cores/ja/conf/protwords.txt
-- config/solr/cores/ja/conf/schema.xml
-- config/solr/cores/ja/conf/solrconfig.xml
-- config/solr/cores/ja/conf/stopwords.txt
-- config/solr/cores/ja/conf/synonyms.txt
-- config/solr/cores/nl/conf/protwords.txt
-- config/solr/cores/nl/conf/schema.xml
-- config/solr/cores/nl/conf/solrconfig.xml
-- config/solr/cores/nl/conf/stopwords.txt
-- config/solr/cores/nl/conf/synonyms.txt
-- config/solr/cores/ru/conf/protwords.txt
-- config/solr/cores/ru/conf/schema.xml
-- config/solr/cores/ru/conf/solrconfig.xml
-- config/solr/cores/ru/conf/stopwords.txt
-- config/solr/cores/ru/conf/synonyms.txt
-- config/solr/cores/zh/conf/protwords.txt
-- config/solr/cores/zh/conf/schema.xml
-- config/solr/cores/zh/conf/solrconfig.xml
-- config/solr/cores/zh/conf/stopwords.txt
-- config/solr/cores/zh/conf/synonyms.txt
-- config/solr/solr.xml
 - db/bootstrap/attention.yml
 - db/bootstrap/feeds.yml
 - db/bootstrap/oai_endpoints.yml
@@ -589,6 +548,7 @@ files:
 - locales/zh-TW.yml
 - locales/zh.yml
 - muck-services.gemspec
+- public/images/folksemantic/logo-folksemantic-gm.gif
 - public/images/service_icons/16/amazon.png
 - public/images/service_icons/16/ask.png
 - public/images/service_icons/16/bibsonomy.png
@@ -852,6 +812,7 @@ files:
 - public/images/service_icons/facebook_friend_links.jpg
 - public/images/service_icons/facebook_my_links.jpg
 - public/javascripts/muck_services.js
+- public/javascripts/recommenderextension.user.js
 - public/stylesheets/frame.css
 - public/stylesheets/muck_services.css
 - rails/init.rb
@@ -963,11 +924,6 @@ test_files:
 - test/rails_root/test/functional/oai_endpoints_controller_test.rb
 - test/rails_root/test/functional/topics_controller_test.rb
 - test/rails_root/test/functional/visits_controller_test.rb
-- test/rails_root/test/shoulda_macros/controller.rb
-- test/rails_root/test/shoulda_macros/forms.rb
-- test/rails_root/test/shoulda_macros/models.rb
-- test/rails_root/test/shoulda_macros/pagination.rb
-- test/rails_root/test/shoulda_macros/plugins.rb
 - test/rails_root/test/test_helper.rb
 - test/rails_root/test/unit/aggregation_feed_test.rb
 - test/rails_root/test/unit/aggregation_test.rb