ayadn 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbef520e744519eb89d3572d2ed07278e3d7cff7
-  data.tar.gz: d334761a0eb199dfed6f62ccb9fa67f16dcabee3
+  metadata.gz: 00656e4af8c792c9b5230d9da9bb4bc64513da1a
+  data.tar.gz: 458d524340d6dbd9fc7fc6f9bf705f32777baa71
 SHA512:
-  metadata.gz: d2643e94560b360c577d4f2d08031fd31f561023276a511e12ded496a70cc61a0b91e7306537b53b1360cf747abd342266cd23b9b576b319cfb420a765f4bbad
-  data.tar.gz: 4ae9761ff188b03063756b75ff0138bbc9b5c51384ec5f6bc634a449d3f317528812a5bffbaaf6faa0e72c43a7e5f2d9803b42a0551f0d27ed472d81232ad142
+  metadata.gz: 74744be16e5315052c51407642389e27d045667067270402359d6b081aafd4fd8567ef2f636a17d1b4837d4331181b2c2f4f0b7599179f23b7246e736f160907
+  data.tar.gz: ffcc6b1211f8666f99d4b7bd6a911d08909a75ad4bd81a8209817225354251bc897e37d9a146b330fafecc7b8a7c1c35ab2f3acfa3b498363f9d820791b114cd

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.0.4
+
+- Fixed 'reply to an indexed stream' for Ruby < 2.1
+- More tests for Databases
+- Tests for Blacklist
+- Tests for Set
+
 # 1.0.3
 
 - Fixed the bug introduced by the last bugfix (yes, I know... sigh...)

data/lib/ayadn/databases.rb

@@ -82,7 +82,7 @@ module Ayadn
 
     def self.get_post_from_index(number)
       unless number > @index.length || number <= 0
-        @index.to_h.each do |id, values|
+        @index.each do |id, values|
           return values if values[:count] == number
         end
       else

data/lib/ayadn/errors.rb

@@ -31,7 +31,7 @@ module Ayadn
     private
 
     def self.detokenize(string)
-      string.to_s.gsub!(/token=[a-zA-Z0-9_-]+/, "token=XXX") unless string.nil?
+      string.dup.to_s.gsub!(/token=[a-zA-Z0-9_-]+/, "token=XXX") unless string.nil?
     end
   end
 end

data/lib/ayadn/set.rb

@@ -134,8 +134,7 @@ module Ayadn
       Settings.save_config
     end
     def validate(t)
-      t = t.to_i
-      t >= 0.7 ? t : 1.5
+      Validators.timer(t)
     end
     def timer(t)
       Settings.options[:scroll][:timer] = t
@@ -158,12 +157,7 @@ module Ayadn
       Settings.save_config
     end
     def validate(value)
-      case value
-      when "TRUE", "true", "1", "yes"
-        true
-      when "FALSE", "false", "0", "no"
-        false
-      end
+      Validators.boolean(value)
     end
     def auto_save_sent_posts(value)
       Settings.options[:backup][:auto_save_sent_posts] = value
@@ -176,6 +170,38 @@ module Ayadn
     end
   end
 
+  class Validators
+    def self.boolean(value)
+      case value.downcase
+      when "true", "1", "yes"
+        true
+      when "false", "0", "no"
+        false
+      else
+        abort(Status.error_missing_parameters)
+      end
+    end
+    def self.index_range(min, max, value)
+      x = value.to_i
+      if x >= min && x <= max
+        x
+      else
+        abort(Status.must_be_integer)
+      end
+    end
+    def self.timer(t)
+      t = t.to_i
+      t >= 1 ? t : 3
+    end
+    def self.color(color)
+      colors_list = %w{red green magenta cyan yellow blue white}
+      unless colors_list.include?(color)
+        puts Status.error_missing_parameters
+        abort(Status.valid_colors(colors_list))
+      end
+    end
+  end
+
   class SetCounts
     def initialize
       Settings.load_config
@@ -192,16 +218,7 @@ module Ayadn
       Settings.save_config
     end
     def validate(value)
-      if value.is_integer?
-        x = value
-      else
-        x = value.to_i
-      end
-      if x >= 1 && x <= 200
-        x
-      else
-        abort(Status.must_be_integer)
-      end
+      Validators.index_range(1, 200, value)
     end
     def default(value)
       Settings.options[:counts][:default] = value
@@ -261,12 +278,7 @@ module Ayadn
       Logs.create_logger
     end
     def validate(value)
-      case value
-      when "TRUE", "true", "1", "yes"
-        1
-      when "FALSE", "false", "0", "no"
-        0
-      end
+      Validators.boolean(value)
     end
     def log(args)
       x = "New value for '#{args[0]}' in 'Timeline' => #{args[1]}"
@@ -313,11 +325,7 @@ module Ayadn
     end
 
     def validate(color)
-      colors_list = %w{red green magenta cyan yellow blue white}
-      unless colors_list.include?(color)
-        puts Status.error_missing_parameters
-        abort(Status.valid_colors(colors_list))
-      end
+      Validators.color(color)
     end
 
     def log(args)

data/lib/ayadn/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Ayadn
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/spec/unit/blacklistworkers_spec.rb

@@ -0,0 +1,114 @@
+require 'spec_helper'
+require 'helpers'
+
+describe Ayadn::BlacklistWorkers do
+  before do
+    Ayadn::Settings.stub(:options).and_return({
+        colors: {
+          hashtags: :cyan,
+          mentions: :red,
+          username: :green,
+          id: :blue,
+          name: :yellow,
+          source: :blue,
+          symbols: :green,
+          index: :blue,
+          date: :cyan,
+          link: :magenta
+        },
+        timeline: {
+          show_real_name: true,
+          show_date: true,
+          show_symbols: true,
+          show_source: true
+        },
+        formats: {table: {width: 75}},
+        counts: {
+          default: 33
+        }
+      })
+    Ayadn::Settings.stub(:config).and_return({
+        identity: {
+          username: 'test',
+          handle: '@test'
+        },
+        post_max_length: 256,
+        message_max_length: 2048,
+        version: 'wee',
+        paths: {
+          db: 'spec/mock/',
+          pagination: 'spec/mock/',
+          log: 'spec/mock'
+        }
+      })
+    Ayadn::Settings.stub(:user_token).and_return('XYZ')
+    Ayadn::Settings.stub(:check_for_accounts)
+    Ayadn::Settings.stub(:load_config)
+    Ayadn::Settings.stub(:get_token)
+    Ayadn::Settings.stub(:init_config)
+    Dir.stub(:home).and_return('spec/mock/')
+  end
+
+  describe "add" do
+    it "adds a client to the blacklist" do
+      k = Ayadn::BlacklistWorkers.new
+      k.add(['client', 'IFTTT'])
+      expect(Ayadn::Databases.blacklist['IFTTT']).to eq :client
+      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added 'IFTTT' to blacklist of clients."
+    end
+    it "adds a client to the blacklist" do
+      k = Ayadn::BlacklistWorkers.new
+      k.add(['source', 'Zapier'])
+      expect(Ayadn::Databases.blacklist['Zapier']).to eq :client
+      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added 'Zapier' to blacklist of clients."
+    end
+    it "adds a hashtag to the blacklist" do
+      k = Ayadn::BlacklistWorkers.new
+      k.add(['hashtag', 'sports'])
+      expect(Ayadn::Databases.blacklist['sports']).to eq :hashtag
+      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added 'sports' to blacklist of hashtags."
+    end
+    it "adds a hashtag to the blacklist" do
+      k = Ayadn::BlacklistWorkers.new
+      k.add(['tag', 'tv'])
+      expect(Ayadn::Databases.blacklist['tv']).to eq :hashtag
+      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added 'tv' to blacklist of hashtags."
+    end
+    it "adds a mention to the blacklist" do
+      k = Ayadn::BlacklistWorkers.new
+      k.add(['mention', 'mrtest'])
+      expect(Ayadn::Databases.blacklist['@mrtest']).to eq :mention
+      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '@mrtest' to blacklist of mentions."
+    end
+    it "adds a mention to the blacklist" do
+      k = Ayadn::BlacklistWorkers.new
+      k.add(['mentions', 'yolo'])
+      expect(Ayadn::Databases.blacklist['@yolo']).to eq :mention
+      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '@yolo' to blacklist of mentions."
+    end
+  end
+
+  describe "remove" do
+    it "removes a client from the blacklist" do
+      k = Ayadn::BlacklistWorkers.new
+      k.add(['client', 'IFTTT'])
+      expect(Ayadn::Databases.blacklist['IFTTT']).to eq :client
+      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added 'IFTTT' to blacklist of clients."
+      k = Ayadn::BlacklistWorkers.new
+      k.remove(['client', 'IFTTT'])
+      expect(Ayadn::Databases.blacklist['IFTTT']).to eq nil
+      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Removed 'client:IFTTT' from blacklist."
+    end
+  end
+
+  after do
+    File.delete('spec/mock/ayadn.log')
+    Ayadn::Databases.open_databases
+    Ayadn::Databases.blacklist.clear
+    Ayadn::Databases.users.clear
+    Ayadn::Databases.pagination.clear
+    Ayadn::Databases.index.clear
+    Ayadn::Databases.aliases.clear
+    Ayadn::Databases.close_all
+  end
+end

data/spec/unit/databases_spec.rb

@@ -30,20 +30,56 @@ describe Ayadn::Databases do
       expect(u['lucy']).to eq 'Lucy Fair'
     end
   end
-  # describe ".save_max_id" do
-  #   it "saves pagination" do
-
-
-  #   end
-  # end
-  # describe ".has_new?" do
-  #   it "check if new posts since last pagination record" do
-  #     stream = {'meta'=>{'max_id'=>33666}}
-
-  #   end
-  # end
+  describe ".save_max_id" do
+    it "saves pagination" do
+      stream = {'meta'=>{'max_id'=>'33666','marker'=>{'name'=>'test_stream'}}}
+      Ayadn::Databases.save_max_id(stream)
+      expect(Ayadn::Databases.pagination.keys).to eq ['test_stream']
+      expect(Ayadn::Databases.pagination['test_stream']).to eq '33666'
+    end
+  end
+  describe ".has_new?" do
+    it "check if new posts since last pagination record" do
+      stream = {'meta'=>{'max_id'=>'33666','marker'=>{'name'=>'test_stream'}}}
+      Ayadn::Databases.save_max_id(stream)
+      expect(Ayadn::Databases.has_new?(stream, 'test_stream')).to eq false
+      stream = {'meta'=>{'max_id'=>'42000000','marker'=>{'name'=>'test_stream'}}}
+      expect(Ayadn::Databases.has_new?(stream, 'test_stream')).to eq true
+    end
+  end
+  describe ".save_indexed_posts" do
+    it "saves index" do
+      posts = {'33666' =>{:count=>1},'424242' =>{:count=>2}}
+      Ayadn::Databases.save_indexed_posts(posts)
+      expect(Ayadn::Databases.index['424242'][:count]).to eq 2
+    end
+  end
+  describe ".get_post_from_index" do
+    it "gets post id from index" do
+      posts = {'33666' =>{:count=>1, :id=>33666},'424242' =>{:count=>2, :id=>424242}}
+      Ayadn::Databases.save_indexed_posts(posts)
+      r = Ayadn::Databases.get_post_from_index(1)
+      expect(r[:count]).to eq 1
+      expect(r[:id]).to eq 33666
+    end
+  end
+  describe ".create_alias" do
+    it "creates an alias for a channel id" do
+      Ayadn::Databases.create_alias('42','everything')
+      expect(Ayadn::Databases.aliases['everything']).to eq '42'
+    end
+  end
+  describe ".get_alias_from_id" do
+    it "gets an alias from a channel id" do
+      Ayadn::Databases.create_alias('42','everything')
+      expect(Ayadn::Databases.get_alias_from_id('42')).to eq 'everything'
+    end
+  end
   after do
     Ayadn::Databases.users.clear
+    Ayadn::Databases.pagination.clear
+    Ayadn::Databases.index.clear
+    Ayadn::Databases.aliases.clear
     Ayadn::Databases.close_all
   end
 end

data/spec/unit/set_spec.rb

@@ -0,0 +1,176 @@
+require 'spec_helper'
+require 'helpers'
+
+def init_stubs
+  Ayadn::Settings.stub(:options).and_return({
+      colors: {
+        hashtags: :cyan,
+        mentions: :red,
+        username: :green,
+        id: :blue,
+        name: :yellow,
+        source: :blue,
+        symbols: :green,
+        index: :blue,
+        date: :cyan,
+        link: :magenta
+      },
+      timeline: {
+        show_real_name: true,
+        show_date: true,
+        show_symbols: true,
+        show_source: true
+      },
+      formats: {table: {width: 75}},
+      counts: {
+        default: 33
+      },
+      scroll: {
+        timer: 5
+      }
+    })
+  Ayadn::Settings.stub(:config).and_return({
+      identity: {
+        username: 'test',
+        handle: '@test'
+      },
+      post_max_length: 256,
+      message_max_length: 2048,
+      version: 'wee',
+      paths: {
+        db: 'spec/mock/',
+        pagination: 'spec/mock/',
+        log: 'spec/mock'
+      }
+    })
+  Ayadn::Settings.stub(:user_token).and_return('XYZ')
+  Ayadn::Settings.stub(:load_config)
+  Ayadn::Settings.stub(:get_token)
+  Ayadn::Settings.stub(:init_config)
+  Dir.stub(:home).and_return('spec/mock/')
+end
+
+describe Ayadn::SetScroll do
+  before do
+    init_stubs
+  end
+  describe "#validate" do
+    it "validates a correct timer value" do
+      timer = Ayadn::SetScroll.new.validate(3)
+      expect(timer).to eq 3
+    end
+    it "validates a correct timer value" do
+      timer = Ayadn::SetScroll.new.validate(1)
+      expect(timer).to eq 1
+    end
+    it "validates a correct timer value" do
+      timer = Ayadn::SetScroll.new.validate(2)
+      expect(timer).to eq 2
+    end
+    it "validates a correct timer value" do
+      timer = Ayadn::SetScroll.new.validate(10.2)
+      expect(timer).to eq 10
+    end
+    it "validates a correct timer value" do
+      timer = Ayadn::SetScroll.new.validate(1.1)
+      expect(timer).to eq 1
+    end
+    it "sets a default if incorrect timer value" do
+      timer = Ayadn::SetScroll.new.validate(0)
+      expect(timer).to eq 3
+    end
+    it "sets a default if incorrect timer value" do
+      timer = Ayadn::SetScroll.new.validate('johnson')
+      expect(timer).to eq 3
+    end
+    it "sets a default if incorrect timer value" do
+      timer = Ayadn::SetScroll.new.validate(-666)
+      expect(timer).to eq 3
+    end
+    it "sets a default if incorrect timer value" do
+      timer = Ayadn::SetScroll.new.validate(0.5)
+      expect(timer).to eq 3
+    end
+  end
+  after do
+    File.delete('spec/mock/ayadn.log')
+  end
+end
+
+describe Ayadn::SetCounts do
+  before do
+    init_stubs
+  end
+  describe "#validate" do
+    it "validates a correct count value" do
+      count = Ayadn::SetCounts.new.validate('1')
+      expect(count).to eq 1
+    end
+    it "validates a correct count value" do
+      count = Ayadn::SetCounts.new.validate('200')
+      expect(count).to eq 200
+    end
+    it "raises error if incorrect count value" do
+      printed = capture_stderr do
+        lambda {Ayadn::SetCounts.new.validate('201')}.should raise_error(SystemExit)
+      end
+      expect(printed).to include 'This paramater must be an integer between 1 and 200'
+    end
+    it "raises error if incorrect count value" do
+      printed = capture_stderr do
+        lambda {Ayadn::SetCounts.new.validate('0')}.should raise_error(SystemExit)
+      end
+      expect(printed).to include 'This paramater must be an integer between 1 and 200'
+    end
+    it "raises error if incorrect count value" do
+      printed = capture_stderr do
+        lambda {Ayadn::SetCounts.new.validate('yolo')}.should raise_error(SystemExit)
+      end
+      expect(printed).to include 'This paramater must be an integer between 1 and 200'
+    end
+  end
+  after do
+    File.delete('spec/mock/ayadn.log')
+  end
+end
+
+describe Ayadn::SetBackup do
+  before do
+    init_stubs
+  end
+  describe "#validate" do
+    it "validates a correct boolean" do
+      value = Ayadn::SetBackup.new.validate('1')
+      expect(value).to eq true
+    end
+    it "validates a correct boolean" do
+      value = Ayadn::SetBackup.new.validate('true')
+      expect(value).to eq true
+    end
+    it "validates a correct boolean" do
+      value = Ayadn::SetBackup.new.validate('TrUe')
+      expect(value).to eq true
+    end
+    it "validates a correct boolean" do
+      value = Ayadn::SetBackup.new.validate('false')
+      expect(value).to eq false
+    end
+    it "validates a correct boolean" do
+      value = Ayadn::SetBackup.new.validate('fAlsE')
+      expect(value).to eq false
+    end
+    it "validates a correct boolean" do
+      value = Ayadn::SetBackup.new.validate('0')
+      expect(value).to eq false
+    end
+    it "raises error if incorrect boolean" do
+      printed = capture_stderr do
+        lambda {Ayadn::SetBackup.new.validate('yolo')}.should raise_error(SystemExit)
+      end
+      expect(printed).to include "You have to submit valid items. See 'ayadn -sg' for a list of valid parameters and values"
+    end
+  end
+  after do
+    File.delete('spec/mock/ayadn.log')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -238,10 +238,12 @@ files:
 - spec/mock/users.db
 - spec/spec_helper.rb
 - spec/unit/api_spec.rb
+- spec/unit/blacklistworkers_spec.rb
 - spec/unit/databases_spec.rb
 - spec/unit/descriptions_spec.rb
 - spec/unit/endpoints_spec.rb
 - spec/unit/post_spec.rb
+- spec/unit/set_spec.rb
 - spec/unit/status_spec.rb
 - spec/unit/view_spec.rb
 - spec/unit/workers_spec.rb
@@ -284,10 +286,12 @@ test_files:
 - spec/mock/users.db
 - spec/spec_helper.rb
 - spec/unit/api_spec.rb
+- spec/unit/blacklistworkers_spec.rb
 - spec/unit/databases_spec.rb
 - spec/unit/descriptions_spec.rb
 - spec/unit/endpoints_spec.rb
 - spec/unit/post_spec.rb
+- spec/unit/set_spec.rb
 - spec/unit/status_spec.rb
 - spec/unit/view_spec.rb
 - spec/unit/workers_spec.rb