agenda 0.1.2 → 0.1.3

data/config/dics/commons.yaml

@@ -0,0 +1 @@
+preposition: [of, with, a]

data/config/dics/conjugations.yaml

@@ -0,0 +1 @@
+go: [went, going]

data/features/dictionaries.feature

@@ -12,6 +12,7 @@ Feature: Dictionaries
     When is loaded
     Then I should get a discarded chars regexp
   
+  @dictionary
   Scenario: Negatively loaded words
     Given the file "config/dictionary.yaml"
     And it contains:
@@ -22,6 +23,7 @@ Feature: Dictionaries
     Then I should get a negative words dictionary
     And negative dictionary should have "disgrace"
     
+  @dictionary
   Scenario: Common words
     Given the file "config/dictionary.yaml"
     And it contains:
@@ -31,6 +33,7 @@ Feature: Dictionaries
     When is loaded
     Then I should get a common words dictionary
   
+  @dictionary
   Scenario: Load dictionary
     Given the file "config/alternate-dictionary.yaml"
     And it contains:
@@ -41,6 +44,7 @@ Feature: Dictionaries
     Then I should get a freak words dictionary
     And I should get a common words dictionary
     
+  @dictionary
   Scenario: Replace dictionary
     Given the file "config/alternate-dictionary.yaml"
     And it contains:
@@ -49,4 +53,36 @@ Feature: Dictionaries
       """
     When I replace dictionaries with it
     Then I should get a freak words dictionary
+    And I should not get a common words dictionary
+    
+  @dictionary
+  Scenario: Load dictionaries from directory
+    Given the directory: "config/dics"
+    And it contains the file "commons.yaml" with:
+      """
+      preposition: [of, with
+      """
+    And it contains the file "conjugations.yaml" with:
+      """
+      go: [went, going
+      """
+    When I load the directory
+    Then I should get a preposition words dictionary
+    And I should get a go words dictionary
+    And I should get a common words dictionary
+    
+  @dictionary
+  Scenario: Replace dictionaries from directory
+    Given the directory: "config/dics"
+    And it contains the file "commons.yaml" with:
+      """
+      preposition: [of, with
+      """
+    And it contains the file "conjugations.yaml" with:
+      """
+      go: [went, going
+      """
+    When I replace dictionaries with those in the directory
+    Then I should get a preposition words dictionary
+    And I should get a go words dictionary
     And I should not get a common words dictionary

data/features/steps/dictionaries.rb

@@ -8,6 +8,19 @@ Given /it contains:/ do |content|
   @the_content.should include(content)
 end
 
+Given /the directory: "(.+?)"$/ do |dir|
+  @dir_path = File.dirname(File.dirname(File.dirname(__FILE__))) + "/" + dir
+  Dir.should exist(@dir_path)
+end
+
+Given /it contains the file "(.+?)" with:$/ do |file, content|
+  @file_path = "#{@dir_path}/#{file}"
+  File.should exist(@file_path)
+  
+  @content = File.read @file_path
+  @content.should include(content)
+end
+
 When /is loaded/ do; end
 
 When /I load it/ do
@@ -18,6 +31,14 @@ When /I replace dictionaries with it/ do
   Agenda.replace_dictionaries_with @path
 end
 
+When /I load the directory/ do
+  Agenda.load_dictionaries_from @dir_path
+end
+
+When /I replace dictionaries with those in the directory/ do 
+  Agenda.replace_dictionaries @dir_path
+end
+
 Then /I should get a (.+?) words dictionary/ do |type|
   Agenda.dictionary[type.to_sym].should_not be_empty
 end

data/features/support/hooks.rb

@@ -0,0 +1,3 @@
+After "@dictionary" do
+  Agenda.reset_dictionaries
+end

data/lib/agenda.rb

@@ -2,15 +2,15 @@ require "yaml"
 
 module Agenda
 
-  base_path = File.dirname(File.dirname(File.expand_path(__FILE__)))
+  @@base_path = File.dirname(File.dirname(File.expand_path(__FILE__)))
   
-  @@base_dictionary = YAML.load_file "#{base_path}/config/dictionary.yaml"
+  @@base_dictionary = YAML.load_file "#{@@base_path}/config/dictionary.yaml"
   @@dictionary = {}
   @@base_dictionary.each do |key, value|
     @@dictionary[key.to_sym] = value
   end
 
-  @@regexp = YAML.load_file "#{base_path}/config/regexp.yaml"
+  @@regexp = YAML.load_file "#{@@base_path}/config/regexp.yaml"
   
   @@regexp.each do |key, value|
     @@regexp[key] = Regexp.new "[#{value}]"
@@ -19,6 +19,15 @@ module Agenda
   def self.dictionary; @@dictionary; end 
   def self.regexp; @@regexp; end
 
+  def self.reset_dictionaries
+    @@dictionary = {}
+    @@base_dictionary = YAML.load_file "#{@@base_path}/config/dictionary.yaml"
+    @@dictionary = {}
+    @@base_dictionary.each do |key, value|
+      @@dictionary[key.to_sym] = value
+    end
+  end
+  
   def self.load_dictionary(path)
     YAML.load_file(path).each do |key, value|
       @@dictionary[key.to_sym] = value
@@ -28,6 +37,17 @@ module Agenda
     @@dictionary = {}
     Agenda.load_dictionary(path)
   end
+  
+  def self.load_dictionaries_from(path)
+    Dir.new(path).each do |file|
+      Agenda.load_dictionary "#{path}/#{file}" if file.end_with? "yaml"
+    end
+  end
+  
+  def self.replace_dictionaries(path)
+    @@dictionary = {}
+    Agenda.load_dictionaries_from path
+  end
 end
 
 # Gem own requires

data/lib/agenda/version.rb

@@ -1,3 +1,3 @@
 module Agenda
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: agenda
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21654444 !ruby/object:Gem::Requirement
+  requirement: &21271896 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21654444
+  version_requirements: *21271896
 description: Text analysis package oriented to deconstruct discourse
 email:
 - xavier.via.canel@gmail.com
@@ -36,6 +36,8 @@ files:
 - Rakefile
 - agenda.gemspec
 - config/alternate-dictionary.yaml
+- config/dics/commons.yaml
+- config/dics/conjugations.yaml
 - config/dictionary.yaml
 - config/regexp.yaml
 - features/dictionaries.feature
@@ -44,6 +46,7 @@ files:
 - features/steps/tagging.rb
 - features/steps/word_count.rb
 - features/support/env.rb
+- features/support/hooks.rb
 - features/tagged_result.feature
 - features/tagging.feature
 - features/word_count.feature