vatbook 0.1.0 → 0.2.0

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0

data/CONTRIBUTING.md

@@ -3,6 +3,6 @@
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Make sure all tests are passing!
+4. Make sure all tests pass!
 5. Push to the branch (`git push origin my-new-feature`)
 6. Create new Pull Request

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', :version => 2 do
+guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Svilen Vassilev
+Copyright (c) 2013 Svilen Vassilev
 
 MIT License
 

data/README.md

@@ -6,8 +6,9 @@ objects, exposing a rich set of attributes. Supports excluding enroute pilot boo
 Supports pulling pilot and atc bookings separately or as a combined hash.
 
 [![Build Status](https://secure.travis-ci.org/tarakanbg/vatbook.png?branch=master)](http://travis-ci.org/tarakanbg/vatbook)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/tarakanbg/vatbook)
-<!-- [![Gemnasium](https://gemnasium.com/tarakanbg/vatbook.png?travis)](https://gemnasium.com/tarakanbg/vatbook) -->
+[![Gemnasium](https://gemnasium.com/tarakanbg/vatbook.png?travis)](https://gemnasium.com/tarakanbg/vatbook)
+[![Gem Version](https://badge.fury.io/rb/vatbook.png)](http://badge.fury.io/rb/vatbook)
+[![Code Climate](https://codeclimate.com/github/tarakanbg/vatbook.png)](https://codeclimate.com/github/tarakanbg/vatbook)
 
 
 ## Installation
@@ -118,6 +119,12 @@ airports. Example:
 
 ## Changelog
 
+### v. 0.2 - 28 February 2013
+
+* Ruby 2.0 support
+* dependencies update
+* classes refactored
+
 ### v. 0.1 - 22 October 2012
 
 * Initial release
@@ -133,11 +140,11 @@ airports. Example:
 
 ## Credits
 
-Copyright © 2012 [Svilen Vassilev](http://about.me/svilen)
+Copyright © 2013 [Svilen Vassilev](http://svilen.rubystudio.net)
 
-*If you find my work useful or time-saving, you can endorse it or buy me a beer:*
+*If you find my work useful or time-saving, you can endorse it or buy me a cup of coffee:*
 
-[![endorse](http://api.coderwall.com/svilenv/endorse.png)](http://coderwall.com/svilenv)
+[![endorse](http://api.coderwall.com/svilenv/endorsecount.png)](http://coderwall.com/svilenv)
 [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5FR7AQA4PLD8A)
 
-Released under the [MIT LICENSE](https://github.com/tarakanbg/vatbook/blob/master/LICENSE.txt)
+Released under the [MIT LICENSE](https://github.com/tarakanbg/vatbook/blob/master/LICENSE)

data/lib/vatbook.rb

@@ -1,4 +1,4 @@
-require "vatbook/version"
+%w{vatbook/version vatbook/book_fetcher vatbook/booking}.each { |lib| require lib }
 
 class String
   def vatbook(args={})
@@ -7,113 +7,9 @@ class String
 end
 
 module Vatbook
+
   def self.bookings(fir, args)
     BookFetcher.new(fir, args).fetch
   end
 
-  class BookFetcher
-    require 'nokogiri'
-    require 'open-uri'
-
-    attr_accessor :fir, :atc_bookings, :pilot_bookings, :enroute, :doc
-
-    def initialize(fir, args = nil)
-      @fir = fir.upcase
-      @enroute = true
-      process_arguments(args) if args.class == Hash
-      @atc_bookings = []; @pilot_bookings = [];
-      @doc = raw_list
-      atcs
-      pilots
-    end
-
-    def raw_list
-      Nokogiri::XML(open("http://vatbook.euroutepro.com/xml2.php?fir=#{@fir}"))
-    end
-
-    def fetch
-       {:atc => atc_bookings, :pilots => pilot_bookings}
-    end
-
-    def atc_bookings
-      @atc_bookings
-    end
-
-    def pilot_bookings
-      @pilot_bookings
-    end
-
-    def atcs_count
-      @doc.css("atcs booking").count
-    end
-
-    def pilots_count
-      @doc.css("pilots booking").count
-    end
-
-    private
-
-    def atcs
-      @doc.css("atcs booking").each do |booking|
-        @atc_bookings << Booking.new(booking, role = "atc", @fir)
-      end
-    end
-
-    def pilots
-      @doc.css("pilots booking").each do |booking|
-        if @enroute == false
-          bk = Booking.new(booking, role = "pilot", @fir)
-          if bk.enroute == false
-            @pilot_bookings << bk
-          end
-        else
-          @pilot_bookings << Booking.new(booking, role = "pilot", @fir)
-        end
-      end
-    end
-
-    def process_arguments(args)
-      args[:enroute] == false ? @enroute = false : @enroute = true
-    end
-
-  end
-
-   class Booking
-    require 'nokogiri'
-
-    attr_accessor :role, :callsign, :name, :cid, :start, :end, :dep, :arr
-    attr_accessor :aircraft, :route, :enroute, :fir
-
-
-    def initialize(booking, role, fir)
-      @fir = fir
-      @role = role
-      @callsign = booking.children.css("callsign").first.children.to_s
-      @name = booking.children.css("name").first.children.to_s
-      @role == "atc" ? @cid = booking.children.css("cid").first.children.to_s : @cid = booking.children.css("pid").first.children.to_s
-      if @role == "atc"
-        @start = booking.children.css("time_start").first.children.to_s
-        @end = booking.children.css("time_end").first.children.to_s
-      elsif @role == "pilot"
-        @dep = booking.children.css("dep").first.children.to_s
-        @arr = booking.children.css("arr").first.children.to_s
-        @route = booking.children.css("route").first.children.to_s.gsub(/[\n]/, ' ').strip
-        @start = booking.children.css("from").first.children.to_s
-        @end = booking.children.css("to").first.children.to_s
-        @aircraft = booking.children.css("actype").first.children.to_s
-        check_enroute
-      end
-    end
-
-  private
-    def check_enroute
-      if @fir[0..1] == @dep[0..1] or @fir[0..1] == @arr[0..1]
-        @enroute = false
-      else
-        @enroute = true
-      end
-    end
-
-  end
-
-end
+end

data/lib/vatbook/book_fetcher.rb

@@ -0,0 +1,70 @@
+module Vatbook
+
+  class BookFetcher
+    require 'nokogiri'
+    require 'open-uri'
+
+    attr_accessor :fir, :atc_bookings, :pilot_bookings, :enroute, :doc
+
+    def initialize(fir, args = nil)
+      @fir = fir.upcase
+      @enroute = true
+      process_arguments(args) if args.class == Hash
+      @atc_bookings = []; @pilot_bookings = [];
+      @doc = raw_list
+      atcs
+      pilots
+    end
+
+    def raw_list
+      Nokogiri::XML(open("http://vatbook.euroutepro.com/xml2.php?fir=#{@fir}"))
+    end
+
+    def fetch
+       {:atc => atc_bookings, :pilots => pilot_bookings}
+    end
+
+    def atc_bookings
+      @atc_bookings
+    end
+
+    def pilot_bookings
+      @pilot_bookings
+    end
+
+    def atcs_count
+      @doc.css("atcs booking").count
+    end
+
+    def pilots_count
+      @doc.css("pilots booking").count
+    end
+
+    private
+
+    def atcs
+      @doc.css("atcs booking").each do |booking|
+        @atc_bookings << Booking.new(booking, role = "atc", @fir)
+      end
+    end
+
+    def pilots
+      @doc.css("pilots booking").each do |booking|
+        if @enroute == false
+          bk = Booking.new(booking, role = "pilot", @fir)
+          if bk.enroute == false
+            @pilot_bookings << bk
+          end
+        else
+          @pilot_bookings << Booking.new(booking, role = "pilot", @fir)
+        end
+      end
+    end
+
+    def process_arguments(args)
+      args[:enroute] == false ? @enroute = false : @enroute = true
+    end
+
+  end
+
+end

data/lib/vatbook/booking.rb

@@ -0,0 +1,41 @@
+module Vatbook
+
+  class Booking
+    require 'nokogiri'
+
+    attr_accessor :role, :callsign, :name, :cid, :start, :end, :dep, :arr
+    attr_accessor :aircraft, :route, :enroute, :fir
+
+    def initialize(booking, role, fir)
+      @fir = fir
+      @role = role
+      @callsign = booking.children.css("callsign").first.children.to_s
+      @name = booking.children.css("name").first.children.to_s
+      @role == "atc" ? @cid = booking.children.css("cid").first.children.to_s : @cid = booking.children.css("pid").first.children.to_s
+      if @role == "atc"
+        @start = booking.children.css("time_start").first.children.to_s
+        @end = booking.children.css("time_end").first.children.to_s
+      elsif @role == "pilot"
+        @dep = booking.children.css("dep").first.children.to_s
+        @arr = booking.children.css("arr").first.children.to_s
+        @route = booking.children.css("route").first.children.to_s.gsub(/[\n]/, ' ').strip
+        @start = booking.children.css("from").first.children.to_s
+        @end = booking.children.css("to").first.children.to_s
+        @aircraft = booking.children.css("actype").first.children.to_s
+        check_enroute
+      end
+    end
+
+  private
+
+    def check_enroute
+      if @fir[0..1] == @dep[0..1] or @fir[0..1] == @arr[0..1]
+        @enroute = false
+      else
+        @enroute = true
+      end
+    end
+
+  end
+
+end

data/lib/vatbook/version.rb

@@ -1,3 +1,3 @@
 module Vatbook
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/vatbook.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "guard"
   gem.add_development_dependency "libnotify"
   gem.add_development_dependency "guard-rspec"
-  gem.add_dependency "nokogiri", "~> 1.5.5"
+  gem.add_dependency "nokogiri", "~> 1.5.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vatbook
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.5.6
 description: Ruby API to the Vatbook service for reading and parsing Vatsim pilot
   and ATC bookings. Booking query requests are made by FIR and individual bookings
   are returned as objects, exposing a rich set of attributes. Support for excluding
@@ -119,6 +119,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
@@ -126,6 +127,8 @@ files:
 - README.md
 - Rakefile
 - lib/vatbook.rb
+- lib/vatbook/book_fetcher.rb
+- lib/vatbook/booking.rb
 - lib/vatbook/version.rb
 - spec/spec_helper.rb
 - spec/vatbook_spec.rb
@@ -151,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby API to the Vatbook service for reading Vatsim pilot and ATC bookings