nostos-target-voyager 0.0.1 → 0.0.2

data/lib/nostos-target-voyager/config.rb

@@ -1,8 +1,9 @@
+require 'rails'
+
 module Target
   module Voyager
     class Config
-       attr_accessor :host, :port, :username, :password, :operator, :location
+      attr_accessor :db, :sip
     end
   end
 end
-

data/lib/nostos-target-voyager/railtie.rb

@@ -4,17 +4,19 @@ module Target
   module Voyager
     class Railtie < Rails::Railtie
       config.target_voyager = ActiveSupport::OrderedOptions.new
+      config.target_voyager.sip = ActiveSupport::OrderedOptions.new
+      config.target_voyager.db = ActiveSupport::OrderedOptions.new
 
       initializer "target_voyager.configure" do |app|
         Target::Voyager.configure do |config|
-          config.host = app.config.target_voyager[:host]
-          config.port = app.config.target_voyager[:port]
-          config.username = app.config.target_voyager[:username]
-          config.password = app.config.target_voyager[:password]
-          config.operator = app.config.target_voyager[:operator]
-          config.location = app.config.target_voyager[:location]
+          config.sip = app.config.target_voyager[:sip]
+          config.db = app.config.target_voyager[:db]
         end
       end
+
+      initializer "target_voyager.establish_connection", :after => "target_voyager.configure" do |app|
+        VoyagerGem::AR::Base.establish_connection(Target::Voyager.config.db)
+      end
     end
   end
 end

data/lib/nostos-target-voyager/record.rb

@@ -8,7 +8,7 @@ module Target
         begin
           @due_date = DateTime.strptime(attributes[:due_date], '%Y%m%d    %H%M%S')
         rescue
-          @due_date = nil
+          @due_date = attributes[:due_date]
         end
       end
 

data/lib/nostos-target-voyager/version.rb

@@ -1,5 +1,5 @@
 module Target
   module Voyager
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/nostos-target-voyager.rb

@@ -1,7 +1,7 @@
-require 'nostos-target-voyager/railtie.rb'
-require 'nostos-target-voyager/config.rb'
-require 'nostos-target-voyager/record.rb'
-require 'voyager-sip'
+require 'voyager'
+require 'nostos-target-voyager/railtie'
+require 'nostos-target-voyager/config'
+require 'nostos-target-voyager/record'
 
 VoyagerGem = Voyager
 
@@ -19,8 +19,8 @@ module Target
     def self.find(id)
       id = id.to_s unless id.is_a?(String)
 
-      VoyagerGem::SipClient.new(config.host, config.port) do |sip|
-        sip.login(config.username, config.password, config.location) do |response|
+      VoyagerGem::SIP::Client.new(config.sip[:host], config.sip[:port]) do |sip|
+        sip.login(config.sip[:username], config.sip[:password], config.sip[:location]) do |response|
           if response[:ok] != '1' # Login failed
             Rails::logger.error "Failed to sign in to SIP server"
             return false
@@ -57,8 +57,8 @@ module Target
       end
       # Illiad encodes strings in Windows-1252, but Voyager SIP requires all messages be ASCII.
 
-      VoyagerGem::SipClient.new(config.host, config.port) do |sip|
-        sip.login(config.username, config.password, config.location) do |response|
+      VoyagerGem::SIP::Client.new(config.sip[:host], config.sip[:port]) do |sip|
+        sip.login(config.sip[:username], config.sip[:password], config.sip[:location]) do |response|
           # First be sure that an item doesn't already exist.
           sip.item_status(item.id) do |item_status|
             unless item_status[:AF] == 'Item barcode not found.  Please consult library personnel for assistance.'
@@ -69,7 +69,7 @@ module Target
                                                  :charged => !item_status[:AH].empty?)
             else
               # Item doesn't exist
-              sip.create_bib(config.operator, title, item.id) do |response|
+              sip.create_bib(config.sip[:operator], title, item.id) do |response|
                 # Bib/MFHD/Item created. Store values.
                 #
                 # Values must be stored in order to delete the items via SIP.
@@ -86,5 +86,14 @@ module Target
       end
       nil
     end
+
+    def self.charged
+      VoyagerGem::AR::Item.joins(:circ_transaction).includes(:circ_transaction, :bib_text, :barcode).where(:item_type_id => 24).all.map do |item|
+        Target::Voyager::Record.new(:id => item.barcode.item_barcode,
+                                    :title => item.bib_item.bib_text.title,
+                                    :due_date => item.circ_transaction.current_due_date,
+                                    :charged => !item.circ_transaction.nil?)
+      end
+    end
   end
 end

data/nostos-target-voyager.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_dependency('voyager-sip')
+  s.add_dependency('voyager')
+  s.add_dependency('rails')
 end

metadata

@@ -2,7 +2,7 @@
 name: nostos-target-voyager
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Brice Stacey
@@ -10,10 +10,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 Z
+date: 2011-04-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: voyager-sip
+  name: voyager
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -23,6 +23,17 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: Nostos Target Driver for Voyager ILS
 email: 
 - bricestacey@gmail.com