ayadn 3.0 → 4.0

data/spec/unit/view_spec.rb

@@ -6,43 +6,116 @@ require 'json'
 describe Ayadn::View 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},
-          list: {reverse: true}
+        scroll: {
+          spinner: true,
+          timer: 3,
+          date: false
         },
-        counts: {
-          default: 33
+        nicerank: {
+          threshold: 2.1,
+          filter: true,
+          unranked: false
         },
-        blacklist: {active: true}
-      })
-    Ayadn::Settings.stub(:config).and_return({
-        identity: {
-          username: 'test'
+        nowplaying: {},
+        blacklist: {
+          active: true
         }
-      })
-    Ayadn::Settings.stub(:global).and_return({
-        scrolling: false
-      })
+      }))
+    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(: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::Logs.stub(:rec).and_return("logged")
     Ayadn::Databases.stub(:blacklist).and_return("blacklist")
     Ayadn::Databases.stub(:save_indexed_posts).and_return("indexed")
@@ -166,7 +239,7 @@ describe Ayadn::View do
   describe "#show_posts" do
     it 'outputs the stream' do
       printed = capture_stdout do
-        Ayadn::View.new.show_posts(stream['data'])
+        Ayadn::View.new.show_posts(Ayadn::StreamObject.new(stream))
       end
       expect(printed).to include "23184500"
       expect(printed).to include "Backer of the Day"
@@ -180,7 +253,7 @@ describe Ayadn::View do
   describe "#show_raw" do
     it 'outputs the raw stream' do
       printed = capture_stdout do
-        Ayadn::View.new.show_raw(stream['data'][0])
+        Ayadn::View.new.show_raw(Ayadn::StreamObject.new(stream))
       end
       expect(printed).to include '"created_at": "2013-05-19T22:33:57Z"'
     end
@@ -189,7 +262,7 @@ describe Ayadn::View do
   describe "#show_simple_post" do
     it 'outputs one post' do
       printed = capture_stdout do
-        Ayadn::View.new.show_simple_post([stream['data'][0]])
+        Ayadn::View.new.show_simple_post([Ayadn::StreamObject.new(stream).posts[0]])
       end
       expect(printed).to include "23187443"
       expect(printed).to include "Julia Cory"
@@ -199,7 +272,7 @@ describe Ayadn::View do
   describe "#show_posts_with_index" do
     it 'outputs the indexed stream' do
       printed = capture_stdout do
-        Ayadn::View.new.show_posts_with_index(stream['data'])
+        Ayadn::View.new.show_posts_with_index(Ayadn::StreamObject.new(stream))
       end
       expect(printed).to include "001"
       expect(printed).to include "Backer of the Day"
@@ -212,7 +285,7 @@ describe Ayadn::View do
     end
     it "outputs user info" do
       printed = capture_stdout do
-        Ayadn::View.new.show_userinfos(user_e['data'], "")
+        Ayadn::View.new.show_userinfos(Ayadn::UserObject.new(user_e), "")
       end
       expect(printed).to include "Sound engineer"
       expect(printed).to include "aya.io"

data/spec/unit/workers_spec.rb

@@ -5,34 +5,116 @@ require 'json'
 describe Ayadn::Workers 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,
+          source: :cyan,
+          symbols: :green,
+          unread: :cyan,
+          debug: :red,
           excerpt: :green
         },
-        timeline: {compact: false},
-        formats: {table: {width: 75}, list: {reverse: true}},
-        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'
+        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
+        }
+      }))
+    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)
+    )
     Ayadn::Logs.stub(:rec).and_return("logged")
     Ayadn::Databases.stub(:blacklist).and_return("blacklist")
     Ayadn::Databases.stub(:users).and_return("users")
@@ -54,28 +136,35 @@ describe Ayadn::Workers do
 
   describe "#build_posts" do
     it "builds posts hash from stream" do
-      posts = @workers.build_posts(data['data'])
+      posts = @workers.build_posts(Ayadn::StreamObject.new(data).posts)
+      p1 = posts.select { |post| post.id == 23187363 }.first
+      p2 = posts.select { |post| post.id == 23184500 }.first
+      p3 = posts.select { |post| post.id == 23185033 }.first
+      p4 = posts.select { |post| post.id == 23187443 }.first
       expect(posts.length).to eq 10
-      expect(posts[23187363][:name]).to eq 'App.net Staff'
-      expect(posts[23184500][:username]).to eq 'wired'
-      expect(posts[23185033][:handle]).to eq '@hackernews'
-      expect(posts[23184500][:links]).to eq ['http://ift.tt/1mtTrU9']
-      expect(posts[23187443][:source_name]).to eq 'IFTTT'
-      expect(posts[23187443][:thread_id]).to eq '23187443'
-      expect(posts[23187443][:text]).to include 'Jagulsan. by Julia Cory'
-      expect(posts[23187443][:is_starred]).to be false
-      expect(posts[23187443][:is_repost]).to be false
-      expect(posts[23187443][:is_reply]).to be false
-      expect(posts[23187443][:directed_to]).to be false
-      expect(posts[23187443][:has_checkins]).to be false
-      expect(posts[23187443][:mentions]).to eq []
-      expect(posts[23187443][:checkins]).to be_empty
+      expect(p1.name).to eq 'App.net Staff'
+      expect(p2.username).to eq 'wired'
+      expect(p3.handle).to eq '@hackernews'
+      expect(p2.links).to eq ['http://ift.tt/1mtTrU9']
+      expect(p4.source_name).to eq 'IFTTT'
+      expect(p4.thread_id).to eq '23187443'
+      expect(p4.text).to include 'Jagulsan. by Julia Cory'
+      expect(p4.is_starred).to be false
+      expect(p4.is_repost).to be false
+      expect(p4.is_reply).to be false
+      expect(p4.directed_to).to be false
+      expect(p4.has_checkins).to be false
+      expect(p4.mentions).to eq []
+      expect(p4.checkins).to be_empty
     end
     it "gets oembed link from checkins post" do
-      posts = @workers.build_posts(checkins['data'])
-      expect(posts[27101186][:links]).to eq ["https://photos.app.net/27101186/1"]
-      expect(posts[27080492][:links]).to eq ["http://sprintr.co/27080492"]
-      expect(posts[27073989][:links]).to eq ["http://pic.favd.net/27073989", "https://photos.app.net/27073989/1"]
+      posts = @workers.build_posts(Ayadn::StreamObject.new(checkins).posts)
+      p1 = posts.select { |post| post.id == 27101186 }.first
+      p2 = posts.select { |post| post.id == 27080492 }.first
+      p3 = posts.select { |post| post.id == 27073989 }.first
+      expect(p1.links).to eq ["https://photos.app.net/27101186/1"]
+      expect(p2.links).to eq ["http://sprintr.co/27080492"]
+      expect(p3.links).to eq ["http://pic.favd.net/27073989", "https://photos.app.net/27073989/1"]
     end
   end
 
@@ -94,21 +183,21 @@ describe Ayadn::Workers do
 
   describe "#links_from_posts" do
     it "extract links" do
-      links = @workers.links_from_posts(data)
+      links = @workers.links_from_posts(Ayadn::StreamObject.new(data))
       expect(links).to eq ["http://feed.500px.com/~r/500px-best/~3/c2tMPEJVf6I/61517259", "https://app.net/b/m6bk3", "http://bit.ly/1cr16vM", "http://feed.500px.com/~r/500px-best/~3/i4uhLN-4rd4/61484745", "http://www.newscientist.com/article/dn25068-wikipediasize-maths-proof-too-big-for-humans-to-check.html#.UwTuA3gRq8M", "http://news.ycombinator.com/item?id=7264886", "http://ift.tt/1d0TA7I", "http://feed.500px.com/~r/500px-best/~3/hFi3AUnh_u8/61493427", "http://Experiment.com", "http://priceonomics.com/how-microryza-acquired-the-domain-experimentcom/", "http://news.ycombinator.com/item?id=7265540", "http://feeds.popsci.com/c/34567/f/632419/s/374c6496/sc/38/l/0L0Spopsci0N0Carticle0Cscience0Ccat0Ebites0Eare0Elinked0Edepression/story01.htm?utm_medium=App.net&utm_source=PourOver", "http://ift.tt/1mtTrU9"]
     end
   end
 
   describe "#extract_hashtags" do
     it "extracts hashtags" do
-      tags = @workers.extract_hashtags(data['data'][0])
+      tags = @workers.extract_hashtags(Ayadn::StreamObject.new(data).posts[0])
       expect(tags).to eq ['photography']
     end
   end
 
   describe "#extract_links" do
     it "extracts links" do
-      links = @workers.extract_links(data['data'][0])
+      links = @workers.extract_links(Ayadn::StreamObject.new(data).posts[0])
       expect(links).to eq ['http://feed.500px.com/~r/500px-best/~3/c2tMPEJVf6I/61517259']
     end
   end
@@ -124,17 +213,19 @@ describe Ayadn::Workers do
 
   describe "#extract_checkins" do
     it "extracts checkins" do
-      posts = @workers.build_posts(checkins['data'])
+      posts = @workers.build_posts(Ayadn::StreamObject.new(checkins).posts)
+      p1 = posts.select { |post| post.id == 27101186 }.first
+      p2 = posts.select { |post| post.id == 26947690 }.first
       expect(posts.length).to eq 10
-      expect(posts[27101186][:has_checkins]).to be true
-      expect(posts[27101186][:checkins][:name]).to eq "Hobbs State Park"
-      expect(posts[27101186][:checkins][:address]).to eq "21392 E Highway 12"
-      expect(posts[27101186][:checkins][:address_extended]).to be nil
-      expect(posts[27101186][:checkins][:locality]).to eq "Rogers"
-      expect(posts[26947690][:has_checkins]).to be true
-      expect(posts[26947690][:checkins][:categories]).to eq "Landmarks"
-      expect(posts[26947690][:checkins][:country_code]).to eq "us"
-      expect(posts[26947690][:mentions]).to eq ["tuaw"]
+      expect(p1.has_checkins).to be true
+      expect(p1.checkins[:name]).to eq "Hobbs State Park"
+      expect(p1.checkins[:address]).to eq "21392 E Highway 12"
+      expect(p1.checkins[:address_extended]).to be nil
+      expect(p1.checkins[:locality]).to eq "Rogers"
+      expect(p2.has_checkins).to be true
+      expect(p2.checkins[:categories]).to eq "Landmarks"
+      expect(p2.checkins[:country_code]).to eq "us"
+      expect(p2.mentions).to eq ["tuaw"]
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: '3.0'
+  version: '4.0'
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -94,34 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: spotlite
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: tvdb_party
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: amalgalite
   requirement: !ruby/object:Gem::Requirement
@@ -242,10 +214,9 @@ files:
 - doc/13-bookmark.md
 - doc/14-set.md
 - doc/15-nowplaying.md
-- doc/16-movie.md
-- doc/17-tvshow.md
-- doc/18-contact.md
-- doc/19-examples.md
+- doc/16-contact.md
+- doc/17-examples.md
+- doc/18-develop.md
 - lib/ayadn.rb
 - lib/ayadn/action.rb
 - lib/ayadn/alias.rb
@@ -254,6 +225,7 @@ files:
 - lib/ayadn/app.rb
 - lib/ayadn/authorize.rb
 - lib/ayadn/blacklist.rb
+- lib/ayadn/channel_object.rb
 - lib/ayadn/check.rb
 - lib/ayadn/cnx.rb
 - lib/ayadn/databases.rb
@@ -264,14 +236,16 @@ files:
 - lib/ayadn/errors.rb
 - lib/ayadn/extend.rb
 - lib/ayadn/fileops.rb
+- lib/ayadn/filtered_post_object.rb
 - lib/ayadn/ids.rb
 - lib/ayadn/logs.rb
 - lib/ayadn/mark.rb
 - lib/ayadn/nicerank.rb
 - lib/ayadn/nowplaying.rb
-- lib/ayadn/nowwatching.rb
 - lib/ayadn/pinboard.rb
 - lib/ayadn/post.rb
+- lib/ayadn/post_object.rb
+- lib/ayadn/preferences_object.rb
 - lib/ayadn/profile.rb
 - lib/ayadn/scroll.rb
 - lib/ayadn/search.rb
@@ -279,8 +253,9 @@ files:
 - lib/ayadn/settings.rb
 - lib/ayadn/status.rb
 - lib/ayadn/stream.rb
+- lib/ayadn/stream_object.rb
 - lib/ayadn/switch.rb
-- lib/ayadn/tvshow.rb
+- lib/ayadn/user_object.rb
 - lib/ayadn/version.rb
 - lib/ayadn/view.rb
 - lib/ayadn/workers.rb
@@ -335,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: App.net command-line client.