ayadn 3.0 → 4.0

data/spec/integration/action_spec.rb

@@ -11,43 +11,53 @@ module Ayadn
 end
 
 describe Ayadn::Action do
+
   before do
     Ayadn::Settings.stub(:options).and_return(
+      Ayadn::Preferences.new(
       {
         timeline: {
-          directed: 1,
-          html: 0,
+          directed: true,
           source: true,
           symbols: true,
           name: true,
           date: true,
-          spinner: true,
           debug: false,
           compact: false
         },
+        marker: {
+          messages: true
+        },
         counts: {
-          default: 50,
-          unified: 100,
+          default: 100,
+          unified: 33,
           global: 100,
           checkins: 100,
-          conversations: 50,
-          photos: 50,
+          conversations: 100,
+          photos: 100,
           trending: 100,
           mentions: 100,
           convo: 100,
           posts: 100,
-          messages: 50,
+          messages: 20,
           search: 200,
-          whoreposted: 50,
-          whostarred: 50,
+          whoreposted: 20,
+          whostarred: 20,
           whatstarred: 100,
           files: 100
         },
         formats: {
           table: {
-            width: 75
+            width: 75,
+            borders: true
+          },
+          list: {
+            reverse: true
           }
         },
+        channels: {
+          links: true
+        },
         colors: {
           id: :blue,
           index: :red,
@@ -60,6 +70,7 @@ describe Ayadn::Action do
           mentions: :red,
           source: :cyan,
           symbols: :green,
+          unread: :cyan,
           debug: :red,
           excerpt: :green
         },
@@ -69,41 +80,49 @@ describe Ayadn::Action do
           lists: false
         },
         scroll: {
-          timer: 3
+          spinner: true,
+          timer: 3,
+          date: false
         },
         nicerank: {
           threshold: 2.1,
-          filter: false,
+          filter: true,
           unranked: false
         },
         nowplaying: {},
-        movie: {
-          hashtag: 'nowwatching'
-        },
-        tvshow: {
-          hashtag: 'nowwatching'
-        },
         blacklist: {
           active: true
         }
-      })
-    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/',
-        log: 'spec/mock'
+      }))
+    require 'json'
+    require 'ostruct'
+    obj =
+      {
+        identity: {
+          username: 'test',
+          handle: '@test'
+        },
+        post_max_length: 256,
+        message_max_length: 2048,
+        version: 'wee',
+        paths: {
+          db: 'spec/mock/',
+          log: 'spec/mock'
+        },
+        platform: 'shoes',
+        ruby: '0',
+        locale: 'gibberish'
       }
-    })
-    Ayadn::Settings.stub(:global).and_return({
+    Ayadn::Settings.stub(:config).and_return(
+      JSON.parse(obj.to_json, object_class: OpenStruct)
+    )
+    global_hash = {
       scrolling: false,
       force: false
-    })
+    }
+    Ayadn::Settings.stub(:global).and_return(
+      JSON.parse(global_hash.to_json, object_class: OpenStruct)
+    )
     Dir.stub(:home).and_return("spec/mock")
     Ayadn::Settings.stub(:get_token).and_return('XYZ')
     Ayadn::Settings.stub(:user_token).and_return('XYZ')
@@ -119,11 +138,13 @@ describe Ayadn::Action do
     Ayadn::Databases.stub(:has_new?).and_return(true)
     Ayadn::Databases.stub(:add_to_users_db_from_list)
   end
+
   let(:stream) { File.read("spec/mock/stream.json") } 
   let(:mentions) { File.read("spec/mock/mentions.json") }
   let(:list) { File.read("spec/mock/fwr_@ayadn.json") }
   let(:ranks) { JSON.parse(File.read("spec/mock/nicerank.json")) }
   let(:cnx) {Ayadn::CNX}
+
   describe "#Global" do
     before do
       cnx.stub(:get)

data/spec/unit/annotations_spec.rb

@@ -6,40 +6,50 @@ describe Ayadn::Annotations do
 
   before do
     Ayadn::Settings.stub(:options).and_return(
+      Ayadn::Preferences.new(
       {
         timeline: {
-          directed: 1,
-          html: 0,
+          directed: true,
           source: true,
           symbols: true,
           name: true,
           date: true,
-          spinner: true,
-          debug: false
+          debug: false,
+          compact: false
+        },
+        marker: {
+          messages: true
         },
         counts: {
           default: 50,
-          unified: 100,
-          global: 100,
-          checkins: 100,
+          unified: 50,
+          global: 50,
+          checkins: 50,
           conversations: 50,
           photos: 50,
-          trending: 100,
-          mentions: 100,
-          convo: 100,
-          posts: 100,
-          messages: 50,
+          trending: 50,
+          mentions: 50,
+          convo: 50,
+          posts: 50,
+          messages: 20,
           search: 200,
-          whoreposted: 50,
-          whostarred: 50,
+          whoreposted: 20,
+          whostarred: 20,
           whatstarred: 100,
-          files: 100
+          files: 50
         },
         formats: {
           table: {
-            width: 75
+            width: 75,
+            borders: true
+          },
+          list: {
+            reverse: true
           }
         },
+        channels: {
+          links: true
+        },
         colors: {
           id: :blue,
           index: :red,
@@ -52,6 +62,7 @@ describe Ayadn::Annotations do
           mentions: :red,
           source: :cyan,
           symbols: :green,
+          unread: :cyan,
           debug: :red,
           excerpt: :green
         },
@@ -61,7 +72,9 @@ describe Ayadn::Annotations do
           lists: false
         },
         scroll: {
-          timer: 3
+          spinner: true,
+          timer: 3,
+          date: false
         },
         nicerank: {
           threshold: 2.1,
@@ -69,15 +82,15 @@ describe Ayadn::Annotations do
           unranked: false
         },
         nowplaying: {},
-        movie: {
-          hashtag: 'nowwatching'
-        },
-        tvshow: {
-          hashtag: 'nowwatching'
+        blacklist: {
+          active: true
         }
-      }
+      })
     )
-    Ayadn::Settings.stub(:config).and_return({
+    require 'json'
+    require 'ostruct'
+    obj =
+      {
         identity: {
           username: 'test',
           handle: '@test'
@@ -85,10 +98,24 @@ describe Ayadn::Annotations do
         post_max_length: 256,
         message_max_length: 2048,
         version: 'wee',
+        paths: {
+          db: 'spec/mock/',
+          log: 'spec/mock'
+        },
+        platform: 'shoes',
         ruby: '0',
-        locale: 'gibberish',
-        platform: 'shoes'
-      })
+        locale: 'gibberish'
+      }
+    Ayadn::Settings.stub(:config).and_return(
+      JSON.parse(obj.to_json, object_class: OpenStruct)
+    )
+    global_hash = {
+      scrolling: false,
+      force: false
+    }
+    Ayadn::Settings.stub(:global).and_return(
+      JSON.parse(global_hash.to_json, object_class: OpenStruct)
+    )
     Ayadn::Errors.stub(:warn).and_return("warned")
     Ayadn::Logs.stub(:rec).and_return("logged")
     Ayadn::FileOps.stub(:make_paths).and_return(['~/your/path/cat.jpg', '~/your/path/dog.png']) # STUB1
@@ -124,20 +151,6 @@ describe Ayadn::Annotations do
     end
   end
 
-  describe "#movie" do
-    it "creates movie annotations" do
-      ann = Ayadn::Annotations.new({title: 'WUT', source: 'tEsT', options: {movie: true}})
-      expect(ann.content).to eq [{"type"=>"com.ayadn.user", "value"=>{"+net.app.core.user"=>{"user_id"=>"@test", "format"=>"basic"}, "env"=>{"platform"=>'shoes', "ruby"=>"0", "locale"=>"gibberish"}}}, {"type"=>"com.ayadn.client", "value"=>{"url"=>"https://github.com/ericdke/na", "author"=>{"name"=>"Eric Dejonckheere", "username"=>"ericd", "id"=>"69904", "email"=>"eric@aya.io"}, "version"=>"wee"}}, {"type"=>"com.ayadn.movie", "value"=>{"title"=>"WUT", "source"=>"tEsT"}}]
-    end
-  end
-
-  describe "#tvshow" do
-    it "creates tvshow annotations" do
-      ann = Ayadn::Annotations.new({title: 'WUT', source: 'tEsT', options: {tvshow: true}})
-      expect(ann.content).to eq [{"type"=>"com.ayadn.user", "value"=>{"+net.app.core.user"=>{"user_id"=>"@test", "format"=>"basic"}, "env"=>{"platform"=>'shoes', "ruby"=>"0", "locale"=>"gibberish"}}}, {"type"=>"com.ayadn.client", "value"=>{"url"=>"https://github.com/ericdke/na", "author"=>{"name"=>"Eric Dejonckheere", "username"=>"ericd", "id"=>"69904", "email"=>"eric@aya.io"}, "version"=>"wee"}}, {"type"=>"com.ayadn.tvshow", "value"=>{"title"=>"WUT", "source"=>"tEsT"}}]
-    end
-  end
-
   describe "#nowplaying --silent" do
     it "creates nowplaying --silent annotations" do
       ann = Ayadn::Annotations.new({source: 'wadawadawada', options: {nowplaying: true, no_url: true}})

data/spec/unit/api_spec.rb

@@ -2,16 +2,87 @@ require 'spec_helper'
 
 describe Ayadn::API do
 	before do
-    Ayadn::Settings.stub(:options).and_return({
+    Ayadn::Settings.stub(:options).and_return(
+      Ayadn::Preferences.new(
+        {
+        timeline: {
+          directed: false,
+          source: true,
+          symbols: true,
+          name: true,
+          date: true,
+          debug: false,
+          compact: false
+        },
+        marker: {
+          messages: true
+        },
         counts: {
-          default: 50
+          default: 50,
+          unified: 50,
+          global: 50,
+          checkins: 50,
+          conversations: 50,
+          photos: 50,
+          trending: 50,
+          mentions: 50,
+          convo: 50,
+          posts: 50,
+          messages: 20,
+          search: 200,
+          whoreposted: 20,
+          whostarred: 20,
+          whatstarred: 100,
+          files: 50
         },
-        timeline: {
-          directed: 1,
-          html: 0,
-          annotations: 1
+        formats: {
+          table: {
+            width: 75,
+            borders: true
+          },
+          list: {
+            reverse: true
+          }
+        },
+        channels: {
+          links: true
+        },
+        colors: {
+          id: :blue,
+          index: :red,
+          username: :green,
+          name: :magenta,
+          date: :cyan,
+          link: :yellow,
+          dots: :blue,
+          hashtags: :cyan,
+          mentions: :red,
+          source: :cyan,
+          symbols: :green,
+          unread: :cyan,
+          debug: :red,
+          excerpt: :green
+        },
+        backup: {
+          posts: false,
+          messages: false,
+          lists: false
+        },
+        scroll: {
+          spinner: true,
+          timer: 3,
+          date: false
+        },
+        nicerank: {
+          threshold: 2.1,
+          filter: true,
+          unranked: false
+        },
+        nowplaying: {},
+        blacklist: {
+          active: true
         }
-      })
+      }))
   end
   describe ".build_query" do
     it 'returns a URL with count=12' do

data/spec/unit/blacklistworkers_spec.rb

@@ -3,32 +3,91 @@ require 'helpers'
 
 describe Ayadn::BlacklistWorkers do
   before do
-    Ayadn::Settings.stub(:options).and_return({
+    Ayadn::Settings.stub(:options).and_return(
+      Ayadn::Preferences.new(
+      {
+        timeline: {
+          directed: true,
+          source: true,
+          symbols: true,
+          name: true,
+          date: true,
+          debug: false,
+          compact: false
+        },
+        marker: {
+          messages: true
+        },
+        counts: {
+          default: 50,
+          unified: 50,
+          global: 50,
+          checkins: 50,
+          conversations: 50,
+          photos: 50,
+          trending: 50,
+          mentions: 50,
+          convo: 50,
+          posts: 50,
+          messages: 20,
+          search: 200,
+          whoreposted: 20,
+          whostarred: 20,
+          whatstarred: 100,
+          files: 50
+        },
+        formats: {
+          table: {
+            width: 75,
+            borders: true
+          },
+          list: {
+            reverse: true
+          }
+        },
+        channels: {
+          links: true
+        },
         colors: {
+          id: :blue,
+          index: :red,
+          username: :green,
+          name: :magenta,
+          date: :cyan,
+          link: :yellow,
+          dots: :blue,
           hashtags: :cyan,
           mentions: :red,
-          username: :green,
-          id: :blue,
-          name: :yellow,
-          source: :blue,
+          source: :cyan,
           symbols: :green,
-          index: :blue,
-          date: :cyan,
-          link: :magenta,
+          unread: :cyan,
+          debug: :red,
           excerpt: :green
         },
-        timeline: {
-          name: true,
-          date: true,
-          symbols: true,
-          source: true
+        backup: {
+          posts: false,
+          messages: false,
+          lists: false
         },
-        formats: {table: {width: 75}},
-        counts: {
-          default: 33
+        scroll: {
+          spinner: true,
+          timer: 3,
+          date: false
+        },
+        nicerank: {
+          threshold: 2.1,
+          filter: true,
+          unranked: false
+        },
+        nowplaying: {},
+        blacklist: {
+          active: true
         }
-      })
-    Ayadn::Settings.stub(:config).and_return({
+      }))
+    require 'json'
+    require 'ostruct'
+    obj =
+      {
         identity: {
           username: 'test',
           handle: '@test'
@@ -39,8 +98,21 @@ describe Ayadn::BlacklistWorkers do
         paths: {
           db: 'spec/mock/',
           log: 'spec/mock'
-        }
-      })
+        },
+        platform: 'shoes',
+        ruby: '0',
+        locale: 'gibberish'
+      }
+    Ayadn::Settings.stub(:config).and_return(
+      JSON.parse(obj.to_json, object_class: OpenStruct)
+    )
+    global_hash = {
+      scrolling: false,
+      force: false
+    }
+    Ayadn::Settings.stub(:global).and_return(
+      JSON.parse(global_hash.to_json, object_class: OpenStruct)
+    )
     Ayadn::Settings.stub(:user_token).and_return('XYZ')
     Ayadn::Settings.stub(:check_for_accounts)
     Ayadn::Settings.stub(:load_config)