pixy 0.1.0 → 0.1.1

data/README.md

@@ -1,22 +1,24 @@
-# Pixy
-
-[![Build Status](https://secure.travis-ci.org/NARKOZ/pixy.png)](http://travis-ci.org/NARKOZ/pixy)
+# Pixy [![Build Status](https://secure.travis-ci.org/NARKOZ/pixy.png)](http://travis-ci.org/NARKOZ/pixy)
 
 Pixy is an API wrapper for Pixiv url shortener - [p.tl](http://p.tl/)
 
 ## Installation
 
-```ruby
-gem 'pixy'
-# gem install pixy
+```sh
+gem install pixy
 ```
 
 ## Usage
 
+Get an API key here: http://p.tl/key_create.php
+
 ```ruby
 Pixy.shorten!(API_KEY, 'https://github.com/narkoz/pixy')
 # => "http://p.tl/Us9R"
 
+Pixy.stats API_KEY
+# => {:calls=>12, :limit=>988}
+
 pixy = Pixy.shorten(API_KEY, 'https://github.com/narkoz/pixy')
 # => #<Pixy::Shorten:0x0000010201bde8 @status="ok", @long_url="https://github.com/narkoz/pixy", @short_url="http://p.tl/Us9R", @counter=20>
 

data/lib/pixy.rb

@@ -15,4 +15,12 @@ module Pixy
   def shorten!(key=nil, url='')
     Pixy.shorten(key, url).short_url
   end
+
+  def stats(key=nil, url='^')
+    pixy = Pixy.shorten(key, url)
+    {
+      :calls => pixy.counter,
+      :limit => 1000 - pixy.counter
+    }
+  end
 end

data/lib/pixy/shorten.rb

@@ -4,16 +4,16 @@ module Pixy
     attr_accessor :status, :long_url, :short_url, :counter
 
     def initialize(key, url)
-      uri       = URI "#{API_URL}?key=#{key}&url=#{escape_url(url)}"
+      uri       = URI "#{API_URL}?key=#{key}&url=#{escape_url escape_url(url)}"
       response  = Net::HTTP.get_response(uri)
       result    = JSON.parse(response.body)
 
       if response.code.to_i == 200
-        self.status     = result['status']
-        self.long_url   = result['long_url']
-        self.short_url  = result['short_url']
-        self.counter    = result['counter']
-        raise_exception self.status unless self.status == 'ok'
+        @status     = result['status']
+        @long_url   = result['long_url']
+        @short_url  = result['short_url']
+        @counter    = result['counter']
+        raise_exception @status unless @status == 'ok'
       else
         raise UnknownError, "Server responded with code #{response.code}"
       end
@@ -39,7 +39,7 @@ module Pixy
     end
 
     def escape_url(url)
-      URI.escape(url, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+      URI.encode_www_form_component(url).gsub('+', '%20')
     end
   end
 end

data/lib/pixy/version.rb

@@ -1,3 +1,3 @@
 module Pixy
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/spec_helper.rb

@@ -5,12 +5,12 @@ require 'pixy'
 FakeWeb.allow_net_connect = false
 
 def escape_url(url)
-  URI.escape(url, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+  URI.encode_www_form_component(url).gsub('+', '%20')
 end
 
 API_URL                 = 'http://p.tl/api/api_simple.php'
-url_to_shorten          = escape_url("https://github.com/narkoz/pixy")
-invalid_url_to_shorten  = escape_url("^_^")
+url_to_shorten          = escape_url escape_url("https://github.com/narkoz/pixy")
+invalid_url_to_shorten  = escape_url escape_url("^_^")
 
 def load_fixture(name)
   File.open(File.dirname(__FILE__) + "/fixtures/#{name}.json").read

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pixy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-19 00:00:00.000000000 Z
+date: 2011-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2164331840 !ruby/object:Gem::Requirement
+  requirement: &2168716640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164331840
+  version_requirements: *2168716640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164331040 !ruby/object:Gem::Requirement
+  requirement: &2168716180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164331040
+  version_requirements: *2168716180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164330600 !ruby/object:Gem::Requirement
+  requirement: &2168715720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164330600
+  version_requirements: *2168715720
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2164329980 !ruby/object:Gem::Requirement
+  requirement: &2168715240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164329980
+  version_requirements: *2168715240
 description: Pixy is an API wrapper for Pixiv url shortener - p.tl
 email:
 - mail@narkoz.me
@@ -92,12 +92,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1002057726999351752
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1002057726999351752
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.12