dljbz 0.0.3 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 988cf7cd803605025301abe9edc12758656708ab
-  data.tar.gz: 3f250a44a96379873f7e793c59b7bb3dbba85dd1
+SHA256:
+  metadata.gz: 93a255272b20392a7e31af2415c83137e0382a7199345e937fb9eac05c13626c
+  data.tar.gz: f6e0244cd274dfe54946501f21a92f56a286e5885fe6e05731c0b2c2d9cf0901
 SHA512:
-  metadata.gz: e601d29e5ff1d0ba41559311b83cd157dd9b6df714d02b4e49179686d5b67a38c8770a7757771d74041fbfbcadc88643800be7a423006b6ec5bbd6de63d0103b
-  data.tar.gz: 923c69ce068ec05893c694b5513732241f0be4a2488172ceddd254d01104059fb824386241ba634a45873947f83c9f6c6240ad272f1ccb600d2fa17f72dfdd9b
+  metadata.gz: 33f2cc09b1f6ac16791c4815d1e26e020133d8a954ea46bf81598e979d35b8183992f42171a232d5fb584b7412ace1281cc000d31c4582b8794bf5d0fa9a7fa4
+  data.tar.gz: 7ccd22fcb875eae5a0cd463cbb8788dcfb8327b3b8bfa31bbcffc8ccd3be907e333ed82e7b4b7db9436eae065bb4e7e4404ef1fed7a586e94862880936f9c1b2

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
-gem "httparty", "~> 0.10.0"
-gem "json", ">= 1.4.6"
+# Specify your gem's dependencies in dljbz.gemspec
+gemspec

data/README.md

@@ -18,16 +18,19 @@ Or install it yourself as:
 
 ## Usage
 
+create rails file: config/initializers/dljbz.rb
+```
+  Dljbz.api_key = 'api_key' # from: http://dlj.bz/dashboard/api_key
+```
 
 ```
-  url = Dljbz.shorten('http://51qiangda.com')
-  url.short_url
-  => "http://dlj.bz/51qd"
+  url = Dljbz::V2::Short.request('http://www.sina.com.cn')
+  => {"short"=>"http://dlj.bz/H0Jo6e", "url"=>"http://www.sina.com.cn"}
 ```
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/dljbz/fork )
+1. Fork it ( https://github.com/growcn/dljbz )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "dljbz"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/dljbz.gemspec

@@ -13,13 +13,17 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://github.com/growcn/dljbz"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  # spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  spec.add_dependency "httparty"
-  spec.add_dependency(%q<json>, [">= 1.4.6"])  
+  spec.add_development_dependency "pry" if ENV['PRY']
+  spec.add_dependency "rest-client"
+  spec.add_dependency(%q<json>, [">= 1.4.6"])
 end

data/lib/dljbz/request.rb

@@ -1,5 +1,29 @@
 module Dljbz
-  class Request # :nodoc:
-    include HTTParty
+  class Request
+    API_URL = 'http://dlj.bz/api'
+
+    class << self
+      def post(api_path, params = {}, headers = {})
+        begin
+          JSON.parse(
+            RestClient.post(parse_path(api_path), params, app_headers.merge(headers))
+          )
+        rescue RestClient::ExceptionWithResponse => err
+          JSON.parse(err.response.body)
+        rescue => e
+          raise e.inspect
+        end
+      end
+
+      def app_headers
+        {}
+      end
+
+      def parse_path(path)
+        host = Dljbz.endpoint || API_URL
+
+        "#{host}#{path}"
+      end
+    end
   end
 end

data/lib/dljbz/v2/short.rb

@@ -0,0 +1,17 @@
+module Dljbz
+  module V2
+    class Short
+      # attr_accessor :params
+      API_SHORT_V2_URL = '/v2/short'
+      # Dljbz.api_key = 'c9bc59f083b691828006391ff92e0fe5'
+      # Dljbz::V2::Short.request('http://www.sina.com.cn')
+      # def initialize(long_url, opts = {})
+      # end
+
+      def self.request(long_url, opts = {})
+        params = { url: long_url, api_key: Dljbz.api_key.to_s }.merge(opts)
+        Dljbz::Request.post(API_SHORT_V2_URL, params)
+      end
+    end
+  end
+end

data/lib/dljbz/version.rb

@@ -1,3 +1,3 @@
 module Dljbz
-  VERSION = "0.0.3"
+  VERSION = "1.0.1"
 end

data/lib/dljbz.rb

@@ -1,25 +1,10 @@
-require 'httparty'
-require 'json'
-
-require 'dljbz/base'
-require 'dljbz/utils'
+require 'pry' if ENV['PRY']
+require 'rest-client'
 require 'dljbz/request'
-require 'dljbz/shorten'
+require 'dljbz/v2/short'
 
 module Dljbz
-  extend self
-
-  # Creates a new short URL
-  #
-  #   url = Dljbz.shorten('http://51qiangda.com')
-  #   url.short_url
-  #   => "http://dlj.bz/51qd"
-  #
-  def shorten(url=nil)
-    raise ArgumentError.new("URL to shorten is required") if url.nil? || url.strip.empty?
-    Dljbz::Shorten.new(url)
+  class << self
+    attr_accessor :api_key, :endpoint
   end
-    
-
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dljbz
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.1
 platform: ruby
 authors:
 - John Chen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-14 00:00:00.000000000 Z
+date: 2022-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -69,7 +69,9 @@ dependencies:
 description: Small library for dlj.bz URL Shortener API
 email:
 - cgg5207@sina.com
-executables: []
+executables:
+- console
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -78,18 +80,18 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
 - dljbz.gemspec
 - lib/dljbz.rb
-- lib/dljbz/base.rb
 - lib/dljbz/request.rb
-- lib/dljbz/shorten.rb
-- lib/dljbz/utils.rb
+- lib/dljbz/v2/short.rb
 - lib/dljbz/version.rb
 homepage: http://github.com/growcn/dljbz
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -104,9 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Wrapper for dlj.bz URL Shortener API
 test_files: []

data/lib/dljbz/base.rb

@@ -1,31 +0,0 @@
-module Dljbz
-
-  class Base
-    
-    # URL for QR Code
-    #
-    #   url = Dljbz.shorten('http://51qiangda.com')
-    #   ur.qr_code
-    #   => http://dlj.bz/51qd.qr
-    #
-    # Usage:
-    #
-    #   <img src="http://dlj.bz/51qd.qr" />
-    #
-    def qr_code
-      "#{short_url}.qr"
-    end
-
-    # URL for analytics
-    #
-    #   url = Dljbz.shorten('http://51qiangda.com')
-    #   ur.info
-    #   => http://dlj.bz/51qd.info
-    #
-    def info
-      "#{short_url}.info"
-    end
-
-  end
-
-end

data/lib/dljbz/shorten.rb

@@ -1,25 +0,0 @@
-module Dljbz
-
-  class Shorten < Base
-
-    include Dljbz::Utils
-
-    attr_accessor :short_url, :long_url
-
-    # Creates a new short URL, see Dljbz.shorten
-    #
-    def initialize(long_url)
-      modify_headers('Content-Type' => 'application/json')
-      options = {"long_url" => long_url}
-      resp = post(API_URL, :body => options)
-      if resp.code == 200 or resp.code == 201
-        self.short_url  = resp['short_url']
-        self.long_url   = resp['long_url']
-      else
-        raise exception(resp.parsed_response)
-      end
-    end
-
-  end
-
-end

data/lib/dljbz/utils.rb

@@ -1,26 +0,0 @@
-module Dljbz
-
-  module Utils
-
-    API_URL              = 'http://dlj.bz/api/urlshortener/'
-
-    private
-    def modify_headers(item)
-      Dljbz::Request.headers.merge!(item)
-    end
-
-    def post(url, params={})
-      Dljbz::Request.post(url, params)
-    end
-
-    def get(url, params={})
-      Dljbz::Request.get(url, params)
-    end
-
-    def exception(msg)
-      Exception.new(msg)
-    end
-
-  end
-
-end