ayadn 2.1 → 3.0

data/lib/ayadn/endpoints.rb

@@ -4,9 +4,20 @@ module Ayadn
 
     attr_accessor :ayadn_callback_url, :base_url, :config_api_url, :posts_url, :users_url, :files_url, :token_url, :channels_url, :pm_url
 
+    # Warning
+    # comment next line
+    require_relative "ids"
+    # uncomment and insert your own URL
+    # CALLBACK_URL = ""
+
     def initialize
-      @ayadn_callback_url = "http://aya.io/ayadn/auth.html"
-      @base_url = "https://api.app.net/"
+      @ayadn_callback_url = CALLBACK_URL
+      api_file = Dir.home + "/ayadn/.api.yml"
+      @base_url = if File.exist?(api_file)
+        YAML.load(File.read(api_file))[:root] + "/"
+      else
+        "https://api.app.net/"
+      end
       @config_api_url = @base_url + "config"
       @posts_url = @base_url + "posts/"
       @users_url = @base_url + "users/"
@@ -17,7 +28,7 @@ module Ayadn
     end
 
     def authorize_url
-      "https://account.app.net/oauth/authenticate?client_id=#{Settings::AYADN_CLIENT_ID}&response_type=token&redirect_uri=#{@ayadn_callback_url}&scope=basic,stream,write_post,follow,public_messages,messages,files,update_profile&include_marker=1"
+      "https://account.app.net/oauth/authenticate?client_id=#{Settings::CLIENT_ID}&response_type=token&redirect_uri=#{@ayadn_callback_url}&scope=basic,stream,write_post,follow,public_messages,messages,files,update_profile&include_marker=1"
     end
 
     def token_info
@@ -32,28 +43,42 @@ module Ayadn
       "#{@files_url}?access_token=#{Settings.user_token}"
     end
 
-    def unified(options)
+    private
+
+    def make_options_list(options)
       @options_list = if options[:count] || options[:since_id]
         API.build_query(options)
       else
+        yield
+      end
+    end
+
+    def make_options_list_simple(options)
+      @options_list = if options[:count]
+        API.build_query(options)
+      else
+        yield
+      end
+    end
+
+    public
+
+    def unified(options)
+      make_options_list(options) do
         API.build_query({count: Settings.options[:counts][:unified]})
       end
       "#{@posts_url}stream/unified?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def checkins(options)
-      @options_list = if options[:count] || options[:since_id]
-        API.build_query(options)
-      else
+      make_options_list(options) do
         API.build_query({count: Settings.options[:counts][:checkins]})
       end
       "#{@posts_url}stream/explore/checkins?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def global(options)
-      @options_list = if options[:count] || options[:since_id]
-        API.build_query(options)
-      else
+      make_options_list(options) do
         API.build_query({count: Settings.options[:counts][:global]})
       end
       if Settings.global[:force] == true
@@ -64,45 +89,35 @@ module Ayadn
     end
 
     def trending(options)
-      @options_list = if options[:count] || options[:since_id]
-        API.build_query(options)
-      else
+      make_options_list(options) do
         API.build_query({count: Settings.options[:counts][:trending]})
       end
       "#{@posts_url}stream/explore/trending?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def photos(options)
-      @options_list = if options[:count] || options[:since_id]
-        API.build_query(options)
-      else
+      make_options_list(options) do
         API.build_query({count: Settings.options[:counts][:photos]})
       end
       "#{@posts_url}stream/explore/photos?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def conversations(options)
-      @options_list = if options[:count] || options[:since_id]
-        API.build_query(options)
-      else
+      make_options_list(options) do
         API.build_query({count: Settings.options[:counts][:conversations]})
       end
       "#{@posts_url}stream/explore/conversations?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def mentions(username, options)
-      @options_list = if options[:count]
-        API.build_query(options)
-      else
+      make_options_list_simple(options) do
         API.build_query({count: Settings.options[:counts][:mentions]})
       end
       "#{@users_url}#{username}/mentions/?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def posts(username, options)
-      @options_list = if options[:count]
-        API.build_query(options)
-      else
+      make_options_list_simple(options) do
         API.build_query({count: Settings.options[:counts][:posts]})
       end
       if Settings.global[:force] == true
@@ -113,9 +128,7 @@ module Ayadn
     end
 
     def whatstarred(username, options)
-      @options_list = if options[:count]
-        API.build_query(options)
-      else
+      make_options_list_simple(options) do
         API.build_query({count: Settings.options[:counts][:default]})
       end
       "#{@users_url}#{username}/stars/?access_token=#{Settings.user_token}#{@options_list}"
@@ -134,9 +147,7 @@ module Ayadn
     end
 
     def convo(post_id, options)
-      @options_list = if options[:count]
-        API.build_query(options)
-      else
+      make_options_list_simple(options) do
         API.build_query({count: Settings.options[:counts][:convo]})
       end
       "#{@posts_url}#{post_id}/replies/?access_token=#{Settings.user_token}#{@options_list}"
@@ -163,36 +174,28 @@ module Ayadn
     end
 
     def search(words, options)
-      @options_list = if options[:count]
-        API.build_query(options)
-      else
+      make_options_list_simple(options) do
         API.build_query({count: Settings.options[:counts][:search]})
       end
       "#{@posts_url}search?text=#{words}&access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def search_users words, options
-      @options_list = if options[:count]
-        API.build_query(options)
-      else
+      make_options_list_simple(options) do
         API.build_query({count: Settings.options[:counts][:search]})
       end
       "#{@users_url}search?q=#{words}&access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def search_annotations anno, options
-      @options_list = if options[:count]
-        API.build_query(options)
-      else
+      make_options_list_simple(options) do
         API.build_query({count: Settings.options[:counts][:search]})
       end
       "#{@posts_url}search?annotation_types=#{anno}&access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def search_messages channel_id, words, options
-      @options_list = if options[:count]
-        API.build_query(options)
-      else
+      make_options_list_simple(options) do
         API.build_query({count: Settings.options[:counts][:search]})
       end
       "#{@channels_url}messages/search?query=#{words}&channel_ids=#{channel_id}&access_token=#{Settings.user_token}#{@options_list}"
@@ -216,9 +219,7 @@ module Ayadn
     end
 
     def files_list(options)
-      @options_list = if options[:count]
-        API.build_query(options)
-      else
+      make_options_list_simple(options) do
         API.build_query({count: Settings.options[:counts][:files]})
       end
       "#{@users_url}me/files?access_token=#{Settings.user_token}#{@options_list}"

data/lib/ayadn/extend.rb

@@ -22,3 +22,23 @@ class Integer
     }.each_pair { |e, s| return "#{(self.to_f / (s / 1024)).round(2)} #{e}" if self < s }
   end
 end
+class Object
+  def blank?
+    respond_to?(:empty?) ? !!empty? : !self
+  end
+end
+class Hash
+  def deep_diff(b)
+    a = self
+    (a.keys | b.keys).inject({}) do |diff, k|
+      if a[k] != b[k]
+        if a[k].respond_to?(:deep_diff) && b[k].respond_to?(:deep_diff)
+          diff[k] = a[k].deep_diff(b[k])
+        else
+          diff[k] = [a[k], b[k]]
+        end
+      end
+      diff
+    end
+  end
+end

data/lib/ayadn/fileops.rb

@@ -59,11 +59,11 @@ module Ayadn
       begin
         case File.extname(file).downcase
         when ".png"
-          `curl -k -H 'Authorization: BEARER #{token}' https://api.app.net/files -F 'type=com.ayadn.files' -F "content=@#{file};type=image/png" -F 'public=true' -X POST`
+          `curl -k -H 'Authorization: BEARER #{token}' #{Settings.config[:api][:baseURL]}/files -F 'type=com.ayadn.files' -F "content=@#{file};type=image/png" -F 'public=true' -X POST`
         when ".gif"
-          `curl -k -H 'Authorization: BEARER #{token}' https://api.app.net/files -F 'type=com.ayadn.files' -F "content=@#{file};type=image/gif" -F 'public=true' -X POST`
+          `curl -k -H 'Authorization: BEARER #{token}' #{Settings.config[:api][:baseURL]}/files -F 'type=com.ayadn.files' -F "content=@#{file};type=image/gif" -F 'public=true' -X POST`
         else #jpg or jpeg or JPG or JPEG, automatically recognized as such
-          `curl -k -H 'Authorization: BEARER #{token}' https://api.app.net/files -F 'type=com.ayadn.files' -F "content=@#{file}" -F 'public=true' -X POST`
+          `curl -k -H 'Authorization: BEARER #{token}' #{Settings.config[:api][:baseURL]}/files -F 'type=com.ayadn.files' -F "content=@#{file}" -F 'public=true' -X POST`
         end
       rescue Errno::ENOENT
         Status.new.no_curl

data/lib/ayadn/ids.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+module Ayadn
+  class Settings
+    CLIENT_ID = "hFsCGArAjgJkYBHTHbZnUvzTmL4vaLHL"
+  end
+  class TvShow
+    TVDB_API_KEY = 'E874ACBC542CAA53'
+  end
+  class Endpoints
+    CALLBACK_URL = "http://aya.io/ayadn/auth.html"
+  end
+  class NowPlaying
+    AFFILIATE_SUFFIX = "&at=1l3vtb8&ct=ayadn"
+    DEEZER_APP_ID = "150971"
+    DEEZER_AUTH_URL = "http://aya.io/ayadn/deezer.html"
+  end
+end

data/lib/ayadn/nicerank.rb

@@ -2,6 +2,8 @@
 module Ayadn
   class NiceRank
 
+    require "fast_cache"
+
     attr_reader :store
 
     def initialize

data/lib/ayadn/nowplaying.rb

@@ -3,6 +3,14 @@ module Ayadn
 
   class NowPlaying
 
+    # Warning
+    # comment next line
+    require_relative "ids"
+    # uncomment next line and insert your own codes
+    # AFFILIATE_SUFFIX = ""
+    # DEEZER_APP_ID = ""
+    # DEEZER_AUTH_URL = ""
+
     begin
       require 'rss'
     rescue LoadError => e
@@ -25,9 +33,8 @@ module Ayadn
         @custom_text = nil
       else
         @custom_text = "\n \n#{options[:text].join(' ')}"
-      end
-      @affiliate_suffix = "&at=1l3vtb8&ct=ayadn"
-      @deezer_auth_url = "https://connect.deezer.com/oauth/auth.php?app_id=150971&redirect_uri=http://aya.io/ayadn/deezer.html&response_type=token&perms=basic_access,listening_history,offline_access"
+      end 
+      @auth_url = "https://connect.deezer.com/oauth/auth.php?app_id=#{DEEZER_APP_ID}&redirect_uri=#{DEEZER_AUTH_URL}&response_type=token&perms=basic_access,listening_history,offline_access"
     end
 
     def deezer options
@@ -203,7 +210,7 @@ module Ayadn
 
     def ask_deezer_user
       @status.info("please", "open this link to authorize Deezer", "yellow")
-      @status.say { @workers.thor.say_status :link, @deezer_auth_url, :green }
+      @status.say { @status.say_green :link, @auth_url }
       @status.info("next", "paste the authorization code here", "cyan")
       print "> "
       begin
@@ -274,7 +281,7 @@ module Ayadn
           'artist' => candidate['artistName'],
           'track' => candidate['trackName'],
           'preview' => candidate['previewUrl'],
-          'link' => "#{candidate['collectionViewUrl']}#{@affiliate_suffix}",
+          'link' => "#{candidate['collectionViewUrl']}#{AFFILIATE_SUFFIX}",
           'artwork' => candidate['artworkUrl100'].gsub('100x100', '1200x1200'),
           'artwork_thumb' => candidate['artworkUrl100'].gsub('100x100', '600x600'),
           'request' => url,

data/lib/ayadn/post.rb

@@ -2,6 +2,8 @@
 module Ayadn
   class Post
 
+    require_relative "annotations"
+
     def initialize
       @status = Status.new
     end

data/lib/ayadn/set.rb

@@ -132,6 +132,23 @@ module Ayadn
       counts_config.save
     end
 
+    desc "edit", "Edit settings in $EDITOR"
+    def edit
+      Settings.load_config()
+      sets = Settings.config[:paths][:config] + "/config.yml"
+      if sets.blank?
+        Status.new.not_authorized
+        exit
+      end
+      ed = `echo $EDITOR`
+      if ed.blank?
+        Status.new.info "No predefined EDITOR, opening in VIM"
+        `vim #{sets}`
+        exit
+      end
+      `$EDITOR #{sets}`
+    end
+
     desc "color ITEM COLOR", "Set ITEM to COLOR"
     long_desc Descriptions.set_color
     map "colors" => :color
@@ -202,10 +219,44 @@ module Ayadn
       formats_config.save
     end
 
+    desc "api URL", "Set an alternative base URL for the API calls."
+    def api(*args)
+      if args[0]
+        begin
+          SetAPI.new.setURL(args[0])
+        rescue NoMethodError, ArgumentError => e
+          Status.new.error_missing_parameters
+          exit
+        rescue => e
+          raise e
+        end
+      else
+        Status.new.error_missing_parameters
+        exit
+      end
+    end
+
   end
 
   class Validators
 
+    def self.URL(str)
+      require 'net/http'
+      if(str.to_s.empty?)
+        Status.new.error_missing_parameters
+        exit
+      end
+      begin
+        URI.parse(str)
+        # if url.host.nil? || (url.scheme != 'http' && url.scheme != 'https')
+            # ask: are you sure about this url?
+        # end
+        # url
+      rescue URI::Error => e
+        return nil
+      end
+    end
+
     def self.boolean(value)
       case value.downcase
       when "true", "1", "yes"
@@ -271,7 +322,6 @@ module Ayadn
       Settings.get_token()
       Settings.init_config()
       Logs.create_logger()
-      @thor = Thor::Shell::Color.new
       @status = Status.new
     end
 
@@ -282,14 +332,39 @@ module Ayadn
 
     def log
       @status.say do
-        @thor.say_status(:updated, "'#{@input}' in '#{@category}'", :cyan)
-        @thor.say_status(:content, "'#{@output}'", :green)
+        @status.say_cyan :updated, "'#{@input}' in '#{@category}'"
+        @status.say_green :content, "'#{@output}'"
       end
       Logs.rec.info "new value for '#{@input}' in '#{@category}' => '#{@output}'"
     end
 
   end
 
+  class SetAPI < SetBase
+
+    def initialize
+      super
+      @category = 'API'
+      @status = Status.new
+    end
+
+    def setURL(url)
+      @input = url
+      # @status.say_header "checking URL validity"
+      url = Validators.URL(url)
+      if url != nil
+        @output = url.to_s
+        @status.say_info "setting up configuration"
+        File.write(Dir.home + "/ayadn/.api.yml", {root: @output}.to_yaml)
+        log()
+      else
+        @status.say_red :canceled, "URL is invalid"
+        exit
+      end
+    end
+
+  end
+
   class SetFormats < SetBase
 
     def initialize

data/lib/ayadn/settings.rb

@@ -2,7 +2,11 @@
 module Ayadn
   class Settings
 
-    AYADN_CLIENT_ID = "hFsCGArAjgJkYBHTHbZnUvzTmL4vaLHL"
+    # Warning
+    # comment next line
+    require_relative "ids"
+    # uncomment and insert your own client id
+    # CLIENT_ID = ""
 
     class << self
       attr_accessor :options, :config, :global
@@ -11,7 +15,17 @@ module Ayadn
 
     def self.load_config
       active = self.check_for_accounts
+      if active.blank?
+        Status.new.not_authorized
+        exit
+      end
       home = active[3]
+      api_file = Dir.home + "/ayadn/.api.yml"
+      baseURL = if File.exist?(api_file)
+        YAML.load(File.read(api_file))[:root]
+      else
+        "https://api.app.net"
+      end
       @config = {
         paths: {
           home: home,
@@ -28,6 +42,9 @@ module Ayadn
           id: active[1],
           username: active[0],
           handle: active[2]
+        },
+        api: {
+          baseURL: baseURL
         }
       }
       @options = self.defaults
@@ -43,10 +60,10 @@ module Ayadn
       else
         if File.exist?(Dir.home + "/ayadn/accounts.db")
           # Ayadn 1.x with already authorized account(s)
-          status.has_to_migrate
+          status.deprecated_ayadn
           exit
         else
-          # Ayadn 1.x without any authorized account (gem installed but no ~/ayadn folder)
+          # Ayadn without any authorized account (gem installed but no ~/ayadn folder)
           status.not_authorized
           exit
         end