pixy 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2b605a212e121ae3c92c780497fe7d9cfc37614b
+  data.tar.gz: 2dbd56e9d55bc15a1c3b9a9e444ed26cdd2d274d
+SHA512:
+  metadata.gz: 49a5366f356011b36dfedb1c807115e880df36f25136b3ddb3075b8feeba75a1a685ea82d6209e16e5f4185a2baccf696a35b6c7ae9b87708e97b0c5f988049f
+  data.tar.gz: 124ddc6aa5de4025bb760425c3053fc04d6288b256a75f55e6c44affdd91cab4154efe51428b7290d553a702e717fe50bf07f5ed88925473feef79520cf56bda

data/.travis.yml

@@ -1,3 +1,3 @@
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Nihad Abbasov / NARKOZ
+Copyright (c) 2011-2013 Nihad Abbasov <mail@narkoz.me>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -1,4 +1,4 @@
-# Pixy [![Build Status](https://secure.travis-ci.org/NARKOZ/pixy.png)](http://travis-ci.org/NARKOZ/pixy)
+# Pixy [![Build Status](https://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/)
 
@@ -37,5 +37,5 @@ pixy.counter
 
 ## Copyright
 
-Copyright (c) 2011 Nihad Abbasov    
+Copyright (c) 2011-2013 Nihad Abbasov    
 BSD License.

data/lib/pixy/errors.rb

@@ -1,9 +1,10 @@
 module Pixy
-  class EmptyLongUrl < StandardError; end
-  class EmptyApiKey < StandardError; end
-  class ApiLimit < StandardError; end
-  class InvalidApiKey < StandardError; end
-  class InvalidLongUrl < StandardError; end
-  class UnknownError < StandardError; end
-  class MissingApiKey < ArgumentError; end
+  class Error < StandardError; end
+  class EmptyLongUrl < Error; end
+  class EmptyApiKey < Error; end
+  class ApiLimit < Error; end
+  class InvalidApiKey < Error; end
+  class InvalidLongUrl < Error; end
+  class UnknownError < Error; end
+  class MissingApiKey < Error; end
 end

data/lib/pixy/shorten.rb

@@ -1,12 +1,12 @@
 module Pixy
   class Shorten
     API_URL = 'http://p.tl/api/api_simple.php'
-    attr_accessor :status, :long_url, :short_url, :counter
+    attr_reader :status, :long_url, :short_url, :counter
 
     def initialize(key, url)
       uri       = URI "#{API_URL}?key=#{key}&url=#{escape_url escape_url(url)}"
       response  = Net::HTTP.get_response(uri)
-      result    = JSON.parse(response.body)
+      result    = MultiJson.load(response.body)
 
       if response.code.to_i == 200
         @status     = result['status']

data/lib/pixy/version.rb

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

data/lib/pixy.rb

@@ -2,25 +2,20 @@ require 'pixy/version'
 require 'pixy/shorten'
 require 'pixy/errors'
 require 'net/http'
-require 'json'
+require 'multi_json'
 
 module Pixy
-  extend self
-
-  def shorten(key=nil, url='')
+  def self.shorten(key=nil, url='')
     raise MissingApiKey, "API key is required" if key.nil?
-    Pixy::Shorten.new(key, url)
+    Shorten.new(key, url)
   end
 
-  def shorten!(key=nil, url='')
-    Pixy.shorten(key, url).short_url
+  def self.shorten!(key=nil, url='')
+    shorten(key, url).short_url
   end
 
-  def stats(key=nil, url='^')
-    pixy = Pixy.shorten(key, url)
-    {
-      :calls => pixy.counter,
-      :limit => 1000 - pixy.counter
-    }
+  def self.stats(key=nil, url='^')
+    pixy = shorten(key, url) # submit fake url to get API rate limit
+    { :calls => pixy.counter, :limit => 1000 - pixy.counter }
   end
 end

data/pixy.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Pixy::VERSION
 
-  gem.add_runtime_dependency 'json'
+  gem.add_dependency 'multi_json', '~> 1.7'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

data/spec/pixy/shorten_spec.rb

@@ -1,79 +1,62 @@
 require 'spec_helper'
 
 describe Pixy::Shorten do
-  it { Pixy.should respond_to :shorten }
-  it { Pixy.should respond_to :shorten! }
+  let(:pixy) { Pixy::Shorten.new('API_KEY', 'https://github.com/narkoz/pixy') }
 
-  describe "#shorten!" do
-    it "should return a short url" do
-      Pixy.shorten!('API_KEY', 'https://github.com/narkoz/pixy').should == 'http://p.tl/Us9R'
+  describe "#status" do
+    it "should return a response status" do
+      pixy.status.should == 'ok'
     end
   end
 
-  context "when a new short url requested" do
-    context "without arguments" do
-      it "should raise a required API key error" do
-        lambda { Pixy.shorten }.should raise_error(Pixy::MissingApiKey, "API key is required")
-      end
+  describe "#long_url" do
+    it "should return a long url" do
+      pixy.long_url.should == 'https://github.com/narkoz/pixy'
     end
+  end
 
-    context "with arguments" do
-      subject { Pixy.shorten('API_KEY', 'https://github.com/narkoz/pixy') }
-
-      describe "#status" do
-        it "should return a response status" do
-          subject.status.should == 'ok'
-        end
-      end
-
-      describe "#long_url" do
-        it "should return a long url" do
-          subject.long_url.should == 'https://github.com/narkoz/pixy'
-        end
-      end
-
-      describe "#short_url" do
-        it "should return a short url" do
-          subject.short_url.should == 'http://p.tl/Us9R'
-        end
-      end
+  describe "#short_url" do
+    it "should return a short url" do
+      pixy.short_url.should == 'http://p.tl/Us9R'
+    end
+  end
 
-      describe "#counter" do
-        it "should return a request number" do
-          subject.counter.should == 12
-        end
-      end
+  describe "#counter" do
+    it "should return a request number" do
+      pixy.counter.should == 12
+    end
+  end
 
-      context "with empty long url" do
-        it "should raise EmptyLongUrl" do
-          lambda {
-            Pixy.shorten('API_KEY', '')
-          }.should raise_error(Pixy::EmptyLongUrl, "Missing long URL.")
-        end
+  describe "exceptions" do
+    context "when empty long url" do
+      it "should raise EmptyLongUrl" do
+        expect {
+          Pixy::Shorten.new('API_KEY', '')
+        }.to raise_error(Pixy::EmptyLongUrl, "Missing long URL.")
       end
+    end
 
-      context "with empty API key" do
-        it "should raise EmptyApiKey" do
-          lambda {
-            Pixy.shorten('', 'https://github.com/narkoz/pixy')
-          }.should raise_error(Pixy::EmptyApiKey, "Missing API key.")
-        end
+    context "when empty API key" do
+      it "should raise EmptyApiKey" do
+        expect {
+          Pixy::Shorten.new('', 'https://github.com/narkoz/pixy')
+        }.to raise_error(Pixy::EmptyApiKey, "Missing API key.")
       end
+    end
 
-      context "with invalid API key" do
-        it "should raise InvalidApiKey" do
-          lambda {
-            Pixy.shorten('invalid_API_KEY', 'https://github.com/narkoz/pixy')
-          }.should raise_error(Pixy::InvalidApiKey, "API key is invalid.")
-        end
+    context "when invalid API key" do
+      it "should raise InvalidApiKey" do
+        expect {
+          Pixy::Shorten.new('invalid_API_KEY', 'https://github.com/narkoz/pixy')
+        }.to raise_error(Pixy::InvalidApiKey, "API key is invalid.")
       end
+    end
 
-      context "with invalid long url" do
-        it "should raise InvalidLongUrl" do
-          lambda {
-            Pixy.shorten('API_KEY', '^_^')
-          }.should raise_error(Pixy::InvalidLongUrl, "The URL can not be shortened.")
-        end
+    context "when invalid long url" do
+      it "should raise InvalidLongUrl" do
+        expect {
+          Pixy::Shorten.new('API_KEY', '^_^')
+        }.to raise_error(Pixy::InvalidLongUrl, "The URL can not be shortened.")
       end
     end
   end

data/spec/pixy_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Pixy do
+  it { should respond_to :shorten }
+  it { should respond_to :shorten! }
+  it { should respond_to :stats }
+
+  describe "#shorten" do
+    context "without arguments" do
+      it "should raise a required API key error" do
+        expect { Pixy.shorten }.to raise_error(Pixy::MissingApiKey, "API key is required")
+      end
+    end
+
+    context "with arguments" do
+      it "should return an instance of Pixy::Shorten" do
+        pixy = Pixy.shorten('API_KEY', 'https://github.com/narkoz/pixy')
+        pixy.should be_a_kind_of Pixy::Shorten
+      end
+    end
+  end
+
+  describe "#shorten!" do
+    it "should return a short url" do
+      Pixy.shorten!('API_KEY', 'https://github.com/narkoz/pixy').should == 'http://p.tl/Us9R'
+    end
+  end
+end

metadata

@@ -1,60 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: pixy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Nihad Abbasov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000 Z
+date: 2013-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &2168716640 !ruby/object:Gem::Requirement
-    none: false
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2168716640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2168716180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168716180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2168715720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168715720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2168715240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168715240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Pixy is an API wrapper for Pixiv url shortener - p.tl
 email:
 - mail@narkoz.me
@@ -79,36 +90,30 @@ files:
 - spec/fixtures/invalid_long_url.json
 - spec/fixtures/ok.json
 - spec/pixy/shorten_spec.rb
+- spec/pixy_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/narkoz/pixy
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !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
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: API wrapper for Pixiv url shortener
 test_files:
 - spec/fixtures/empty_api_key.json
@@ -117,4 +122,5 @@ test_files:
 - spec/fixtures/invalid_long_url.json
 - spec/fixtures/ok.json
 - spec/pixy/shorten_spec.rb
+- spec/pixy_spec.rb
 - spec/spec_helper.rb