ayadn 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f8e1b7b05ad05985a512f87bd25bafae49b4349
-  data.tar.gz: 0a014cf6c284723edffca3829533561515cd0586
+  metadata.gz: af910b3cdf032bba6a40ec67f9ef72b26f85bcce
+  data.tar.gz: 30406883a202fe07dea4b2f4c64ab1db07579118
 SHA512:
-  metadata.gz: c66cc072a0717d04de64fbd4d8269ff2dccb1f2a2c7aedf9e28c888c3a5dda5302380c75c6f97d6000f0030b9ce498fbf46b98a5a2a85a76d35c9e0ea5c25ad1
-  data.tar.gz: 3c91d658e3d6d6108f654b1b9da544788e183d7b9c134176ec78aabe25c36dc1504a0d69e62bcecbe4e1af1acb34f5392890b0798110fb20e44cf54b8fe030fe
+  metadata.gz: c96df00a81872453044d605c2c2391f21a2e96847660bcb299cbade0cc7e5f7e76fe910dfcdb951c23c0635681d589b4e88585fd718f789b5178b74265ae56a4
+  data.tar.gz: 02c601968b84ef5cd20b37835efefbb0551fa3cf35641f7837151f430e3616823703beaf9eee2afc38a807bed877f237bd3130714e0caf9449f7dad1da8a364b

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# 1.0.2
+
+- Fixed a critical bug in Reply (when the original post was a repost)
+- Tests for Databases
+- Tests for Posts & Messages
+- Better layout for checkins
+- Better alert message if error 429
+
+# 1.0.1
+
+Release!
+
+It should have been 1.0.0, but a PEBKAC happened and, yeah, so 1.0.1 it is.

data/README.md

@@ -1,3 +1,4 @@
+[![Gem Version](https://badge.fury.io/rb/ayadn.svg)](http://badge.fury.io/rb/ayadn) 
 [![Build Status](https://travis-ci.org/ericdke/na.svg?branch=master)](https://travis-ci.org/ericdke/na)
 
 AYADN

data/lib/ayadn/action.rb

@@ -758,6 +758,11 @@ module Ayadn
       	puts Status.replying_to(post_id)
       	replied_to = @api.get_details(post_id)
         post_404(post_id) if meta_404(replied_to)
+        post_id = get_original_id(post_id, replied_to)
+        if post_id == replied_to['data']['repost_of']['id']
+          replied_to = @api.get_details(post_id)
+          post_404(post_id) if meta_404(replied_to)
+        end
         poster = Post.new
         puts Status.reply
         lines_array = poster.compose

data/lib/ayadn/cnx.rb

@@ -39,7 +39,7 @@ module Ayadn
         Errors.global_error("cnx.rb", response.headers, "METHOD NOT ALLOWED")
       when 429
         puts "\n'Too many requests'".color(:red)
-        puts "\n\nAyadn made too many requests to the App.net API. You should wait at least ".color(:cyan) + "#{response.headers[:retry_after]} ".color(:red) + "seconds before trying again. Maybe you launched a lot of Ayadn instances at the same time? That's no problem, but in this case you should increase the value of the scroll timer (do `ayadn set scroll timer 2.5` for example).".color(:cyan)
+        puts "\n\nAyadn made too many requests to the App.net API. You should wait at least ".color(:cyan) + "#{response.headers[:retry_after]} ".color(:red) + "seconds before trying again. Maybe you launched a lot of Ayadn instances at the same time? That's no problem, but in this case you should increase the value of the scroll timer (with `ayadn set scroll timer 5` for example). App.net allows 5000 requests per hour per account maximum.".color(:cyan)
         Errors.global_error("cnx.rb", response.headers, "TOO MANY REQUESTS")
       when 500
         puts "\n'App.net server error'".color(:red)

data/lib/ayadn/version.rb

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

data/lib/ayadn/view.rb

@@ -455,14 +455,20 @@ module Ayadn
       hd << "\n"
       formatted = { header: hd }
       content[:checkins].each do |key, val|
-          formatted[key] = val unless (val.nil? || !val)
+          #formatted[key] = val unless (val.nil? || !val)
+          formatted[key] = val
       end
 
+      formatted[:name] = "" if formatted[:name].nil?
       chk = formatted[:header]
-      unless formatted[:name].nil?
+      unless formatted[:name] == ""
         chk << formatted[:name].color(Settings.options[:colors][:dots])
         chk << "\n"
       end
+      unless formatted[:title].nil? || formatted[:title] == formatted[:name]
+        chk << formatted[:title]
+        chk << "\n"
+      end
       unless formatted[:address].nil?
         chk << formatted[:address]
         chk << "\n"
@@ -471,22 +477,37 @@ module Ayadn
         chk << formatted[:address_extended]
         chk << "\n"
       end
-      unless formatted[:country_code].nil?
-        cc = "(#{formatted[:country_code]})".upcase
-      else
-        cc = ""
-      end
+
       unless formatted[:postcode].nil?
         unless formatted[:locality].nil?
-          chk << "#{formatted[:postcode]}, #{formatted[:locality]} #{cc}"
-          chk << "\n"
+          chk << "#{formatted[:postcode]}, #{formatted[:locality]}"
+        else
+          chk << "#{formatted[:postcode]}"
         end
+        chk << "\n"
       else
         unless formatted[:locality].nil?
-          chk << "#{formatted[:locality]} #{cc}"
+          chk << "#{formatted[:locality]}"
+          chk << "\n"
+        end
+      end
+
+      formatted[:country_code].nil? ? cc = "" : cc = formatted[:country_code]
+
+      if formatted[:region].nil?
+        unless cc == ""
+          chk << "(#{cc})".upcase
           chk << "\n"
         end
+      else
+        unless cc == ""
+          chk << "#{formatted[:region]} (#{cc.upcase})"
+        else
+          chk << "#{formatted[:region]}"
+        end
+        chk << "\n"
       end
+
       unless formatted[:website].nil?
         chk << formatted[:website]
         chk << "\n"

data/lib/ayadn/workers.rb

@@ -349,6 +349,12 @@ module Ayadn
               checkins[:longitude] = obj['value']['longitude']
               checkins[:latitude] = obj['value']['latitude']
             end
+            unless obj['value']['title'].nil?
+              checkins[:title] = obj['value']['title']
+            end
+            unless obj['value']['region'].nil?
+              checkins[:region] = obj['value']['region']
+            end
           #when "net.app.core.oembed"
             #has_checkins = true
             #checkins[:embeddable_url] = obj['value']['embeddable_url']

data/spec/spec_helper.rb

@@ -10,5 +10,5 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
-  #config.include FakeFS::SpecHelpers, fakefs: true
+  config.include FakeFS::SpecHelpers, fakefs: true
 end

data/spec/unit/databases_spec.rb

@@ -1,5 +1,49 @@
 require 'spec_helper'
+require 'helpers'
 
 describe Ayadn::Databases do
+  before do
+    Ayadn::Settings.stub(:config).and_return({
+        paths: {
+          db: 'spec/mock/',
+          pagination: 'spec/mock/'
+        }
+      })
+    Ayadn::Databases.open_databases
+  end
+  describe ".add_to_users_db" do
+    it "adds a user" do
+      Ayadn::Databases.add_to_users_db(33, 'test', 'Mr Test')
+      expect(Ayadn::Databases.users.keys).to eq ['33']
+      u = Ayadn::Databases.users[33]
+      expect(u['test']).to eq 'Mr Test'
+    end
+  end
+  describe ".add_to_users_db_from_list" do
+    it "imports users from a list" do
+      list = {12=>['yolo', 'Miss YOLO'], 666=>['lucy', 'Lucy Fair']}
+      Ayadn::Databases.add_to_users_db_from_list(list)
+      expect(Ayadn::Databases.users.keys).to eq ['12', '666']
+      u = Ayadn::Databases.users[12]
+      expect(u['yolo']).to eq 'Miss YOLO'
+      u = Ayadn::Databases.users[666]
+      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
+  after do
+    Ayadn::Databases.users.clear
+    Ayadn::Databases.close_all
+  end
 end

data/spec/unit/post_spec.rb

@@ -36,59 +36,37 @@ describe Ayadn::Post do
         },
         post_max_length: 256,
         message_max_length: 2048,
-        version: Ayadn::VERSION
+        version: 'wee'
       })
-    Ayadn::Settings.stub(:user_token).and_return('XXX')
+    Ayadn::Settings.stub(:user_token).and_return('XYZ')
+    Ayadn::Settings.stub(:check_for_accounts)
     Ayadn::Errors.stub(:warn).and_return("warned")
     Ayadn::Logs.stub(:rec).and_return("logged")
   end
 
   let(:post) { Ayadn::Post.new }
+  let(:rest) {Ayadn::CNX = double} #verbose in RSpec output, but useful
 
   describe "#post" do
+    before do
+      rest.stub(:post).and_return(File.read("spec/mock/posted.json"))
+    end
     it "should raise an error if args are empty" do
       printed = capture_stdout do
         post.post([])
       end
       expect(printed).to include "You should provide some text."
     end
+    it "posts a post" do
+      expect(rest).to receive(:post).with("https://alpha-api.app.net/stream/0/posts/?include_annotations=1&access_token=XYZ", {"text"=>"YOLO", "entities"=>{"parse_markdown_links"=>true, "parse_links"=>true}, "annotations"=>[{"type"=>"com.ayadn.user", "value"=>{"+net.app.core.user"=>{"user_id"=>"@test", "format"=>"basic"}}}, {"type"=>"com.ayadn.client", "value"=>{"url"=>"http://ayadn-app.net", "author"=>{"name"=>"Eric Dejonckheere", "username"=>"ericd", "id"=>"69904", "email"=>"eric@aya.io"}, "version"=>"wee"}}]})
+      x = post.post(['YOLO'])
+    end
+    it "returns the posted post" do
+      x = post.post(['whatever'])
+      expect(x['data']['text']).to eq 'TEST'
+    end
   end
 
-  # let(:rest) {RestClient = double}
-  # let(:res) {response = double}
-  # let(:db) {Ayadn::Databases = double}
-
-  # describe "#post" do
-  #   before do
-  #     db.stub(:blacklist) {"x"}
-  #     res.stub(:code) {200}
-  #     rest.stub(:post) {File.read("spec/mock/posted.json")}
-  #   end
-  #   # Those 2 tests return a fake response, but this fake
-  #   # response wouldn't be returned if the tests failed
-  #   # I should intercept what goes into the fake RestClient
-  #   # instead, but have no idea how to do it at the moment ¯\(ツ)/¯
-  #   #
-  #   # As their warning messages are pretty annoying, I disabled
-  #   # them but you can uncomment to run the test
-  #   it "sends a post" do
-  #     a = post.post(["TEST"])
-  #     printed = capture_stdout do
-  #       Ayadn::View.new.show_posted(a)
-  #     end
-  #     expect(printed).to include '@aya_tests'
-  #     expect(printed).to include 'TEST'
-  #   end
-  #   it "sends a message" do
-  #     a = post.send_message(666, 'TEST')
-  #     printed = capture_stdout do
-  #       Ayadn::View.new.show_posted(a)
-  #     end
-  #     expect(printed).to include '@aya_tests'
-  #     expect(printed).to include 'TEST'
-  #   end
-  # end
-
   describe "#reply" do
     it "formats a reply" do
       new_post = "Hey guys!"
@@ -125,12 +103,23 @@ describe Ayadn::Post do
     it "checks normal post length" do
       post.check_post_length(["allo", "wtf"]).should be nil #no error
     end
+    it "checks excessive post length" do
+      printed = capture_stderr do
+        lambda {post.check_post_length(["allo", "wtf dude", "ok whatever pfff", "Black malt berliner weisse, filter. Ibu degrees plato alcohol. ipa hard cider ester infusion conditioning tank. Dry stout bottom fermenting yeast wort chiller wort chiller lager hand pump ! All-malt dunkle bright beer grainy, original gravity wheat beer glass."])}.should raise_error(SystemExit)
+      end
+      expect(printed).to include 'Canceled: too long. 256 max, 32 characters to remove.'
+    end
   end
 
   describe "#check_message_length" do
     it "checks normal message length" do
       post.check_message_length(["allo", "wtf"]).should be nil #no error
     end
+    it "checks excessive message length" do
+      printed = capture_stderr do
+        lambda {post.check_message_length(["Black malt berliner weisse, filter. Ibu degrees plato alcohol. ipa hard cider ester infusion conditioning tank. Dry stout bottom fermenting yeast wort chiller wort chiller lager hand pump ! All-malt dunkle bright beer grainy, original gravity wheat beer glass!!" * 8])}.should raise_error(SystemExit)
+      end
+      expect(printed).to include 'Canceled: too long. 2048 max, 40 characters to remove.'
+    end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -190,6 +190,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -226,10 +227,15 @@ files:
 - spec/helpers.rb
 - spec/mock/@ericd.json
 - spec/mock/@m.json
+- spec/mock/aliases.db
+- spec/mock/blacklist.db
 - spec/mock/checkins.json
 - spec/mock/fwr_@ayadn.json
+- spec/mock/index.db
+- spec/mock/pagination.db
 - spec/mock/posted.json
 - spec/mock/stream.json
+- spec/mock/users.db
 - spec/spec_helper.rb
 - spec/unit/api_spec.rb
 - spec/unit/databases_spec.rb
@@ -267,10 +273,15 @@ test_files:
 - spec/helpers.rb
 - spec/mock/@ericd.json
 - spec/mock/@m.json
+- spec/mock/aliases.db
+- spec/mock/blacklist.db
 - spec/mock/checkins.json
 - spec/mock/fwr_@ayadn.json
+- spec/mock/index.db
+- spec/mock/pagination.db
 - spec/mock/posted.json
 - spec/mock/stream.json
+- spec/mock/users.db
 - spec/spec_helper.rb
 - spec/unit/api_spec.rb
 - spec/unit/databases_spec.rb
@@ -280,3 +291,4 @@ test_files:
 - spec/unit/status_spec.rb
 - spec/unit/view_spec.rb
 - spec/unit/workers_spec.rb
+has_rdoc: