smartware 0.1.6 → 0.1.7

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.idea
 Gemfile.lock
 InstalledFiles
 _yardoc

data/lib/smartware/clients/modem.rb

@@ -8,12 +8,6 @@ module Smartware
       DRb.start_service
       @device = DRbObject.new_with_uri('druby://localhost:6002')
 
-      #def self.configure(port, driver)
-      #  DRb.start_service
-      #  @device = DRbObject.new_with_uri('druby://localhost:6002')
-      #  @device.configure!(port, driver)
-      #end
-
       def self.error
         @device.error
       end
@@ -30,24 +24,6 @@ module Smartware
         @device.signal_level
       end
 
-      def self.d_model
-        @device.d_model
-      end
-
-      def self.d_signal
-        @device.d_signal
-      end
-
-      def self.d_balance
-        @device.d_balance
-      end
-
-      def self.d_stop
-        @device.d_stop
-      end
-
-
-
     end
   end
 end

data/lib/smartware/clients/printer.rb

@@ -8,12 +8,6 @@ module Smartware
       DRb.start_service
       @device = DRbObject.new_with_uri('druby://localhost:6005')
 
-      #def self.configure(port, driver)
-      #  DRb.start_service
-      #  @device = DRbObject.new_with_uri('druby://localhost:6005')
-      #  @device.configure!(port, driver)
-      #end
-
       def self.error
         @device.error
       rescue => e

data/lib/smartware/drivers/cash_acceptor/ccnet.rb

@@ -1,4 +1,7 @@
 # coding: utf-8
+#
+# CCNET protocol driver for CashCode bill validator
+#
 require 'serialport'
 
 module Smartware

data/lib/smartware/drivers/modem/standard.rb

@@ -49,7 +49,7 @@ module Smartware
           port = SerialPort.new(@port, 115200, 8, 1, SerialPort::NONE)
           port.read_timeout = 3000
           port.write "AT+CUSD=1,\"#{code}\",15\r\n"
-          ussd_body = port.read.split(/[\r\n]+/).last.split(",")[1].gsub('"','') # Get only USSD message body
+          ussd_body = port.read.split(/[\r\n]+/).last.split(",")[1].gsub('"','') # Parse USSD message body
           port.close
           ussd_body.scan(/\w{4}/).map{|i| [i.hex].pack("U") }.join # Encode USSD message from broken ucs2 to utf-8
         rescue

data/lib/smartware/interfaces/modem.rb

@@ -45,22 +45,6 @@ module Smartware
         @status[:signal_level]
       end
 
-      def self.d_model
-        @device.model
-      end
-
-      def self.d_signal
-        @device.signal_level
-      end
-
-      def self.d_balance
-        @device.ussd
-      end
-
-      def self.d_stop
-        @session.kill
-      end
-
       private
         def self.poll_status!
           t = Thread.new do

data/lib/smartware/version.rb

@@ -1,3 +1,3 @@
 module Smartware
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartware
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serialport
@@ -67,7 +67,6 @@ files:
 - lib/smartware/drivers/cash_acceptor/dummy.rb
 - lib/smartware/drivers/modem/dummy.rb
 - lib/smartware/drivers/modem/standard.rb
-- lib/smartware/drivers/modem/standart.rb
 - lib/smartware/drivers/printer/dummy.rb
 - lib/smartware/drivers/printer/tg24xx.rb
 - lib/smartware/interfaces/cash_acceptor.rb

data/lib/smartware/drivers/modem/standart.rb

@@ -1,74 +0,0 @@
-# coding: utf-8
-require 'serialport'
-
-module Smartware
-  module Driver
-    module Modem
-
-      class Standart
-
-        def initialize(port)
-          # @port Class variable needs for ussd request
-          @port = port
-          @sp = SerialPort.new(@port, 115200, 8, 1, SerialPort::NONE)
-        end
-
-        def error
-          false
-        end
-
-        def model
-          res = send 'ATI' rescue -1
-          return -1 unless res.last == "OK"
-
-          res.shift
-          res.pop
-          res.join(' ')
-        rescue
-          -1
-        end
-
-        #
-        # Returns signal level in dbm
-        #
-        def signal_level
-          res = send 'AT+CSQ'
-          return -1 if res.last != "OK"
-          value = res[1].gsub("+CSQ: ",'').split(',')[0].to_i
-          "#{(-113 + value * 2)} dbm"
-        rescue
-          -1
-        end
-
-        #
-        # Method send ussd to operator and return only valid answer body
-        # Don`t call with method synchronously from app, method waits USSD answer 3 sec,
-        # Use some scheduler and buffer for balance value
-        #
-        def ussd(code="*100#")
-          port = SerialPort.new(@port, 115200, 8, 1, SerialPort::NONE)
-          port.read_timeout = 3000
-          port.write "AT+CUSD=1,\"#{code}\",15\r\n"
-          ussd_body = port.read.split(/[\r\n]+/).last.split(",")[1].gsub('"','') # Get only USSD message body
-          port.close
-          ussd_body.scan(/\w{4}/).map{|i| [i.hex].pack("U") }.join # Encode USSD message from broken ucs2 to utf-8
-        rescue
-          -1
-        end
-
-        private
-          def send cmd
-            @sp.write "#{ cmd }\r\n"
-            answer = ''
-            while IO.select [@sp], [], [], 0.25
-              chr = @sp.getc.chr
-              answer << chr
-            end
-            answer.split(/[\r\n]+/)
-          end
-
-      end
-
-    end
-  end
-end