coderbits 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4e0049c3c53f1a9a7d60e7641d687457f8b4e91
-  data.tar.gz: 8efd2cdbc2ceeb5407d24479d33159c69d0eae54
+  metadata.gz: 0f3f89f4d80c71f4f30ccec6aeb3e3e4537d99b7
+  data.tar.gz: 4f4ec14200e32a65f7a2006c49771fa0a9df8183
 SHA512:
-  metadata.gz: c84856626af07e1f24de4e5d6ab3cd8c987aa8fb584703b769362719d070b870634ced894f6dc45de946d1eb05fbc3f7fcca5477730798f0533358040b9d4681
-  data.tar.gz: ceb6e5e36152a0a0361c9dc2ccdd49ce0f725e654511b80adb18e74ba829a132e9421b1f40824f742b8889a67ce08ba56a13cf990e3c28ab7948483f54c3558c
+  metadata.gz: d14bfbc1f15991c35d29f491e3ca034c491d001f0aab185a4734c5173869b5b3428d32a199364612236b112bc397cfd695719c0b69f64767988a2c1f485b1ca7
+  data.tar.gz: 494a6e187229d9de9f030c540a4b4157abf6a495b1a00e39550553711c115a31fc5b7bd36ab875e3cf729f6a422013e4bf613a061b73475153df0debb2c8a96f

data/README.md

@@ -1,7 +1,7 @@
 # coderbits
 
 [![Gem version](https://badge.fury.io/rb/coderbits.png)](https://rubygems.org/gems/coderbits)
-[![Build Status](https://secure.travis-ci.org/artemeff/coderbits.png)][travis]
+[![Build Status](https://secure.travis-ci.org/artemeff/coderbits.png)](https://travis-ci.org/artemeff/coderbits)
 [![Code Climate](https://codeclimate.com/github/artemeff/coderbits.png)](https://codeclimate.com/github/artemeff/coderbits)
 [![Dependency Status](https://gemnasium.com/artemeff/coderbits.png)](https://gemnasium.com/artemeff/coderbits)
 

data/coderbits.gemspec

@@ -19,7 +19,9 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler', '~> 1.0'
   s.add_dependency 'faraday', '~> 0.8'
-  s.add_dependency 'multi_json', '~> 1.3'
+  s.add_dependency 'faraday_middleware', '~> 0.8'
+  s.add_dependency 'multi_json', '~> 1.7'
   s.add_dependency 'sprite-factory', '~> 1.5'
   s.add_dependency 'chunky_png', '~> 1.2'
+  s.add_dependency 'hashie', '~> 2.0'
 end

data/lib/coderbits.rb

@@ -1,27 +1,26 @@
+require 'sprite_factory'
+require 'multi_json'
+require 'hashie'
+require 'faraday'
+require 'faraday_middleware'
+
+require 'coderbits/defaults'
 require 'coderbits/client'
+require 'coderbits/object'
 require 'coderbits/glue'
 
 module Coderbits
   class << self
-    # Alias for Coderbits::Client.new
-    #
-    # @return [Coderbits::Client]
+    # Alias for Coderbits::Client.new.get
     def new username, options = {}
-      Coderbits::Client.new# username, options
-    end
-
-    # Alias for Coderbits::Client.new(...).get
-    #
-    # @return [Hash]
-    def get username
-      Coderbits::Client.new.get username
+      Coderbits::Client.new.get username, options
     end
+    
+    alias_method :get, :new
 
     # Alias for Coderbits::Glue.new(...)
-    #
-    # @return
     def glue username, options = {}
       Coderbits::Glue.new username, options
     end
   end
-end
+end

data/lib/coderbits/client.rb

@@ -1,6 +1,3 @@
-require 'faraday'
-require 'multi_json'
-
 module Coderbits
   class Client
     # valid options
@@ -10,25 +7,48 @@ module Coderbits
     attr_reader :connection
 
     # Coderbits::Client.new
-    #
-    # @return @connection
-    def initialize
-      @connection = Faraday.new url: "https://coderbits.com"
+    # establish faraday connection
+    def initialize options = {}
+      options[:url]     ||= Coderbits::Defaults::BASE_URL
+      options[:headers] ||= Coderbits::Defaults::HEADERS
+      options[:ssl]     ||= Coderbits::Defaults::SSL
+
+      @connection = Faraday.new(options)
     end
 
     # Coderbits::Client.new.get username: 'artemeff'
+    # gets user data
     def get username, options = {}
-      response = @connection.get "/#{username}.json", safe(options)
-
-      if options[:callback]
-        response.body
-      else
-        MultiJson.load response.body, symbolize_keys: true
+      begin
+        response = @connection.get "/#{username}.json", safe(options)
+
+        status = response.status
+        error  = false
+      rescue Exception => e
+        status = -1
+        error  = "Connection error: #{e}"
       end
+
+      # return string if options has callback
+      return response.body if options[:callback]
+
+      # parse json
+      user_data = MultiJson.load response.body, symbolize_keys: true
+
+      # set error if loaded json is empty
+      error = "User not found" if user_data.empty?
+
+      # set status and error message to returned data
+      user_data[:status] = status
+      user_data[:error]  = error
+
+      # hashie
+      Coderbits::Object.new user_data
     end
 
   private
 
+    # safety option
     def safe options
       options.select { |k, v| OPTIONS.include? k }
     end

data/lib/coderbits/defaults.rb

@@ -0,0 +1,7 @@
+module Coderbits
+  module Defaults
+    BASE_URL = 'https://coderbits.com'        unless defined? Coderbits::Defaults::BASE_URL
+    HEADERS  = { accept: 'application/json' } unless defined? Coderbits::Defaults::HEADERS
+    SSL      = { verify: false }              unless defined? Coderbits::Defaults::SSL
+  end
+end

data/lib/coderbits/glue.rb

@@ -1,6 +1,3 @@
-require 'sprite_factory'
-require 'faraday'
-
 module Coderbits
   class Glue
     # valid options
@@ -15,10 +12,11 @@ module Coderbits
       @username = username
     end
 
+    # launching all rockets
     def run!
       imgs = download_images
       css  = merge_images
-      html = generate_html
+      html = generate_html imgs
 
       {
         images: imgs,
@@ -32,36 +30,47 @@ module Coderbits
       data = Coderbits::Client.new.get @username
 
       # collect images
-      images = data[:badges].select{ |b| b[:earned] }.map { |b| b[:image_link].match(/(.*)\/(.*)/)[2] }.uniq
-
-      # get connection
-      connection = Coderbits::Client.new.connection
+      images = data.badges.select { |b| b.earned }.map { |b| b.image_link.match(/(.*)\/(.*)/)[2] }.uniq
 
-      # create directory
+      # create directories
       Dir.mkdir @options[:save_to] unless Dir.exists? @options[:save_to]
       Dir.mkdir "#{@options[:save_to]}/badges" unless Dir.exists? "#{@options[:save_to]}/badges"
 
+      # connection for download images
+      connection = Coderbits::Client.new(headers: { accept: 'image/png' }).connection
+
       # download images
       images.each do |img|
         # specify badge size
         img = change_size img unless @options[:badge_size] == 64
 
         # download image
-        response = connection.get "https://coderbits.com/images/badges/#{img}"
-        
-        # save to disk
-        if response.headers["content-type"] == "image/png"
-          File.open("#{@options[:save_to]}/badges/#{img.downcase}", 'wb') { |f| f.write response.body }
+        begin
+          response = connection.get "/images/badges/#{img}"
+
+          # save to disk
+          if response.headers["content-type"] == "image/png"
+            File.open("#{@options[:save_to]}/badges/#{img.downcase}", 'wb') { |f| f.write response.body }
+          end
+        rescue Exception => e
+          # TODO logging
         end
       end
     end
 
+    # merge and generate css by SpriteFactory
     def merge_images
       SpriteFactory.run! "#{@options[:save_to]}/badges", @options
     end
 
-    def generate_html
-      nil # coming soon
+    def generate_html images
+      html_tags = []
+
+      images.each do |name|
+        html_tags << "<img src='#{@options[:output_image]}' class='#{@options[:selector][1..-1]}#{name.downcase.gsub(/.png/,'')}'>"
+      end
+
+      html_tags.join "\n"
     end
 
     def safe options
@@ -70,7 +79,7 @@ module Coderbits
 
       dflt = {
         badge_size: 64,       # badges size for download
-        save_to: './',        # path for files
+        save_to: '.',        # path for files
 
         layout: 'horizontal', # horizontal, vertical or packed
         style: 'css',         # css, scss or sass

data/lib/coderbits/object.rb

@@ -0,0 +1,5 @@
+module Coderbits
+  class Object < Hashie::Mash
+
+  end
+end

data/lib/coderbits/version.rb

@@ -1,3 +1,3 @@
 class Colos
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/spec/coderbits/client_spec.rb

@@ -15,8 +15,16 @@ describe Coderbits::Client do
         @data = Coderbits::Client.new.get 'artemeff'
       end
 
-      it "should have user data" do
-        expect(@data).to be_a Hash
+      it "should be a Coderbits::Object instance" do
+        expect(@data).to be_a Coderbits::Object
+      end
+
+      it "should return status eq 200" do
+        @data.status.should be 200
+      end
+
+      it "shouldn't have error" do
+        @data.error.should be false
       end
 
       it "should have username" do
@@ -31,10 +39,24 @@ describe Coderbits::Client do
         data.should be_an_instance_of String
       end
 
-      it "should be a Hash with account option" do
+      it "should be a Coderbits::Object with account option" do
         data = Coderbits::Client.new.get 'artemeff', account: 'github'
 
-        data.should be_an_instance_of Hash
+        data.should be_an_instance_of Coderbits::Object
+      end
+    end
+
+    describe "with nonexistent user" do
+      before do
+        @data = Coderbits::Client.new.get "prettyuserthatdoesntexist#{rand(10)}"
+      end
+
+      it "should have 200 status" do
+        @data.status.should be 200
+      end
+
+      it "should have error" do
+        @data.error.should match "User not found"
       end
     end
   end

data/spec/coderbits/glue_spec.rb

@@ -17,33 +17,15 @@ describe Coderbits::Glue do
       FileUtils.rm_rf './temp/'
     end
 
-    it "should run without errors" do
+    it "should work" do
       Coderbits.glue('artemeff', save_to: './temp/').run!
     end
 
-    it "should run without errors with custom badge size" do
+    it "should work with custom badge size" do
       Coderbits.glue('artemeff', badge_size: 32, save_to: './temp/').run!
     end
   end
 
-  describe ".download_images" do
-    it "..." do
-      pending "Write tests"
-    end
-  end
-
-  describe ".merge_images" do
-    it "..." do
-      pending "Write tests"
-    end
-  end
-
-  describe ".generate_html" do
-    it "..." do
-      pending "Write tests"
-    end
-  end
-
   describe "#safe" do
     before do
       @glue = Coderbits::Glue.new 'artemeff'

data/spec/coderbits_spec.rb

@@ -2,15 +2,9 @@ require 'spec_helper'
 
 describe Coderbits do
 
-  describe ".new" do
+  describe ".new and .get" do
     it "is a Coderbits::Client" do
-      expect(Coderbits.new('artemeff')).to be_a Coderbits::Client
-    end
-  end
-
-  describe ".get" do
-    it "is a Coderbits::Client" do
-      expect(Coderbits.get('artemeff')).to be_a Hash
+      expect(Coderbits.new('artemeff')).to be_a Hash
     end
   end
 

data/spec/spec_helper.rb

@@ -3,7 +3,4 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'rspec'
 require 'coderbits'
-require 'coveralls'
 require 'fileutils'
-
-Coveralls.wear!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coderbits
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Yuri Artemev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: sprite-factory
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Simple wrapper for the Coderbits API
 email:
 - i@artemeff.com
@@ -93,7 +121,9 @@ files:
 - Rakefile
 - coderbits.gemspec
 - lib/coderbits/client.rb
+- lib/coderbits/defaults.rb
 - lib/coderbits/glue.rb
+- lib/coderbits/object.rb
 - lib/coderbits/version.rb
 - lib/coderbits.rb
 - spec/coderbits/client_spec.rb