acts_as_word_cloud 0.0.1 → 0.0.2

data/spec/dummy/app/models/article_reader.rb

@@ -0,0 +1,10 @@
+class ArticleReader < ActiveRecord::Base
+  acts_as_word_cloud :included_methods => [:name]
+  
+  belongs_to :article
+  belongs_to :reader
+
+  def name
+    "ArticleReader #{id}"
+  end
+end

data/spec/dummy/app/models/author.rb

@@ -1,7 +1,10 @@
 class Author < ActiveRecord::Base
-  acts_as_word_cloud :methods_to_use => [:name], :excluded_models => [], :skipped_attributes => [], :depth => 1
+  acts_as_word_cloud
   
   has_many :articles
   belongs_to :publisher
-  belongs_to :site
+
+  def to_s
+    "Author #{id}"
+  end
 end

data/spec/dummy/app/models/publisher.rb

@@ -1,7 +1,8 @@
 class Publisher < ActiveRecord::Base
-  acts_as_word_cloud :methods_to_use => [:name], :excluded_models => [], :skipped_attributes => [], :depth => 1
-  
-  has_one :site
-  has_many :articles
   has_many :authors
+  has_many :articles, :through => :authors
+
+  def to_s
+    "Publisher #{id}"
+  end
 end

data/spec/dummy/app/models/reader.rb

@@ -1,7 +1,10 @@
 class Reader < ActiveRecord::Base
-  acts_as_word_cloud :methods_to_use => [:username], :excluded_models => [], :skipped_attributes => [], :depth => 1
+  acts_as_word_cloud
   
-  has_many :followings
-  has_many :articles, :through => :followings
-  belongs_to :site
+  has_many :article_readers
+  has_many :articles, :through => :article_readers
+
+  def to_s
+    "Reader #{id}"
+  end
 end

data/spec/dummy/db/migrate/20121107162154_create_system.rb

@@ -2,29 +2,19 @@ class CreateSystem < ActiveRecord::Migration
   def change
     create_table :articles do |t|
       t.integer :author_id
-      t.integer :publisher_id
-      t.integer :site_id
       t.string :title
       t.string :genre
       t.text :content
 
       t.timestamps
     end
-    add_index :articles, :author_id
-    add_index :articles, :publisher_id
-    add_index :articles, :site_id
 
     create_table :authors do |t|
       t.integer :publisher_id
-      t.integer :site_id
       t.string :name
-      t.string :genre
-      t.integer :age
       
       t.timestamps
     end
-    add_index :authors, :publisher_id
-    add_index :authors, :site_id
 
     create_table :publishers do |t|
       t.string :name
@@ -34,31 +24,15 @@ class CreateSystem < ActiveRecord::Migration
     end
     
     create_table :readers do |t|
-      t.integer :site_id
-      t.string :username
+      t.string :name
       t.integer :age
       
       t.timestamps
     end
-    add_index :readers, :site_id
    
-    create_table :followings do |t|
-      t.string :special_name
+    create_table :article_readers do |t|
       t.integer :article_id
       t.integer :reader_id
     end
-    add_index :followings, :article_id
-    add_index :followings, :reader_id
-    
-    create_table :sites do |t|
-      t.integer :publisher_id 
-      t.string :name
-      t.string :domain
-      t.string :genre
-
-      t.timestamps
-    end
-    add_index :sites, :publisher_id
-
   end
 end

data/spec/dummy/db/schema.rb

@@ -13,69 +13,39 @@
 
 ActiveRecord::Schema.define(:version => 20121107162154) do
 
+  create_table "article_readers", :force => true do |t|
+    t.integer "article_id"
+    t.integer "reader_id"
+  end
+
   create_table "articles", :force => true do |t|
     t.integer  "author_id"
-    t.integer  "publisher_id"
-    t.integer  "site_id"
     t.string   "title"
     t.string   "genre"
     t.text     "content"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "articles", ["author_id"], :name => "index_articles_on_author_id"
-  add_index "articles", ["publisher_id"], :name => "index_articles_on_publisher_id"
-  add_index "articles", ["site_id"], :name => "index_articles_on_site_id"
-
   create_table "authors", :force => true do |t|
     t.integer  "publisher_id"
-    t.integer  "site_id"
     t.string   "name"
-    t.string   "genre"
-    t.integer  "age"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  add_index "authors", ["publisher_id"], :name => "index_authors_on_publisher_id"
-  add_index "authors", ["site_id"], :name => "index_authors_on_site_id"
-
-  create_table "followings", :force => true do |t|
-    t.string  "special_name"
-    t.integer "article_id"
-    t.integer "reader_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "followings", ["article_id"], :name => "index_followings_on_article_id"
-  add_index "followings", ["reader_id"], :name => "index_followings_on_reader_id"
-
   create_table "publishers", :force => true do |t|
     t.string   "name"
     t.string   "location"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "readers", :force => true do |t|
-    t.integer  "site_id"
-    t.string   "username"
-    t.integer  "age"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  add_index "readers", ["site_id"], :name => "index_readers_on_site_id"
-
-  create_table "sites", :force => true do |t|
-    t.integer  "publisher_id"
     t.string   "name"
-    t.string   "domain"
-    t.string   "genre"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
+    t.integer  "age"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "sites", ["publisher_id"], :name => "index_sites_on_publisher_id"
-
 end

data/spec/integration_spec.rb

@@ -0,0 +1,123 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Integration tests" do
+  describe "mixin" do
+    it "should set default values if called with no arguments" do
+      reader = Reader.new
+      reader.word_cloud_attributes[:included_methods].should == []
+      reader.word_cloud_attributes[:excluded_methods].should == []
+      reader.word_cloud_attributes[:excluded_models].should == []
+      reader.word_cloud_attributes[:depth].should == ActsAsWordCloud.config.default_search_depth
+      reader.word_cloud_attributes[:object_name_methods].should == ActsAsWordCloud.config.object_name_methods
+    end
+
+    it "should set attributes included in the mixin call" do
+      article = Article.new
+      article.word_cloud_attributes[:included_methods].should == [:truncated_title]
+      article.word_cloud_attributes[:excluded_methods].should == [:genre]
+      article.word_cloud_attributes[:excluded_models].should == [ArticleReader, Reader]
+      article.word_cloud_attributes[:depth].should == 2
+      article.word_cloud_attributes[:object_name_methods].should == [:title]
+    end
+  end
+
+  describe "included methods" do
+    before(:each) do
+      @publisher = Publisher.make(:name => "Cloudhouse")
+      @author = Author.make(:publisher => @publisher, :name => "Jeremiah Hemphill")
+      @article = Article.make(:author => @author)
+
+      @word_cloud_output = @article.word_cloud(:array)
+    end
+
+    it "should return database attributes" do
+      expected_word_cloud_output = [
+        @article.title,
+        @article.content
+      ]
+      expected_word_cloud_output.each do |str|
+        @word_cloud_output.should include str
+      end
+    end
+    
+    it "should return associated object names" do
+      expected_word_cloud_output = [
+        @author.name,
+        @publisher.name,
+      ]
+      expected_word_cloud_output.each do |str|
+        @word_cloud_output.should include str
+      end
+    end
+
+    it "should return included methods" do
+      expected_word_cloud_output = [
+        @article.truncated_title
+      ]
+      expected_word_cloud_output.each do |str|
+        @word_cloud_output.should include str
+      end
+    end
+  end
+
+  describe "excluded methods" do
+    before(:each) do
+      @article = Article.make
+      @word_cloud_output = @article.word_cloud(:array)
+    end
+
+    it "should not include database attributes in excluded methods" do
+      @word_cloud_output.should_not include @article.genre
+    end
+  end
+
+  describe "excluded_models" do
+    before(:each) do
+      @article = Article.make
+      @reader = Reader.make(:name => "Alfredo Uribe")
+      @article_reader = ArticleReader.make(:article => @article, :reader => @reader)
+      @word_cloud_output = @article.word_cloud(:array)
+    end
+
+    it "should not include excluded models with an association to the current model" do
+      @word_cloud_output.should_not include @article_reader.name
+    end
+
+    it "should not include children of excluded models if the depth is set to 2" do
+      @word_cloud_output.should_not include @reader.name
+    end
+  end
+
+  describe "depth" do
+    before(:each) do
+      @publisher = Publisher.make(:name => "Cloudhouse")
+      @author = Author.make(:publisher => @publisher, :name => "Jeremiah Hemphill")
+      @article = Article.make(:author => @author)
+      @reader = Reader.make(:name => "Alfredo Uribe")
+      @article_reader = ArticleReader.make(:article => @article, :reader => @reader)
+    end
+
+    it "should return a single level of associations if the depth is set to 1" do
+      @word_cloud_output = @article_reader.word_cloud(:array)
+
+      expected_word_cloud_output = [ @article.title, @reader.name ]
+      expected_word_cloud_output.each { |str| @word_cloud_output.should include str }
+
+      unexpected_word_cloud_output = [ @publisher.name, @author.name ]
+      unexpected_word_cloud_output.each { |str| @word_cloud_output.should_not include str }
+      
+    end
+
+    it "should return multiple levels of associations if the depth is set to 2" do
+      @word_cloud_output = @article.word_cloud(:array)
+
+      expected_word_cloud_output = [
+        @author.name,
+        @publisher.name,
+      ]
+      expected_word_cloud_output.each do |str|
+        @word_cloud_output.should include str
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,12 +3,14 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 ENV["RAILS_ENV"] = 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
-require File.expand_path("../dummy/features/support/blueprints", __FILE__) 
-require File.expand_path("../dummy/lib/model_methods_helper", __FILE__)
 
-require 'rspec'
+# require 'rails/test_help'
+require 'rspec/rails'
 require 'acts_as_word_cloud'
+require 'database_cleaner'
 
+# Run any available migration
+ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
@@ -17,5 +19,18 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 RSpec.configure do |config|
   
   config.mock_with :rspec
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with(:truncation)
+  end 
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end 
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end 
     
 end

data/spec/{dummy/features/support → support}/blueprints.rb

@@ -14,22 +14,15 @@ def generate_tiny_text
 end
 
 Article.blueprint do
-  author = Author.make
-  author_id { author.id }
-  publisher_id { author.publisher.id }
-  site_id { author.site.id }
+  author { Author.make }
   title { generate_tiny_text }
   genre { generate_tiny_text }
   content { generate_text }
 end
 
 Author.blueprint do
-  site = Site.make
-  site_id { site.id }
-  publisher_id { site.publisher.id }
+  publisher { Publisher.make }
   name { generate_tiny_text }
-  genre { generate_tiny_text }
-  age { generate_age }
 end
 
 Publisher.blueprint do
@@ -37,21 +30,13 @@ Publisher.blueprint do
   location { generate_tiny_text }
 end
 
-Following.blueprint do
-  special_name { generate_tiny_text }
-  article_id { Article.make }
-  reader_id { Reader.make }
+ArticleReader.blueprint do
+  article { Article.make }
+  reader { Reader.make }
 end
 
 Reader.blueprint do
-  site_id { Site.make }
-  username { generate_tiny_text }
+  name { generate_tiny_text }
   age { generate_age }
 end
 
-Site.blueprint do
-  publisher_id { Publisher.make }
-  name { generate_tiny_text }
-  domain { generate_tiny_text }
-  genre { generate_tiny_text }
-end

metadata

@@ -2,15 +2,16 @@
 name: acts_as_word_cloud
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jeremiah Hemphill
+- Alfredo Uribe
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2013-02-19 00:00:00 Z
+date: 2013-02-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -46,24 +47,24 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: rspec-rails
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "3.12"
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: database_cleaner
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.6.7
   type: :development
   prerelease: false
   version_requirements: *id005
@@ -122,9 +123,6 @@ files:
 - Rakefile
 - VERSION
 - acts_as_word_cloud.gemspec
-- features/acts_as_word_cloud.feature
-- features/step_definitions/acts_as_word_cloud_steps.rb
-- features/support/env.rb
 - lib/acts_as_word_cloud.rb
 - lib/acts_as_word_cloud/config.rb
 - lib/acts_as_word_cloud/engine.rb
@@ -132,7 +130,6 @@ files:
 - lib/acts_as_word_cloud/word_cloud.rb
 - lib/generators/acts_as_word_cloud/install_generator.rb
 - lib/generators/acts_as_word_cloud/templates/config.rb
-- lib/model_methods_helper.rb
 - spec/acts_as_word_cloud_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
@@ -143,11 +140,10 @@ files:
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/article.rb
+- spec/dummy/app/models/article_reader.rb
 - spec/dummy/app/models/author.rb
-- spec/dummy/app/models/following.rb
 - spec/dummy/app/models/publisher.rb
 - spec/dummy/app/models/reader.rb
-- spec/dummy/app/models/site.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -167,16 +163,16 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20121107162154_create_system.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/features/support/blueprints.rb
 - spec/dummy/lib/assets/.gitkeep
-- spec/dummy/lib/model_methods_helper.rb
 - spec/dummy/log/.gitkeep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
+- spec/integration_spec.rb
 - spec/spec_helper.rb
+- spec/support/blueprints.rb
 homepage: http://github.com/jeremiahishere/acts_as_word_cloud
 licenses: 
 - MIT
@@ -190,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4154919138677042520
+      hash: 2660284366431254682
       segments: 
       - 0
       version: "0"

data/features/acts_as_word_cloud.feature

@@ -1,9 +0,0 @@
-Feature: something something
-  In order to something something
-  A user something something
-  something something something
-
-  Scenario: something something
-    Given inspiration
-    When I create a sweet new gem
-    Then everyone should see how awesome I am

data/features/support/env.rb

@@ -1,13 +0,0 @@
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
-require 'acts_as_word_cloud'
-
-require 'rspec/expectations'

data/lib/model_methods_helper.rb

@@ -1,87 +0,0 @@
-require 'find'
-class ModelMethodsHelper
-
-  # finds or makes a model based on the given attributes
-  # @param [Constant] model_name The name of the model
-  # @param [Hash] attributes The attributes to find the model or add to the new one
-  def self.find_or_make_by_attributes(model_name, attributes)
-    instances = model_name.where(attributes)
-    if instances.empty?
-      return model_name.make(attributes)
-    else
-      return instances.first
-    end
-  end
-
-  # Uses the descendants_of method to determine the model structure
-  # Then tableizes and converts to symbol
-  #
-  # Load all models must be run for accurate descendants list
-  # it is now being called every time this method is called
-  # for now it works because this is only called one time when the authorization config is loaded on initialize
-  # if this ever changes, this code may need to be update (2-15-2012)
-  #
-  # @return [Array] Array with file names underscored and pluralized in the format [:users, :case_placements, :roles, :job_locations, ... ]
-  def self.get_model_symbol_array
-    # Old method:
-    # Major redesign of this method that finds namespaced models
-    # Finds all files in the given folder, tries to find the ruby files
-    # Then processes the names to get the names we need for the code
-    #
-    # @return [Array] Array with file names underscored and pluralized in the format [:users, :case_placements, :roles, :job_locations, ... ]
-    #model_array = []
-    #Find.find("#{Rails.root.to_s}/app/models") do |model_path|
-    #  if model_path.match(/\.rb$/)
-    #    model_path = model_path.gsub("#{Rails.root.to_s}/app/models/", "")
-    #    model_path = model_path.gsub("/","_")
-    #    model_path = model_path.gsub(/\.rb$/, "")
-    #    model_array.push model_path.pluralize.to_sym
-    #  end
-    #end
-    #return model_array
-
-    # new method
-    self.load_all_models
-    # returns the table name if there is one or tableizes the model name if not
-    # our permissions system generally uses table names for model permissions
-    return self.descendants_of(ActiveRecord::Base).map{ |m| m.abstract_class ? m.to_s.tableize.to_sym : m.table_name.to_sym }
-  end
-
-  # Requires all models so that they are visible in the object space
-  # This is only necessary when we are not caching classes
-  def self.load_all_models
-    if !::Rails.application.config.cache_classes
-      Dir[Rails.root.join("app/models/**/*.rb")].each {|f| require f}
-    end
-  end
-
-  # Return a list of descendants of the given model.
-  #
-  # If direct is set to true, only return immediate descendants
-  # The load_all_models must be called before this is called or the result may not be correct
-  #
-  # @param [Constant] parent_class The parent class to look for descendants for
-  # @param [Boolean] direct Whether to look for all descendants or immediate descendants
-  # @return [Array] An array of class constants that satisfy the conditions of the parameters
-  def self.descendants_of(parent_class, direct = false)
-    classes = []
-    ObjectSpace.each_object(::Class).each do |klass|
-      if direct
-        classes << klass if klass.superclass == parent_class
-      else
-        classes << klass if klass < parent_class
-      end
-    end
-    return classes
-  end
-
-  # Convenience method to return the results of descendants_of with direct set to true 
-  #
-  # The load_all_models must be called before this is called or the result may not be correct
-  #
-  # @param [Constant] parent_class The parent class to look for descendants for
-  # @return [Array] An array of class constants that satisfy the conditions of the parameters
-  def self.direct_descendants_of(parent_class)
-    return self.descendants_of(parent_class, true)
-  end
-end

data/spec/dummy/app/models/following.rb

@@ -1,5 +0,0 @@
-class Following < ActiveRecord::Base
-  
-  belongs_to :article
-  belongs_to :reader
-end

data/spec/dummy/app/models/site.rb

@@ -1,8 +0,0 @@
-class Site < ActiveRecord::Base
-  acts_as_word_cloud :methods_to_use => [:domain], :excluded_models => [], :skipped_attributes => [], :depth => 2
-  
-  has_many :articles
-  has_many :authors
-  has_many :readers
-  belongs_to :publisher
-end